Reenable CoreConfigWizard

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

diff --git a/src/client/coreconnection.h b/src/client/coreconnection.h
index 2ef7d1a..2f9d7cc 100644 (file)
--- a/src/client/coreconnection.h
+++ b/src/client/coreconnection.h
@@ -72,7 +72,7 @@ public:
 public slots:
   bool connectToCore(AccountId = 0);
   void reconnectToCore();
-  void disconnectFromCore();
+  void disconnectFromCore(const QString &errorString = QString());
 
 signals:
   void stateChanged(CoreConnection::ConnectionState);
@@ -80,6 +80,7 @@ signals:
   void synchronized();
 
   void connectionError(const QString &errorMsg);
+  void connectionErrorPopup(const QString &errorMsg);
   void connectionWarnings(const QStringList &warnings);
   void connectionMsg(const QString &msg);
   void disconnected();
@@ -89,6 +90,9 @@ signals:
   void progressTextChanged(const QString &);
 
   void startCoreSetup(const QVariantList &);
+  void coreSetupSuccess();
+  void coreSetupFailed(const QString &error);
+
   void startInternalCore();
   void connectToInternalCore(SignalProxy *proxy);
 
@@ -121,12 +125,14 @@ private slots:
 
   void resetConnection();
   void connectionReady();
-  //void doCoreSetup(const QVariant &setupData);
 
+  void loginToCore(const QString &user, const QString &password, bool remember); // for config wizard
   void loginToCore(const QString &previousError = QString());
   void loginSuccess();
   void loginFailed(const QString &errorMessage);
 
+  void doCoreSetup(const QVariant &setupData);
+
   void updateProgress(int value, int maximum);
   void setProgressText(const QString &text);
   void setProgressValue(int value);
@@ -158,6 +164,8 @@ private:
   QString _coreInfoString(const QVariantMap &);
 
   inline CoreAccountModel *accountModel() const;
+
+  friend class CoreConfigWizard;
 };
 
 Q_DECLARE_METATYPE(CoreConnection::ConnectionState)