X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fserver.h;h=360bed85ddeb1e160fbf807219e9b37e112ae985;hp=dd8aac9b80c6d02d705b5fbd83626363525b7949;hb=c7ad7451b1e899ba0de2ded9ac08359dff5cca61;hpb=44b22c4419f478a20f6324f9f3a700a2dec56302 diff --git a/src/core/server.h b/src/core/server.h index dd8aac9b..360bed85 100644 --- a/src/core/server.h +++ b/src/core/server.h @@ -66,7 +66,7 @@ class Server : public QThread { //void exitThread(); signals: - void serverState(QString net, VarMap data); + void serverState(QString net, QVariantMap data); void recvRawServerMsg(QString); void displayStatusMsg(QString); //void displayMsg(Message msg); @@ -74,10 +74,10 @@ class Server : public QThread { void connected(QString network); void disconnected(QString network); - void nickAdded(QString network, QString nick, VarMap props); + void nickAdded(QString network, QString nick, QVariantMap props); void nickRenamed(QString network, QString oldnick, QString newnick); void nickRemoved(QString network, QString nick); - void nickUpdated(QString network, QString nick, VarMap props); + void nickUpdated(QString network, QString nick, QVariantMap props); void modeSet(QString network, QString target, QString mode); void topicSet(QString network, QString buffer, QString topic); void ownNickSet(QString network, QString newNick); @@ -152,11 +152,11 @@ class Server : public QThread { QString ownNick; QString currentServer; - VarMap networkSettings; - VarMap identity; - QHash nicks; // stores all known nicks for the server + QVariantMap networkSettings; + QVariantMap identity; + QHash nicks; // stores all known nicks for the server QHash topics; // stores topics for each buffer - VarMap serverSupports; // stores results from RPL_ISUPPORT + QVariantMap serverSupports; // stores results from RPL_ISUPPORT void handleServerMsg(QByteArray rawMsg); void handleUserInput(QString buffer, QString usrMsg);