Yay! After months, distributed client/core operation is working again!

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

diff --git a/src/client/client.h b/src/client/client.h
index 9bc4034..cb031ac 100644 (file)
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -21,16 +21,20 @@
 #ifndef _CLIENT_H_
 #define _CLIENT_H_
 
-#include <QtCore>
-#include <QtNetwork>
+#include <QAbstractSocket>
+#include <QTcpSocket>
+#include <QList>
 
-#include "quasselui.h"
 #include "buffer.h"
 #include "message.h"
 #include "proxy_common.h"
 
+class AbstractUi;
 class ClientProxy;
 class BufferTreeModel;
+class QtGui;
+
+class QTimer;
 
 class Client : public QObject {
   Q_OBJECT
@@ -51,6 +55,13 @@ class Client : public QObject {
 
     static bool isConnected();
 
+    static void storeSessionData(const QString &key, const QVariant &data);
+    static QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+    static QStringList sessionDataKeys();
+
+    enum ClientMode { LocalCore, RemoteCore };
+    static ClientMode clientMode;
+
   signals:
     void sendInput(BufferId, QString message);
     void showBuffer(Buffer *);
@@ -64,10 +75,16 @@ class Client : public QObject {
 
     void recvPartialItem(quint32 avail, quint32 size);
     void coreConnectionError(QString errorMsg);
+    void coreConnectionMsg(const QString &msg);
+    void coreConnectionProgress(uint part, uint total);
 
     void connected();
     void disconnected();
 
+    void sessionDataChanged(const QString &key);
+    void sessionDataChanged(const QString &key, const QVariant &data);
+    void sendSessionData(const QString &key, const QVariant &data);
+
   public slots:
     //void selectBuffer(Buffer *);
     //void connectToLocalCore();
@@ -75,14 +92,14 @@ class Client : public QObject {
     void disconnectFromCore();
 
   private slots:
-    void updateCoreData(UserId, QString);
-    void updateLocalData(QString, QVariant);
+    void recvCoreState(const QVariant &state);
+    void recvSessionData(const QString &key, const QVariant &data);
     void recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3);
 
     void serverError(QAbstractSocket::SocketError);
     void serverHasData();
-    void coreConnected();
-    void coreDisconnected();
+    void coreSocketConnected();
+    void coreSocketDisconnected();
 
     void userInput(BufferId, QString);
     void networkConnected(QString);
@@ -107,13 +124,10 @@ class Client : public QObject {
     void init();
     static Client *instanceptr;
 
-    void syncToCore();
+    void syncToCore(const QVariant &coreState);
     QVariant connectToLocalCore(QString user, QString passwd);  // defined in main.cpp
     void disconnectFromLocalCore();                             // defined in main.cpp
 
-    enum ClientMode { LocalCore, RemoteCore };
-    static ClientMode clientMode;
-
     AbstractUi *mainUi;
     ClientProxy *clientProxy;
     BufferTreeModel *_bufferModel;
@@ -122,15 +136,18 @@ class Client : public QObject {
     quint32 blockSize;
 
     static bool connectedToCore;
+    static VarMap coreConnectionInfo;
     static QHash<BufferId, Buffer *> buffers;
     static QHash<uint, BufferId> bufferIds;
     static QHash<QString, QHash<QString, VarMap> > nicks;
     static QHash<QString, bool> netConnected;
+    static QStringList netsAwaitingInit;
     static QHash<QString, QString> ownNick;
-    //static QList<BufferId> coreBuffers;
 
     QTimer *layoutTimer;
     QList<Buffer *> layoutQueue;
+
+    VarMap sessionData;
 };
 
 #endif