Remove PropagateDirectory::_runningNow

This variable isn't used anymore except in a stray Q_ASSERT.

diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index 6a041d52db18575adbd9d75e6ea9af3c2dcffd61..f8a8db89239d6a08b057d551ff254619d7cd8bde 100644 (file)
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -676,12 +676,10 @@ void PropagateDirectory::slotSubJobFinished(SyncFileItem::Status status)
     } else if (status == SyncFileItem::NormalError || status == SyncFileItem::SoftError) {
         _hasError = status;
     }
-    _runningNow--;
 
     // We finished processing all the jobs
     // check if we finished
     if (!_firstJob && _subJobs.isEmpty()) {
-        Q_ASSERT(!_runningNow); // how can we be finished if there are still jobs running now
         finalize();
     } else {
         emit ready();

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
index c6f18550d9a2d4cfe45a8bf627e1c0d45089a496..4c06fcf3ee34611377b7e6ebacd5d022432b3a81 100644 (file)
--- a/src/libsync/owncloudpropagator.h
+++ b/src/libsync/owncloudpropagator.h
@@ -192,12 +192,11 @@ public:
 
     SyncFileItemPtr _item;
 
-    int _runningNow; // number of subJobs running right now
     SyncFileItem::Status _hasError;  // NoStatus,  or NormalError / SoftError if there was an error
 
     explicit PropagateDirectory(OwncloudPropagator *propagator, const SyncFileItemPtr &item = SyncFileItemPtr(new SyncFileItem))
         : PropagatorJob(propagator)
-        , _item(item), _runningNow(0), _hasError(SyncFileItem::NoStatus)
+        , _item(item), _hasError(SyncFileItem::NoStatus)
     { }
 
     virtual ~PropagateDirectory() {
@@ -232,7 +231,6 @@ private slots:
             connect(next, SIGNAL(itemCompleted(const SyncFileItemPtr &)), this, SIGNAL(itemCompleted(const SyncFileItemPtr &)));
             connect(next, SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
             connect(next, SIGNAL(ready()), this, SIGNAL(ready()));
-            _runningNow++;
         }
         return next->scheduleNextJob();
     }