despammificating the pglog

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 25bf012..9d8ba55 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -38,6 +38,7 @@ class CoreIrcListHelper;
 class CoreNetwork;
 class CoreNetworkConfig;
 class CoreSessionEventProcessor;
+class CtcpParser;
 class EventManager;
 class EventStringifier;
 class IrcParser;
@@ -72,7 +73,8 @@ public:
 
   inline EventManager *eventManager() const { return _eventManager; }
   inline EventStringifier *eventStringifier() const { return _eventStringifier; }
-  inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+  inline CoreSessionEventProcessor *sessionEventProcessor() const { return _sessionEventProcessor; }
+  inline CtcpParser *ctcpParser() const { return _ctcpParser; }
   inline IrcParser *ircParser() const { return _ircParser; }
 
   inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
@@ -153,6 +155,7 @@ private slots:
 
   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);
 
@@ -165,13 +168,9 @@ 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);
@@ -194,13 +193,13 @@ private:
 
   EventManager *_eventManager;
   EventStringifier *_eventStringifier; // should eventually move into client
-  CoreSessionEventProcessor *_eventProcessor;
+  CoreSessionEventProcessor *_sessionEventProcessor;
+  CtcpParser *_ctcpParser;
   IrcParser *_ircParser;
 
   QScriptEngine *scriptEngine;
 
   QList<RawMessage> _messageQueue;
-  bool _processMessages;
   CoreIgnoreListManager _ignoreListManager;
 };