X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fclient%2Fclient.h;h=cb031ac9f86dca8700406013401fc63fa29a3b78;hp=1b3a4e8dc1375dc4187c7150df11f9d8c6258daa;hb=2039f5e28eeb431e394f1c2468a26218bd926538;hpb=42ff71aaa8d3cee9e348a45758c56c380a4f1b45

diff --git a/src/client/client.h b/src/client/client.h
index 1b3a4e8d..cb031ac9 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -57,6 +57,10 @@ class Client : public QObject {
 
     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);
@@ -71,6 +75,8 @@ 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();
@@ -86,15 +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);
@@ -119,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;
@@ -134,10 +136,12 @@ 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;
 
     QTimer *layoutTimer;