[Pkg-owncloud-commits] [owncloud-client] 187/333: Prefer the use of _isDirectory over item._type == SyncFileItem::Directory

[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 756e1c4a12584b6cdd944dd840881badef850d2d
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Thu Mar 20 14:58:56 2014 +0100

    Prefer the use of _isDirectory over  item._type == SyncFileItem::Directory
---
 src/mirall/folder.cpp             | 6 ++----
 src/mirall/owncloudpropagator.cpp | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp
index 0969c06..221bb47 100644
--- a/src/mirall/folder.cpp
+++ b/src/mirall/folder.cpp
@@ -314,12 +314,10 @@ void Folder::bubbleUpSyncResult()
 
         } else {
             // add new directories or remove gone away dirs to the watcher
-            if (item._type == SyncFileItem::Directory &&
-                    item._instruction == CSYNC_INSTRUCTION_NEW ) {
+            if (item._isDirectory && item._instruction == CSYNC_INSTRUCTION_NEW ) {
                 FolderMan::instance()->addMonitorPath( alias(), path()+item._file );
             }
-            if (item._type == SyncFileItem::Directory &&
-                    item._instruction == CSYNC_INSTRUCTION_REMOVE ) {
+            if (item._isDirectory && item._instruction == CSYNC_INSTRUCTION_REMOVE ) {
                 FolderMan::instance()->removeMonitorPath( alias(), path()+item._file );
             }
 
diff --git a/src/mirall/owncloudpropagator.cpp b/src/mirall/owncloudpropagator.cpp
index 86769b9..d0402d4 100644
--- a/src/mirall/owncloudpropagator.cpp
+++ b/src/mirall/owncloudpropagator.cpp
@@ -79,7 +79,7 @@ bool PropagateItemJob::checkForProblemsWithShared(int httpStatusCode, const QStr
     PropagateItemJob *newJob = NULL;
 
     if( httpStatusCode == 403 && _propagator->isInSharedDirectory(_item._file )) {
-        if( _item._type != SyncFileItem::Directory ) {
+        if( !_item._isDirectory ) {
             SyncFileItem downloadItem(_item);
             if (downloadItem._instruction == CSYNC_INSTRUCTION_NEW) {
                 // don't try to recover pushing new files

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