X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=8b4305e343f64a61ba75c564ebf255dca157ef48;hb=d399105c3cacc85e30afc28e174efefd36332bc3;hp=3f36497bb16fc1a7a84b6cc9084225fa1376c17b;hpb=86837eac3346857733f3488acccca9dc2c45605e;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 3f36497b..8b4305e3 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -38,8 +38,11 @@ class CoreIrcListHelper;
 class CoreNetwork;
 class CoreNetworkConfig;
 class CoreSessionEventProcessor;
+class CtcpParser;
 class EventManager;
+class EventStringifier;
 class IrcParser;
+class MessageEvent;
 class NetworkConnection;
 class SignalProxy;
 
@@ -69,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; }
@@ -143,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);
@@ -161,13 +170,14 @@ 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);
 
   UserId _user;
 
@@ -186,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;