X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreproxy.h;h=12f5d845386a4c6146488c36360bea0f7387b43d;hp=737d061a1f859a244822b43e7bdccfd08edc3d04;hb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4 diff --git a/src/core/coreproxy.h b/src/core/coreproxy.h index 737d061a..12f5d845 100644 --- a/src/core/coreproxy.h +++ b/src/core/coreproxy.h @@ -25,9 +25,10 @@ #include "message.h" #include "global.h" -#include -#include -#include +//#include +#include +//#include +//#include /** This class is the Core side of the proxy. The Core connects its signals and slots to it, * and the calls are marshalled and sent to (or received and unmarshalled from) the GuiProxy. @@ -41,6 +42,7 @@ class CoreProxy : public QObject { public slots: inline void csUpdateGlobalData(QString key, QVariant data) { send(CS_UPDATE_GLOBAL_DATA, key, data); } + inline void csSessionDataChanged(const QString &key, const QVariant &data) { send(CS_SESSION_DATA_CHANGED, key, data); } inline void csServerConnected(QString net) { send(CS_SERVER_CONNECTED, net); } inline void csServerDisconnected(QString net) { send(CS_SERVER_DISCONNECTED, net); } inline void csServerState(QString net, VarMap data) { send(CS_SERVER_STATE, net, data); } @@ -61,6 +63,7 @@ class CoreProxy : public QObject { signals: void gsPutGlobalData(QString, QVariant); + void gsSessionDataChanged(const QString &, const QVariant &); void gsUserInput(BufferId, QString); void gsRequestConnect(QStringList networks); void gsImportBacklog(); @@ -74,20 +77,10 @@ class CoreProxy : public QObject { void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); public: - //void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); void recv(ClientSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); - private: - void processClientUpdate(QTcpSocket *, QString key, QVariant data); - - private: - - friend class GuiProxy; }; -//extern CoreProxy *coreProxy; - - #endif