X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclientproxy.h;h=e66aa65afe758832c1c8729a0b0285f4f4cc6424;hp=28fbfff4bbe1b48369d8cb586bb83fe7a8fd9c3e;hb=8c3b7e4773e9f20ad9ea264cbaafaa52485bdf86;hpb=130ccf5033c21ca3ad0e0357a82953b5727bd0e9 diff --git a/src/client/clientproxy.h b/src/client/clientproxy.h index 28fbfff4..e66aa65a 100644 --- a/src/client/clientproxy.h +++ b/src/client/clientproxy.h @@ -18,18 +18,15 @@ * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. * ***************************************************************************/ -#ifndef _GUIPROXY_H_ -#define _GUIPROXY_H_ +#ifndef _CLIENTPROXY_H_ +#define _CLIENTPROXY_H_ + +#include #include "proxy_common.h" #include "message.h" #include "global.h" -#include -#include -#include -#include - class ClientProxy : public QObject { Q_OBJECT @@ -42,12 +39,10 @@ class ClientProxy : public QObject { 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); @@ -70,36 +65,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