projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing backlog timestamps when merging from sqlite.
[quassel.git]
/
src
/
core
/
corealiasmanager.cpp
diff --git
a/src/core/corealiasmanager.cpp
b/src/core/corealiasmanager.cpp
index
9576c04
..
b1e7f2f
100644
(file)
--- a/
src/core/corealiasmanager.cpp
+++ b/
src/core/corealiasmanager.cpp
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-0
8
by the Quassel Project *
+ * Copyright (C) 2005-0
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 *
@@
-21,6
+21,7
@@
#include "corealiasmanager.h"
#include "core.h"
#include "corealiasmanager.h"
#include "core.h"
+#include "corenetwork.h"
#include "coresession.h"
CoreAliasManager::CoreAliasManager(CoreSession *parent)
#include "coresession.h"
CoreAliasManager::CoreAliasManager(CoreSession *parent)
@@
-33,13
+34,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
+49,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()) {