[Pkg-owncloud-commits] [owncloud-client] 43/115: SyncEngine & UI: Make the function part of UpdateJob

[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 c27f1514511e9bb5f0f365ddc7434f7312a8412d
Author: Markus Goetz <markus at woboq.com>
Date:   Fri Aug 15 16:11:51 2014 +0200

    SyncEngine & UI: Make the function part of UpdateJob
    
    That way we can easily emit UploadJob's signals
---
 src/mirall/syncengine.cpp | 2 +-
 src/mirall/syncengine.h   | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/mirall/syncengine.cpp b/src/mirall/syncengine.cpp
index 824f4f4..544b37a 100644
--- a/src/mirall/syncengine.cpp
+++ b/src/mirall/syncengine.cpp
@@ -453,7 +453,7 @@ void SyncEngine::handleSyncError(CSYNC *ctx, const char *state) {
     finalize();
 }
 
-void update_job_update_callback (bool local,
+void UpdateJob::update_job_update_callback (bool local,
                                     const char *dirUrl,
                                     void *userdata)
 {
diff --git a/src/mirall/syncengine.h b/src/mirall/syncengine.h
index 99a5b36..e31a920 100644
--- a/src/mirall/syncengine.h
+++ b/src/mirall/syncengine.h
@@ -147,10 +147,6 @@ private:
     QHash<QString, QByteArray> _remotePerms;
 };
 
-void update_job_update_callback (bool local,
-                                    const char *dirname,
-                                    void *userdata);
-
 class UpdateJob : public QObject {
     Q_OBJECT
     CSYNC *_csync_ctx;
@@ -166,6 +162,9 @@ class UpdateJob : public QObject {
         emit finished(csync_update(_csync_ctx));
         deleteLater();
     }
+    static void update_job_update_callback (bool local,
+                                        const char *dirname,
+                                        void *userdata);
 public:
     explicit UpdateJob(CSYNC *ctx, QObject* parent = 0)
             : QObject(parent), _csync_ctx(ctx) {

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