X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=1e8d89f7267789428a7baba626f43f7e7d0dd550;hp=9576c04b7cccc57f7599a3df196ec196467759ff;hb=694f9bfbf7f1af19108461c7e00d133e55082bce;hpb=8179670f13fbbdd5cbcd7fb4a3dc187913ee9ba3

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index 9576c04b..1e8d89f7 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,38 +21,50 @@
 #include "corealiasmanager.h"
 
 #include "core.h"
+#include "corenetwork.h"
 #include "coresession.h"
 
+INIT_SYNCABLE_OBJECT(CoreAliasManager)
 CoreAliasManager::CoreAliasManager(CoreSession *parent)
-  : AliasManager(parent)
+    : AliasManager(parent)
 {
-  CoreSession *session = qobject_cast<CoreSession *>(parent);
-  if(!session) {
-    qWarning() << "CoreAliasManager: unable to load Aliases. Parent is not a Coresession!";
-    loadDefaults();
-    return;
-  }
-
-  QVariantMap aliases = Core::getUserSetting(session->user(), "Aliases").toMap();
-  initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
-  if(isEmpty())
-    loadDefaults();
+    CoreSession *session = qobject_cast<CoreSession *>(parent);
+    if (!session) {
+        qWarning() << "CoreAliasManager: unable to load Aliases. Parent is not a Coresession!";
+        loadDefaults();
+        return;
+    }
+
+    initSetAliases(Core::getUserSetting(session->user(), "Aliases").toMap());
+    if (isEmpty())
+        loadDefaults();
+
+    // we store our settings whenever they change
+    connect(this, SIGNAL(updatedRemotely()), SLOT(save()));
 }
 
 
-CoreAliasManager::~CoreAliasManager() {
-  CoreSession *session = qobject_cast<CoreSession *>(parent());
-  if(!session) {
-    qWarning() << "CoreAliasManager: unable to save Aliases. Parent is not a Coresession!";
-    return;
-  }
+void CoreAliasManager::save() const
+{
+    CoreSession *session = qobject_cast<CoreSession *>(parent());
+    if (!session) {
+        qWarning() << "CoreAliasManager: unable to save Aliases. Parent is not a Coresession!";
+        return;
+    }
+
+    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()) {
-    addAlias(alias.name, alias.expansion);
-  }
+void CoreAliasManager::loadDefaults()
+{
+    foreach(Alias alias, AliasManager::defaults()) {
+        addAlias(alias.name, alias.expansion);
+    }
 }