X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=gui%2Fguiproxy.h;h=d1f5534825ed3ffe99d33082a74ddd4acb97e727;hp=37bfd1494d2f2526c6d8e78c0dbb8a733923f000;hb=65919ad0ffef03335bf8358836c65a77cbed247d;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18

diff --git a/gui/guiproxy.h b/gui/guiproxy.h
index 37bfd149..d1f55348 100644
--- a/gui/guiproxy.h
+++ b/gui/guiproxy.h
@@ -21,10 +21,11 @@
 #ifndef _GUIPROXY_H_
 #define _GUIPROXY_H_
 
-#include "../main/proxy_common.h"
+#include "proxy_common.h"
 
 #include <QObject>
 #include <QVariant>
+#include <QTcpSocket>
 
 /** This class is the GUI side of the proxy. The GUI connects its signals and slots to it,
  *  and the calls are marshalled and sent to (or received and unmarshalled from) the CoreProxy.
@@ -33,20 +34,44 @@
 class GUIProxy : public QObject {
   Q_OBJECT
 
-  private:
-    void send(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-    void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-
   public:
-    static GUIProxy * init();
+    GUIProxy();
 
   public slots:
-    void gsUserInput(QString);
+    inline void gsUserInput(QString s)                             { send(GS_USER_INPUT, s); }
+    inline void gsRequestConnect(QString host, quint16 port)       { send(GS_REQUEST_CONNECT, host, port); }
+    //inline void gsPutQuasselData(QString key, QVariant data)       { send(GS_PUT_QUASSEL_DATA, key, data); }
 
+    void connectToCore(QString host, quint16 port);
+    void disconnectFromCore();
 
   signals:
-    void psCoreMessage(QString);
+    void csCoreState(QVariant);
+    void csCoreMessage(QString);
+    void csUpdateGlobalData(QString key, QVariant data);
+    void csGlobalDataChanged(QString key);
+
+    void coreConnected();
+    void coreDisconnected();
+    void coreConnectionError(QString errorMsg);
+
+    void recvPartialItem(quint32 avail, quint32 size);
+
+  public:
+    void send(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+    void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+
+  private slots:
+    void updateCoreData(QString);
+
+    void serverError(QAbstractSocket::SocketError);
+    void serverHasData();
+
+  private:
+    QTcpSocket socket;
+    quint32 blockSize;
 
+  friend class CoreProxy;
 
 };