X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcommon%2Fhighlightrulemanager.cpp;h=aca87e6bad5fb742338421e5083163814e1e0134;hb=6de2be92eff20e0c3d2e4a6350315b23061f675e;hp=4d74deb0e9661b6e170c980b22325cd9ef0f32f6;hpb=ebe14ade2f3496aefc8926ce704a161c4451fedd;p=quassel.git diff --git a/src/common/highlightrulemanager.cpp b/src/common/highlightrulemanager.cpp index 4d74deb0..aca87e6b 100644 --- a/src/common/highlightrulemanager.cpp +++ b/src/common/highlightrulemanager.cpp @@ -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 * @@ -19,11 +19,10 @@ ***************************************************************************/ #include "highlightrulemanager.h" + #include "util.h" -#include #include -#include INIT_SYNCABLE_OBJECT(HighlightRuleManager) HighlightRuleManager &HighlightRuleManager::operator=(const HighlightRuleManager &other) @@ -123,7 +122,13 @@ void HighlightRuleManager::addHighlightRule(const QString &name, bool isRegEx, b } -bool HighlightRuleManager::_match(const QString &msgContents, const QString &msgSender, Message::Type msgType, Message::Flags msgFlags, const QString &bufferName, const QString ¤tNick, const QStringList identityNicks) +bool HighlightRuleManager::match(const QString &msgContents, + const QString &msgSender, + Message::Type msgType, + Message::Flags msgFlags, + const QString &bufferName, + const QString ¤tNick, + const QStringList identityNicks) { if (!((msgType & (Message::Plain | Message::Notice | Message::Action)) && !(msgFlags & Message::Self))) { return false; @@ -222,5 +227,5 @@ void HighlightRuleManager::toggleHighlightRule(const QString &highlightRule) bool HighlightRuleManager::match(const Message &msg, const QString ¤tNick, const QStringList &identityNicks) { - return _match(msg.contents(), msg.sender(), msg.type(), msg.flags(), msg.bufferInfo().bufferName(), currentNick, identityNicks); + return match(msg.contents(), msg.sender(), msg.type(), msg.flags(), msg.bufferInfo().bufferName(), currentNick, identityNicks); }