clazy: Convert many old-style connects into function pointer based

[quassel.git] / src / core / corehighlightrulemanager.cpp

diff --git a/src/core/corehighlightrulemanager.cpp b/src/core/corehighlightrulemanager.cpp
index eed5655..99a046f 100644 (file)
--- a/src/core/corehighlightrulemanager.cpp
+++ b/src/core/corehighlightrulemanager.cpp
@@ -25,7 +25,6 @@
 
 constexpr auto settingsKey = "HighlightRuleList";
 
-INIT_SYNCABLE_OBJECT(CoreHighlightRuleManager)
 CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession *session)
     : HighlightRuleManager(session)
     , _coreSession{session}
@@ -37,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()
@@ -48,5 +47,6 @@ void CoreHighlightRuleManager::save()
 bool CoreHighlightRuleManager::match(const RawMessage &msg, const QString &currentNick,
                                      const QStringList &identityNicks)
 {
-    return match(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);
 }