Cleanup IWizard interface and users

Added 639 lines, removed 1391.

Change-Id: I15ec7dd056d4f7ad79c6dd6a4181007ad14f6a43
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

2 files changed, 6 insertions, 17 deletions

diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index 2bc5fd27dd..56202924b8 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -40,9 +40,9 @@
 namespace Designer {
 namespace Internal {
 
-FormClassWizard::FormClassWizard(const BaseFileWizardParameters &parameters,  QObject *parent)
-  : Core::BaseFileWizard(parameters, parent)
+FormClassWizard::FormClassWizard()
 {
+    setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS));
 }
 
 QString FormClassWizard::headerSuffix() const
@@ -60,11 +60,6 @@ QString FormClassWizard::formSuffix() const
     return preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE));
 }
 
-Core::FeatureSet FormClassWizard::requiredFeatures() const
-{
-    return Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS);
-}
-
 QWizard *FormClassWizard::createWizardDialog(QWidget *parent,
                                              const Core::WizardDialogParameters &wizardDialogParameters) const
 {
diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h
index 9c6635f945..d8ee46c721 100644
--- a/src/plugins/designer/cpp/formclasswizard.h
+++ b/src/plugins/designer/cpp/formclasswizard.h
@@ -37,28 +37,22 @@
 namespace Designer {
 namespace Internal {
 
-class FormClassWizardParameters;
-
 class FormClassWizard : public Core::BaseFileWizard
 {
     Q_OBJECT
 
 public:
-    typedef Core::BaseFileWizardParameters BaseFileWizardParameters;
-
-    FormClassWizard(const BaseFileWizardParameters &parameters, QObject *parent);
+    FormClassWizard();
 
     QString headerSuffix() const;
     QString sourceSuffix() const;
     QString formSuffix() const;
 
-    virtual Core::FeatureSet requiredFeatures() const;
-
-protected:
-    virtual QWizard *createWizardDialog(QWidget *parent,
+private:
+    QWizard *createWizardDialog(QWidget *parent,
                                         const Core::WizardDialogParameters &wizardDialogParameters) const;
 
-    virtual Core::GeneratedFiles generateFiles(const QWizard *w,
+    Core::GeneratedFiles generateFiles(const QWizard *w,
                                                QString *errorMessage) const;
 };