X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=492208aeb3710f6f1e37546c307564a0ed3b010e;hp=6d01d176e5a2f41313fe61abca070045e6732de1;hb=480eab8daec4fb56a6886918c6a913cc197330f1;hpb=9f9d207ecf28dd5470ecef9d4076a3f447662a20

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 6d01d176..492208ae 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -18,18 +18,23 @@
  *   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 Network;
+class CoreNetwork;
 struct NetworkInfo;
 class SignalProxy;
 
@@ -44,7 +49,7 @@ public:
 
   QList<BufferInfo> buffers() const;
   UserId user() const;
-  Network *network(NetworkId) const;
+  CoreNetwork *network(NetworkId) const;
   NetworkConnection *networkConnection(NetworkId) const;
   Identity *identity(IdentityId) const;
 
@@ -52,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
@@ -66,7 +76,6 @@ public slots:
   void connectToNetwork(NetworkId);
   void disconnectFromNetwork(NetworkId id);
 
-  void sendBacklog(BufferInfo, QVariant, QVariant);
   void msgFromClient(BufferInfo, QString message);
 
   //! Create an identity and propagate the changes to the clients.
@@ -74,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.
    */
@@ -89,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.
    */
@@ -127,8 +126,6 @@ signals:
   //void connectToIrc(QString net);
   //void disconnectFromIrc(QString net);
 
-  void backlogData(BufferInfo, QVariantList, bool done);
-
   void bufferInfoUpdated(BufferInfo);
 
   void scriptResult(QString result);
@@ -151,13 +148,17 @@ signals:
   void bufferRenamed(BufferId, QString);
 
 private slots:
+  void removeClient(QIODevice *dev);
+
   void recvStatusMsgFromServer(QString msg);
-  void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  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);
 
+  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)
@@ -176,12 +177,17 @@ private:
   UserId _user;
 
   SignalProxy *_signalProxy;
+  CoreAliasManager _aliasManager;
   QHash<NetworkId, NetworkConnection *> _connections;
-  QHash<NetworkId, Network *> _networks;
-  QHash<NetworkId, Network *> _networksToRemove;
+  QHash<NetworkId, CoreNetwork *> _networks;
+  //  QHash<NetworkId, CoreNetwork *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
   BufferSyncer *_bufferSyncer;
+  CoreBacklogManager *_backlogManager;
+  CoreBufferViewManager *_bufferViewManager;
+  CoreIrcListHelper *_ircListHelper;
+  CoreCoreInfo _coreInfo;
 
   QScriptEngine *scriptEngine;