X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcoreproxy.h;h=9b4acc5a1dbd7ec0b398d5b3837cda7b898c4d41;hp=d1fd9c7433c8d9403ea147e596c27a74dcf42040;hb=6fc26e28a07a2b6bbc60ee786514a802e628d6d3;hpb=1c7d9f13b744cd517c0769f453fd8dc3106cd94c

diff --git a/core/coreproxy.h b/core/coreproxy.h
index d1fd9c74..9b4acc5a 100644
--- a/core/coreproxy.h
+++ b/core/coreproxy.h
@@ -23,6 +23,7 @@
 
 #include "proxy_common.h"
 #include "message.h"
+#include "global.h"
 
 #include <QtCore>
 #include <QTcpSocket>
@@ -40,15 +41,34 @@ class CoreProxy : public QObject {
 
   public slots:
     inline void csUpdateGlobalData(QString key, QVariant data)          { send(CS_UPDATE_GLOBAL_DATA, key, data); }
-    inline void csSendMessage(QString net, QString buf, Message msg)    { send(CS_SEND_MESSAGE, net, buf, QVariant::fromValue(msg)); }
-    inline void csSendStatusMsg(QString net, QString msg)               { send(CS_SEND_STATUS_MSG, net, msg); }
-    inline void csSetTopic(QString net, QString buf, QString topic)     { send(CS_SET_TOPIC, net, buf, topic); }
-    inline void csSetNicks(QString net, QString buf, QStringList nicks) { send(CS_SET_NICKS, net, buf, nicks); }
+    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 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); }
+    inline void csNickAdded(QString net, QString nick, VarMap props)    { send(CS_NICK_ADDED, net, nick, props); }
+    inline void csNickRemoved(QString net, QString nick)                { send(CS_NICK_REMOVED, net, nick); }
+    inline void csNickRenamed(QString net, QString oldn, QString newn)  { send(CS_NICK_RENAMED, net, oldn, newn); }
+    inline void csNickUpdated(QString net, QString nick, VarMap props)  { send(CS_NICK_UPDATED, net, nick, props); }
+    inline void csOwnNickSet(QString net, QString nick)                 { send(CS_OWN_NICK_SET, net, nick); }
+    inline void csQueryRequested(QString net, QString nick)             { send(CS_QUERY_REQUESTED, net, nick); }
+    inline void csBacklogData(BufferId id, QList<QVariant> msg, bool done) { send(CS_BACKLOG_DATA, QVariant::fromValue(id), msg, done); }
+    inline void csUpdateBufferId(BufferId id)                           { send(CS_UPDATE_BUFFERID, QVariant::fromValue(id)); }
+
+    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 gsUserInput(QString, QString, QString);
+    void gsUserInput(BufferId, QString);
     void gsRequestConnect(QStringList networks);
+    void gsImportBacklog();
+    void gsRequestBacklog(BufferId, QVariant, QVariant);
+
+    void gsGeneric(GUISignal, QVariant, QVariant, QVariant);
+
+    void requestServerStates();
 
   private:
     void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());