X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=492208aeb3710f6f1e37546c307564a0ed3b010e;hb=ed2415135359b4f8a3f75f2634e028500c08c1fe;hp=913f630b7ad9ea6ba9171d69eae41c4276246367;hpb=c9ee7972b2c9b84e37f363befa05bf5fb04114af;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 913f630b..492208ae 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -18,17 +18,20 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CORESESSION_H_
-#define _CORESESSION_H_
+#ifndef CORESESSION_H
+#define CORESESSION_H
 
 #include <QString>
 #include <QVariant>
 
+#include "corecoreinfo.h"
+#include "corealiasmanager.h"
 #include "message.h"
 
 class BufferSyncer;
 class CoreBacklogManager;
 class CoreBufferViewManager;
+class CoreIrcListHelper;
 class Identity;
 class NetworkConnection;
 class CoreNetwork;
@@ -54,6 +57,11 @@ public:
 
   SignalProxy *signalProxy() const;
 
+  const AliasManager &aliasManager() const { return _aliasManager; }
+  AliasManager &aliasManager() { return _aliasManager; }
+
+  inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
+
   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
@@ -75,11 +83,6 @@ public slots:
    */
   void createIdentity(const Identity &identity);
 
-  //! Update an identity and propagate the changes to the clients.
-  /** \param identity The identity to be updated.
-   */
-  void updateIdentity(const Identity &identity);
-
   //! Remove identity and propagate that fact to the clients.
   /** \param identity The identity to be removed.
    */
@@ -90,11 +93,6 @@ public slots:
    */
   void createNetwork(const NetworkInfo &info);
 
-  //! Update a network and propagate the changes to the clients.
-  /** \param info The updated network settings.
-   */
-  void updateNetwork(const NetworkInfo &info);
-
   //! Remove identity and propagate that fact to the clients.
   /** \param identity The identity to be removed.
    */
@@ -159,6 +157,8 @@ private slots:
 
   void destroyNetwork(NetworkId);
 
+  void identityUpdated(const QVariantMap &);
+
   //! Called when storage updated a BufferInfo.
   /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
    *  \param user       The buffer's owner (not necessarily us)
@@ -177,6 +177,7 @@ private:
   UserId _user;
 
   SignalProxy *_signalProxy;
+  CoreAliasManager _aliasManager;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, CoreNetwork *> _networks;
   //  QHash<NetworkId, CoreNetwork *> _networksToRemove;
@@ -185,6 +186,8 @@ private:
   BufferSyncer *_bufferSyncer;
   CoreBacklogManager *_backlogManager;
   CoreBufferViewManager *_bufferViewManager;
+  CoreIrcListHelper *_ircListHelper;
+  CoreCoreInfo _coreInfo;
 
   QScriptEngine *scriptEngine;