I am starting to clean up the mess that is Global right now, and to implement a clean...

[quassel.git] / src / client / client.cpp

diff --git a/src/client/client.cpp b/src/client/client.cpp
index 30eeb51..9a74119 100644 (file)
--- a/src/client/client.cpp
+++ b/src/client/client.cpp
@@ -19,9 +19,11 @@
  ***************************************************************************/
 
 #include "client.h"
-#include "clientproxy.h"
+
 #include "buffer.h"
 #include "buffertreemodel.h"
+#include "clientproxy.h"
+#include "quasselui.h"
 #include "util.h"
 
 Client * Client::instanceptr = 0;
@@ -33,8 +35,6 @@ QHash<uint, BufferId> Client::bufferIds;
 QHash<QString, QHash<QString, VarMap> > Client::nicks;
 QHash<QString, bool> Client::netConnected;
 QHash<QString, QString> Client::ownNick;
-//QList<BufferId> Client::coreBuffers;
-
 
 Client *Client::instance() {
   if(instanceptr) return instanceptr;
@@ -77,6 +77,8 @@ void Client::init() {
 
   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(clientProxy, SIGNAL(send(ClientSignal, QVariant, QVariant, QVariant)), this, SLOT(recvProxySignal(ClientSignal, QVariant, QVariant, QVariant)));
   connect(clientProxy, SIGNAL(csServerState(QString, QVariant)), this, SLOT(recvNetworkState(QString, QVariant)));
@@ -180,7 +182,6 @@ void Client::syncToCore() {
     BufferId id = vid.value<BufferId>();
     bufferIds[id.uid()] = id;  // make lookups by id faster
     buffer(id);                // create all buffers, so we see them in the network views
-    //emit requestBacklog(id, -1, -1);  // TODO: use custom settings for backlog request
   }
   connectedToCore = true;
   emit connected();
@@ -197,6 +198,25 @@ 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);
+  emit sessionDataChanged(key);
+  qDebug() << "stored data in client:" << key;
+}
+
+void Client::storeSessionData(const QString &key, const QVariant &data) {
+  // Not sure if this is a good idea, but we'll try it anyway:
+  // Calling this function only sends a signal to core. Data is stored upon reception of the update signal,
+  // rather than immediately.
+  emit instance()->sendSessionData(key, data);
+}
+
+QVariant Client::retrieveSessionData(const QString &key, const QVariant &def) {
+  if(instance()->sessionData.contains(key)) return instance()->sessionData[key];
+  else return def;
+}
+
 void Client::recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3) {
   if(clientMode == LocalCore) return;
   QList<QVariant> sigdata;
@@ -404,4 +424,3 @@ void Client::setOwnNick(QString net, QString nick) {
   }
 }
 
-