X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcoreproxy.h;h=9b4acc5a1dbd7ec0b398d5b3837cda7b898c4d41;hp=c8850a355bfe659628ad00011fd4a6030bc40d7a;hb=7a0c26e22498cabadd791be32614ba65f69125c3;hpb=d6a96a47a3964b9c0b1ea2413601d70d0d327413

diff --git a/core/coreproxy.h b/core/coreproxy.h
index c8850a35..9b4acc5a 100644
--- a/core/coreproxy.h
+++ b/core/coreproxy.h
@@ -44,21 +44,29 @@ class CoreProxy : public QObject {
     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(QString net, Message msg)                  { send(CS_DISPLAY_MSG, net, QVariant::fromValue(msg)); }
+    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 csSetNicks(QString net, QString buf, QStringList nicks) { send(CS_SET_NICKS, net, buf, nicks); }
     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();