X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhighlightrulemanager.h;h=6fa9c27630ee2ce96248809567f663839103d0e8;hb=5941a9d24333401874e051c349b391e2bcac0e0d;hp=4fdf211ae26a339242f36e00263b9783655139b6;hpb=6a51298c1f18613e9b64ee746e7f846dfcd05290;p=quassel.git

diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h
index 4fdf211a..6fa9c276 100644
--- a/src/common/highlightrulemanager.h
+++ b/src/common/highlightrulemanager.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,13 +18,16 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef HIGHLIGHTRULELISTMANAGER_H
-#define HIGHLIGHTRULELISTMANAGER_H
+#pragma once
 
-#include <QString>
-#include <QRegExp>
 #include <utility>
 
+#include <QRegExp>
+#include <QString>
+#include <QStringList>
+#include <QVariantList>
+#include <QVariantMap>
+
 #include "message.h"
 #include "syncableobject.h"
 
@@ -38,7 +41,6 @@ public:
         CurrentNick = 0x01,
         AllNicks = 0x02
     };
-    Q_ENUM(HighlightNickType);
 
     inline HighlightRuleManager(QObject *parent = nullptr) : SyncableObject(parent) { setAllowClientUpdates(true); }
     HighlightRuleManager &operator=(const HighlightRuleManager &other);
@@ -81,7 +83,7 @@ public:
     inline const HighlightRuleList &highlightRuleList() const { return _highlightRuleList; }
 
     inline HighlightNickType highlightNick() { return _highlightNick; }
-    inline bool  nicksCaseSensitive() { return _nicksCaseSensitive; }
+    inline bool nicksCaseSensitive() { return _nicksCaseSensitive; }
 
     //! Check if a message matches the HighlightRule
     /** This method checks if a message matches the users highlight rules.
@@ -127,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)
     {
@@ -142,7 +144,13 @@ public slots:
 protected:
     void setHighlightRuleList(const QList<HighlightRule> &HighlightRuleList) { _highlightRuleList = HighlightRuleList; }
 
-    bool _match(const QString &msgContents, const QString &msgSender, Message::Type msgType, Message::Flags msgFlags, const QString &bufferName, const QString &currentNick, const QStringList identityNicks);
+    bool match(const QString &msgContents,
+               const QString &msgSender,
+               Message::Type msgType,
+               Message::Flags msgFlags,
+               const QString &bufferName,
+               const QString &currentNick,
+               const QStringList identityNicks);
 
 signals:
     void ruleAdded(QString name, bool isRegEx, bool isCaseSensitive, bool isEnabled, bool isInverse, QString sender, QString chanName);
@@ -152,6 +160,3 @@ private:
     HighlightNickType _highlightNick = HighlightNickType::CurrentNick;
     bool _nicksCaseSensitive = false;
 };
-
-
-#endif // HIGHLIGHTRULELISTMANAGER_H