projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: Remove copy assignment operator from CoreIdentity
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
c0475f5
..
cee8db0
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
8
by the Quassel Project *
+ * Copyright (C) 2005-201
9
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 *
@@
-24,11
+24,10
@@
#include "corenetwork.h"
#include "coresession.h"
#include "corenetwork.h"
#include "coresession.h"
-INIT_SYNCABLE_OBJECT(CoreAliasManager)
-CoreAliasManager::CoreAliasManager(CoreSession *parent)
+CoreAliasManager::CoreAliasManager(CoreSession* parent)
: AliasManager(parent)
{
: AliasManager(parent)
{
-
CoreSession *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();
@@
-40,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
{
-
CoreSession *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;
@@
-55,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);
}
}