Big refactoring completed. Everything prepared for the separation of core and gui.

[quassel.git] / core / core.cpp

diff --git a/core/core.cpp b/core/core.cpp
index 10c9d3d..b7f0e39 100644 (file)
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -20,22 +20,25 @@
 
 #include "core.h"
 #include "server.h"
+#include "quassel.h"
 
 #include <QSettings>
 
-void Core::init() {
-
-
+Core * Core::init() {
+  if(core) return core;
+  QSettings s;
+  VarMap identities = s.value("Network/Identities").toMap();
+  qDebug() << identities;
+  //VarMap networks   = s.value("Network/
+  quassel->putData("Identities", identities);
+  return new Core();
 }
 
 void Core::run() {
 
-  connect(this, SIGNAL(connectToIrc( const QString&, quint16 )), &server, SLOT(connectToIrc( const QString&, quint16 )));
   connect(&server, SIGNAL(recvLine(const QString &)), this, SIGNAL(outputLine(const QString &)));
   //connect(
   server.start();
-  qDebug() << "Core running...";
-
   exec();
 }
 
@@ -57,3 +60,5 @@ void Core::storeIdentities(VarMap identities) {
   QSettings s;
   s.setValue("Network/Identities", identities);
 }
+
+Core *core;