From: Jocelyn Turcotte <jturcotte@woboq.com>
Date: Thu, 26 Jan 2017 14:59:27 +0000 (+0100)
Subject: Remove PropagateDirectory::_runningNow
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~855
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8884fe7236dd477bba4af36a0421e51d6afbbf02;p=nextcloud-desktop.git

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 6a041d52d..f8a8db892 100644
--- 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 c6f18550d..4c06fcf3e 100644
--- 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();
     }