Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJocelyn Turcotte <jturcotte@woboq.com>2017-01-25 16:09:44 +0300
committerJocelyn Turcotte <jturcotte@woboq.com>2017-01-26 01:26:23 +0300
commita764d7eb86b40315931e3a0c9fac20ef7a83c09c (patch)
tree4bee32883a00eb562bdb10930974d934a92f317d /src/libsync/owncloudpropagator.cpp
parent605a18ff738afc3951dfaedf9068a921b77bebc7 (diff)
Don't pass the PropagatorJob in itemCompleted
This was to catch duplicate emissions for PropagateDirectory but we don't emit this signal anymore from there. This fixes a warning about PropagatorJob not being a registered metatype. This reverts commit fe42c1a818c3b1ccadb2e9557971b62a350573b4.
Diffstat (limited to 'src/libsync/owncloudpropagator.cpp')
-rw-r--r--src/libsync/owncloudpropagator.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
index afe26c3d3..6d87f53b7 100644
--- a/src/libsync/owncloudpropagator.cpp
+++ b/src/libsync/owncloudpropagator.cpp
@@ -172,7 +172,7 @@ void PropagateItemJob::done(SyncFileItem::Status status, const QString &errorStr
_item->_status = status;
- emit itemCompleted(*_item, *this);
+ emit itemCompleted(*_item);
emit finished(status);
}
@@ -221,7 +221,7 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
if( newJob ) {
newJob->setRestoreJobMsg(msg);
_restoreJob.reset(newJob);
- connect(_restoreJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &, const PropagatorJob &)),
+ connect(_restoreJob.data(), SIGNAL(itemCompleted(const SyncFileItemPtr &)),
this, SLOT(slotRestoreJobCompleted(const SyncFileItemPtr &)));
QMetaObject::invokeMethod(newJob, "start");
}
@@ -403,8 +403,8 @@ void OwncloudPropagator::start(const SyncFileItemVector& items)
_rootJob->append(it);
}
- connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)),
- this, SIGNAL(itemCompleted(const SyncFileItem &, const PropagatorJob &)));
+ connect(_rootJob.data(), SIGNAL(itemCompleted(const SyncFileItem &)),
+ this, SIGNAL(itemCompleted(const SyncFileItem &)));
connect(_rootJob.data(), SIGNAL(progress(const SyncFileItem &,quint64)), this, SIGNAL(progress(const SyncFileItem &,quint64)));
connect(_rootJob.data(), SIGNAL(finished(SyncFileItem::Status)), this, SLOT(emitFinished(SyncFileItem::Status)));
connect(_rootJob.data(), SIGNAL(ready()), this, SLOT(scheduleNextJob()), Qt::QueuedConnection);