X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=8b4305e343f64a61ba75c564ebf255dca157ef48;hb=11cecc112915cd9940e7612c05091f9b5bb18b00;hp=25bf01226798c6422ee29bc654daf279a080b635;hpb=43e0488dad735096164d3088398653097f816424;p=quassel.git diff --git a/src/core/coresession.h b/src/core/coresession.h index 25bf0122..8b4305e3 100644 --- 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; } @@ -148,6 +150,9 @@ signals: void networkRemoved(NetworkId); void networkDisconnected(NetworkId); +protected: + virtual void customEvent(QEvent *event); + private slots: void removeClient(QIODevice *dev); @@ -165,13 +170,11 @@ 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); @@ -194,7 +197,8 @@ private: EventManager *_eventManager; EventStringifier *_eventStringifier; // should eventually move into client - CoreSessionEventProcessor *_eventProcessor; + CoreSessionEventProcessor *_sessionEventProcessor; + CtcpParser *_ctcpParser; IrcParser *_ircParser; QScriptEngine *scriptEngine;