X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fmain_core.cpp;h=607aada70fc329cd7e8042a3f083dd995a605bb4;hp=f8e6630b644534924cf9e71d88c4494e1a6974c2;hb=8fc3a498f754f34b21d2a163e2a28323dae384cb;hpb=a975272aca8f0deb25c395532b189141979304e5

diff --git a/main/main_core.cpp b/main/main_core.cpp
index f8e6630b..607aada7 100644
--- a/main/main_core.cpp
+++ b/main/main_core.cpp
@@ -20,32 +20,38 @@
 #include <iostream>
 
 #include <QCoreApplication>
+#include <QtNetwork>
+#include <QtCore>
+#include <QtDebug>
 
-#include "quassel.h"
-#include "logger.h"
-#include "proxy.h"
+#include "global.h"
+#include "core.h"
+#include "coreproxy.h"
+#include "util.h"
 
 int main(int argc, char **argv) {
-
-  Core::init();
-  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::quasselDir = QDir::homePath() + "/.quassel";
 
-QVariant proxyConnect(uint func, QVariant arg) {
-  switch(func) {
-    case LOAD_IDENTITIES: return (QVariant) CoreProxy::loadIdentities();
-    case STORE_IDENTITIES: CoreProxy::storeIdentities(arg.toMap()); return 0;
+  global = new Global();
+  coreProxy = new CoreProxy();
 
-  }
-  return 0;
+  //Logger *logger = new Logger();
+  //Quassel::setLogger(logger);
+
+  int exitCode = app.exec();
+  delete core;
+  delete coreProxy;
+  delete global;
+  return exitCode;
+}
+
+void CoreProxy::sendToGUI(CoreSignal, QVariant, QVariant, QVariant) {
+  // dummy function, no GUI available!
 }
+