From: Janne Koschinski <janne@kuschku.de>
Date: Thu, 21 Dec 2017 22:50:26 +0000 (+0100)
Subject: Per popular request, always enable local highlights
X-Git-Tag: travis-deploy-test~155
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=a280012942234f8c6acefefd5fa60f17e7ad0c88

Per popular request, always enable local highlights
---

diff --git a/src/qtui/qtuimessageprocessor.cpp b/src/qtui/qtuimessageprocessor.cpp
index 40d9c284..eee90aab 100644
--- a/src/qtui/qtuimessageprocessor.cpp
+++ b/src/qtui/qtuimessageprocessor.cpp
@@ -57,8 +57,7 @@ void QtUiMessageProcessor::reset()
 
 void QtUiMessageProcessor::process(Message &msg)
 {
-    if (!Client::isCoreFeatureEnabled(Quassel::Feature::CoreSideHighlights))
-        checkForHighlight(msg);
+    checkForHighlight(msg);
     preProcess(msg);
     Client::messageModel()->insertMessage(msg);
 }
@@ -69,8 +68,7 @@ void QtUiMessageProcessor::process(QList<Message> &msgs)
     QList<Message>::iterator msgIter = msgs.begin();
     QList<Message>::iterator msgIterEnd = msgs.end();
     while (msgIter != msgIterEnd) {
-        if (!Client::isCoreFeatureEnabled(Quassel::Feature::CoreSideHighlights))
-            checkForHighlight(*msgIter);
+        checkForHighlight(*msgIter);
         preProcess(*msgIter);
         ++msgIter;
     }
diff --git a/src/qtui/settingspages/highlightsettingspage.cpp b/src/qtui/settingspages/highlightsettingspage.cpp
index cb84b9fa..b2dd568c 100644
--- a/src/qtui/settingspages/highlightsettingspage.cpp
+++ b/src/qtui/settingspages/highlightsettingspage.cpp
@@ -293,7 +293,3 @@ bool HighlightSettingsPage::testHasChanged()
 
     return false;
 }
-
-bool HighlightSettingsPage::isSelectable() const {
-    return !Client::isConnected() || !Client::isCoreFeatureEnabled(Quassel::Feature::CoreSideHighlights);
-}
diff --git a/src/qtui/settingspages/highlightsettingspage.h b/src/qtui/settingspages/highlightsettingspage.h
index 87ff64b6..563074c0 100644
--- a/src/qtui/settingspages/highlightsettingspage.h
+++ b/src/qtui/settingspages/highlightsettingspage.h
@@ -36,8 +36,6 @@ public:
 
     bool hasDefaults() const;
 
-    bool isSelectable() const override;
-
 public slots:
     void save();
     void load();