X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=main%2Fquassel.cpp;h=cb35cc210adc59504b4fd78c33d2fc611ac65905;hp=6e90e13fddd2192da8f850625a0f1b638207c3db;hb=04e21ce26ebabdde9586ca9d2a3168431e448df5;hpb=e368a1672c4f917bfa6adb52dae3b5ebfcd0db18

diff --git a/main/quassel.cpp b/main/quassel.cpp
index 6e90e13f..cb35cc21 100644
--- a/main/quassel.cpp
+++ b/main/quassel.cpp
@@ -20,48 +20,61 @@
 
 #include "quassel.h"
 #include "logger.h"
-//#include "proxy.h"
 #include "core.h"
 
 #include <QString>
+#include <QStringList>
 #include <QDomDocument>
 
 extern void messageHandler(QtMsgType type, const char *msg);
 
-Quassel * Quassel::init() {
-  if(quassel) return quassel;
+Global::Global() {
+  if(global) qFatal("Trying to instantiate more than one Global object!");
   qInstallMsgHandler(messageHandler);
-  quassel = new Quassel();
   //initIconMap();
-  return quassel;
 }
 
 /*
-void Quassel::setLogger(Logger *) {
+void Global::setLogger(Logger *) {
 
 
 };
 */
 
-QVariant Quassel::getData(QString key) {
+QVariant Global::getData(QString key, QVariant defval) {
+  QVariant d;
   mutex.lock();
-  QVariant d = data[key];
+  if(data.contains(key)) d = data[key];
+  else d = defval;
   mutex.unlock();
-  qDebug() << "getData("<<key<<"): " << d;
+  //qDebug() << "getData("<<key<<"): " << d;
   return d;
 }
 
-void Quassel::putData(QString key, const QVariant &d) {
+QStringList Global::getKeys() {
+  QStringList k;
+  mutex.lock();
+  k = data.keys();
+  mutex.unlock();
+  return k;
+}
+
+void Global::putData(QString key, QVariant d) {
+  mutex.lock();
+  data[key] = d;
+  mutex.unlock();
+  emit dataPutLocally(key);
+}
+
+void Global::updateData(QString key, QVariant d) {
   mutex.lock();
   data[key] = d;
   mutex.unlock();
-  emit dataChanged(key, d);
-  qDebug() << "putData("<<key<<"): " << d;
-  qDebug() << "data: " << data;
+  emit dataUpdatedRemotely(key);
 }
 
 /* not done yet */
-void Quassel::initIconMap() {
+void Global::initIconMap() {
 // Do not depend on GUI in core!
 /*
   QDomDocument doc("IconMap");
@@ -87,13 +100,11 @@ void Quassel::initIconMap() {
  * @return Pointer to a newly created QIcon
  */
 //
-//QIcon *Quassel::getIcon(QString /*symbol*/) {
+//QIcon *Global::getIcon(QString /*symbol*/) {
   //if(symbol == "connect"
 
 //  return 0;
 //}
 
-Quassel *quassel = 0;
-Quassel::RunMode Quassel::runMode;
-QMutex Quassel::mutex;
-QHash<QString, QVariant> Quassel::data;
+Global *global = 0;
+Global::RunMode Global::runMode;