Lots of additions again. Working on implementing commands and prettifying the output.

[quassel.git] / core / coreproxy.h

diff --git a/core/coreproxy.h b/core/coreproxy.h
index 1bded17..8cdea83 100644 (file)
--- a/core/coreproxy.h
+++ b/core/coreproxy.h
@@ -22,6 +22,8 @@
 #define _COREPROXY_H_
 
 #include "proxy_common.h"
 #define _COREPROXY_H_
 
 #include "proxy_common.h"

+#include "message.h"
+#include "global.h"

 
 #include <QtCore>
 #include <QTcpSocket>
 
 #include <QtCore>
 #include <QTcpSocket>


@@ -38,13 +40,21 @@ class CoreProxy : public QObject {
     CoreProxy();
 
   public slots:
     CoreProxy();
 
   public slots:

-    inline void csCoreMessage(QString s)                           { send(CS_CORE_MESSAGE, s); }
-    inline void csUpdateGlobalData(QString key, QVariant data)     { send(CS_UPDATE_GLOBAL_DATA, key, data); }
+    inline void csUpdateGlobalData(QString key, QVariant data)          { send(CS_UPDATE_GLOBAL_DATA, key, data); }
+    inline void csDisplayMsg(QString net, QString buf, Message msg)     { send(CS_DISPLAY_MSG, net, buf, 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 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);
 
   signals:
     void gsPutGlobalData(QString, QVariant);

-    void gsUserInput(QString);
-    void gsRequestConnect(QString, quint16);
+    void gsUserInput(QString, QString, QString);
+    void gsRequestConnect(QStringList networks);

 
   private:
     void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
 
   private:
     void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());