projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring the GUI. Work in progress.
[quassel.git]
/
core
/
coreproxy.h
diff --git
a/core/coreproxy.h
b/core/coreproxy.h
index
e060c45
..
071f651
100644
(file)
--- a/
core/coreproxy.h
+++ b/
core/coreproxy.h
@@
-30,7
+30,7
@@
#include <QTcpServer>
/** This class is the Core side of the proxy. The Core connects its signals and slots to it,
#include <QTcpServer>
/** This class is the Core side of the proxy. The Core connects its signals and slots to it,
- * and the calls are marshalled and sent to (or received and unmarshalled from) the G
UI
Proxy.
+ * and the calls are marshalled and sent to (or received and unmarshalled from) the G
ui
Proxy.
* The connection functions are defined in main/main_core.cpp or main/main_mono.cpp.
*/
class CoreProxy : public QObject {
* The connection functions are defined in main/main_core.cpp or main/main_mono.cpp.
*/
class CoreProxy : public QObject {
@@
-66,7
+66,7
@@
class CoreProxy : public QObject {
void gsImportBacklog();
void gsRequestBacklog(BufferId, QVariant, QVariant);
void gsImportBacklog();
void gsRequestBacklog(BufferId, QVariant, QVariant);
- void gsGeneric(
GUI
Signal, QVariant, QVariant, QVariant);
+ void gsGeneric(
Client
Signal, QVariant, QVariant, QVariant);
void requestServerStates();
void requestServerStates();
@@
-74,7
+74,7
@@
class CoreProxy : public QObject {
public:
//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(
GUI
Signal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
+ void recv(
Client
Signal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
private:
void processClientUpdate(QTcpSocket *, QString key, QVariant data);
private:
void processClientUpdate(QTcpSocket *, QString key, QVariant data);
@@
-82,7
+82,7
@@
class CoreProxy : public QObject {
private:
private:
- friend class G
UI
Proxy;
+ friend class G
ui
Proxy;
};
//extern CoreProxy *coreProxy;
};
//extern CoreProxy *coreProxy;