X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorehighlightrulemanager.h;h=85a26ff53d785e6b485169ea15d893e44b62b6d1;hb=37110ceaa070167b4f40ed449ac9ea130503a792;hp=5f2db906d792003610e933a9a33ed47a715e30f3;hpb=ebe14ade2f3496aefc8926ce704a161c4451fedd;p=quassel.git

diff --git a/src/core/corehighlightrulemanager.h b/src/core/corehighlightrulemanager.h
index 5f2db906..85a26ff5 100644
--- a/src/core/corehighlightrulemanager.h
+++ b/src/core/corehighlightrulemanager.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,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef COREHIGHLIGHTRULEMANAHER_H
-#define COREHIGHLIGHTRULEMANAHER_H
+#pragma once
 
 #include "highlightrulemanager.h"
 
@@ -28,28 +27,28 @@ struct RawMessage;
 
 class CoreHighlightRuleManager : public HighlightRuleManager
 {
+    Q_OBJECT
     SYNCABLE_OBJECT
-        Q_OBJECT
+
+    using HighlightRuleManager::match;
 
 public:
     explicit CoreHighlightRuleManager(CoreSession *parent);
 
-    inline virtual const QMetaObject *syncMetaObject() const { return &HighlightRuleManager::staticMetaObject; }
+    virtual const QMetaObject *syncMetaObject() const override { return &HighlightRuleManager::staticMetaObject; }
 
     bool match(const RawMessage &msg, const QString &currentNick, const QStringList &identityNicks);
+
 public slots:
-    virtual inline void requestToggleHighlightRule(const QString &highlightRule) { toggleHighlightRule(highlightRule); }
-    virtual inline void requestRemoveHighlightRule(const QString &highlightRule) { removeHighlightRule(highlightRule); }
-    virtual inline void requestAddHighlightRule(const QString &name, bool isRegEx, bool isCaseSensitive, bool isEnabled,
-                                                bool isInverse, const QString &sender, const QString &chanName)
+    inline void requestToggleHighlightRule(int highlightRule) override { toggleHighlightRule(highlightRule); }
+    inline void requestRemoveHighlightRule(int highlightRule) override { removeHighlightRule(highlightRule); }
+    inline void requestAddHighlightRule(int id, const QString &name, bool isRegEx, bool isCaseSensitive,
+                                                bool isEnabled, bool isInverse, const QString &sender,
+                                                const QString &chanName) override
     {
-        addHighlightRule(name, isRegEx, isCaseSensitive, isEnabled, isInverse, sender, chanName);
+        addHighlightRule(id, name, isRegEx, isCaseSensitive, isEnabled, isInverse, sender, chanName);
     }
 
-
 private slots:
     void save() const;
 };
-
-
-#endif //COREHIGHLIGHTRULEMANAHER_H