projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test: Add GTest printers for commonly used Qt types
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
0a7faa1
..
5739fb2
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-24,10
+24,10
@@
#include "corenetwork.h"
#include "coresession.h"
#include "corenetwork.h"
#include "coresession.h"
-CoreAliasManager::CoreAliasManager(CoreSession
*
parent)
+CoreAliasManager::CoreAliasManager(CoreSession
*
parent)
: AliasManager(parent)
{
: AliasManager(parent)
{
- auto
*session = qobject_cast<CoreSession
*>(parent);
+ auto
* session = qobject_cast<CoreSession
*>(parent);
if (!session) {
qWarning() << "CoreAliasManager: unable to load Aliases. Parent is not a Coresession!";
loadDefaults();
if (!session) {
qWarning() << "CoreAliasManager: unable to load Aliases. Parent is not a Coresession!";
loadDefaults();
@@
-39,13
+39,12
@@
CoreAliasManager::CoreAliasManager(CoreSession *parent)
loadDefaults();
// we store our settings whenever they change
loadDefaults();
// we store our settings whenever they change
- connect(this,
SIGNAL(updatedRemotely()), SLOT(save())
);
+ connect(this,
&SyncableObject::updatedRemotely, this, &CoreAliasManager::save
);
}
}
-
void CoreAliasManager::save() const
{
void CoreAliasManager::save() const
{
- auto
*session = qobject_cast<CoreSession
*>(parent());
+ auto
* session = qobject_cast<CoreSession
*>(parent());
if (!session) {
qWarning() << "CoreAliasManager: unable to save Aliases. Parent is not a Coresession!";
return;
if (!session) {
qWarning() << "CoreAliasManager: unable to save Aliases. Parent is not a Coresession!";
return;
@@
-54,16
+53,14
@@
void CoreAliasManager::save() const
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
-
-const Network *CoreAliasManager::network(NetworkId id) const
+const Network* CoreAliasManager::network(NetworkId id) const
{
{
- return qobject_cast<CoreSession
*>(parent())->network(id);
+ return qobject_cast<CoreSession*>(parent())->network(id);
}
}
-
void CoreAliasManager::loadDefaults()
{
void CoreAliasManager::loadDefaults()
{
- foreach(Alias alias, AliasManager::defaults()) {
+ foreach
(Alias alias, AliasManager::defaults()) {
addAlias(alias.name, alias.expansion);
}
}
addAlias(alias.name, alias.expansion);
}
}