projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add link to certificate FAQ in --require-ssl error
[quassel.git]
/
src
/
core
/
corehighlightrulemanager.cpp
diff --git
a/src/core/corehighlightrulemanager.cpp
b/src/core/corehighlightrulemanager.cpp
index
ffd3d67
..
40d0566
100644
(file)
--- a/
src/core/corehighlightrulemanager.cpp
+++ b/
src/core/corehighlightrulemanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-20
18
by the Quassel Project *
+ * Copyright (C) 2005-20
20
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-25,7
+25,7
@@
constexpr auto settingsKey = "HighlightRuleList";
constexpr auto settingsKey = "HighlightRuleList";
-CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession
*
session)
+CoreHighlightRuleManager::CoreHighlightRuleManager(CoreSession
*
session)
: HighlightRuleManager(session)
, _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
// 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()
}
void CoreHighlightRuleManager::save()
@@
-44,9
+44,7
@@
void CoreHighlightRuleManager::save()
Core::setUserSetting(_coreSession->user(), settingsKey, toVariantMap());
}
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);
}
}