X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fserver.h;h=360bed85ddeb1e160fbf807219e9b37e112ae985;hp=c17b4d0f34ae9ef830a29b7ce39f6ac24c34924a;hb=c7ad7451b1e899ba0de2ded9ac08359dff5cca61;hpb=077d44f36d2f5c730283ef6be839aea7dd073d56

diff --git a/src/core/server.h b/src/core/server.h
index c17b4d0f..360bed85 100644
--- a/src/core/server.h
+++ b/src/core/server.h
@@ -21,14 +21,15 @@
 #ifndef _SERVER_H_
 #define _SERVER_H_
 
-#include <QtCore>
+#include <QAbstractSocket>
+#include <QString>
+#include <QStringList>
+#include <QTcpSocket>
+#include <QThread>
 #include <QTimer>
-#include <QtNetwork>
 
-#include "global.h"
 #include "message.h"
-
-#define DEFAULT_PORT 6667
+#include "serverinfo.h"
 
 
 /*!
@@ -65,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);
@@ -73,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);
@@ -151,13 +152,13 @@ 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(QString rawMsg);
+    void handleServerMsg(QByteArray rawMsg);
     void handleUserInput(QString buffer, QString usrMsg);
 
     // CTCP Stuff
@@ -183,6 +184,9 @@ class Server : public QThread {
       public:
         UnknownCmdError(QString cmd, QString prefix, QStringList params);
     };
+    
+    // stuff needed for new separation of server information
+    ServerInfo *serverinfo;
 };
 
 #endif