diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2015-01-08 17:33:39 +0300 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2015-01-08 17:33:39 +0300 |
| commit | c3468b7ed6ee7f55f4739411b591270ec654f8ec (patch) | |
| tree | 37089f34a1a0fe55eb9a42ae7011031824ba1458 /src/gui/owncloudsetupwizard.h | |
| parent | 4fa212c43b22cfe63ca3fac2c869e05805bebc9f (diff) | |
| parent | 3f5c1d2adeb643fe94d0f2d1274c8d283da029f0 (diff) | |
Merge remote-tracking branch 'origin/master' into accountstate
Conflicts:
src/gui/owncloudsetupwizard.cpp
src/gui/owncloudsetupwizard.h
src/libsync/propagatedownload.cpp
src/libsync/propagatedownload.h
Diffstat (limited to 'src/gui/owncloudsetupwizard.h')
| -rw-r--r-- | src/gui/owncloudsetupwizard.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/owncloudsetupwizard.h b/src/gui/owncloudsetupwizard.h index 416d9cfb9..29a60718a 100644 --- a/src/gui/owncloudsetupwizard.h +++ b/src/gui/owncloudsetupwizard.h @@ -62,7 +62,6 @@ class OwncloudSetupWizard : public QObject public: /** Run the wizard */ static void runWizard(QObject *obj, const char* amember, QWidget *parent = 0 ); - signals: // overall dialog close signal. void ownCloudWizardDone( int ); @@ -85,7 +84,6 @@ private slots: private: explicit OwncloudSetupWizard(QObject *parent = 0 ); ~OwncloudSetupWizard(); - void startWizard(); void testOwnCloudConnect(); void createRemoteFolder(); @@ -93,6 +91,7 @@ private: bool ensureStartFromScratch(const QString &localFolder); void replaceDefaultAccountWith(AccountPtr newAccount); void applyAccountChanges(); + bool checkDowngradeAdvised(QNetworkReply* reply); AccountPtr _account; OwncloudWizard* _ocWizard; |