Added getNetworkId(UserId user, const QString &network) to make the transition to...

[quassel.git] / src / core / server.h

diff --git a/src/core/server.h b/src/core/server.h
index bcc7ffd..360bed8 100644 (file)
--- a/src/core/server.h
+++ b/src/core/server.h
@@ -31,8 +31,6 @@
 #include "message.h"
 #include "serverinfo.h"
 
-#define DEFAULT_PORT 6667
-
 
 /*!
  * This is a server object, managing a single connection to an IRC server, handling the associated channels and so on.
@@ -68,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);
@@ -76,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);
@@ -154,11 +152,11 @@ class Server : public QThread {
 
     QString ownNick;
     QString currentServer;
-    VarMap networkSettings;
-    VarMap identity;
-    QHash<QString, VarMap> nicks;  // stores all known nicks for the server
+    QVariantMap networkSettings;
+    QVariantMap identity;
+    QHash<QString, QVariantMap> nicks;  // stores all known nicks for the server
     QHash<QString, QString> 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);