Semi-yearly copyright bump

[quassel.git] / src / common / highlightrulemanager.cpp

diff --git a/src/common/highlightrulemanager.cpp b/src/common/highlightrulemanager.cpp
index 4d74deb..aca87e6 100644 (file)
--- 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 <QtCore>
 #include <QDebug>
-#include <QStringList>
 
 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 &currentNick, const QStringList identityNicks)
+bool HighlightRuleManager::match(const QString &msgContents,
+                                 const QString &msgSender,
+                                 Message::Type msgType,
+                                 Message::Flags msgFlags,
+                                 const QString &bufferName,
+                                 const QString &currentNick,
+                                 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 &currentNick, 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);
 }