projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fitting the SyncableObjects to the new Style
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
78044db
..
68c3881
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-21,8
+21,10
@@
#include "corealiasmanager.h"
#include "core.h"
#include "corealiasmanager.h"
#include "core.h"
+#include "corenetwork.h"
#include "coresession.h"
#include "coresession.h"
+INIT_SYNCABLE_OBJECT(CoreAliasManager)
CoreAliasManager::CoreAliasManager(CoreSession *parent)
: AliasManager(parent)
{
CoreAliasManager::CoreAliasManager(CoreSession *parent)
: AliasManager(parent)
{
@@
-33,13
+35,11
@@
CoreAliasManager::CoreAliasManager(CoreSession *parent)
return;
}
return;
}
- QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
if(isEmpty())
loadDefaults();
}
initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
if(isEmpty())
loadDefaults();
}
-
CoreAliasManager::~CoreAliasManager() {
CoreSession *session = qobject_cast<CoreSession *>(parent());
if(!session) {
CoreAliasManager::~CoreAliasManager() {
CoreSession *session = qobject_cast<CoreSession *>(parent());
if(!session) {
@@
-50,6
+50,9
@@
CoreAliasManager::~CoreAliasManager() {
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
Core::setUserSetting(session->user(), "Aliases", initAliases());
}
+const Network *CoreAliasManager::network(NetworkId id) const {
+ return qobject_cast<CoreSession *>(parent())->network(id);
+}
void CoreAliasManager::loadDefaults() {
foreach(Alias alias, AliasManager::defaults()) {
void CoreAliasManager::loadDefaults() {
foreach(Alias alias, AliasManager::defaults()) {