projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix includes
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
20a2374
..
8b4305e
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-38,7
+38,9
@@
class CoreIrcListHelper;
class CoreNetwork;
class CoreNetworkConfig;
class CoreSessionEventProcessor;
class CoreNetwork;
class CoreNetworkConfig;
class CoreSessionEventProcessor;
+class CtcpParser;
class EventManager;
class EventManager;
+class EventStringifier;
class IrcParser;
class MessageEvent;
class NetworkConnection;
class IrcParser;
class MessageEvent;
class NetworkConnection;
@@
-70,7
+72,9
@@
public:
AliasManager &aliasManager() { return _aliasManager; }
inline EventManager *eventManager() const { return _eventManager; }
AliasManager &aliasManager() { return _aliasManager; }
inline EventManager *eventManager() const { return _eventManager; }
- inline CoreSessionEventProcessor *eventProcessor() const { return _eventProcessor; }
+ 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 IrcParser *ircParser() const { return _ircParser; }
inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
@@
-144,6
+148,10
@@
signals:
void networkCreated(NetworkId);
void networkRemoved(NetworkId);
void networkCreated(NetworkId);
void networkRemoved(NetworkId);
+ void networkDisconnected(NetworkId);
+
+protected:
+ virtual void customEvent(QEvent *event);
private slots:
void removeClient(QIODevice *dev);
private slots:
void removeClient(QIODevice *dev);
@@
-162,13
+170,11
@@
private slots:
void saveSessionState() const;
void saveSessionState() const;
-protected:
- virtual void customEvent(QEvent *event);
-
private:
private:
+ void processMessages();
+
void loadSettings();
void initScriptEngine();
void loadSettings();
void initScriptEngine();
- void processMessages();
/// Hook for converting events to the old displayMsg() handlers
Q_INVOKABLE void processMessageEvent(MessageEvent *event);
/// Hook for converting events to the old displayMsg() handlers
Q_INVOKABLE void processMessageEvent(MessageEvent *event);
@@
-190,7
+196,9
@@
private:
CoreCoreInfo _coreInfo;
EventManager *_eventManager;
CoreCoreInfo _coreInfo;
EventManager *_eventManager;
- CoreSessionEventProcessor *_eventProcessor;
+ EventStringifier *_eventStringifier; // should eventually move into client
+ CoreSessionEventProcessor *_sessionEventProcessor;
+ CtcpParser *_ctcpParser;
IrcParser *_ircParser;
QScriptEngine *scriptEngine;
IrcParser *_ircParser;
QScriptEngine *scriptEngine;