X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=9d8ba559f9a62158bc52e6090074df5c7327e519;hp=20a2374e0cf520436c7a7b67ef94d68ae0dbf813;hb=5cab348de53cb3b994273c06fe69e1f799d247b4;hpb=0afd913a5fa29fa44f6119df86aa7574b3274e51

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 20a2374e..9d8ba559 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -38,7 +38,9 @@ class CoreIrcListHelper;
 class CoreNetwork;
 class CoreNetworkConfig;
 class CoreSessionEventProcessor;
+class CtcpParser;
 class EventManager;
+class EventStringifier;
 class IrcParser;
 class MessageEvent;
 class NetworkConnection;
@@ -70,7 +72,9 @@ public:
   AliasManager &aliasManager() { return _aliasManager; }
 
   inline EventManager *eventManager() const { return _eventManager; }
-  inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+  inline EventStringifier *eventStringifier() const { return _eventStringifier; }
+  inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; }
+  inline CtcpParser *ctcpParser() const { return _ctcpParser; }
   inline IrcParser *ircParser() const { return _ircParser; }
 
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
@@ -144,12 +148,14 @@ signals:
 
   void networkCreated(NetworkId);
   void networkRemoved(NetworkId);
+  void networkDisconnected(NetworkId);
 
 private slots:
   void removeClient(QIODevice *dev);
 
   void recvStatusMsgFromServer(QString msg);
   void recvMessageFromServer(NetworkId networkId, Message::Type, BufferInfo::Type, const QString &target, const QString &text, const QString &sender = "", Message::Flags flags = Message::None);
+  void processMessages();
 
   void destroyNetwork(NetworkId);
 
@@ -162,13 +168,9 @@ private slots:
 
   void saveSessionState() const;
 
-protected:
-  virtual void customEvent(QEvent *event);
-
 private:
   void loadSettings();
   void initScriptEngine();
-  void processMessages();
 
   /// Hook for converting events to the old displayMsg() handlers
   Q_INVOKABLE void processMessageEvent(MessageEvent *event);
@@ -190,13 +192,14 @@ private:
   CoreCoreInfo _coreInfo;
 
   EventManager *_eventManager;
-  CoreSessionEventProcessor *_eventProcessor;
+  EventStringifier *_eventStringifier; // should eventually move into client
+  CoreSessionEventProcessor *_sessionEventProcessor;
+  CtcpParser *_ctcpParser;
   IrcParser *_ircParser;
 
   QScriptEngine *scriptEngine;
 
   QList<RawMessage> _messageQueue;
-  bool _processMessages;
   CoreIgnoreListManager _ignoreListManager;
 };