From 908c7068213307be405b80788996403a0ab9fd3c Mon Sep 17 00:00:00 2001 From: Janne Koschinski Date: Fri, 1 Sep 2017 13:51:35 +0200 Subject: [PATCH] Fix an issue with QStringList being declared differently on Qt4 --- src/common/highlightrulemanager.cpp | 5 +++++ src/common/highlightrulemanager.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/common/highlightrulemanager.cpp b/src/common/highlightrulemanager.cpp index d18d8d63..98548bd1 100644 --- a/src/common/highlightrulemanager.cpp +++ b/src/common/highlightrulemanager.cpp @@ -188,3 +188,8 @@ void HighlightRuleManager::toggleHighlightRule(const QString &highlightRule) _highlightRuleList[idx].isEnabled = !_highlightRuleList[idx].isEnabled; SYNC(ARG(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); +} diff --git a/src/common/highlightrulemanager.h b/src/common/highlightrulemanager.h index 5799e480..75834d15 100644 --- a/src/common/highlightrulemanager.h +++ b/src/common/highlightrulemanager.h @@ -80,7 +80,7 @@ public: /** This method checks if a message matches the users highlight rules. * \param msg The Message that should be checked */ - inline bool 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); } + bool match(const Message &msg, const QString ¤tNick, const QStringList &identityNicks); public slots: virtual QVariantMap initHighlightRuleList() const; -- 2.20.1