Big, big, major commit this time:

[quassel.git] / main / main_core.cpp

diff --git a/main/main_core.cpp b/main/main_core.cpp
index 2526485..1997034 100644 (file)
--- a/main/main_core.cpp
+++ b/main/main_core.cpp
@@ -20,31 +20,37 @@
 #include <iostream>
 
 #include <QCoreApplication>
+#include <QtNetwork>
+#include <QtCore>
+#include <QtDebug>
 
 #include "quassel.h"
-#include "logger.h"
-#include "proxy.h"
+#include "core.h"
+#include "coreproxy.h"
+#include "util.h"
 
 int main(int argc, char **argv) {
-
-  Quassel::init();
-  Logger *logger = new Logger();
-  Quassel::setLogger(logger);
-
   QCoreApplication app(argc, argv);
-
   QCoreApplication::setOrganizationDomain("quassel-irc.org");
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("The Quassel Team");
 
-  return app.exec();
-}
+  Global::runMode = Global::CoreOnly;
+  global = new Global();
+  coreProxy = new CoreProxy();
+  core = new Core();
 
-QVariant proxyConnect(uint func, QVariant arg) {
-  switch(func) {
-    case LOAD_IDENTITIES: return (QVariant) CoreProxy::loadIdentities();
-    case STORE_IDENTITIES: CoreProxy::storeIdentities(arg.toMap()); return 0;
+  //Logger *logger = new Logger();
+  //Quassel::setLogger(logger);
 
-  }
-  return 0;
+  int exitCode = app.exec();
+  delete core;
+  delete coreProxy;
+  delete global;
+  return exitCode;
 }
+
+void CoreProxy::sendToGUI(CoreSignal, QVariant, QVariant, QVariant) {
+  // dummy function, no GUI available!
+}
+