X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fignorelistmanager.cpp;h=e2e515cddca61ecce41b5f9e249b283f0b8da06d;hb=b627af388d570f48a03fd22ab024c07e82e0d503;hp=cdd15ebefcc078c1ffe108ae8aa4f256f9905b98;hpb=b65b9f7615165e8700a44d59b7275a55558dd45b;p=quassel.git diff --git a/src/common/ignorelistmanager.cpp b/src/common/ignorelistmanager.cpp index cdd15ebe..e2e515cd 100644 --- a/src/common/ignorelistmanager.cpp +++ b/src/common/ignorelistmanager.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 * @@ -91,7 +91,7 @@ void IgnoreListManager::initSetIgnoreList(const QVariantMap &ignoreList) int count = ignoreRule.count(); if (count != scopeRule.count() || count != isRegEx.count() || count != scope.count() || count != strictness.count() || count != ignoreType.count() || count != isActive.count()) { - qWarning() << "Corrupted IgnoreList settings! (Count missmatch)"; + qWarning() << "Corrupted IgnoreList settings! (Count mismatch)"; return; } @@ -160,20 +160,6 @@ IgnoreListManager::StrictnessType IgnoreListManager::_match(const QString &msgCo } -bool IgnoreListManager::scopeMatch(const QString &scopeRule, const QString &string) const -{ - foreach(QString rule, scopeRule.split(";")) { - QRegExp ruleRx = QRegExp(rule.trimmed()); - ruleRx.setCaseSensitivity(Qt::CaseInsensitive); - ruleRx.setPatternSyntax(QRegExp::Wildcard); - if (ruleRx.exactMatch(string)) { - return true; - } - } - return false; -} - - void IgnoreListManager::removeIgnoreListItem(const QString &ignoreRule) { removeAt(indexOf(ignoreRule));