[Pkg-owncloud-commits] [owncloud-client] 68/219: Fix style issues.

[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 1cf1f6edcbc45e9c0bdba420f0475bf1696b2111
Author: Christian Kamm <kamm at incasoftware.de>
Date:   Thu Sep 4 13:27:11 2014 +0200

    Fix style issues.
---
 src/mirall/folder.cpp           |  3 ++-
 src/mirall/mirallconfigfile.cpp | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index e2f46ad..835b2ce 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -538,8 +538,9 @@ bool Folder::setIgnoredFiles()
     QString excludeList = cfgFile.excludeFile( MirallConfigFile::SystemScope );
     if( !excludeList.isEmpty() ) {
         qDebug() << "==== added system ignore list to csync:" << excludeList.toUtf8();
-        if (csync_add_exclude_list( _csync_ctx, excludeList.toUtf8() ) != -1)
+        if (csync_add_exclude_list( _csync_ctx, excludeList.toUtf8() ) == 0) {
             ok = true;
+        }
     }
     excludeList = cfgFile.excludeFile( MirallConfigFile::UserScope );
     if( !excludeList.isEmpty() ) {
diff --git a/src/mirall/mirallconfigfile.cpp b/src/mirall/mirallconfigfile.cpp
index f659302..d5089cd 100644
--- a/src/mirall/mirallconfigfile.cpp
+++ b/src/mirall/mirallconfigfile.cpp
@@ -233,13 +233,13 @@ QString MirallConfigFile::excludeFile(Scope scope) const
 #endif
 #ifdef Q_OS_UNIX
             fi.setFile( QString( SYSCONFDIR "/%1").arg(Theme::instance()->appName()), exclFile );
-            if ( ! fi.exists() )
-            {
+            if ( ! fi.exists() ) {
                 // Prefer to return the preferred path! Only use the fallback location
                 // if the other path does not exist and the fallback is valid.
-                QFileInfo next_to_binary( QCoreApplication::applicationDirPath(), exclFile );
-                if (next_to_binary.exists())
-                    fi = next_to_binary;
+                QFileInfo nextToBinary( QCoreApplication::applicationDirPath(), exclFile );
+                if (nextToBinary.exists()) {
+                    fi = nextToBinary;
+                }
             }
 #endif
 #ifdef Q_OS_MAC

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