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/gui/protocolwidget.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/gui/protocolwidget.cpp')
-rw-r--r--src/gui/protocolwidget.cpp11
1 files changed, 3 insertions, 8 deletions
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index e97ba9e14..6adf2fc54 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -27,7 +27,6 @@
#include "syncfileitem.h"
#include "folder.h"
#include "openfilemanager.h"
-#include "owncloudpropagator.h"
#include "activityitemdelegate.h"
#include "ui_protocolwidget.h"
@@ -45,8 +44,8 @@ ProtocolWidget::ProtocolWidget(QWidget *parent) :
connect(ProgressDispatcher::instance(), SIGNAL(progressInfo(QString,ProgressInfo)),
this, SLOT(slotProgressInfo(QString,ProgressInfo)));
- connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString,SyncFileItem,PropagatorJob)),
- this, SLOT(slotItemCompleted(QString,SyncFileItem,PropagatorJob)));
+ connect(ProgressDispatcher::instance(), SIGNAL(itemCompleted(QString,SyncFileItem)),
+ this, SLOT(slotItemCompleted(QString,SyncFileItem)));
connect(_ui->_treeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), SLOT(slotOpenFile(QTreeWidgetItem*,int)));
@@ -222,12 +221,8 @@ void ProtocolWidget::slotProgressInfo( const QString& folder, const ProgressInfo
}
}
-void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem &item, const PropagatorJob &job)
+void ProtocolWidget::slotItemCompleted(const QString &folder, const SyncFileItem &item)
{
- if (qobject_cast<const PropagateDirectory*>(&job)) {
- return;
- }
-
QTreeWidgetItem *line = createCompletedTreewidgetItem(folder, item);
if(line) {
if( item.hasErrorStatus() ) {