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

diff --git a/src/client/client.h b/src/client/client.h
index caa21b92..cb031ac9 100644
--- a/src/client/client.h
+++ b/src/client/client.h
@@ -59,6 +59,9 @@ class Client : public QObject {
     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 *);
@@ -89,13 +92,14 @@ class Client : public QObject {
     void disconnectFromCore();
 
   private slots:
+    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);
@@ -120,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;