X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=25bf01226798c6422ee29bc654daf279a080b635;hp=772e7dc3875a08700598254d74295d9875874447;hb=43e0488dad735096164d3088398653097f816424;hpb=0f667b4d2fb9a34b8ebbfe1d07b47407ce54468a

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 772e7dc3..25bf0122 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -33,15 +33,20 @@
 class CoreBacklogManager;
 class CoreBufferSyncer;
 class CoreBufferViewManager;
+class CoreIdentity;
 class CoreIrcListHelper;
+class CoreNetwork;
 class CoreNetworkConfig;
-class Identity;
-class CoreIdentity;
+class CoreSessionEventProcessor;
+class EventManager;
+class EventStringifier;
+class IrcParser;
+class MessageEvent;
 class NetworkConnection;
-class CoreNetwork;
-struct NetworkInfo;
 class SignalProxy;
 
+struct NetworkInfo;
+
 class QScriptEngine;
 
 class CoreSession : public QObject {
@@ -65,6 +70,11 @@ public:
   const AliasManager &aliasManager() const { return _aliasManager; }
   AliasManager &aliasManager() { return _aliasManager; }
 
+  inline EventManager *eventManager() const { return _eventManager; }
+  inline EventStringifier *eventStringifier() const { return _eventStringifier; }
+  inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+  inline IrcParser *ircParser() const { return _ircParser; }
+
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
 
   inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
@@ -136,6 +146,7 @@ signals:
 
   void networkCreated(NetworkId);
   void networkRemoved(NetworkId);
+  void networkDisconnected(NetworkId);
 
 private slots:
   void removeClient(QIODevice *dev);
@@ -162,6 +173,9 @@ private:
   void initScriptEngine();
   void processMessages();
 
+  /// Hook for converting events to the old displayMsg() handlers
+  Q_INVOKABLE void processMessageEvent(MessageEvent *event);
+
   UserId _user;
 
   SignalProxy *_signalProxy;
@@ -178,6 +192,11 @@ private:
   CoreNetworkConfig *_networkConfig;
   CoreCoreInfo _coreInfo;
 
+  EventManager *_eventManager;
+  EventStringifier *_eventStringifier; // should eventually move into client
+  CoreSessionEventProcessor *_eventProcessor;
+  IrcParser *_ircParser;
+
   QScriptEngine *scriptEngine;
 
   QList<RawMessage> _messageQueue;