From: Claudio Cambra <claudio.cambra@nextcloud.com>
Date: Thu, 3 Aug 2023 07:13:51 +0000 (+0800)
Subject: Declare whitelist and blacklist activity verbs as static constexprs in activitydata... 
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~92^2^2~57^2~4
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=e1f342c320d6dc34866171eccd9f16c023a932a7;p=nextcloud-desktop.git

Declare whitelist and blacklist activity verbs as static constexprs in activitydata, refer to this in usage

Signed-off-by: Claudio Cambra <claudio.cambra@nextcloud.com>
---

diff --git a/src/gui/folder.cpp b/src/gui/folder.cpp
index 02caa5322..e43bcea06 100644
--- a/src/gui/folder.cpp
+++ b/src/gui/folder.cpp
@@ -1297,7 +1297,7 @@ void Folder::slotExistingFolderNowBig(const QString &folderPath)
         auto whitelistActivityLink = ActivityLink();
         whitelistActivityLink._label = tr("Keep syncing");
         whitelistActivityLink._primary = false;
-        whitelistActivityLink._verb = "WHITELIST_FOLDER";
+        whitelistActivityLink._verb = ActivityLink::WhitelistFolderVerb;
 
         QVector<ActivityLink> activityLinks = {whitelistActivityLink};
 
@@ -1305,7 +1305,7 @@ void Folder::slotExistingFolderNowBig(const QString &folderPath)
             auto blacklistActivityLink = ActivityLink();
             blacklistActivityLink._label = tr("Stop syncing");
             blacklistActivityLink._primary = true;
-            blacklistActivityLink._verb = "BLACKLIST_FOLDER";
+            blacklistActivityLink._verb = ActivityLink::BlacklistFolderVerb;
 
             activityLinks.append(blacklistActivityLink);
         }
diff --git a/src/gui/tray/activitydata.h b/src/gui/tray/activitydata.h
index 29df3c878..e613ad5bf 100644
--- a/src/gui/tray/activitydata.h
+++ b/src/gui/tray/activitydata.h
@@ -45,6 +45,9 @@ class ActivityLink
 public:
     static ActivityLink createFomJsonObject(const QJsonObject &obj);
 
+    static constexpr auto WhitelistFolderVerb = "WHITELIST_FOLDER";
+    static constexpr auto BlacklistFolderVerb = "BLACKLIST_FOLDER";
+
 public:
     QString _imageSource;
     QString _imageSourceHovered;
diff --git a/src/gui/tray/activitylistmodel.cpp b/src/gui/tray/activitylistmodel.cpp
index 76fb6f8db..b43cb45c0 100644
--- a/src/gui/tray/activitylistmodel.cpp
+++ b/src/gui/tray/activitylistmodel.cpp
@@ -836,11 +836,11 @@ void ActivityListModel::slotTriggerAction(const int activityIndex, const int act
                (activity._syncFileItemStatus == SyncFileItem::Conflict || activity._syncFileItemStatus == SyncFileItem::FileNameClash)) {
         slotTriggerDefaultAction(activityIndex);
         return;
-    } else if (action._verb == "WHITELIST_FOLDER" && !activity._file.isEmpty()) { // _folder == folder alias/name, _file == folder/file path
+    } else if (action._verb == ActivityLink::WhitelistFolderVerb && !activity._file.isEmpty()) { // _folder == folder alias/name, _file == folder/file path
         FolderMan::instance()->whitelistFolderPath(activity._file);
         removeActivityFromActivityList(activity);
         return;
-    } else if (action._verb == "BLACKLIST_FOLDER" && !activity._file.isEmpty()) {
+    } else if (action._verb == ActivityLink::BlacklistFolderVerb && !activity._file.isEmpty()) {
         FolderMan::instance()->blacklistFolderPath(activity._file);
         removeActivityFromActivityList(activity);
         return;