X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcoreproxy.h;fp=core%2Fcoreproxy.h;h=071f651c2ea3ed8ea1751c68e664d5fedf4b2ee1;hp=e060c454d0f5ae06b87ecaab19a5a353233b7612;hb=26586e615ffe42bb2b1b307ed1324a6e3051f5da;hpb=0d5499deed248902ce2341208cbc33acd8cace19 diff --git a/core/coreproxy.h b/core/coreproxy.h index e060c454..071f651c 100644 --- a/core/coreproxy.h +++ b/core/coreproxy.h @@ -30,7 +30,7 @@ #include /** 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 GUIProxy. + * and the calls are marshalled and sent to (or received and unmarshalled from) the GuiProxy. * 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 gsGeneric(GUISignal, QVariant, QVariant, QVariant); + void gsGeneric(ClientSignal, QVariant, QVariant, QVariant); void requestServerStates(); @@ -74,7 +74,7 @@ class CoreProxy : public QObject { 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(ClientSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant()); private: void processClientUpdate(QTcpSocket *, QString key, QVariant data); @@ -82,7 +82,7 @@ class CoreProxy : public QObject { private: - friend class GUIProxy; + friend class GuiProxy; }; //extern CoreProxy *coreProxy;