Progress bar working, get rid of debug code.

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

diff --git a/src/client/client.h b/src/client/client.h
index 9bb606a..a974978 100644 (file)
--- 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 *);
@@ -70,7 +73,7 @@ class Client : public QObject {
     void requestBacklog(BufferId, QVariant, QVariant);
     void requestNetworkStates();
 
-    void recvPartialItem(quint32 avail, quint32 size);
+    void recvPartialItem(uint avail, uint size);
     void coreConnectionError(QString errorMsg);
     void coreConnectionMsg(const QString &msg);
     void coreConnectionProgress(uint part, uint total);
@@ -89,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);
@@ -122,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;