Remove PropagateDirectory::_runningNow

This variable isn't used anymore except in a stray Q_ASSERT.
This commit is contained in:
Jocelyn Turcotte 2017-01-26 15:59:27 +01:00
parent bb3efc5988
commit 8884fe7236
2 changed files with 1 additions and 5 deletions

View file

@ -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();

View file

@ -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();
}