[Pkg-owncloud-commits] [owncloud-client] 04/498: Some minor cleanups.

[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 4b212f905fab161a7ef6b2bb30304171e3b096a2
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Tue Feb 24 10:58:51 2015 +0100

    Some minor cleanups.
---
 csync/src/vio/csync_vio.c      |  2 +-
 src/libsync/discoveryphase.cpp | 10 +++++-----
 src/libsync/discoveryphase.h   | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/csync/src/vio/csync_vio.c b/csync/src/vio/csync_vio.c
index c32ef4d..b143d60 100644
--- a/csync/src/vio/csync_vio.c
+++ b/csync/src/vio/csync_vio.c
@@ -50,7 +50,7 @@ csync_vio_handle_t *csync_vio_opendir(CSYNC *ctx, const char *name) {
       break;
     case LOCAL_REPLICA:
 	if( ctx->callbacks.update_callback ) {
-	  ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
+        ctx->callbacks.update_callback(ctx->replica, name, ctx->callbacks.update_callback_userdata);
 	}
       return csync_vio_local_opendir(name);
       break;
diff --git a/src/libsync/discoveryphase.cpp b/src/libsync/discoveryphase.cpp
index f6bb13f..41fab73 100644
--- a/src/libsync/discoveryphase.cpp
+++ b/src/libsync/discoveryphase.cpp
@@ -66,12 +66,12 @@ void DiscoveryJob::update_job_update_callback (bool local,
     DiscoveryJob *updateJob = static_cast<DiscoveryJob*>(userdata);
     if (updateJob) {
         // Don't wanna overload the UI
-        if (!updateJob->lastUpdateProgressCallbackCall.isValid()) {
-            updateJob->lastUpdateProgressCallbackCall.restart(); // first call
-        } else if (updateJob->lastUpdateProgressCallbackCall.elapsed() < 200) {
+        if (!updateJob->_lastUpdateProgressCallbackCall.isValid()) {
+            updateJob->_lastUpdateProgressCallbackCall.restart(); // first call
+        } else if (updateJob->_lastUpdateProgressCallbackCall.elapsed() < 200) {
             return;
         } else {
-            updateJob->lastUpdateProgressCallbackCall.restart();
+            updateJob->_lastUpdateProgressCallbackCall.restart();
         }
 
         QString path(QUrl::fromPercentEncoding(QByteArray(dirUrl)).section('/', -1));
@@ -472,7 +472,7 @@ void DiscoveryJob::start() {
     csync_set_log_callback(_log_callback);
     csync_set_log_level(_log_level);
     csync_set_log_userdata(_log_userdata);
-    lastUpdateProgressCallbackCall.invalidate();
+    _lastUpdateProgressCallbackCall.invalidate();
     int ret = csync_update(_csync_ctx);
 
     _csync_ctx->checkSelectiveSyncBlackListHook = 0;
diff --git a/src/libsync/discoveryphase.h b/src/libsync/discoveryphase.h
index 356047b..207883c 100644
--- a/src/libsync/discoveryphase.h
+++ b/src/libsync/discoveryphase.h
@@ -117,11 +117,11 @@ public:
 class DiscoveryJob : public QObject {
     Q_OBJECT
     friend class DiscoveryMainThread;
-    CSYNC *_csync_ctx;
-    csync_log_callback _log_callback;
-    int _log_level;
-    void* _log_userdata;
-    QElapsedTimer lastUpdateProgressCallbackCall;
+    CSYNC              *_csync_ctx;
+    csync_log_callback  _log_callback;
+    int                 _log_level;
+    void*               _log_userdata;
+    QElapsedTimer       _lastUpdateProgressCallbackCall;
 
     /**
      * return true if the given path should be synced,

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