projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Big update this time - Core has been redesigned to be multi-user capable. At least...
[quassel.git]
/
core
/
coreproxy.h
diff --git
a/core/coreproxy.h
b/core/coreproxy.h
index
9b4acc5
..
e060c45
100644
(file)
--- a/
core/coreproxy.h
+++ b/
core/coreproxy.h
@@
-70,29
+70,22
@@
class CoreProxy : public QObject {
void requestServerStates();
void requestServerStates();
- private:
void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+
+ public:
+ //void send(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
void recv(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
void recv(GUISignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
- void sendToGUI(CoreSignal, QVariant arg1, QVariant arg2, QVariant arg3);
- void processClientInit(QTcpSocket *socket, const QVariant &v);
+ private:
void processClientUpdate(QTcpSocket *, QString key, QVariant data);
void processClientUpdate(QTcpSocket *, QString key, QVariant data);
- private slots:
- void incomingConnection();
- void clientHasData();
- void clientDisconnected();
- void updateGlobalData(QString key);
private:
private:
- QTcpServer server;
- QList<QTcpSocket *> clients;
- QHash<QTcpSocket *, quint32> blockSizes;
friend class GUIProxy;
};
friend class GUIProxy;
};
-extern CoreProxy *coreProxy;
+
//
extern CoreProxy *coreProxy;