X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=9576c04b7cccc57f7599a3df196ec196467759ff;hb=44a6109557eafd29cc6079dd6521ad3cf80c15b3;hp=b89435623d4ab41b71b8be04c075789f379f2a12;hpb=eb8ee27deb8346dbf9e8515b0cceefd58cda971b;p=quassel.git

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index b8943562..9576c04b 100644
--- a/src/core/corealiasmanager.cpp
+++ b/src/core/corealiasmanager.cpp
@@ -34,11 +34,9 @@ CoreAliasManager::CoreAliasManager(CoreSession *parent)
   }
 
   QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  if(aliases.isEmpty()) {
+  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+  if(isEmpty())
     loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
 }
 
 
@@ -52,16 +50,9 @@ CoreAliasManager::~CoreAliasManager() {
   Core::setUserSetting(session->user(), "Aliases", initAliases());
 }
 
-void CoreAliasManager::loadDefaults() {
-  // Default Aliases:
-  addAlias("j", "/join $0");
-
-  addAlias("ns", "/msg nickserv $0");
-  addAlias("nickserv", "/msg nickserv $0");
-  addAlias("cs", "/msg chanserv $0");
-  addAlias("chanserv",  "/msg chanserv $0");
-  addAlias("hs", "/msg hostserv $0");
-  addAlias("hostserv", "/msg hostserv $0");
 
-  addAlias("back", "/quote away");
+void CoreAliasManager::loadDefaults() {
+  foreach(Alias alias, AliasManager::defaults()) {
+    addAlias(alias.name, alias.expansion);
+  }
 }