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

[quassel.git] / main / main_core.cpp

diff --git a/main/main_core.cpp b/main/main_core.cpp
index b7d33a4..90f46c1 100644 (file)
--- a/main/main_core.cpp
+++ b/main/main_core.cpp
@@ -23,6 +23,7 @@
 
 #include "quassel.h"
 #include "core.h"
+#include "coreproxy.h"
 
 int main(int argc, char **argv) {
   QCoreApplication app(argc, argv);
@@ -31,14 +32,18 @@ int main(int argc, char **argv) {
   QCoreApplication::setOrganizationName("The Quassel Team");
 
   Quassel::runMode = Quassel::CoreOnly;
-  quassel = Quassel::init();
-  core = Core::init();
-  //coreProxy = CoreProxy::init();
+  quassel = new Quassel();
+  coreProxy = new CoreProxy();
+  core = new Core();
 
   //Logger *logger = new Logger();
   //Quassel::setLogger(logger);
 
+  core->init();
+
   int exitCode = app.exec();
+  delete core;
+  delete coreProxy;
   delete quassel;
   return exitCode;
 }