X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreproxy.h;h=9a48fe0f40ee287f8a5448356e9eecb9ae6a5292;hb=38db2f48a30f697ef8c0b61dfa6345e8a53336fd;hp=737d061a1f859a244822b43e7bdccfd08edc3d04;hpb=8836fdc8e4107437e5fff0e10e18d581297d59e4;p=quassel.git

diff --git a/src/core/coreproxy.h b/src/core/coreproxy.h
index 737d061a..9a48fe0f 100644
--- a/src/core/coreproxy.h
+++ b/src/core/coreproxy.h
@@ -25,9 +25,9 @@
 #include "message.h"
 #include "global.h"
 
-#include <QtCore>
-#include <QTcpSocket>
-#include <QTcpServer>
+//#include <QtCore>
+#include <QStringList>
+#include <QDebug>
 
 /** 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.
@@ -40,11 +40,11 @@ class CoreProxy : public QObject {
     CoreProxy();
 
   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); }
-    inline void csDisplayMsg(Message msg)                               { send(CS_DISPLAY_MSG, QVariant::fromValue(msg)); }
+    inline void csDisplayMsg(Message msg)                               { send(CS_DISPLAY_MSG, QVariant::fromValue(msg));}
     inline void csDisplayStatusMsg(QString net, QString msg)            { send(CS_DISPLAY_STATUS_MSG, net, msg); }
     inline void csModeSet(QString net, QString target, QString mode)    { send(CS_MODE_SET, net, target, mode); }
     inline void csTopicSet(QString net, QString buf, QString topic)     { send(CS_TOPIC_SET, net, buf, topic); }
@@ -60,7 +60,7 @@ class CoreProxy : public QObject {
     inline void csGeneric(CoreSignal sig, QVariant v1 = QVariant(), QVariant v2 = QVariant(), QVariant v3 = QVariant()) { send(sig, v1, v2, v3); }
 
   signals:
-    void gsPutGlobalData(QString, QVariant);
+    void gsSessionDataChanged(const QString &, const QVariant &);
     void gsUserInput(BufferId, QString);
     void gsRequestConnect(QStringList networks);
     void gsImportBacklog();
@@ -74,20 +74,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