SyncEngine: Rename phase finishing slots

slotDiscoveryJobFinished -> slotDiscoveryFinished
slotFinished -> slotPropagationFinished

This should be clearer. Particular the
slotFinished -> finalize -> emit finished()
chain was confusing before.

diff --git a/src/libsync/progressdispatcher.h b/src/libsync/progressdispatcher.h
index fdb13bbda4f40dcaafc7104764f1e9ca79d3f3af..17e1601a95a3f38e40c67c28b0df3e71f6b8d0c1 100644 (file)
--- a/src/libsync/progressdispatcher.h
+++ b/src/libsync/progressdispatcher.h
@@ -63,7 +63,7 @@ public:
          * Emitted once when done
          *
          * Except when SyncEngine jumps directly to finalize() without going
-         * through slotFinished().
+         * through slotPropagationFinished().
          */
         Done
     };

diff --git a/src/libsync/syncengine.cpp b/src/libsync/syncengine.cpp
index afa8cdfdb1751533dbe0649489cf56b109dea3d2..c1613eb575f809006110697472c330aff8b70234 100644 (file)
--- a/src/libsync/syncengine.cpp
+++ b/src/libsync/syncengine.cpp
@@ -617,7 +617,7 @@ void SyncEngine::slotStartDiscovery()
         syncError(errorString);
         finalize(false);
     });
-    connect(_discoveryPhase.data(), &DiscoveryPhase::finished, this, &SyncEngine::slotDiscoveryJobFinished);
+    connect(_discoveryPhase.data(), &DiscoveryPhase::finished, this, &SyncEngine::slotDiscoveryFinished);
 
     auto discoveryJob = new ProcessDirectoryJob(SyncFileItemPtr(), ProcessDirectoryJob::NormalQuery, ProcessDirectoryJob::NormalQuery,
         _discoveryPhase.data(), _discoveryPhase.data());
@@ -660,7 +660,7 @@ void SyncEngine::slotNewItem(const SyncFileItemPtr &item)
     _progressInfo->adjustTotalsForFile(*item);
 }
 
-void SyncEngine::slotDiscoveryJobFinished()
+void SyncEngine::slotDiscoveryFinished()
 {
     if (!_discoveryPhase) {
         // There was an error that was already taken care of
@@ -749,7 +749,7 @@ void SyncEngine::slotDiscoveryJobFinished()
         this, &SyncEngine::slotItemCompleted);
     connect(_propagator.data(), &OwncloudPropagator::progress,
         this, &SyncEngine::slotProgress);
-    connect(_propagator.data(), &OwncloudPropagator::finished, this, &SyncEngine::slotFinished, Qt::QueuedConnection);
+    connect(_propagator.data(), &OwncloudPropagator::finished, this, &SyncEngine::slotPropagationFinished, Qt::QueuedConnection);
     connect(_propagator.data(), &OwncloudPropagator::seenLockedFile, this, &SyncEngine::seenLockedFile);
     connect(_propagator.data(), &OwncloudPropagator::touchedFile, this, &SyncEngine::slotAddTouchedFile);
     connect(_propagator.data(), &OwncloudPropagator::insufficientLocalStorage, this, &SyncEngine::slotInsufficientLocalStorage);
@@ -811,7 +811,7 @@ void SyncEngine::slotItemCompleted(const SyncFileItemPtr &item)
     emit itemCompleted(item);
 }
 
-void SyncEngine::slotFinished(bool success)
+void SyncEngine::slotPropagationFinished(bool success)
 {
     if (_propagator->_anotherSyncNeeded && _anotherSyncNeeded == NoFollowUpSync) {
         _anotherSyncNeeded = ImmediateFollowUp;

diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h
index 49927772fa79ae10ed05c37d2b4465af7bf7cc1f..49523eb4777fec5243f76ac1fa1a22481be4afe5 100644 (file)
--- a/src/libsync/syncengine.h
+++ b/src/libsync/syncengine.h
@@ -181,9 +181,9 @@ private slots:
     void slotNewItem(const SyncFileItemPtr &item);
 
     void slotItemCompleted(const SyncFileItemPtr &item);
-    void slotFinished(bool success);
+    void slotDiscoveryFinished();
+    void slotPropagationFinished(bool success);
     void slotProgress(const SyncFileItem &item, quint64 curent);
-    void slotDiscoveryJobFinished();
     void slotCleanPollsJobAborted(const QString &error);
 
     /** Records that a file was touched by a job. */