I am starting to clean up the mess that is Global right now, and to implement a clean...

[quassel.git] / src / client / clientproxy.h

diff --git a/src/client/clientproxy.h b/src/client/clientproxy.h
index 28fbfff..33b3403 100644 (file)
--- a/src/client/clientproxy.h
+++ b/src/client/clientproxy.h
@@ -18,18 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _GUIPROXY_H_
-#define _GUIPROXY_H_
+#ifndef _CLIENTPROXY_H_
+#define _CLIENTPROXY_H_
+
+#include <QStringList>
+#include <QtDebug>
 
 #include "proxy_common.h"
 #include "message.h"
 #include "global.h"
 
-#include <QObject>
-#include <QVariant>
-#include <QTcpSocket>
-#include <QStringList>
-
 class ClientProxy : public QObject {
   Q_OBJECT
 
@@ -38,16 +36,15 @@ class ClientProxy : public QObject {
     static void destroy();
 
   public slots:
+    inline void gsSessionDataChanged(const QString &key, const QVariant &data) { send(GS_SESSION_DATA_CHANGED, key, data); }
     inline void gsUserInput(BufferId id, QString msg)                 { send(GS_USER_INPUT, QVariant::fromValue(id), msg); }
     inline void gsRequestConnect(QStringList networks)                { send(GS_REQUEST_CONNECT, networks); }
     inline void gsImportBacklog()                                     { send(GS_IMPORT_BACKLOG); }
     inline void gsRequestBacklog(BufferId id, QVariant v1, QVariant v2) { send(GS_REQUEST_BACKLOG, QVariant::fromValue(id), v1, v2); }
+    inline void gsRequestNetworkStates()                              { send(GS_REQUEST_NETWORK_STATES); }
 
     inline void gsGeneric(ClientSignal sig, QVariant v1 = QVariant(), QVariant v2 = QVariant(), QVariant v3 = QVariant()) { send(sig, v1, v2, v3); }
 
-    //void connectToCore(QString host, quint16 port);
-    //void disconnectFromCore();
-
   signals:
     void csCoreState(QVariant);
     void csServerState(QString, QVariant);
@@ -57,6 +54,7 @@ class ClientProxy : public QObject {
     void csDisplayStatusMsg(QString, QString);
     void csUpdateGlobalData(QString key, QVariant data);
     void csGlobalDataChanged(QString key);
+    void csSessionDataChanged(const QString &key, const QVariant &data);
     void csModeSet(QString, QString, QString);
     void csTopicSet(QString, QString, QString);
     void csNickAdded(QString, QString, VarMap);
@@ -70,36 +68,14 @@ class ClientProxy : public QObject {
 
     void csGeneric(CoreSignal, QVariant, QVariant, QVariant);
 
-    //void coreConnected();
-    //void coreDisconnected();
-    //void coreConnectionError(QString errorMsg);
-
-    //void recvPartialItem(quint32 avail, quint32 size);
-
     void send(ClientSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
 
   public slots:
     void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
 
-  private slots:
-    //void updateCoreData(QString);
-
-    //void serverError(QAbstractSocket::SocketError);
-    //void serverHasData();
-
   private:
     ClientProxy();
     static ClientProxy *instanceptr;
-
-    //QTcpSocket socket;
-    //quint32 blockSize;
-
-  //friend class CoreProxy;
-
 };
 
-//extern ClientProxy *guiProxy;
-
-
-
 #endif