diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp b/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp index 4b66b437b..9505d3add 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/filescleaner.cpp @@ -73,7 +73,7 @@ bool CFilesCleaner::exec() dir.removeRecursively(); } - if (m_listener) m_listener->operationFinish(); + if (m_listener) m_listener->operationSuccess(files.size()); return true; } diff --git a/code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp b/code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp index 8c8cfabb4..8b2af9be8 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/filescopier.cpp @@ -181,7 +181,6 @@ bool CFilesCopier::copyFiles(const FilesToCopy &files) if (m_listener) { m_listener->operationSuccess(totalSize); - m_listener->operationFinish(); } return true; diff --git a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp b/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp index 222add173..3adea7e80 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/filesextractor.cpp @@ -457,7 +457,6 @@ bool CFilesExtractor::extract7z() if (m_listener) { m_listener->operationSuccess(totalUncompressed); - m_listener->operationFinish(); } return true; @@ -563,7 +562,6 @@ bool CFilesExtractor::extractZip() if (m_listener) { m_listener->operationSuccess(totalSize); - m_listener->operationFinish(); } return true; @@ -594,7 +592,6 @@ bool CFilesExtractor::progress(const std::string &filename, uint32 currentSize, if (m_listener) { m_listener->operationSuccess((qint64)totalSize); - m_listener->operationFinish(); } } diff --git a/code/ryzom/tools/client/ryzom_installer/src/operation.h b/code/ryzom/tools/client/ryzom_installer/src/operation.h index b8cfeea34..121761e57 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operation.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operation.h @@ -29,7 +29,6 @@ public: virtual void operationProgress(qint64 current, const QString &filename) =0; virtual void operationSuccess(qint64 total) =0; virtual void operationFail(const QString &error) =0; - virtual void operationFinish() =0; virtual bool operationShouldStop() =0; }; diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp index 88656a68a..ef9984e6b 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.cpp @@ -382,11 +382,6 @@ void COperationDialog::operationFail(const QString &error) emit fail(error); } -void COperationDialog::operationFinish() -{ - emit done(); -} - bool COperationDialog::operationShouldStop() { QMutexLocker locker(&m_abortingMutex); diff --git a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h index b4004988b..b16f90edb 100644 --- a/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h +++ b/code/ryzom/tools/client/ryzom_installer/src/operationdialog.h @@ -97,7 +97,6 @@ protected: virtual void operationProgress(qint64 current, const QString &filename); virtual void operationSuccess(qint64 total); virtual void operationFail(const QString &error); - virtual void operationFinish(); virtual bool operationShouldStop();