projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Moving quasselui.h from common/ to client/ where it belongs.
[quassel.git]
/
src
/
core
/
core.h
diff --git
a/src/core/core.h
b/src/core/core.h
index
374d821
..
5e73b7c
100644
(file)
--- a/
src/core/core.h
+++ b/
src/core/core.h
@@
-26,7
+26,7
@@
#include <QTcpServer>
#include <QTcpSocket>
#include <QTcpServer>
#include <QTcpSocket>
-#include "
coreproxy
.h"
+#include "
global
.h"
class CoreSession;
class Storage;
class CoreSession;
class Storage;
@@
-43,16
+43,14
@@
class Core : public QObject {
static CoreSession * createSession(UserId);
static QVariant connectLocalClient(QString user, QString passwd);
static CoreSession * createSession(UserId);
static QVariant connectLocalClient(QString user, QString passwd);
- static
QVariant
disconnectLocalClient();
+ static
void
disconnectLocalClient();
private slots:
private slots:
- void recvProxySignal(CoreSignal, QVariant, QVariant, QVariant);
- bool startListening(uint port = 4242);
+ bool startListening(uint port = DEFAULT_PORT);
void stopListening();
void incomingConnection();
void clientHasData();
void clientDisconnected();
void stopListening();
void incomingConnection();
void clientHasData();
void clientDisconnected();
- void updateGlobalData(UserId, QString);
private:
Core();
private:
Core();
@@
-68,14
+66,12
@@
class Core : public QObject {
*/
QVariant initSession(UserId userId);
void processClientInit(QTcpSocket *socket, const QVariant &v);
*/
QVariant initSession(UserId userId);
void processClientInit(QTcpSocket *socket, const QVariant &v);
- void processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data);
UserId guiUser;
QHash<UserId, CoreSession *> sessions;
Storage *storage;
QTcpServer server; // TODO: implement SSL
UserId guiUser;
QHash<UserId, CoreSession *> sessions;
Storage *storage;
QTcpServer server; // TODO: implement SSL
- QHash<QTcpSocket *, UserId> validClients;
QHash<QTcpSocket *, quint32> blockSizes;
};
QHash<QTcpSocket *, quint32> blockSizes;
};