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

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 4f341ee5..9d8ba559 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -33,15 +33,21 @@
 class CoreBacklogManager;
 class CoreBufferSyncer;
 class CoreBufferViewManager;
+class CoreIdentity;
 class CoreIrcListHelper;
+class CoreNetwork;
 class CoreNetworkConfig;
-class Identity;
-class CoreIdentity;
+class CoreSessionEventProcessor;
+class CtcpParser;
+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 +71,12 @@ 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 *sessionEventProcessor() const { return _sessionEventProcessor; }
+  inline CtcpParser *ctcpParser() const { return _ctcpParser; }
+  inline IrcParser *ircParser() const { return _ircParser; }
+
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
 
   inline CoreIgnoreListManager *ignoreListManager() { return &_ignoreListManager; }
@@ -109,6 +121,9 @@ public slots:
 
   QHash<QString, QString> persistentChannels(NetworkId) const;
 
+  //! Marks us away (or unaway) on all networks
+  void globalAway(const QString &msg = QString());
+
 signals:
   void initialized();
   void sessionState(const QVariant &);
@@ -133,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);
 
@@ -151,13 +168,12 @@ 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);
 
   UserId _user;
 
@@ -175,10 +191,15 @@ private:
   CoreNetworkConfig *_networkConfig;
   CoreCoreInfo _coreInfo;
 
+  EventManager *_eventManager;
+  EventStringifier *_eventStringifier; // should eventually move into client
+  CoreSessionEventProcessor *_sessionEventProcessor;
+  CtcpParser *_ctcpParser;
+  IrcParser *_ircParser;
+
   QScriptEngine *scriptEngine;
 
   QList<RawMessage> _messageQueue;
-  bool _processMessages;
   CoreIgnoreListManager _ignoreListManager;
 };