X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=7144fe2b0d37723eabddea943dd3f0d114ee0659;hb=72661d39517f5a06862abfe4e645f64334041cb4;hp=482fa76af7f5a088deeb20e43dbf75fcdb9b44e7;hpb=444e91f948b435e652205c4d0f1148906e9e86dc;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 482fa76a..7144fe2b 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -24,14 +24,16 @@
 #include <QString>
 #include <QVariant>
 
+#include "corecoreinfo.h"
 #include "message.h"
 
 class BufferSyncer;
 class CoreBacklogManager;
 class CoreBufferViewManager;
+class CoreIrcListHelper;
 class Identity;
 class NetworkConnection;
-class Network;
+class CoreNetwork;
 struct NetworkInfo;
 class SignalProxy;
 
@@ -46,7 +48,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;
 
@@ -54,6 +56,8 @@ public:
 
   SignalProxy *signalProxy() const;
 
+  inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
+  
   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
@@ -153,7 +157,7 @@ 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);
 
@@ -178,13 +182,15 @@ 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;
+  CoreIrcListHelper *_ircListHelper;
+  CoreCoreInfo _coreInfo;
 
   QScriptEngine *scriptEngine;