/***************************************************************************
- * Copyright (C) 2005-09 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "ignorelistmanager.h"
#include <QtCore>
#include <QDebug>
#include <QStringList>
-#include <QRegExp>
INIT_SYNCABLE_OBJECT(IgnoreListManager)
IgnoreListManager &IgnoreListManager::operator=(const IgnoreListManager &other)
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;
}
else
str = msgSender;
- QRegExp ruleRx = QRegExp(item.ignoreRule);
- ruleRx.setCaseSensitivity(Qt::CaseInsensitive);
- if (!item.isRegEx) {
- ruleRx.setPatternSyntax(QRegExp::Wildcard);
- }
-
// qDebug() << "IgnoreListManager::match: ";
// qDebug() << "string: " << str;
// qDebug() << "pattern: " << ruleRx.pattern();
// qDebug() << "scopeRule: " << item.scopeRule;
// qDebug() << "now testing";
- if ((!item.isRegEx && ruleRx.exactMatch(str)) ||
- (item.isRegEx && ruleRx.indexIn(str) != -1)) {
+ if ((!item.isRegEx && item.regEx.exactMatch(str)) ||
+ (item.isRegEx && item.regEx.indexIn(str) != -1)) {
// qDebug() << "MATCHED!";
return item.strictness;
}