X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fserver.h;h=3f2ea316e5dce79af5fcba642ddc17fbd0744c86;hp=ba333d39b0514c77e3ac9739deb9e15e7e7a4839;hb=2c9184c37fc54adb7670ea261a8e34c99a82a285;hpb=d6a96a47a3964b9c0b1ea2413601d70d0d327413

diff --git a/core/server.h b/core/server.h
index ba333d39..3f2ea316 100644
--- a/core/server.h
+++ b/core/server.h
@@ -47,6 +47,7 @@ class Server : public QThread {
     // serverState state();
     bool isConnected() { return socket.state() == QAbstractSocket::ConnectedState; }
     QString getNetwork() { return network; }
+    QStringList providesUserHandlers();
 
   public slots:
     // void setServerOptions();
@@ -64,7 +65,8 @@ class Server : public QThread {
     void serverState(QString net, VarMap data);
     void recvRawServerMsg(QString);
     void displayStatusMsg(QString);
-    void displayMsg(Message msg);
+    //void displayMsg(Message msg);
+    void displayMsg(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
     void connected(QString network);
     void disconnected(QString network);
 
@@ -74,8 +76,8 @@ class Server : public QThread {
     void nickUpdated(QString network, QString nick, VarMap props);
     void modeSet(QString network, QString target, QString mode);
     void topicSet(QString network, QString buffer, QString topic);
-    void setNicks(QString network, QString buffer, QStringList nicks);
     void ownNickSet(QString network, QString newNick);
+    void queryRequested(QString network, QString nick);
 
 
   private slots:
@@ -101,6 +103,7 @@ class Server : public QThread {
     void handleUserNick(QString, QString);
     void handleUserOp(QString, QString);
     void handleUserPart(QString, QString);
+    void handleUserQuery(QString, QString);
     void handleUserQuit(QString, QString);
     void handleUserQuote(QString, QString);
     void handleUserSay(QString, QString);
@@ -125,6 +128,8 @@ class Server : public QThread {
     void handleServer332(QString, QStringList);   // RPL_TOPIC
     void handleServer333(QString, QStringList);   // Topic set by...
     void handleServer353(QString, QStringList);   // RPL_NAMREPLY
+    void handleServer432(QString, QStringList);   // ERR_ERRONEUSNICKNAME
+    void handleServer433(QString, QStringList);   // ERR_NICKNAMEINUSE
 
     void defaultServerHandler(QString cmd, QString prefix, QStringList params);
     void defaultUserHandler(QString buf, QString cmd, QString msg);