X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoresession.h;h=8b4305e343f64a61ba75c564ebf255dca157ef48;hb=4ae8f86c1ce452582d6fe576956c7c1bc1460adf;hp=20a2374e0cf520436c7a7b67ef94d68ae0dbf813;hpb=0afd913a5fa29fa44f6119df86aa7574b3274e51;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 20a2374e..8b4305e3 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,6 +148,10 @@ signals:
 
   void networkCreated(NetworkId);
   void networkRemoved(NetworkId);
+  void networkDisconnected(NetworkId);
+
+protected:
+  virtual void customEvent(QEvent *event);
 
 private slots:
   void removeClient(QIODevice *dev);
@@ -162,13 +170,11 @@ private slots:
 
   void saveSessionState() const;
 
-protected:
-  virtual void customEvent(QEvent *event);
-
 private:
+  void processMessages();
+
   void loadSettings();
   void initScriptEngine();
-  void processMessages();
 
   /// Hook for converting events to the old displayMsg() handlers
   Q_INVOKABLE void processMessageEvent(MessageEvent *event);
@@ -190,7 +196,9 @@ private:
   CoreCoreInfo _coreInfo;
 
   EventManager *_eventManager;
-  CoreSessionEventProcessor *_eventProcessor;
+  EventStringifier *_eventStringifier; // should eventually move into client
+  CoreSessionEventProcessor *_sessionEventProcessor;
+  CtcpParser *_ctcpParser;
   IrcParser *_ircParser;
 
   QScriptEngine *scriptEngine;