From: Janne Koschinski <janne@kuschku.de>
Date: Tue, 17 Apr 2018 02:08:10 +0000 (+0200)
Subject: Fixes the Highlight Rule Manager
X-Git-Tag: travis-deploy-test~122
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=fa3449061f17d7e8db1387f0758fd052f22f4c3b

Fixes the Highlight Rule Manager

- Previously, sync calls included the new HighlightNickType
- This causes deserialization trouble in older clients
- Now int is used, and the data is static_cast'd back and forth
---

diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h
index e754b8b9..6fa9c276 100644
--- a/src/common/highlightrulemanager.h
+++ b/src/common/highlightrulemanager.h
@@ -129,11 +129,11 @@ public slots:
     virtual void addHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive, bool isEnabled,
                                   bool isInverse, const QString &sender, const QString &chanName);
 
-    virtual inline void requestSetHighlightNick(HighlightNickType highlightNick)
+    virtual inline void requestSetHighlightNick(int highlightNick)
     {
         REQUEST(ARG(highlightNick))
     }
-    inline void setHighlightNick(HighlightNickType highlightNick) { _highlightNick = highlightNick; }
+    inline void setHighlightNick(int highlightNick) { _highlightNick = static_cast<HighlightNickType>(highlightNick); }
 
     virtual inline void requestSetNicksCaseSensitive(bool nicksCaseSensitive)
     {