X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=core%2Fcore.cpp;h=169d28ad820e936cab82adbc8c91262db69d56e1;hp=b7f0e39ce82284b60ab586e3828daf0a2fb8f124;hb=04e21ce26ebabdde9586ca9d2a3168431e448df5;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18

diff --git a/core/core.cpp b/core/core.cpp
index b7f0e39c..169d28ad 100644
--- a/core/core.cpp
+++ b/core/core.cpp
@@ -21,44 +21,49 @@
 #include "core.h"
 #include "server.h"
 #include "quassel.h"
+#include "coreproxy.h"
 
 #include <QSettings>
 
-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();
-}
+Core::Core() {
+  if(core) qFatal("Trying to instantiate more than one Core object!");
+
+  connect(coreProxy, SIGNAL(gsRequestConnect(QString, quint16)), this, SLOT(connectToIrc(QString, quint16)));
+  connect(coreProxy, SIGNAL(gsUserInput(QString)), this, SLOT(inputLine(QString)));
+
+  connect(&server, SIGNAL(recvLine(QString)), coreProxy, SLOT(csCoreMessage(QString)));
 
-void Core::run() {
+  // Read global settings from config file 
+  QSettings s;
+  s.beginGroup("Global");
+  QString key;
+  foreach(key, s.childKeys()) {
+    global->updateData(key, s.value(key));
+  }
+  global->updateData("CoreReady", true);
+  // Now that we are in sync, we can connect signals to automatically store further updates.
+  // I don't think we care if global data changed locally or if it was updated by a client. 
+  connect(global, SIGNAL(dataUpdatedRemotely(QString)), SLOT(globalDataUpdated(QString)));
+  connect(global, SIGNAL(dataPutLocally(QString)), SLOT(globalDataUpdated(QString)));
 
-  connect(&server, SIGNAL(recvLine(const QString &)), this, SIGNAL(outputLine(const QString &)));
-  //connect(
   server.start();
-  exec();
 }
 
-void Core::connectToIrc( const QString &h, quint16 port) {
+void Core::connectToIrc(const QString &h, quint16 port) {
+  if(server.isConnected()) return;
+  qDebug() << "Core: Connecting to " << h << ":" << port;
   server.connectToIrc(h, port);
 }
 
-void Core::inputLine(const QString &s) {
-  server.putRawLine( s);
-
-}
+void Core::inputLine(QString s) {
+  server.putRawLine(s);
 
-VarMap Core::loadIdentities() {
-  QSettings s;
-  return s.value("Network/Identities").toMap();
 }
 
-void Core::storeIdentities(VarMap identities) {
+void Core::globalDataUpdated(QString key) {
+  QVariant data = global->getData(key);
   QSettings s;
-  s.setValue("Network/Identities", identities);
+  s.setValue(QString("Global/")+key, data);
 }
 
-Core *core;
+Core *core = 0;