X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=3dd77f3541ecf28de6aaa83357bc1c65f54246ad;hp=7abd0f1112ea0bb73bf41f6a7d8828bd0a311a64;hb=283fdb2c49e5efa1d497d8c3e6f624f86d008ff8;hpb=27302bba72a29977e81b9a0b2d8cde3a62ebc818

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 7abd0f11..3dd77f35 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,12 +71,18 @@ 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; }
 //   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
-  void saveSessionState() const;
   void restoreSessionState();
 
 public slots:
@@ -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,6 +148,7 @@ signals:
 
   void networkCreated(NetworkId);
   void networkRemoved(NetworkId);
+  void networkDisconnected(NetworkId);
 
 private slots:
   void removeClient(QIODevice *dev);
@@ -149,6 +165,8 @@ private slots:
 
   void updateIdentityBySender();
 
+  void saveSessionState() const;
+
 protected:
   virtual void customEvent(QEvent *event);
 
@@ -157,6 +175,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;
@@ -173,22 +194,29 @@ private:
   CoreNetworkConfig *_networkConfig;
   CoreCoreInfo _coreInfo;
 
+  EventManager *_eventManager;
+  EventStringifier *_eventStringifier; // should eventually move into client
+  CoreSessionEventProcessor *_sessionEventProcessor;
+  CtcpParser *_ctcpParser;
+  IrcParser *_ircParser;
+
   QScriptEngine *scriptEngine;
 
-  struct RawMessage {
-    NetworkId networkId;
-    Message::Type type;
-    BufferInfo::Type bufferType;
-    QString target;
-    QString text;
-    QString sender;
-    Message::Flags flags;
-    RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags)
-      : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {}
-  };
   QList<RawMessage> _messageQueue;
   bool _processMessages;
   CoreIgnoreListManager _ignoreListManager;
 };
 
+struct RawMessage {
+  NetworkId networkId;
+  Message::Type type;
+  BufferInfo::Type bufferType;
+  QString target;
+  QString text;
+  QString sender;
+  Message::Flags flags;
+  RawMessage(NetworkId networkId, Message::Type type, BufferInfo::Type bufferType, const QString &target, const QString &text, const QString &sender, Message::Flags flags)
+    : networkId(networkId), type(type), bufferType(bufferType), target(target), text(text), sender(sender), flags(flags) {}
+};
+
 #endif