1 files changed, 22 insertions, 49 deletions

diff --git a/src/mirall/owncloudsetupwizard.h b/src/mirall/owncloudsetupwizard.h
index 3fd70766e..2fe1acf4b 100644
--- a/src/mirall/owncloudsetupwizard.h
+++ b/src/mirall/owncloudsetupwizard.h
@@ -21,81 +21,54 @@
 #include <QNetworkReply>
 #include <QPointer>
 
-#include "mirall/owncloudwizard.h"
 #include "mirall/theme.h"
 
 namespace Mirall {
 
-class SiteCopyFolder;
-class SyncResult;
-class ownCloudInfo;
+class OwncloudWizard;
 
 class OwncloudSetupWizard : public QObject
 {
     Q_OBJECT
 public:
-    explicit OwncloudSetupWizard(QObject *parent = 0 );
-
-    ~OwncloudSetupWizard();
-
-    /**
-     * @intro wether or not to show the intro wizard page
-     */
-    void startWizard();
-
-    void installServer();
-
-    bool isBusy();
-
-    void writeOwncloudConfig();
-
-    /**
-   * returns the configured owncloud url if its already configured, otherwise an empty
-   * string.
-   */
-
-    void    setupLocalSyncFolder();
-
-    OwncloudWizard *wizard();
-
     /** Run the wizard */
     static void runWizard(QObject *obj, const char* amember, QWidget *parent = 0 );
 
 signals:
-    // issued if the oC Setup process (owncloud-admin) is finished.
-    void    ownCloudSetupFinished( bool );
     // overall dialog close signal.
-    void    ownCloudWizardDone( int );
+    void ownCloudWizardDone( int );
 
-public slots:
+private slots:
+    void slotDetermineAuthType(const QString&);
+    void slotOwnCloudFoundAuth(const QString&, const QString&, const QString&, const QString&);
+    void slotAuthCheckReplyFinished();
+    void slotNoOwnCloudFoundAuth(QNetworkReply*);
 
-protected slots:
-    // wizard dialog signals
-    void slotConnectToOCUrl( const QString& );
+    void slotConnectToOCUrl(const QString&);
+    void slotConnectionCheck(const QString&, QNetworkReply*);
 
-private slots:
-    void slotOwnCloudFound( const QString&, const QString&, const QString&, const QString& );
-    void slotNoOwnCloudFound( QNetworkReply* );
-    void slotCreateRemoteFolderFinished( QNetworkReply::NetworkError );
+    void slotCreateLocalAndRemoteFolders(const QString&, const QString&);
+    void slotAuthCheckReply(const QString&, QNetworkReply*);
+    void slotCreateRemoteFolderFinished(QNetworkReply::NetworkError);
     void slotAssistantFinished( int );
     void slotClearPendingRequests();
-    void slotAuthCheckReply( const QString&, QNetworkReply * );
-private:
-    bool createRemoteFolder();
-    void checkRemoteFolder();
 
-    void finalizeSetup( bool );
+private:
+    explicit OwncloudSetupWizard(QObject *parent = 0 );
+    ~OwncloudSetupWizard();
 
-    /* Start a request to the newly installed ownCloud to check the connection */
+    void startWizard();
     void testOwnCloudConnect();
+    void checkRemoteFolder(const QString& remoteFolder);
+    bool createRemoteFolder();
+    void finalizeSetup( bool );
 
-    OwncloudWizard *_ocWizard;
+    OwncloudWizard* _ocWizard;
     QPointer<QNetworkReply>  _mkdirRequestReply;
     QPointer<QNetworkReply>  _checkInstallationRequest;
     QPointer<QNetworkReply>  _checkRemoteFolderRequest;
-
-    QString         _configHandle;
-    QString         _remoteFolder;
+    QString _configHandle;
+    QString _remoteFolder;
 };
 
 }