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

[quassel.git] / core / coreproxy.cpp

diff --git a/core/proxy.h b/core/coreproxy.cpp
similarity index 76%
rename from core/proxy.h
rename to core/coreproxy.cpp
index ca0319b..ab00384 100644 (file)
--- a/core/proxy.h
+++ b/core/coreproxy.cpp
@@ -18,34 +18,16 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _PROXY_H_
-#define _PROXY_H_
+#include "coreproxy.h"
+#include <QDebug>
 
-#include "core.h"
+CoreProxy::CoreProxy() {
+  if(coreProxy) qFatal("Trying to instantiate more than one CoreProxy object!");
 
-namespace Proxy {
-  enum { LOAD_IDENTITIES, STORE_IDENTITIES };
-};
+}
 
-class CoreProxy {
-  Q_OBJECT
+void CoreProxy::csCoreMessage(QString s) {
+  send(CS_CORE_MESSAGE, s);
+}
 
-  public:
-    static VarMap loadIdentities();
-    static void storeIdentities(VarMap);
-
-};
-
-
-class GuiProxy {
-  Q_OBJECT
-
-  public:
-    static VarMap loadIdentities();
-    static void storeIdentities(VarMap);
-
-};
-
-extern QVariant proxyConnect(uint func, QVariant arg = QVariant());
-
-#endif
+CoreProxy *coreProxy;