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

diff --git a/src/core/server.h b/src/core/server.h
index c17b4d0f..dd8aac9b 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"
 
 
 /*!
@@ -157,7 +158,7 @@ class Server : public QThread {
     QHash<QString, QString> topics; // stores topics for each buffer
     VarMap 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