Finished logical separation of core and GUI. Monolithic build should work as expected.

[quassel.git] / gui / guiproxy.h

diff --git a/gui/guiproxy.h b/gui/guiproxy.h
index 37bfd14..f3b48c0 100644 (file)
--- a/gui/guiproxy.h
+++ b/gui/guiproxy.h
@@ -21,7 +21,7 @@
 #ifndef _GUIPROXY_H_
 #define _GUIPROXY_H_
 
-#include "../main/proxy_common.h"
+#include "proxy_common.h"
 
 #include <QObject>
 #include <QVariant>
@@ -38,15 +38,17 @@ class GUIProxy : public QObject {
     void recv(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
 
   public:
-    static GUIProxy * init();
+    GUIProxy();
 
   public slots:
     void gsUserInput(QString);
+    void gsRequestConnect(QString, quint16);
 
 
   signals:
-    void psCoreMessage(QString);
+    void csCoreMessage(QString);
 
+  friend class CoreProxy;
 
 };