X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=gui%2Fguiproxy.h;h=aeb12f3fc9a105dbfcb75fdee01485fea980867d;hb=0d5499deed248902ce2341208cbc33acd8cace19;hp=a068b6d12ffca990e77ef1cb278f74dc6d9ba2e2;hpb=057883f768f86257c9dbefeb5ef12403b207b773;p=quassel.git

diff --git a/gui/guiproxy.h b/gui/guiproxy.h
index a068b6d1..aeb12f3f 100644
--- a/gui/guiproxy.h
+++ b/gui/guiproxy.h
@@ -41,25 +41,37 @@ class GUIProxy : public QObject {
     GUIProxy();
 
   public slots:
-    inline void gsUserInput(QString net, QString buf, QString msg)    { send(GS_USER_INPUT, net, buf, msg); }
+    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 gsGeneric(GUISignal 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 csDisplayMsg(QString, QString, Message);
+    void csServerState(QString, QVariant);
+    void csServerConnected(QString);
+    void csServerDisconnected(QString);
+    void csDisplayMsg(Message);
     void csDisplayStatusMsg(QString, QString);
     void csUpdateGlobalData(QString key, QVariant data);
     void csGlobalDataChanged(QString key);
     void csModeSet(QString, QString, QString);
     void csTopicSet(QString, QString, QString);
-    void csSetNicks(QString, QString, QStringList);
     void csNickAdded(QString, QString, VarMap);
     void csNickRemoved(QString, QString);
+    void csNickRenamed(QString, QString, QString);
     void csNickUpdated(QString, QString, VarMap);
     void csOwnNickSet(QString, QString);
+    void csQueryRequested(QString, QString);
+    void csBacklogData(BufferId, QList<QVariant>, bool);
+    void csUpdateBufferId(BufferId);
+
+    void csGeneric(CoreSignal, QVariant, QVariant, QVariant);
 
     void coreConnected();
     void coreDisconnected();
@@ -67,8 +79,9 @@ class GUIProxy : public QObject {
 
     void recvPartialItem(quint32 avail, quint32 size);
 
-  public:
     void send(GUISignal, 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: