Make monolithic client work again

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

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 67b9b14..f1afab9 100644 (file)
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -36,6 +36,7 @@
 
 class CoreAccountModel;
 class Network;
+class SignalProxy;
 
 class CoreConnection : public QObject {
   Q_OBJECT
@@ -52,7 +53,6 @@ public:
   CoreConnection(CoreAccountModel *model, QObject *parent = 0);
 
   void init();
-  void start();
 
   inline ConnectionState state() const;
   inline bool isConnected() const;
@@ -64,7 +64,7 @@ public:
   inline QString progressText() const;
 
 public slots:
-  void connectToCore(AccountId);
+  bool connectToCore(AccountId = 0);
   void reconnectToCore();
   void disconnectFromCore();
 
@@ -84,13 +84,17 @@ signals:
   void progressTextChanged(const QString &);
 
   void startCoreSetup(const QVariantList &);
+  void startInternalCore();
+  void connectToInternalCore(SignalProxy *proxy);
 
   // This signal MUST be handled synchronously!
-  void userAuthenticationRequired(CoreAccount *, const QString &errorMessage = QString());
+  void userAuthenticationRequired(CoreAccount *, bool *valid, const QString &errorMessage = QString());
 
   void handleIgnoreWarnings(bool permanently);
 
 private slots:
+  void connectToCurrentAccount();
+
   void socketStateChanged(QAbstractSocket::SocketState);
   void coreSocketError(QAbstractSocket::SocketError);
   void coreHasData();
@@ -104,7 +108,7 @@ private slots:
   void checkSyncState();
 
   void syncToCore(const QVariantMap &sessionState);
-  //void internalSessionStateReceived(const QVariant &packedState);
+  void internalSessionStateReceived(const QVariant &packedState);
   void sessionStateReceived(const QVariantMap &state);
 
   void setWarningsHandler(const char *slot);
@@ -113,7 +117,7 @@ private slots:
   void connectionReady();
   //void doCoreSetup(const QVariant &setupData);
 
-  void loginToCore();
+  void loginToCore(const QString &previousError = QString());
   void loginSuccess();
   void loginFailed(const QString &errorMessage);