X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=core%2Fserver.h;h=0117b6313425794f7209d6786dc9f46a8ff7d2c6;hb=60bce4937bf006ceae27d012908b644a87865302;hp=90763ac7cdcd3ed19bfc70cd153deb977a7e7cd1;hpb=2a068c11e76c7b34afb64d443dbb1afd2e208aaa;p=quassel.git

diff --git a/core/server.h b/core/server.h
index 90763ac7..0117b631 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,7 +76,6 @@ 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);
 
@@ -127,6 +128,7 @@ class Server : public QThread {
     void handleServer332(QString, QStringList);   // RPL_TOPIC
     void handleServer333(QString, QStringList);   // Topic set by...
     void handleServer353(QString, QStringList);   // RPL_NAMREPLY
+    void handleServer433(QString, QStringList);  // RPL_NICKNAMEINUSER
 
     void defaultServerHandler(QString cmd, QString prefix, QStringList params);
     void defaultUserHandler(QString buf, QString cmd, QString msg);