X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientignorelistmanager.cpp;h=a23f8917a1d82ad849be70003b41429f0338d69e;hp=6e52d388bb7ee31723ccc9768a3640409784239e;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=921e54680da16fcf2adb7a90506875aceb6633a4

diff --git a/src/client/clientignorelistmanager.cpp b/src/client/clientignorelistmanager.cpp
index 6e52d388..a23f8917 100644
--- a/src/client/clientignorelistmanager.cpp
+++ b/src/client/clientignorelistmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 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  *
@@ -20,28 +20,16 @@
 
 #include "clientignorelistmanager.h"
 
-#include <QRegExp>
-
-INIT_SYNCABLE_OBJECT(ClientIgnoreListManager)
-
 ClientIgnoreListManager::ClientIgnoreListManager(QObject *parent)
     : IgnoreListManager(parent)
 {
-    connect(this, SIGNAL(updatedRemotely()), SIGNAL(ignoreListChanged()));
+    connect(this, &SyncableObject::updatedRemotely, this, &ClientIgnoreListManager::ignoreListChanged);
 }
 
 
 bool ClientIgnoreListManager::pureMatch(const IgnoreListItem &item, const QString &string) const
 {
-    QRegExp ruleRx = QRegExp(item.ignoreRule);
-    ruleRx.setCaseSensitivity(Qt::CaseInsensitive);
-    if (!item.isRegEx)
-        ruleRx.setPatternSyntax(QRegExp::Wildcard);
-
-    if ((!item.isRegEx && ruleRx.exactMatch(string)) ||
-        (item.isRegEx && ruleRx.indexIn(string) != -1))
-        return true;
-    return false;
+    return (item.contentsMatcher().match(string));
 }
 
 
@@ -49,11 +37,14 @@ QMap<QString, bool> ClientIgnoreListManager::matchingRulesForHostmask(const QStr
 {
     QMap<QString, bool> result;
     foreach(IgnoreListItem item, ignoreList()) {
-        if (item.type == SenderIgnore && pureMatch(item, hostmask)
-            && ((network.isEmpty() && channel.isEmpty()) || item.scope == GlobalScope || (item.scope == NetworkScope && scopeMatch(item.scopeRule, network))
-                || (item.scope == ChannelScope && scopeMatch(item.scopeRule, channel)))) {
-            result[item.ignoreRule] = item.isActive;
-//      qDebug() << "matchingRulesForHostmask found: " << item.ignoreRule << "is active: " << item.isActive;
+        if (item.type() == SenderIgnore && pureMatch(item, hostmask)
+            && ((network.isEmpty() && channel.isEmpty())
+                || item.scope() == GlobalScope
+                || (item.scope() == NetworkScope && item.scopeRuleMatcher().match(network))
+                || (item.scope() == ChannelScope && item.scopeRuleMatcher().match(channel)))) {
+            result[item.contents()] = item.isEnabled();
+            // qDebug() << "matchingRulesForHostmask found: " << item.contents()
+            //         << "is active: " << item.isActive;
         }
     }
     return result;