X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=core%2Fcoreproxy.h;h=c8850a355bfe659628ad00011fd4a6030bc40d7a;hb=12369966345e76e3bba92f64c84c940ef4d8d916;hp=3272a347b657690feb3fe52fadc0970ef809ed20;hpb=82403b8a8777d44cbc35619e3bbd4feabfad5dc4;p=quassel.git

diff --git a/core/coreproxy.h b/core/coreproxy.h
index 3272a347..c8850a35 100644
--- a/core/coreproxy.h
+++ b/core/coreproxy.h
@@ -22,6 +22,8 @@
 #define _COREPROXY_H_
 
 #include "proxy_common.h"
+#include "message.h"
+#include "global.h"
 
 #include <QtCore>
 #include <QTcpSocket>
@@ -39,14 +41,27 @@ 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 chan, QString msg)   { send(CS_SEND_MESSAGE, net, chan, msg); }
-    inline void csSendStatusMsg(QString net, QString msg)               { send(CS_SEND_STATUS_MSG, net, msg); }
+    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 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); }
 
   signals:
     void gsPutGlobalData(QString, QVariant);
-    void gsUserInput(QString);
+    void gsUserInput(QString, QString, QString);
     void gsRequestConnect(QStringList networks);
 
+    void requestServerStates();
+
   private:
     void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
     void recv(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());