X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=b1e7f2f2c0fa0d8c23a001dde4d6ddd61a91e796;hp=8fcdb022148114049dac6b9ff3f5cf1b9f375405;hb=16c9fb5606113ddbcbe4be61f8ed2b775f31055e;hpb=a6266326a5ba6952d574cda16720e69275d2884e

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index 8fcdb022..b1e7f2f2 100644
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel Project                          *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   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 "corenetwork.h"
 #include "coresession.h"
 
 CoreAliasManager::CoreAliasManager(CoreSession *parent)
@@ -33,15 +34,11 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
     return;
   }
 
-  QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())
     loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
 }
 
-
 CoreAliasManager::~CoreAliasManager() {
   CoreSession *session = qobject_cast<CoreSession *>(parent());
   if(!session) {
@@ -52,7 +49,12 @@ 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() {
-  // Default Aliases:
-  addAlias("j", "/join $1");
+  foreach(Alias alias, AliasManager::defaults()) {
+    addAlias(alias.name, alias.expansion);
+  }
 }