X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcorealiasmanager.cpp;h=0700668655d655dbf78d5dd6f2efbe42f385cb17;hp=8fcdb022148114049dac6b9ff3f5cf1b9f375405;hb=6eefdfc697067d184a589fc8a231b16316c09106;hpb=6579cd49c867ce3fb6c99127851a881ea82d1b1b

diff --git a/src/core/corealiasmanager.cpp b/src/core/corealiasmanager.cpp
index 8fcdb022..07006686 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-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,44 +15,55 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "corealiasmanager.h"
 
 #include "core.h"
+#include "corenetwork.h"
 #include "coresession.h"
 
 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();
-  if(aliases.isEmpty()) {
-    loadDefaults();
-  } else {
-    initSetAliases(aliases);
-  }
+    auto *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, &SyncableObject::updatedRemotely, this, &CoreAliasManager::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
+{
+    auto *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());
 }
 
-void CoreAliasManager::loadDefaults() {
-  // Default Aliases:
-  addAlias("j", "/join $1");
+
+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);
+    }
 }