Fixed Bug #20 (Handle Numeric Reply 433 ERR_NICKNAMEINUSE properly)

[quassel.git] / main / main_core.cpp

diff --git a/main/main_core.cpp b/main/main_core.cpp
index b7d33a4..607aada 100644 (file)
--- a/main/main_core.cpp
+++ b/main/main_core.cpp
@@ -20,9 +20,14 @@
 #include <iostream>
 
 #include <QCoreApplication>
+#include <QtNetwork>
+#include <QtCore>
+#include <QtDebug>
 
-#include "quassel.h"
+#include "global.h"
 #include "core.h"
+#include "coreproxy.h"
+#include "util.h"
 
 int main(int argc, char **argv) {
   QCoreApplication app(argc, argv);
@@ -30,28 +35,23 @@ int main(int argc, char **argv) {
   QCoreApplication::setApplicationName("Quassel IRC");
   QCoreApplication::setOrganizationName("The Quassel Team");
 
-  Quassel::runMode = Quassel::CoreOnly;
-  quassel = Quassel::init();
-  core = Core::init();
-  //coreProxy = CoreProxy::init();
+  Global::runMode = Global::CoreOnly;
+  Global::quasselDir = QDir::homePath() + "/.quassel";
+
+  global = new Global();
+  coreProxy = new CoreProxy();
 
   //Logger *logger = new Logger();
   //Quassel::setLogger(logger);
 
   int exitCode = app.exec();
-  delete quassel;
+  delete core;
+  delete coreProxy;
+  delete global;
   return exitCode;
 }
 
-Core *core = 0;
-
-//GUIProxy::send(uint func, QVariant arg) {
-  /*
-  switch(func) {
-    case LOAD_IDENTITIES: return (QVariant) CoreProxy::loadIdentities();
-    case STORE_IDENTITIES: CoreProxy::storeIdentities(arg.toMap()); return 0;
-
-  }
-  */
+void CoreProxy::sendToGUI(CoreSignal, QVariant, QVariant, QVariant) {
+  // dummy function, no GUI available!
+}
 
-//}