Merging NetworkConnection into CoreNetwork.

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 7144fe2..8fa8725 100644 (file)
--- 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,30 +48,29 @@ 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;
 
   QVariant sessionState();
 
-  SignalProxy *signalProxy() const;
+  inline SignalProxy *signalProxy() const { return _signalProxy; }
+
+  const AliasManager &aliasManager() const { return _aliasManager; }
+  AliasManager &aliasManager() { return _aliasManager; }
 
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
-  
-  void attachNetworkConnection(NetworkConnection *conn);
+
+//   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
   void saveSessionState() const;
   void restoreSessionState();
 
 public slots:
-  void networkStateRequested();
-
-  void addClient(QObject *socket);
-
-  void connectToNetwork(NetworkId);
-  void disconnectFromNetwork(NetworkId id);
+  void addClient(QIODevice *device);
+  void addClient(SignalProxy *proxy);
 
   void msgFromClient(BufferInfo, QString message);
 
@@ -79,11 +79,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 +89,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.
    */
@@ -118,22 +108,16 @@ public slots:
    */
   void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
 
-  void channelJoined(NetworkId id, const QString &channel, const QString &key = QString());
-  void channelParted(NetworkId, const QString &channel);
   QHash<QString, QString> persistentChannels(NetworkId) const;
 
 signals:
   void initialized();
+  void sessionState(const QVariant &);
 
   //void msgFromGui(uint netid, QString buf, QString message);
   void displayMsg(Message message);
   void displayStatusMsg(QString, QString);
 
-  //void connectToIrc(QString net);
-  //void disconnectFromIrc(QString net);
-
-  void bufferInfoUpdated(BufferInfo);
-
   void scriptResult(QString result);
 
   //! Identity has been created.
@@ -158,22 +142,18 @@ private slots:
 
   void recvStatusMsgFromServer(QString msg);
   void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
-  void networkConnected(NetworkId networkid);
-  void networkDisconnected(NetworkId networkid);
 
   void destroyNetwork(NetworkId);
 
-  //! 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)
-   *  \param bufferInfo The updated BufferInfo
-   */
-  void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
+  void identityUpdated(const QVariantMap &);
 
   void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
 
   void scriptRequest(QString script);
 
+  void clientsConnected();
+  void clientsDisconnected();
+
 private:
   void loadSettings();
   void initScriptEngine();
@@ -181,7 +161,8 @@ private:
   UserId _user;
 
   SignalProxy *_signalProxy;
-  QHash<NetworkId, NetworkConnection *> _connections;
+  CoreAliasManager _aliasManager;
+  // QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, CoreNetwork *> _networks;
   //  QHash<NetworkId, CoreNetwork *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;