X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=913f630b7ad9ea6ba9171d69eae41c4276246367;hp=9965f0d4921aad2cc6c9b4e7e711c0764a41e4f4;hb=70ed7f4b13ab21a9b3dcb61386b56ad324ed697d;hpb=8ec76e512d20ce5d1dc76de556bb98a06b75d695

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 9965f0d4..913f630b 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -28,9 +28,10 @@
 
 class BufferSyncer;
 class CoreBacklogManager;
+class CoreBufferViewManager;
 class Identity;
 class NetworkConnection;
-class Network;
+class CoreNetwork;
 struct NetworkInfo;
 class SignalProxy;
 
@@ -45,7 +46,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;
 
@@ -149,8 +150,10 @@ 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);
 
@@ -175,12 +178,13 @@ private:
 
   SignalProxy *_signalProxy;
   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;
 
   QScriptEngine *scriptEngine;