[Pkg-owncloud-commits] [owncloud-client] 63/333: Register metatype at better place

[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 65ffe53c205c4d99975dd8434948d0a0e27e308d
Author: Markus Goetz <markus at woboq.com>
Date:   Wed Feb 19 14:53:31 2014 +0100

    Register metatype at better place
---
 src/mirall/csyncthread.cpp      | 2 ++
 src/owncloudcmd/owncloudcmd.cpp | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 31bc316..efbefed 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -66,6 +66,8 @@ CSyncThread::CSyncThread(CSYNC *ctx, const QString& localPath, const QString& re
     _journal = journal;
     qRegisterMetaType<SyncFileItem>("SyncFileItem");
     qRegisterMetaType<SyncFileItem::Status>("SyncFileItem::Status");
+    qRegisterMetaType<Progress::Info>("Progress::Info");
+    qRegisterMetaType<Progress::Kind>("Progress::Kind");
 
     _thread.start();
 }
diff --git a/src/owncloudcmd/owncloudcmd.cpp b/src/owncloudcmd/owncloudcmd.cpp
index 2854210..a053378 100644
--- a/src/owncloudcmd/owncloudcmd.cpp
+++ b/src/owncloudcmd/owncloudcmd.cpp
@@ -223,7 +223,6 @@ int main(int argc, char **argv) {
     SyncJournalDb db(options.source_dir);
     CSyncThread csyncthread(_csync_ctx, options.source_dir, QUrl(options.target_url).path(), folder, &db);
     QObject::connect(&csyncthread, SIGNAL(finished()), &app, SLOT(quit()));
-    qRegisterMetaType<Progress::Info>("Progress::Info");
     QObject::connect(&csyncthread, SIGNAL(transmissionProgress(Progress::Info)), &owncloudCmd, SLOT(transmissionProgressSlot(Progress::Info)));
     csyncthread.startSync();
 

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