From e3ac63e9ff850e0628cbdc5f067afa57b643b1ae Mon Sep 17 00:00:00 2001 From: Felix Weilbach Date: Wed, 10 Mar 2021 10:22:33 +0100 Subject: [PATCH] Rename isActivityIgnored() to isUnsolvableconflict() Signed-off-by: Felix Weilbach --- src/gui/tray/UserModel.cpp | 10 +++------- src/gui/tray/UserModel.h | 2 +- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/gui/tray/UserModel.cpp b/src/gui/tray/UserModel.cpp index 9763a79d0..8a1233be7 100644 --- a/src/gui/tray/UserModel.cpp +++ b/src/gui/tray/UserModel.cpp @@ -418,14 +418,10 @@ bool User::isActivityOfCurrentAccount(const Folder *folder) const return folder->accountState() == _account.data(); } -bool User::isActivityIgnored(const SyncFileItemPtr &item) const +bool User::isUnsolvableConflict(const SyncFileItemPtr &item) const { // We just care about conflict issues that we are able to resolve - if (item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file)) { - return true; - } - - return false; + return item->_status == SyncFileItem::Conflict && !Utility::isConflictFile(item->_file); } void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item) @@ -439,7 +435,7 @@ void User::slotItemCompleted(const QString &folder, const SyncFileItemPtr &item) return; } - if (isActivityIgnored(item)) { + if (isUnsolvableConflict(item)) { return; } diff --git a/src/gui/tray/UserModel.h b/src/gui/tray/UserModel.h index be92e8aec..6302d1340 100644 --- a/src/gui/tray/UserModel.h +++ b/src/gui/tray/UserModel.h @@ -81,7 +81,7 @@ private: bool checkPushNotificationsAreReady() const; bool isActivityOfCurrentAccount(const Folder *folder) const; - bool isActivityIgnored(const SyncFileItemPtr &item) const; + bool isUnsolvableConflict(const SyncFileItemPtr &item) const; private: AccountStatePtr _account; -- 2.30.2