Cleanup IWizard interface and users

Added 639 lines, removed 1391.

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

1 files changed, 41 insertions, 59 deletions

diff --git a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
index db7a983da4..04afef13f2 100644
--- a/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtquickappwizard.cpp
@@ -105,17 +105,14 @@ class QtQuickAppWizardPrivate
 };
 
 QtQuickAppWizard::QtQuickAppWizard()
-    : AbstractMobileAppWizard(baseParameters())
-    , d(new QtQuickAppWizardPrivate)
+    : d(new QtQuickAppWizardPrivate)
 {
-    d->app = new QtQuickApp;
-    d->wizardDialog = 0;
-}
+    setWizardKind(ProjectWizard);
+    setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP)));
+    setId(QLatin1String("D.QMLA Application"));
+    setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
+    setDisplayCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
 
-QtQuickAppWizard::QtQuickAppWizard(const Core::BaseFileWizardParameters &params, QObject *parent)
-    : AbstractMobileAppWizard(params, parent)
-      , d(new QtQuickAppWizardPrivate)
-{
     d->app = new QtQuickApp;
     d->wizardDialog = 0;
 }
@@ -128,83 +125,68 @@ QtQuickAppWizard::~QtQuickAppWizard()
 
 void QtQuickAppWizard::createInstances(ExtensionSystem::IPlugin *plugin)
 {
-    Core::BaseFileWizardParameters base = baseParameters();
-    QList<Core::BaseFileWizardParameters> list;
-    Core::BaseFileWizardParameters parameter;
-
     const QString basicDescription = tr("Creates a Qt Quick 1 application project that can contain "
                                         "both QML and C++ code and includes a QDeclarativeView.\n\n");
     const QString basicDescription2 = tr("Creates a Qt Quick 2 application project that can contain "
                                         "both QML and C++ code and includes a QQuickView.\n\n");
 
-    Core::FeatureSet basicFeatures;
-    basicFeatures = Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_1);
+    Core::FeatureSet basicFeatures = Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_1);
 
-    parameter = base;
-    parameter.setDisplayName(tr("Qt Quick 1 Application (Built-in Types)"));
-    parameter.setDescription(basicDescription + tr("The built-in QML types in the QtQuick 1 namespace allow "
+    QtQuickAppWizard *wizard = new QtQuickAppWizard;
+    wizard->setQtQuickKind(QtQuick1_1);
+    wizard->setDisplayName(tr("Qt Quick 1 Application (Built-in Types)"));
+    wizard->setDescription(basicDescription + tr("The built-in QML types in the QtQuick 1 namespace allow "
                                                    "you to write cross-platform applications with "
                                                    "a custom look and feel.\n\nRequires <b>Qt 4.7.0</b> or newer."));
-    parameter.setRequiredFeatures(basicFeatures);
-    list << parameter;
+    wizard->setRequiredFeatures(basicFeatures);
+    plugin->addAutoReleasedObject(wizard);
 
-    parameter = base;
-    parameter.setDisplayName(tr("Qt Quick 2 Application (Built-in Types)"));
-    parameter.setDescription(basicDescription2 + tr("The built-in QML types in the QtQuick 2 namespace allow "
+
+    wizard = new QtQuickAppWizard;
+    wizard->setQtQuickKind(QtQuick2_0);
+    wizard->setDisplayName(tr("Qt Quick 2 Application (Built-in Types)"));
+    wizard->setDescription(basicDescription2 + tr("The built-in QML types in the QtQuick 2 namespace allow "
                                                     "you to write cross-platform applications with "
                                                     "a custom look and feel.\n\nRequires <b>Qt 5.0</b> or newer."));
-    parameter.setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2));
-    list << parameter;
+    wizard->setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2));
+    plugin->addAutoReleasedObject(wizard);
+
 
-    parameter = base;
-    parameter.setDisplayName(tr("Qt Quick 1 Application for MeeGo Harmattan"));
-    parameter.setDescription(basicDescription +  tr("The Qt Quick Components for MeeGo Harmattan are "
+    wizard = new QtQuickAppWizard;
+    wizard->setQtQuickKind(MeegoComponents);
+    wizard->setDisplayName(tr("Qt Quick 1 Application for MeeGo Harmattan"));
+    wizard->setDescription(basicDescription +  tr("The Qt Quick Components for MeeGo Harmattan are "
                                                     "a set of ready-made components that are designed "
                                                     "with specific native appearance for the MeeGo Harmattan "
                                                     "platform.\n\nRequires <b>Qt 4.7.4</b> or newer, and the "
                                                     "component set installed for your Qt version."));
-    parameter.setRequiredFeatures(basicFeatures | Core::Feature(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO)
+    wizard->setRequiredFeatures(basicFeatures | Core::Feature(QtSupport::Constants::FEATURE_QTQUICK_COMPONENTS_MEEGO)
                                   | Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_1_1));
-    list << parameter;
+    plugin->addAutoReleasedObject(wizard);
 
-    parameter = base;
-    parameter.setDisplayName(tr("Qt Quick 1 Application (from Existing QML File)"));
-    parameter.setDescription(basicDescription +  tr("Creates a deployable Qt Quick application from "
+
+    wizard = new QtQuickAppWizard;
+    wizard->setQtQuickKind(ImportQml);
+    wizard->setDisplayName(tr("Qt Quick 1 Application (from Existing QML File)"));
+    wizard->setDescription(basicDescription +  tr("Creates a deployable Qt Quick application from "
                                                     "existing QML files. All files and directories that "
                                                     "reside in the same directory as the main .qml file "
                                                     "are deployed. You can modify the contents of the "
                                                     "directory any time before deploying.\n\nRequires <b>Qt 4.7.0</b> or newer."));
-    parameter.setRequiredFeatures(basicFeatures);
-    list << parameter;
+    wizard->setRequiredFeatures(basicFeatures);
+    plugin->addAutoReleasedObject(wizard);
+
 
-    parameter = base;
-    parameter.setDisplayName(tr("Qt Quick 2 Application (from Existing QML File)"));
-    parameter.setDescription(basicDescription2 + tr("Creates a deployable Qt Quick application from "
+    wizard = new QtQuickAppWizard;
+    wizard->setQtQuickKind(ImportQml2);
+    wizard->setDisplayName(tr("Qt Quick 2 Application (from Existing QML File)"));
+    wizard->setDescription(basicDescription2 + tr("Creates a deployable Qt Quick application from "
                                                     "existing QML files. All files and directories that "
                                                     "reside in the same directory as the main .qml file "
                                                     "are deployed. You can modify the contents of the "
                                                     "directory any time before deploying.\n\nRequires <b>Qt 5.0</b> or newer."));
-    parameter.setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2));
-    list << parameter;
-
-    QList<QtQuickAppWizard*> wizardList = Core::createMultipleBaseFileWizardInstances<QtQuickAppWizard>(list, plugin);
-
-    Q_ASSERT(wizardList.count() == 5);
-
-    for (int i = 0; i < wizardList.count(); i++) {
-        wizardList.at(i)->setQtQuickKind(Kind(i));
-    }
-}
-
-Core::BaseFileWizardParameters QtQuickAppWizard::baseParameters()
-{
-    Core::BaseFileWizardParameters parameters(ProjectWizard);
-    parameters.setIcon(QIcon(QLatin1String(Qt4ProjectManager::Constants::ICON_QTQUICK_APP)));
-    parameters.setId(QLatin1String("D.QMLA Application"));
-    parameters.setCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY));
-    parameters.setDisplayCategory(QLatin1String(ProjectExplorer::Constants::QT_APPLICATION_WIZARD_CATEGORY_DISPLAY));
-
-    return parameters;
+    wizard->setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_QUICK_2));
+    plugin->addAutoReleasedObject(wizard);
 }
 
 AbstractMobileAppWizardDialog *QtQuickAppWizard::createWizardDialogInternal(QWidget *parent,