Got rid of class Global, as promised. For now, the few global variables we still

have are in a new namespace Global. This is bound to change to Quassel:: or sumthing.

Oh yeah, and if you find out why QPainter complains, feel free to tell me or fix it.
Everything seems to work, but we still get spurious debug output.

diff --git a/src/client/client.cpp b/src/client/client.cpp
index b591f2c..c115068 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -77,8 +77,6 @@ void Client::init() {
   connect(&socket, SIGNAL(disconnected()), this, SLOT(coreDisconnected()));
   connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
 
   connect(&socket, SIGNAL(disconnected()), this, SLOT(coreDisconnected()));
   connect(&socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(serverError(QAbstractSocket::SocketError)));
 

-  connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateCoreData(UserId, QString)));
-  connect(clientProxy, SIGNAL(csUpdateGlobalData(QString, QVariant)), this, SLOT(updateLocalData(QString, QVariant)));

   connect(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), clientProxy, SLOT(gsSessionDataChanged(const QString &, const QVariant &)));
   connect(clientProxy, SIGNAL(csSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &)));
 
   connect(this, SIGNAL(sendSessionData(const QString &, const QVariant &)), clientProxy, SLOT(gsSessionDataChanged(const QString &, const QVariant &)));
   connect(clientProxy, SIGNAL(csSessionDataChanged(const QString &, const QVariant &)), this, SLOT(recvSessionData(const QString &, const QVariant &)));
 


@@ -178,14 +176,6 @@ void Client::syncToCore() {
     // TODO connect to remote cores
   }
 
     // TODO connect to remote cores
   }
 

-  VarMap data = state["CoreData"].toMap();
-  foreach(QString key, data.keys()) {
-    Global::updateData(key, data[key]);
-  }
-  //if(!Global::data("CoreReady").toBool()) {
-  //  qFatal("Something is wrong, getting invalid data from core!");
-  //}
-

   VarMap sessionState = state["SessionState"].toMap();
   VarMap sessData = sessionState["SessionData"].toMap();
   foreach(QString key, sessData.keys()) {
   VarMap sessionState = state["SessionState"].toMap();
   VarMap sessData = sessionState["SessionData"].toMap();
   foreach(QString key, sessData.keys()) {


@@ -211,16 +201,6 @@ void Client::syncToCore() {
   }
 }
 
   }
 }
 

-void Client::updateCoreData(UserId, QString key) {
-  if(clientMode == LocalCore) return;
-  QVariant data = Global::data(key);
-  recvProxySignal(GS_UPDATE_GLOBAL_DATA, key, data, QVariant());
-}
-
-void Client::updateLocalData(QString key, QVariant data) {
-  Global::updateData(key, data);
-}
-

 void Client::recvSessionData(const QString &key, const QVariant &data) {
   sessionData[key] = data;
   emit sessionDataChanged(key, data);
 void Client::recvSessionData(const QString &key, const QVariant &data) {
   sessionData[key] = data;
   emit sessionDataChanged(key, data);

diff --git a/src/client/client.h b/src/client/client.h
index 9bb606a..caa21b9 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -89,8 +89,6 @@ class Client : public QObject {
     void disconnectFromCore();
 
   private slots:
     void disconnectFromCore();
 
   private slots:

-    void updateCoreData(UserId, QString);
-    void updateLocalData(QString, QVariant);

     void recvSessionData(const QString &key, const QVariant &data);
     void recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3);
 
     void recvSessionData(const QString &key, const QVariant &data);
     void recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3);
 

diff --git a/src/client/clientproxy.cpp b/src/client/clientproxy.cpp
index 6118ff1..1d65351 100644 (file)
--- a/src/client/clientproxy.cpp
+++ b/src/client/clientproxy.cpp
@@ -46,8 +46,6 @@ void ClientProxy::recv(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant ar
     case CS_SERVER_STATE: emit csServerState(arg1.toString(), arg2.toMap()); break;
     case CS_SERVER_CONNECTED: emit csServerConnected(arg1.toString()); break;
     case CS_SERVER_DISCONNECTED: emit csServerDisconnected(arg1.toString()); break;
     case CS_SERVER_STATE: emit csServerState(arg1.toString(), arg2.toMap()); break;
     case CS_SERVER_CONNECTED: emit csServerConnected(arg1.toString()); break;
     case CS_SERVER_DISCONNECTED: emit csServerDisconnected(arg1.toString()); break;

-    case CS_UPDATE_GLOBAL_DATA: emit csUpdateGlobalData(arg1.toString(), arg2); break;
-    //case CS_GLOBAL_DATA_CHANGED: emit csGlobalDataChanged(arg1.toString()); break;

     case CS_SESSION_DATA_CHANGED: emit csSessionDataChanged(arg1.toString(), arg2); break;
     case CS_DISPLAY_MSG: emit csDisplayMsg(arg1.value<Message>()); break;
     case CS_DISPLAY_STATUS_MSG: emit csDisplayStatusMsg(arg1.toString(), arg2.toString()); break;
     case CS_SESSION_DATA_CHANGED: emit csSessionDataChanged(arg1.toString(), arg2); break;
     case CS_DISPLAY_MSG: emit csDisplayMsg(arg1.value<Message>()); break;
     case CS_DISPLAY_STATUS_MSG: emit csDisplayStatusMsg(arg1.toString(), arg2.toString()); break;

diff --git a/src/client/clientproxy.h b/src/client/clientproxy.h
index 33b3403..4845faf 100644 (file)
--- a/src/client/clientproxy.h
+++ b/src/client/clientproxy.h
@@ -52,8 +52,6 @@ class ClientProxy : public QObject {
     void csServerDisconnected(QString);
     void csDisplayMsg(Message);
     void csDisplayStatusMsg(QString, QString);
     void csServerDisconnected(QString);
     void csDisplayMsg(Message);
     void csDisplayStatusMsg(QString, QString);

-    void csUpdateGlobalData(QString key, QVariant data);
-    void csGlobalDataChanged(QString key);

     void csSessionDataChanged(const QString &key, const QVariant &data);
     void csModeSet(QString, QString, QString);
     void csTopicSet(QString, QString, QString);
     void csSessionDataChanged(const QString &key, const QVariant &data);
     void csModeSet(QString, QString, QString);
     void csTopicSet(QString, QString, QString);

diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
index d63db6b..c05d7c5 100644 (file)
--- a/src/common/CMakeLists.txt
+++ b/src/common/CMakeLists.txt
@@ -1,6 +1,6 @@
 SET(common_SRCS global.cpp logger.cpp message.cpp settings.cpp util.cpp ircuser.cpp)
 SET(common_SRCS global.cpp logger.cpp message.cpp settings.cpp util.cpp ircuser.cpp)

-SET(common_HDRS message.h util.h)
-SET(common_MOCS global.h logger.h ircuser.h quasselui.h settings.h)
+SET(common_HDRS global.h message.h util.h)
+SET(common_MOCS logger.h ircuser.h quasselui.h settings.h)

 
 QT4_WRAP_CPP(_MOC ${common_MOCS})
 ADD_LIBRARY(common ${common_SRCS} ${_MOC})
 
 QT4_WRAP_CPP(_MOC ${common_MOCS})
 ADD_LIBRARY(common ${common_SRCS} ${_MOC})

diff --git a/src/common/global.cpp b/src/common/global.cpp
index eb4ee8f..a0c94bb 100644 (file)
--- a/src/common/global.cpp
+++ b/src/common/global.cpp
@@ -27,85 +27,6 @@
 
 extern void messageHandler(QtMsgType type, const char *msg);
 
 
 extern void messageHandler(QtMsgType type, const char *msg);
 

-Global *Global::instanceptr = 0;
-
-Global * Global::instance() {
-  if(instanceptr) return instanceptr;
-  return instanceptr = new Global();
-}
-
-void Global::destroy() {
-  delete instanceptr;
-  instanceptr = 0;
-}
-
-Global::Global() {
-  qInstallMsgHandler(messageHandler);
-  qRegisterMetaType<Message>("Message");
-  qRegisterMetaTypeStreamOperators<Message>("Message");
-  qRegisterMetaType<BufferId>("BufferId");
-  qRegisterMetaTypeStreamOperators<BufferId>("BufferId");
-
-  guiUser = 0;
-}
-
-Global::~Global() {
-
-
-}
-
-void Global::setGuiUser(UserId uid) {
-  guiUser = uid;
-}
-
-QVariant Global::data(QString key, QVariant defval) {
-  return data(guiUser, key, defval);
-}
-
-QVariant Global::data(UserId uid, QString key, QVariant defval) {
-  QVariant d;
-  mutex.lock();
-  if(instance()->datastore[uid].contains(key)) d = instance()->datastore[uid][key];
-  else d = defval;
-  mutex.unlock();
-  //qDebug() << "getData("<<key<<"): " << d;
-  return d;
-}
-
-QStringList Global::keys() {
-  return keys(guiUser);
-}
-
-QStringList Global::keys(UserId uid) {
-  QStringList k;
-  mutex.lock();
-  k = instance()->datastore[uid].keys();
-  mutex.unlock();
-  return k;
-}
-
-void Global::putData(QString key, QVariant d) {
-  putData(guiUser, key, d);
-}
-
-void Global::putData(UserId uid, QString key, QVariant d) {
-  mutex.lock();
-  instance()->datastore[uid][key] = d;
-  mutex.unlock();
-  emit instance()->dataPutLocally(uid, key);
-}
-
-void Global::updateData(QString key, QVariant d) {
-  updateData(guiUser, key, d);
-}
-
-void Global::updateData(UserId uid, QString key, QVariant d) {
-  mutex.lock();
-  instance()->datastore[uid][key] = d;
-  mutex.unlock();
-  emit instance()->dataUpdatedRemotely(uid, key);
-}
-

 /* not done yet */
 /*
 void Global::initIconMap() {
 /* not done yet */
 /*
 void Global::initIconMap() {


@@ -168,7 +89,5 @@ uint qHash(const BufferId &bid) {
 //  return 0;
 //}
 
 //  return 0;
 //}
 

-QMutex Global::mutex;

 Global::RunMode Global::runMode;
 Global::RunMode Global::runMode;

-UserId Global::guiUser;

 QString Global::quasselDir;
 QString Global::quasselDir;

diff --git a/src/common/global.h b/src/common/global.h
index efa27aa..c672c40 100644 (file)
--- a/src/common/global.h
+++ b/src/common/global.h
@@ -29,8 +29,6 @@
 
 #define DEFAULT_PORT 4242
 
 
 #define DEFAULT_PORT 4242
 

-class Global;
-

 #include <QHash>
 #include <QMutex>
 #include <QString>
 #include <QHash>
 #include <QMutex>
 #include <QString>


@@ -42,64 +40,11 @@ typedef QMap<QString, QVariant> VarMap;
 typedef uint UserId;
 typedef uint MsgId;
 
 typedef uint UserId;
 typedef uint MsgId;
 

-/**
- * This class is mostly a globally synchronized data store, meant for storing systemwide settings such
- * as identities or network lists. This class is a singleton, but not static as we'd like to use signals and
- * slots with it.
- * The global object is used in both Core and GUI clients. Storing and retrieving data is thread-safe.
- * \note While updated data is propagated to all the remote parts of Quassel quite quickly, the synchronization
- *       protocol is in no way designed to guarantee strict consistency at all times. In other words, it may
- *       well happen that different instances of global data differ from one another for a little while until
- *       all update messages have been processed. You should never rely on all global data stores being consistent.
-*/
-class Global : public QObject {
-  Q_OBJECT
-
-  public:
-    //static Logger *getLogger();
-    //static void setLogger(Logger *);
-
-//    static QIcon *getIcon(QString symbol);
-
-    static Global *instance();
-    static void destroy();
-    static void setGuiUser(UserId);
-
-    static QVariant data(QString key, QVariant defaultValue = QVariant());
-    static QVariant data(UserId, QString key, QVariant defaultValue = QVariant());
-    static QStringList keys();
-    static QStringList keys(UserId);
-
-    static void putData(QString key, QVariant data);      ///< Store data changed locally, will be propagated to all other clients and the core
-    static void putData(UserId, QString key, QVariant data);
-
-    static void updateData(QString key, QVariant data);   ///< Update stored data if requested by the core or other clients
-    static void updateData(UserId, QString key, QVariant data);
-
-  signals:
-    void dataPutLocally(UserId, QString key);
-    void dataUpdatedRemotely(UserId, QString key);  // sent by remote update only!
-
-  public:
-    enum RunMode { Monolithic, ClientOnly, CoreOnly };
-    static RunMode runMode;
-    static QString quasselDir;
-
-  private:
-    Global();
-    ~Global();
-    static Global *instanceptr;
-
-    static UserId guiUser;
-    //static void initIconMap();
-
-    //static Logger *logger;
-
-//    static QString iconPath;
-    //QHash<QString, QString> iconMap;
-    static QMutex mutex;
-    QHash<UserId, QHash<QString, QVariant> > datastore;
-};
+namespace Global {
+  enum RunMode { Monolithic, ClientOnly, CoreOnly };
+  extern RunMode runMode;
+  extern QString quasselDir;
+}

 
 struct Exception {
     Exception(QString msg = "Unknown Exception") : _msg(msg) {};
 
 struct Exception {
     Exception(QString msg = "Unknown Exception") : _msg(msg) {};

diff --git a/src/common/proxy_common.h b/src/common/proxy_common.h
index 0540574..97437b6 100644 (file)
--- a/src/common/proxy_common.h
+++ b/src/common/proxy_common.h
@@ -21,13 +21,13 @@
 #ifndef _PROXY_COMMON_H_
 #define _PROXY_COMMON_H_
 
 #ifndef _PROXY_COMMON_H_
 #define _PROXY_COMMON_H_
 

-enum ClientSignal { GS_CLIENT_INIT, GS_USER_INPUT, GS_REQUEST_CONNECT, GS_UPDATE_GLOBAL_DATA, GS_IMPORT_BACKLOG,
+enum ClientSignal { GS_CLIENT_INIT, GS_USER_INPUT, GS_REQUEST_CONNECT, GS_IMPORT_BACKLOG,

   GS_REQUEST_BACKLOG, GS_REQUEST_NETWORK_STATES, GS_SESSION_DATA_CHANGED
 
 };
 
 enum CoreSignal { CS_CORE_STATE, CS_SERVER_CONNECTED, CS_SERVER_DISCONNECTED, CS_SERVER_STATE,
   GS_REQUEST_BACKLOG, GS_REQUEST_NETWORK_STATES, GS_SESSION_DATA_CHANGED
 
 };
 
 enum CoreSignal { CS_CORE_STATE, CS_SERVER_CONNECTED, CS_SERVER_DISCONNECTED, CS_SERVER_STATE,

-  CS_DISPLAY_MSG, CS_DISPLAY_STATUS_MSG, CS_UPDATE_GLOBAL_DATA, CS_SESSION_DATA_CHANGED,
+  CS_DISPLAY_MSG, CS_DISPLAY_STATUS_MSG, CS_SESSION_DATA_CHANGED,

   CS_MODE_SET, CS_TOPIC_SET, CS_SET_NICKS, CS_NICK_ADDED, CS_NICK_REMOVED, CS_NICK_RENAMED, CS_NICK_UPDATED,
   CS_OWN_NICK_SET, CS_QUERY_REQUESTED, CS_BACKLOG_DATA, CS_UPDATE_BUFFERID
 
   CS_MODE_SET, CS_TOPIC_SET, CS_SET_NICKS, CS_NICK_ADDED, CS_NICK_REMOVED, CS_NICK_RENAMED, CS_NICK_UPDATED,
   CS_OWN_NICK_SET, CS_QUERY_REQUESTED, CS_BACKLOG_DATA, CS_UPDATE_BUFFERID
 

diff --git a/src/core/core.cpp b/src/core/core.cpp
index 9385c64..b3e6d03 100644 (file)
--- a/src/core/core.cpp
+++ b/src/core/core.cpp
@@ -47,7 +47,6 @@ void Core::init() {
   }
   //SqliteStorage::init();
   storage = new SqliteStorage();
   }
   //SqliteStorage::init();
   storage = new SqliteStorage();

-  connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(updateGlobalData(UserId, QString)));

   connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
   //startListening(); // FIXME
   guiUser = 0;
   connect(&server, SIGNAL(newConnection()), this, SLOT(incomingConnection()));
   //startListening(); // FIXME
   guiUser = 0;


@@ -63,18 +62,6 @@ void Core::init() {
     createSession(guiUser);
   } else guiUser = 0;
   */
     createSession(guiUser);
   } else guiUser = 0;
   */

-  // Read global settings from config file
-  QSettings s;
-  s.beginGroup("Global");
-  foreach(QString unum, s.childGroups()) {
-    UserId uid = unum.toUInt();
-    s.beginGroup(unum);
-    foreach(QString key, s.childKeys()) {
-      Global::updateData(uid, key, s.value(key));
-    }
-    s.endGroup();
-  }
-  s.endGroup();

 }
 
 Core::~Core() {
 }
 
 Core::~Core() {


@@ -138,11 +125,7 @@ void Core::clientHasData() {
   while(readDataFromDevice(socket, bsize, item)) {
     if(validClients.contains(socket)) {
       QList<QVariant> sigdata = item.toList();
   while(readDataFromDevice(socket, bsize, item)) {
     if(validClients.contains(socket)) {
       QList<QVariant> sigdata = item.toList();

-      if((ClientSignal)sigdata[0].toInt() == GS_UPDATE_GLOBAL_DATA) {
-        processClientUpdate(socket, sigdata[1].toString(), sigdata[2]);
-      } else {
-        sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);
-      }
+      sessions[validClients[socket]]->processSignal((ClientSignal)sigdata[0].toInt(), sigdata[1], sigdata[2], sigdata[3]);

     } else {
       // we need to auth the client
       try {
     } else {
       // we need to auth the client
       try {


@@ -174,7 +157,6 @@ QVariant Core::connectLocalClient(QString user, QString passwd) {
   UserId uid = instance()->storage->validateUser(user, passwd);
   QVariant reply = instance()->initSession(uid);
   instance()->guiUser = uid;
   UserId uid = instance()->storage->validateUser(user, passwd);
   QVariant reply = instance()->initSession(uid);
   instance()->guiUser = uid;

-  Global::setGuiUser(uid);

   qDebug() << "Local client connected.";
   return reply;
 }
   qDebug() << "Local client connected.";
   return reply;
 }


@@ -182,7 +164,6 @@ QVariant Core::connectLocalClient(QString user, QString passwd) {
 void Core::disconnectLocalClient() {
   qDebug() << "Local client disconnected.";
   instance()->guiUser = 0;
 void Core::disconnectLocalClient() {
   qDebug() << "Local client disconnected.";
   instance()->guiUser = 0;

-  Global::setGuiUser(0);

 }
 
 void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {
 }
 
 void Core::processClientInit(QTcpSocket *socket, const QVariant &v) {


@@ -209,35 +190,10 @@ QVariant Core::initSession(UserId uid) {
     //validClients[socket] = uid;
   }
   VarMap reply;
     //validClients[socket] = uid;
   }
   VarMap reply;

-  VarMap coreData;
-  QStringList dataKeys = Global::keys(uid);
-  foreach(QString key, dataKeys) {
-    coreData[key] = Global::data(uid, key);
-  }
-  reply["CoreData"] = coreData;

   reply["SessionState"] = sess->sessionState();
   return reply;
 }
 
   reply["SessionState"] = sess->sessionState();
   return reply;
 }
 

-void Core::processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data) {
-  UserId uid = validClients[socket];
-  Global::updateData(uid, key, data);
-  QList<QVariant> sigdata;
-  sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant());
-  foreach(QTcpSocket *s, validClients.keys()) {
-    if(validClients[s] == uid && s != socket) writeDataToDevice(s, QVariant(sigdata));
-  }
-}
-
-void Core::updateGlobalData(UserId uid, QString key) {
-  QVariant data = Global::data(uid, key);
-  QList<QVariant> sigdata;
-  sigdata.append(CS_UPDATE_GLOBAL_DATA); sigdata.append(key); sigdata.append(data); sigdata.append(QVariant());
-  foreach(QTcpSocket *socket, validClients.keys()) {
-    if(validClients[socket] == uid) writeDataToDevice(socket, QVariant(sigdata));
-  }
-}
-

 void Core::recvProxySignal(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   CoreSession *sess = qobject_cast<CoreSession*>(sender());
   Q_ASSERT(sess);
 void Core::recvProxySignal(CoreSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   CoreSession *sess = qobject_cast<CoreSession*>(sender());
   Q_ASSERT(sess);

diff --git a/src/core/core.h b/src/core/core.h
index 15a2e90..af5fd92 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -52,7 +52,6 @@ class Core : public QObject {
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();
     void incomingConnection();
     void clientHasData();
     void clientDisconnected();

-    void updateGlobalData(UserId, QString);

 
   private:
     Core();
 
   private:
     Core();


@@ -68,7 +67,6 @@ class Core : public QObject {
      */
     QVariant initSession(UserId userId);
     void processClientInit(QTcpSocket *socket, const QVariant &v);
      */
     QVariant initSession(UserId userId);
     void processClientInit(QTcpSocket *socket, const QVariant &v);

-    void processClientUpdate(QTcpSocket *socket, QString key, const QVariant &data);

 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;
 
     UserId guiUser;
     QHash<UserId, CoreSession *> sessions;

diff --git a/src/core/coreproxy.cpp b/src/core/coreproxy.cpp
index e6b9b49..580c7b1 100644 (file)
--- a/src/core/coreproxy.cpp
+++ b/src/core/coreproxy.cpp
@@ -28,7 +28,6 @@ CoreProxy::CoreProxy() {
 void CoreProxy::recv(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   //qDebug() << "[CORE] Received signal" << sig << ":" << arg1<<arg2<<arg3;
   switch(sig) {
 void CoreProxy::recv(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   //qDebug() << "[CORE] Received signal" << sig << ":" << arg1<<arg2<<arg3;
   switch(sig) {

-    case GS_UPDATE_GLOBAL_DATA: emit gsPutGlobalData(arg1.toString(), arg2); break;

     case GS_SESSION_DATA_CHANGED: emit gsSessionDataChanged(arg1.toString(), arg2); break;
     case GS_USER_INPUT: emit gsUserInput(arg1.value<BufferId>(), arg2.toString()); break;
     case GS_REQUEST_CONNECT: emit gsRequestConnect(arg1.toStringList()); break;
     case GS_SESSION_DATA_CHANGED: emit gsSessionDataChanged(arg1.toString(), arg2); break;
     case GS_USER_INPUT: emit gsUserInput(arg1.value<BufferId>(), arg2.toString()); break;
     case GS_REQUEST_CONNECT: emit gsRequestConnect(arg1.toStringList()); break;

diff --git a/src/core/coreproxy.h b/src/core/coreproxy.h
index 12f5d84..187ddef 100644 (file)
--- a/src/core/coreproxy.h
+++ b/src/core/coreproxy.h
@@ -41,7 +41,6 @@ class CoreProxy : public QObject {
     CoreProxy();
 
   public slots:
     CoreProxy();
 
   public slots:

-    inline void csUpdateGlobalData(QString key, QVariant data)          { send(CS_UPDATE_GLOBAL_DATA, key, data); }

     inline void csSessionDataChanged(const QString &key, const QVariant &data) { send(CS_SESSION_DATA_CHANGED, key, data); }
     inline void csServerConnected(QString net)                          { send(CS_SERVER_CONNECTED, net); }
     inline void csServerDisconnected(QString net)                       { send(CS_SERVER_DISCONNECTED, net); }
     inline void csSessionDataChanged(const QString &key, const QVariant &data) { send(CS_SESSION_DATA_CHANGED, key, data); }
     inline void csServerConnected(QString net)                          { send(CS_SERVER_CONNECTED, net); }
     inline void csServerDisconnected(QString net)                       { send(CS_SERVER_DISCONNECTED, net); }


@@ -62,7 +61,6 @@ class CoreProxy : public QObject {
     inline void csGeneric(CoreSignal sig, QVariant v1 = QVariant(), QVariant v2 = QVariant(), QVariant v3 = QVariant()) { send(sig, v1, v2, v3); }
 
   signals:
     inline void csGeneric(CoreSignal sig, QVariant v1 = QVariant(), QVariant v2 = QVariant(), QVariant v3 = QVariant()) { send(sig, v1, v2, v3); }
 
   signals:

-    void gsPutGlobalData(QString, QVariant);

     void gsSessionDataChanged(const QString &, const QVariant &);
     void gsUserInput(BufferId, QString);
     void gsRequestConnect(QStringList networks);
     void gsSessionDataChanged(const QString &, const QVariant &);
     void gsUserInput(BufferId, QString);
     void gsRequestConnect(QStringList networks);

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index e10b359..ec12da7 100644 (file)
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -46,8 +46,6 @@ CoreSession::CoreSession(UserId uid, Storage *_storage) : user(uid), storage(_st
   connect(this, SIGNAL(backlogData(BufferId, QList<QVariant>, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList<QVariant>, bool)));
   connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
   connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
   connect(this, SIGNAL(backlogData(BufferId, QList<QVariant>, bool)), coreProxy, SLOT(csBacklogData(BufferId, QList<QVariant>, bool)));
   connect(this, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));
   connect(storage, SIGNAL(bufferIdUpdated(BufferId)), coreProxy, SLOT(csUpdateBufferId(BufferId)));

-  connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
-  connect(Global::instance(), SIGNAL(dataPutLocally(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));

   connect(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), coreProxy, SLOT(csSessionDataChanged(const QString &, const QVariant &)));
   connect(coreProxy, SIGNAL(gsSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
 }
   connect(this, SIGNAL(sessionDataChanged(const QString &, const QVariant &)), coreProxy, SLOT(csSessionDataChanged(const QString &, const QVariant &)));
   connect(coreProxy, SIGNAL(gsSessionDataChanged(const QString &, const QVariant &)), this, SLOT(storeSessionData(const QString &, const QVariant &)));
 }


@@ -64,13 +62,6 @@ void CoreSession::processSignal(ClientSignal sig, QVariant arg1, QVariant arg2,
   coreProxy->recv(sig, arg1, arg2, arg3);
 }
 
   coreProxy->recv(sig, arg1, arg2, arg3);
 }
 

-void CoreSession::globalDataUpdated(UserId uid, QString key) {
-  Q_ASSERT(uid == userId());
-  QVariant data = Global::data(userId(), key);
-  QSettings s;
-  s.setValue(QString("Global/%1/").arg(userId())+key, data);
-}
-

 void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
   QSettings s;
   s.beginGroup(QString("SessionData/%1").arg(user));
 void CoreSession::storeSessionData(const QString &key, const QVariant &data) {
   QSettings s;
   s.beginGroup(QString("SessionData/%1").arg(user));

diff --git a/src/core/coresession.h b/src/core/coresession.h
index f9336b2..e963131 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -76,8 +76,6 @@ class CoreSession : public QObject {
     void sessionDataChanged(const QString &key, const QVariant &data);
 
   private slots:
     void sessionDataChanged(const QString &key, const QVariant &data);
 
   private slots:

-    //void recvProxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-    void globalDataUpdated(UserId, QString);

     void recvStatusMsgFromServer(QString msg);
     void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
     void serverConnected(QString net);
     void recvStatusMsgFromServer(QString msg);
     void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
     void serverConnected(QString net);

diff --git a/src/qtgui/identities.cpp b/src/qtgui/identities.cpp
index b085014..f1cc27c 100644 (file)
--- a/src/qtgui/identities.cpp
+++ b/src/qtgui/identities.cpp
@@ -23,7 +23,7 @@
 
 IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent) {
   ui.setupUi(this);
 
 IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent) {
   ui.setupUi(this);

-  connect(Global::instance(), SIGNAL(dataUpdatedRemotely(UserId, QString)), this, SLOT(globalDataUpdated(UserId, QString)));
+  connect(Client::instance(), SIGNAL(sessionDataChanged(const QString &)), this, SLOT(globalDataUpdated(QString)));

 
   connect(ui.enableAutoAway, SIGNAL(stateChanged(int)), this, SLOT(autoAwayChecked()));
 
 
   connect(ui.enableAutoAway, SIGNAL(stateChanged(int)), this, SLOT(autoAwayChecked()));
 


@@ -56,7 +56,7 @@ IdentitiesDlg::IdentitiesDlg(QWidget *parent, QString selected) : QDialog(parent
 }
 
 /* this needs more work! mapping? */
 }
 
 /* this needs more work! mapping? */

-void IdentitiesDlg::globalDataUpdated(UserId, QString key) {
+void IdentitiesDlg::globalDataUpdated(QString key) {

   if(key == "Identities") {
     if(QMessageBox::warning(this, tr("Data changed remotely!"), tr("<b>Some other GUI client changed the identities data!</b><br>"
        "Apply updated settings, losing all changes done locally?"),
   if(key == "Identities") {
     if(QMessageBox::warning(this, tr("Data changed remotely!"), tr("<b>Some other GUI client changed the identities data!</b><br>"
        "Apply updated settings, losing all changes done locally?"),

diff --git a/src/qtgui/identities.h b/src/qtgui/identities.h
index 81fffd6..d528d9d 100644 (file)
--- a/src/qtgui/identities.h
+++ b/src/qtgui/identities.h
@@ -54,7 +54,7 @@ class IdentitiesDlg : public QDialog {
 
     void editIdentities();
 
 
     void editIdentities();
 

-    void globalDataUpdated(UserId, QString);
+    void globalDataUpdated(QString);

 
   private:
     Ui::IdentitiesDlg ui;
 
   private:
     Ui::IdentitiesDlg ui;

diff --git a/src/qtgui/mainwin.cpp b/src/qtgui/mainwin.cpp
index 8398042..e6bb7c1 100644 (file)
--- a/src/qtgui/mainwin.cpp
+++ b/src/qtgui/mainwin.cpp
@@ -161,7 +161,7 @@ void MainWin::disconnectedFromCore() {
   ui.actionNetworkList->setEnabled(false);
   ui.bufferWidget->hide();
   ui.actionConnectCore->setEnabled(false); // FIXME
   ui.actionNetworkList->setEnabled(false);
   ui.bufferWidget->hide();
   ui.actionConnectCore->setEnabled(false); // FIXME

-  qDebug() << "mainwin disconnected";
+  //qDebug() << "mainwin disconnected";

 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {
 }
 
 AbstractUiMsg *MainWin::layoutMsg(const Message &msg) {