fix review comments

Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
nextcloud · Oct 31, 2022 · 54154a7 · 54154a7
1 parent 4bc38d8
commit 54154a7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/libsync/owncloudpropagator.cpp b/src/libsync/owncloudpropagator.cpp
@@ -1339,7 +1339,7 @@ void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
         return;
     }
 
-    if (_hasError == SyncFileItem::NoStatus) {
+    if (_errorStatus == SyncFileItem::NoStatus) {
         switch (status) {
         case SyncFileItem::NoStatus:
         case SyncFileItem::FatalError:
@@ -1355,7 +1355,7 @@ void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
         case SyncFileItem::Success:
             break;
         case SyncFileItem::BlacklistedError:
-            _hasError = SyncFileItem::BlacklistedError;
+            _errorStatus = SyncFileItem::BlacklistedError;
             break;
         }
     }
@@ -1365,9 +1365,9 @@ void PropagateRootDirectory::slotSubJobsFinished(SyncFileItem::Status status)
 
 void PropagateRootDirectory::slotDirDeletionJobsFinished(SyncFileItem::Status status)
 {
-    if (_hasError != SyncFileItem::NoStatus && status == SyncFileItem::Success) {
-        qCInfo(lcPropagator) << "PropagateRootDirectory::slotDirDeletionJobsFinished" << "reporting previous error" << _hasError;
-        status = _hasError;
+    if (_errorStatus != SyncFileItem::NoStatus && status == SyncFileItem::Success) {
+        qCInfo(lcPropagator) << "PropagateRootDirectory::slotDirDeletionJobsFinished" << "reporting previous error" << _errorStatus;
+        status = _errorStatus;
     }
 
     _state = Finished;

diff --git a/src/libsync/owncloudpropagator.h b/src/libsync/owncloudpropagator.h
@@ -383,7 +383,7 @@ private slots:
 
     bool scheduleDelayedJobs();
 
-    SyncFileItem::Status _hasError = SyncFileItem::Status::NoStatus;
+    SyncFileItem::Status _errorStatus = SyncFileItem::Status::NoStatus;
 };
 
 /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -383,7 +383,7 @@ private slots: @@
         bool scheduleDelayedJobs();
-        SyncFileItem::Status _hasError = SyncFileItem::Status::NoStatus;
+        SyncFileItem::Status _errorStatus = SyncFileItem::Status::NoStatus;
     };
     /**
@@ Expand Down @@