X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=91ad27e1301413f0ead24d43f130eaef54b64029;hp=7144fe2b0d37723eabddea943dd3f0d114ee0659;hb=e0464aa399c32231e5cc7879f8910c3ccd3b45e3;hpb=52df0969e22249e6758714eec9e5afd7d4fe9b83

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 7144fe2b..91ad27e1 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -18,13 +18,14 @@
  *   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;
@@ -47,7 +48,7 @@ public:
   ~CoreSession();
 
   QList<BufferInfo> buffers() const;
-  UserId user() const;
+  inline UserId user() const { return _user; }
   CoreNetwork *network(NetworkId) const;
   NetworkConnection *networkConnection(NetworkId) const;
   Identity *identity(IdentityId) const;
@@ -56,8 +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
@@ -67,7 +71,8 @@ public:
 public slots:
   void networkStateRequested();
 
-  void addClient(QObject *socket);
+  void addClient(QIODevice *device);
+  void addClient(SignalProxy *proxy);
 
   void connectToNetwork(NetworkId);
   void disconnectFromNetwork(NetworkId id);
@@ -79,11 +84,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.
    */
@@ -94,11 +94,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.
    */
@@ -124,6 +119,7 @@ public slots:
 
 signals:
   void initialized();
+  void sessionState(const QVariant &);
 
   //void msgFromGui(uint netid, QString buf, QString message);
   void displayMsg(Message message);
@@ -163,6 +159,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)
@@ -174,6 +172,9 @@ private slots:
 
   void scriptRequest(QString script);
 
+  void clientsConnected();
+  void clientsDisconnected();
+
 private:
   void loadSettings();
   void initScriptEngine();
@@ -181,6 +182,7 @@ private:
   UserId _user;
 
   SignalProxy *_signalProxy;
+  CoreAliasManager _aliasManager;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, CoreNetwork *> _networks;
   //  QHash<NetworkId, CoreNetwork *> _networksToRemove;