X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorehighlightrulemanager.cpp;h=40d056655f437daf0bf8da735b2d2396b7232fa4;hp=ffd3d67fb5f00a28d75f5e45ec93d0b0330deceb;hb=4e40c486dea949244b73beaf73d5ceb1ef591b5b;hpb=3e63cb8a6e83765069a45101b86ae9e21dcc57ad diff --git a/src/core/corehighlightrulemanager.cpp b/src/core/corehighlightrulemanager.cpp index ffd3d67f..40d05665 100644 --- a/src/core/corehighlightrulemanager.cpp +++ b/src/core/corehighlightrulemanager.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2020 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -25,7 +25,7 @@ constexpr auto settingsKey = "HighlightRuleList"; -CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession *session) +CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession* session) : HighlightRuleManager(session) , _coreSession{session} { @@ -36,7 +36,7 @@ CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession *session) // Otherwise, we just use the defaults initialized in the base class // We store our settings whenever they change - connect(this, SIGNAL(updatedRemotely()), SLOT(save())); + connect(this, &SyncableObject::updatedRemotely, this, &CoreHighlightRuleManager::save); } void CoreHighlightRuleManager::save() @@ -44,9 +44,7 @@ void CoreHighlightRuleManager::save() Core::setUserSetting(_coreSession->user(), settingsKey, toVariantMap()); } -bool CoreHighlightRuleManager::match(const RawMessage &msg, const QString ¤tNick, - const QStringList &identityNicks) +bool CoreHighlightRuleManager::match(const RawMessage& msg, const QString& currentNick, const QStringList& identityNicks) { - return match(msg.networkId, msg.text, msg.sender, msg.type, msg.flags, msg.target, currentNick, - identityNicks); + return match(msg.networkId, msg.text, msg.sender, msg.type, msg.flags, msg.target, currentNick, identityNicks); }