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 34a4514..360bed8 100644 (file)
--- a/src/core/server.h
+++ b/src/core/server.h
@@ -29,8 +29,7 @@
 #include <QTimer>
 
 #include "message.h"
 #include <QTimer>
 
 #include "message.h"

-
-#define DEFAULT_PORT 6667
+#include "serverinfo.h"

 
 
 /*!
 
 
 /*!


@@ -67,7 +66,7 @@ class Server : public QThread {
     //void exitThread();
 
   signals:
     //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);
     void recvRawServerMsg(QString);
     void displayStatusMsg(QString);
     //void displayMsg(Message msg);


@@ -75,10 +74,10 @@ class Server : public QThread {
     void connected(QString network);
     void disconnected(QString network);
 
     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 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);
     void modeSet(QString network, QString target, QString mode);
     void topicSet(QString network, QString buffer, QString topic);
     void ownNickSet(QString network, QString newNick);


@@ -153,13 +152,13 @@ class Server : public QThread {
 
     QString ownNick;
     QString currentServer;
 
     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
     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(QString rawMsg);
+    void handleServerMsg(QByteArray rawMsg);

     void handleUserInput(QString buffer, QString usrMsg);
 
     // CTCP Stuff
     void handleUserInput(QString buffer, QString usrMsg);
 
     // CTCP Stuff


@@ -185,6 +184,9 @@ class Server : public QThread {
       public:
         UnknownCmdError(QString cmd, QString prefix, QStringList params);
     };
       public:
         UnknownCmdError(QString cmd, QString prefix, QStringList params);
     };

+    
+    // stuff needed for new separation of server information
+    ServerInfo *serverinfo;

 };
 
 #endif
 };
 
 #endif