projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed broken autoconnect (for networks) -- how are we gonna do that anyways?
[quassel.git]
/
src
/
core
/
server.h
diff --git
a/src/core/server.h
b/src/core/server.h
index
c17b4d0
..
dd8aac9
100644
(file)
--- a/
src/core/server.h
+++ b/
src/core/server.h
@@
-21,14
+21,15
@@
#ifndef _SERVER_H_
#define _SERVER_H_
#ifndef _SERVER_H_
#define _SERVER_H_
-#include <QtCore>
+#include <QAbstractSocket>
+#include <QString>
+#include <QStringList>
+#include <QTcpSocket>
+#include <QThread>
#include <QTimer>
#include <QTimer>
-#include <QtNetwork>
-#include "global.h"
#include "message.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
QHash<QString, QString> topics; // stores topics for each buffer
VarMap serverSupports; // stores results from RPL_ISUPPORT
- void handleServerMsg(Q
String
rawMsg);
+ void handleServerMsg(Q
ByteArray
rawMsg);
void handleUserInput(QString buffer, QString usrMsg);
// CTCP Stuff
void handleUserInput(QString buffer, QString usrMsg);
// CTCP Stuff
@@
-183,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