Fixed formatting code %O (which should switch off all format codes, but accidentally

[quassel.git] / core / server.h

diff --git a/core/server.h b/core/server.h
index b2fb230..3f2ea31 100644 (file)
--- a/core/server.h
+++ b/core/server.h
@@ -65,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);
 
@@ -75,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);
 
@@ -128,7 +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 handleServer433(QString, QStringList);  // RPL_NICKNAMEINUSER
+    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);