Utils::Wizard: Move hack out of the base class

Implement it instead where it is needed.

Change-Id: If7f76bcfa82705936b555a5ebfc221978c70e106
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

4 files changed, 3 insertions, 14 deletions

diff --git a/src/libs/utils/wizard.cpp b/src/libs/utils/wizard.cpp
index dfdd561140..3c225b76ea 100644
--- a/src/libs/utils/wizard.cpp
+++ b/src/libs/utils/wizard.cpp
@@ -384,12 +384,6 @@ WizardProgress *Wizard::wizardProgress() const
     return d->m_wizardProgress;
 }
 
-bool Wizard::validateCurrentPage()
-{
-    emit nextClicked();
-    return QWizard::validateCurrentPage();
-}
-
 bool Wizard::hasField(const QString &name) const
 {
     return d_ptr->m_fieldNames.contains(name);
diff --git a/src/libs/utils/wizard.h b/src/libs/utils/wizard.h
index f6ffab99f5..de8b3d9014 100644
--- a/src/libs/utils/wizard.h
+++ b/src/libs/utils/wizard.h
@@ -58,7 +58,6 @@ public:
     void setStartId(int pageId);
 
     WizardProgress *wizardProgress() const;
-    virtual bool validateCurrentPage();
 
     template<class T> T *find() const
     {
@@ -79,10 +78,6 @@ public:
 public slots:
     void showVariables();
 
-signals:
-    void nextClicked(); /* workaround for QWizard behavior where page->initialize is
-                         * called before currentIdChanged */
-
 protected:
     virtual QString stringify(const QVariant &v) const;
     virtual QString evaluate(const QVariant &v) const;
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 2ec2c0b6a4..b69e43ee3b 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -98,7 +98,6 @@ void BaseProjectWizardDialog::init()
         setPage(d->desiredIntroPageId, d->introPage);
     }
     connect(this, SIGNAL(accepted()), this, SLOT(slotAccepted()));
-    connect(this, SIGNAL(nextClicked()), this, SLOT(nextClicked()));
 }
 
 BaseProjectWizardDialog::~BaseProjectWizardDialog()
@@ -155,10 +154,11 @@ void BaseProjectWizardDialog::slotAccepted()
     }
 }
 
-void BaseProjectWizardDialog::nextClicked()
+bool BaseProjectWizardDialog::validateCurrentPage()
 {
     if (currentId() == d->introPageId)
         emit projectParametersChanged(d->introPage->projectName(), d->introPage->path());
+    return Core::BaseFileWizard::validateCurrentPage();
 }
 
 Utils::ProjectIntroPage *BaseProjectWizardDialog::introPage() const
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 7695314677..f936ed0a81 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -86,10 +86,10 @@ protected:
 
 private slots:
     void slotAccepted();
-    void nextClicked();
 
 private:
     void init();
+    bool validateCurrentPage();
 
     BaseProjectWizardDialogPrivate *d;
 };