[Pkg-owncloud-commits] [owncloud-client] 14/164: SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit c0c8a22fa3d7c4ae874755aa3bcc06e5aa4ca4bd
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Mon Feb 16 16:31:49 2015 +0100

    SyncEngine: pass a non-const reference to the SyncFileItemVector in aboutToPropagate
    
    That way, users of the library  can change the contents of the sync item vector.
---
 src/gui/folder.cpp       | 6 +++---
 src/gui/folder.h         | 2 +-
 src/libsync/syncengine.h | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 8308cc4..8acb959 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -590,7 +590,7 @@ void Folder::slotThreadTreeWalkResult(const SyncFileItemVector& items)
     _syncResult.setSyncFileItemVector(items);
 }
 
-void Folder::slotAboutToPropagate(const SyncFileItemVector& items)
+void Folder::slotAboutToPropagate(SyncFileItemVector& items)
 {
     // empty the tainted list since the status generation code will use the _syncedItems
     // (which imply the folder) to generate the syncing state icon now.
@@ -791,8 +791,8 @@ void Folder::startSync(const QStringList &pathList)
     connect(_engine.data(), SIGNAL(rootEtag(QString)), this, SLOT(etagRetreivedFromSyncEngine(QString)));
     connect( _engine.data(), SIGNAL(treeWalkResult(const SyncFileItemVector&)),
               this, SLOT(slotThreadTreeWalkResult(const SyncFileItemVector&)), Qt::QueuedConnection);
-    connect( _engine.data(), SIGNAL(aboutToPropagate(const SyncFileItemVector&)),
-              this, SLOT(slotAboutToPropagate(const SyncFileItemVector&)), Qt::QueuedConnection);
+    connect( _engine.data(), SIGNAL(aboutToPropagate(SyncFileItemVector&)),
+              this, SLOT(slotAboutToPropagate(SyncFileItemVector&)));
 
     connect(_engine.data(), SIGNAL(started()),  SLOT(slotSyncStarted()), Qt::QueuedConnection);
     connect(_engine.data(), SIGNAL(finished()), SLOT(slotSyncFinished()), Qt::QueuedConnection);
diff --git a/src/gui/folder.h b/src/gui/folder.h
index f978be1..f07be95 100644
--- a/src/gui/folder.h
+++ b/src/gui/folder.h
@@ -189,7 +189,7 @@ private slots:
     void etagRetreived(const QString &);
     void etagRetreivedFromSyncEngine(const QString &);
 
-    void slotAboutToPropagate(const SyncFileItemVector& );
+    void slotAboutToPropagate(SyncFileItemVector& );
     void slotThreadTreeWalkResult(const SyncFileItemVector& ); // after sync is done
 
     void slotEmitFinishedDelayed();
diff --git a/src/libsync/syncengine.h b/src/libsync/syncengine.h
index 211dbc5..1c6ec4c 100644
--- a/src/libsync/syncengine.h
+++ b/src/libsync/syncengine.h
@@ -90,7 +90,7 @@ signals:
     // before actual syncing (after update+reconcile) for each item
     void syncItemDiscovered(const SyncFileItem&);
     // after the above signals. with the items that actually need propagating
-    void aboutToPropagate(const SyncFileItemVector&);
+    void aboutToPropagate(SyncFileItemVector&);
 
     // after each job (successful or not)
     void jobCompleted(const SyncFileItem&);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git