Moving alias expansion yet again - this time into AliasManager itself

[quassel.git] / src / core / corealiasmanager.cpp

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index 78044db..b1e7f2f 100644 (file)
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -21,6 +21,7 @@
 #include "corealiasmanager.h"
 
 #include "core.h"
+#include "corenetwork.h"
 #include "coresession.h"
 
 CoreAliasManager::CoreAliasManager(CoreSession *parent)
@@ -33,13 +34,11 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
     return;
   }
 
-  QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
   initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
   if(isEmpty())
     loadDefaults();
 }
 
-
 CoreAliasManager::~CoreAliasManager() {
   CoreSession *session = qobject_cast<CoreSession *>(parent());
   if(!session) {
@@ -50,6 +49,9 @@ CoreAliasManager::~CoreAliasManager() {
   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()) {