From: Janne Koschinski <janne@kuschku.de>
Date: Wed, 20 Dec 2017 02:30:36 +0000 (+0100)
Subject: Store the HighlightNickType as int instead of custom enum
X-Git-Tag: travis-deploy-test~203
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=8fe8accd73abf77ab21d2d1c1346d2bc5c4de2ff

Store the HighlightNickType as int instead of custom enum
---

diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h
index 4fdf211a..427b6581 100644
--- a/src/common/highlightrulemanager.h
+++ b/src/common/highlightrulemanager.h
@@ -38,7 +38,6 @@ public:
         CurrentNick = 0x01,
         AllNicks = 0x02
     };
-    Q_ENUM(HighlightNickType);
 
     inline HighlightRuleManager(QObject *parent = nullptr) : SyncableObject(parent) { setAllowClientUpdates(true); }
     HighlightRuleManager &operator=(const HighlightRuleManager &other);
diff --git a/src/qtui/settingspages/corehighlightsettingspage.cpp b/src/qtui/settingspages/corehighlightsettingspage.cpp
index debf0c13..cdb50888 100644
--- a/src/qtui/settingspages/corehighlightsettingspage.cpp
+++ b/src/qtui/settingspages/corehighlightsettingspage.cpp
@@ -131,7 +131,8 @@ bool CoreHighlightSettingsPage::hasDefaults() const
 
 void CoreHighlightSettingsPage::defaults()
 {
-    int defaultIndex = ui.highlightNicksComboBox->findData(QVariant(HighlightRuleManager::HighlightNickType::CurrentNick));
+    int highlightNickType = HighlightRuleManager::HighlightNickType::CurrentNick;
+    int defaultIndex = ui.highlightNicksComboBox->findData(QVariant(highlightNickType));
     ui.highlightNicksComboBox->setCurrentIndex(defaultIndex);
     ui.nicksCaseSensitive->setChecked(false);
     emptyHighlightTable();
@@ -402,8 +403,8 @@ void CoreHighlightSettingsPage::load()
             }
         }
 
-        ui.highlightNicksComboBox
-            ->setCurrentIndex(ui.highlightNicksComboBox->findData(QVariant(ruleManager->highlightNick())));
+        int highlightNickType = ruleManager->highlightNick();
+        ui.highlightNicksComboBox->setCurrentIndex(ui.highlightNicksComboBox->findData(QVariant(highlightNickType)));
         ui.nicksCaseSensitive->setChecked(ruleManager->nicksCaseSensitive());
 
         setChangedState(false);
@@ -439,9 +440,9 @@ void CoreHighlightSettingsPage::save()
                                        rule.sender, rule.chanName);
     }
 
-    auto highlightNickType = ui.highlightNicksComboBox->currentData().value<HighlightRuleManager::HighlightNickType>();
+    auto highlightNickType = ui.highlightNicksComboBox->currentData().value<int>();
 
-    clonedManager.setHighlightNick(highlightNickType);
+    clonedManager.setHighlightNick(HighlightRuleManager::HighlightNickType(highlightNickType));
     clonedManager.setNicksCaseSensitive(ui.nicksCaseSensitive->isChecked());
 
     ruleManager->requestUpdate(clonedManager.toVariantMap());