Introduce BaseFileWizard

Introduce BaseFileWizard and derive all File Wizards from that.

Change BaseFileWizardFactory::create(...) to return a BaseFileWizard.

Change-Id: Ic0cb9e9d0390045dab57cd1a75a0f839c1f90216
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

54 files changed, 198 insertions, 121 deletions

diff --git a/src/plugins/coreplugin/basefilewizard.cpp b/src/plugins/coreplugin/basefilewizard.cpp
new file mode 100644
index 0000000000..b8b3525e41
--- /dev/null
+++ b/src/plugins/coreplugin/basefilewizard.cpp
@@ -0,0 +1,34 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include "basefilewizard.h"
+
+Core::BaseFileWizard::BaseFileWizard(QWidget *parent) :
+    Utils::FileWizardDialog(parent)
+{ }
diff --git a/src/plugins/coreplugin/basefilewizard.h b/src/plugins/coreplugin/basefilewizard.h
new file mode 100644
index 0000000000..b1b5301f14
--- /dev/null
+++ b/src/plugins/coreplugin/basefilewizard.h
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of Qt Creator.
+**
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef BASEFILEWIZARD_H
+#define BASEFILEWIZARD_H
+
+#include "core_global.h"
+
+#include <utils/filewizarddialog.h>
+
+namespace Core {
+
+class CORE_EXPORT BaseFileWizard : public Utils::FileWizardDialog
+{
+    Q_OBJECT
+
+public:
+    explicit BaseFileWizard(QWidget *parent = 0);
+};
+
+} // namespace Core
+
+#endif // BASEFILEWIZARD_H
diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp
index 2ee671f13d..9be35b87d6 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.cpp
+++ b/src/plugins/coreplugin/basefilewizardfactory.cpp
@@ -28,6 +28,8 @@
 ****************************************************************************/
 
 #include "basefilewizardfactory.h"
+
+#include "basefilewizard.h"
 #include "icore.h"
 #include "ifilewizardextension.h"
 #include "mimedatabase.h"
@@ -524,16 +526,16 @@ QString BaseFileWizardFactory::preferredSuffix(const QString &mimeType)
     Creates a Utils::FileWizardDialog.
 */
 
-QWizard *StandardFileWizardFactory::create(QWidget *parent, const WizardDialogParameters &parameters) const
+BaseFileWizard *StandardFileWizardFactory::create(QWidget *parent, const WizardDialogParameters &parameters) const
 {
-    Utils::FileWizardDialog *standardWizardDialog = new Utils::FileWizardDialog(parent);
+    BaseFileWizard *wizard = new BaseFileWizard(parent);
     if (parameters.flags().testFlag(WizardDialogParameters::ForceCapitalLetterForFileName))
-        standardWizardDialog->setForceFirstCapitalLetterForFileName(true);
-    standardWizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
-    standardWizardDialog->setPath(parameters.defaultPath());
+        wizard->setForceFirstCapitalLetterForFileName(true);
+    wizard->setWindowTitle(tr("New %1").arg(displayName()));
+    wizard->setPath(parameters.defaultPath());
     foreach (QWizardPage *p, parameters.extensionPages())
-        BaseFileWizardFactory::applyExtensionPageShortTitle(standardWizardDialog, standardWizardDialog->addPage(p));
-    return standardWizardDialog;
+        BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
+    return wizard;
 }
 
 /*!
diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h
index cf6c20785c..643609a4a7 100644
--- a/src/plugins/coreplugin/basefilewizardfactory.h
+++ b/src/plugins/coreplugin/basefilewizardfactory.h
@@ -52,6 +52,7 @@ namespace Utils { class Wizard; }
 
 namespace Core {
 
+class BaseFileWizard;
 class IFileWizardExtension;
 
 class CORE_EXPORT WizardDialogParameters
@@ -120,7 +121,7 @@ protected:
 
     virtual ExtensionList extensions() const;
 
-    virtual QWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const = 0;
+    virtual BaseFileWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const = 0;
 
     virtual GeneratedFiles generateFiles(const QWizard *w,
                                          QString *errorMessage) const = 0;
@@ -142,7 +143,7 @@ class CORE_EXPORT StandardFileWizardFactory : public BaseFileWizardFactory
     Q_OBJECT
 
 protected:
-    QWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const;
+    BaseFileWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const;
     GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
     virtual GeneratedFiles generateFilesFromPath(const QString &path, const QString &name,
                                                  QString *errorMessage) const = 0;
diff --git a/src/plugins/coreplugin/coreplugin.pro b/src/plugins/coreplugin/coreplugin.pro
index fa9c543a38..0c6768909f 100644
--- a/src/plugins/coreplugin/coreplugin.pro
+++ b/src/plugins/coreplugin/coreplugin.pro
@@ -55,6 +55,7 @@ SOURCES += mainwindow.cpp \
     coreplugin.cpp \
     variablemanager.cpp \
     modemanager.cpp \
+    basefilewizard.cpp \
     basefilewizardfactory.cpp \
     generatedfile.cpp \
     plugindialog.cpp \
@@ -158,6 +159,7 @@ HEADERS += mainwindow.h \
     coreplugin.h \
     variablemanager.h \
     modemanager.h \
+    basefilewizard.h \
     basefilewizardfactory.h \
     generatedfile.h \
     plugindialog.h \
diff --git a/src/plugins/coreplugin/coreplugin.qbs b/src/plugins/coreplugin/coreplugin.qbs
index 1e5a0d158c..aff6e3f252 100644
--- a/src/plugins/coreplugin/coreplugin.qbs
+++ b/src/plugins/coreplugin/coreplugin.qbs
@@ -28,6 +28,7 @@ QtcPlugin {
     Group {
         name: "General"
         files: [
+            "basefilewizard.cpp", "basefilewizard.h",
             "basefilewizardfactory.cpp", "basefilewizardfactory.h",
             "core.qrc",
             "core_global.h",
diff --git a/src/plugins/cppeditor/cppclasswizard.cpp b/src/plugins/cppeditor/cppclasswizard.cpp
index ae6bb6f4ab..c36a048c30 100644
--- a/src/plugins/cppeditor/cppclasswizard.cpp
+++ b/src/plugins/cppeditor/cppclasswizard.cpp
@@ -111,7 +111,7 @@ void ClassNamePage::slotValidChanged()
 }
 
 CppClassWizardDialog::CppClassWizardDialog(QWidget *parent) :
-    Utils::Wizard(parent),
+    Core::BaseFileWizard(parent),
     m_classNamePage(new ClassNamePage(this))
 {
     setWindowTitle(tr("C++ Class Wizard"));
@@ -153,7 +153,7 @@ QString CppClassWizard::headerSuffix() const
     return preferredSuffix(QLatin1String(Constants::CPP_HEADER_MIMETYPE));
 }
 
-QWizard *CppClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *CppClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     CppClassWizardDialog *wizard = new CppClassWizardDialog(parent);
     foreach (QWizardPage *p, parameters.extensionPages())
diff --git a/src/plugins/cppeditor/cppclasswizard.h b/src/plugins/cppeditor/cppclasswizard.h
index 6f5679e394..2416a957a3 100644
--- a/src/plugins/cppeditor/cppclasswizard.h
+++ b/src/plugins/cppeditor/cppclasswizard.h
@@ -30,6 +30,7 @@
 #ifndef CPPCLASSWIZARD_H
 #define CPPCLASSWIZARD_H
 
+#include <coreplugin/basefilewizard.h>
 #include <coreplugin/basefilewizardfactory.h>
 
 #include <utils/wizard.h>
@@ -72,7 +73,7 @@ struct CppClassWizardParameters
     int classType;
 };
 
-class CppClassWizardDialog : public Utils::Wizard
+class CppClassWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 
@@ -95,7 +96,7 @@ public:
     CppClassWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w,
                                                QString *errorMessage) const;
diff --git a/src/plugins/designer/cpp/formclasswizard.cpp b/src/plugins/designer/cpp/formclasswizard.cpp
index 5a062f9ead..bfa11cdc37 100644
--- a/src/plugins/designer/cpp/formclasswizard.cpp
+++ b/src/plugins/designer/cpp/formclasswizard.cpp
@@ -60,7 +60,7 @@ QString FormClassWizard::formSuffix() const
     return preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE));
 }
 
-QWizard *FormClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *FormClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     FormClassWizardDialog *wizardDialog = new FormClassWizardDialog(parameters.extensionPages(),
                                                                     parent);
diff --git a/src/plugins/designer/cpp/formclasswizard.h b/src/plugins/designer/cpp/formclasswizard.h
index 7dbd0aa348..09164e9f59 100644
--- a/src/plugins/designer/cpp/formclasswizard.h
+++ b/src/plugins/designer/cpp/formclasswizard.h
@@ -49,7 +49,7 @@ public:
     QString formSuffix() const;
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.cpp b/src/plugins/designer/cpp/formclasswizarddialog.cpp
index 1b2b3eaa2b..6ca91ac133 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.cpp
+++ b/src/plugins/designer/cpp/formclasswizarddialog.cpp
@@ -44,7 +44,7 @@ namespace Internal {
 // ----------------- FormClassWizardDialog
 FormClassWizardDialog::FormClassWizardDialog(const WizardPageList &extensionPages,
                                              QWidget *parent) :
-    Utils::Wizard(parent),
+    Core::BaseFileWizard(parent),
     m_formPage(new FormTemplateWizardPage),
     m_classPage(new FormClassWizardPage)
 {
diff --git a/src/plugins/designer/cpp/formclasswizarddialog.h b/src/plugins/designer/cpp/formclasswizarddialog.h
index 0a1bc48bf3..fee9a63b16 100644
--- a/src/plugins/designer/cpp/formclasswizarddialog.h
+++ b/src/plugins/designer/cpp/formclasswizarddialog.h
@@ -30,7 +30,7 @@
 #ifndef FORMCLASSWIZARDDIALOG_H
 #define FORMCLASSWIZARDDIALOG_H
 
-#include <utils/wizard.h>
+#include <coreplugin/basefilewizard.h>
 
 namespace Designer {
 
@@ -41,7 +41,7 @@ namespace Internal {
 class FormClassWizardPage;
 class FormTemplateWizardPage;
 
-class FormClassWizardDialog : public Utils::Wizard
+class FormClassWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 
diff --git a/src/plugins/designer/formwizard.cpp b/src/plugins/designer/formwizard.cpp
index 485e5ff58b..7ee1f6efe6 100644
--- a/src/plugins/designer/formwizard.cpp
+++ b/src/plugins/designer/formwizard.cpp
@@ -42,7 +42,7 @@ FormWizard::FormWizard()
     addRequiredFeature(Core::Id(QtSupport::Constants::FEATURE_QWIDGETS));
 }
 
-QWizard *FormWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *FormWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     FormFileWizardDialog *wizardDialog = new FormFileWizardDialog(parameters.extensionPages(),
                                                                   parent);
diff --git a/src/plugins/designer/formwizard.h b/src/plugins/designer/formwizard.h
index 33c3eef86e..c8b124d99b 100644
--- a/src/plugins/designer/formwizard.h
+++ b/src/plugins/designer/formwizard.h
@@ -43,7 +43,7 @@ public:
     FormWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/designer/formwizarddialog.cpp b/src/plugins/designer/formwizarddialog.cpp
index 698416e0a4..5220eb9014 100644
--- a/src/plugins/designer/formwizarddialog.cpp
+++ b/src/plugins/designer/formwizarddialog.cpp
@@ -45,8 +45,8 @@ namespace Internal {
 
 // ----------------- FormWizardDialog
 FormWizardDialog::FormWizardDialog(const WizardPageList &extensionPages,
-                                   QWidget *parent)
-    : Utils::Wizard(parent),
+                                   QWidget *parent) :
+    Core::BaseFileWizard(parent),
     m_formPage(new FormTemplateWizardPage)
 {
     init(extensionPages);
diff --git a/src/plugins/designer/formwizarddialog.h b/src/plugins/designer/formwizarddialog.h
index 3652d5afdf..345b4b204a 100644
--- a/src/plugins/designer/formwizarddialog.h
+++ b/src/plugins/designer/formwizarddialog.h
@@ -30,7 +30,7 @@
 #ifndef FORMWIZARDDIALOG_H
 #define FORMWIZARDDIALOG_H
 
-#include <utils/wizard.h>
+#include <coreplugin/basefilewizard.h>
 
 namespace Utils { class FileWizardPage; }
 
@@ -42,7 +42,7 @@ class FormTemplateWizardPage;
 // Single-Page Wizard for new forms offering all types known to Qt Designer.
 // To be used for Mode "CreateNewEditor" [not currently used]
 
-class FormWizardDialog : public Utils::Wizard
+class FormWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.cpp b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
index 28012f85d9..89bce38ee9 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.cpp
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.cpp
@@ -59,8 +59,8 @@ static const char *const ConfigFileTemplate =
 //
 //////////////////////////////////////////////////////////////////////////////
 
-GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent)
-    : Utils::Wizard(parent)
+GenericProjectWizardDialog::GenericProjectWizardDialog(QWidget *parent) :
+    Core::BaseFileWizard(parent)
 {
     setWindowTitle(tr("Import Existing Project"));
 
@@ -132,7 +132,7 @@ GenericProjectWizard::GenericProjectWizard()
     setFlags(Core::IWizardFactory::PlatformIndependent);
 }
 
-QWizard *GenericProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *GenericProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     GenericProjectWizardDialog *wizard = new GenericProjectWizardDialog(parent);
 
diff --git a/src/plugins/genericprojectmanager/genericprojectwizard.h b/src/plugins/genericprojectmanager/genericprojectwizard.h
index 2898b6c782..7c9074362f 100644
--- a/src/plugins/genericprojectmanager/genericprojectwizard.h
+++ b/src/plugins/genericprojectmanager/genericprojectwizard.h
@@ -30,22 +30,21 @@
 #ifndef GENERICPROJECTWIZARD_H
 #define GENERICPROJECTWIZARD_H
 
+#include <coreplugin/basefilewizard.h>
 #include <coreplugin/basefilewizardfactory.h>
 #include <utils/wizard.h>
 
-namespace Utils { class FileWizardPage; }
-
 namespace GenericProjectManager {
 namespace Internal {
 
 class FilesSelectionWizardPage;
 
-class GenericProjectWizardDialog : public Utils::Wizard
+class GenericProjectWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 
 public:
-    GenericProjectWizardDialog(QWidget *parent = 0);
+    explicit GenericProjectWizardDialog(QWidget *parent = 0);
 
     QString path() const;
     void setPath(const QString &path);
@@ -66,7 +65,7 @@ public:
     GenericProjectWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
     bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
 };
diff --git a/src/plugins/glsleditor/glslfilewizard.cpp b/src/plugins/glsleditor/glslfilewizard.cpp
index dd093b9261..b80cfa7374 100644
--- a/src/plugins/glsleditor/glslfilewizard.cpp
+++ b/src/plugins/glsleditor/glslfilewizard.cpp
@@ -30,7 +30,8 @@
 #include "glslfilewizard.h"
 #include "glsleditorconstants.h"
 
-#include <utils/filewizarddialog.h>
+#include <coreplugin/basefilewizard.h>
+
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
@@ -38,18 +39,6 @@
 #include <QWizard>
 #include <QPushButton>
 
-namespace {
-class GLSLFileWizardDialog : public Utils::FileWizardDialog
-{
-    Q_OBJECT
-public:
-    GLSLFileWizardDialog(QWidget *parent = 0)
-        : Utils::FileWizardDialog(parent)
-    {
-    }
-};
-} // anonymous namespace
-
 using namespace GLSLEditor;
 
 GLSLFileWizard::GLSLFileWizard(ShaderType shaderType)
@@ -61,9 +50,9 @@ GLSLFileWizard::GLSLFileWizard(ShaderType shaderType)
 Core::GeneratedFiles GLSLFileWizard::generateFiles(const QWizard *w,
                                                  QString * /*errorMessage*/) const
 {
-    const GLSLFileWizardDialog *wizardDialog = qobject_cast<const GLSLFileWizardDialog *>(w);
-    const QString path = wizardDialog->path();
-    const QString name = wizardDialog->fileName();
+    const Core::BaseFileWizard *wizard = qobject_cast<const Core::BaseFileWizard *>(w);
+    const QString path = wizard->path();
+    const QString name = wizard->fileName();
 
     const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, name, preferredSuffix(m_shaderType));
 
@@ -127,14 +116,14 @@ QString GLSLFileWizard::fileContents(const QString &, ShaderType shaderType) con
     return contents;
 }
 
-QWizard *GLSLFileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *GLSLFileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
-    GLSLFileWizardDialog *wizardDialog = new GLSLFileWizardDialog(parent);
-    wizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
-    wizardDialog->setPath(parameters.defaultPath());
+    Core::BaseFileWizard *wizard = new Core::BaseFileWizard(parent);
+    wizard->setWindowTitle(tr("New %1").arg(displayName()));
+    wizard->setPath(parameters.defaultPath());
     foreach (QWizardPage *p, parameters.extensionPages())
-        BaseFileWizardFactory::applyExtensionPageShortTitle(wizardDialog, wizardDialog->addPage(p));
-    return wizardDialog;
+        BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
+    return wizard;
 }
 
 QString GLSLFileWizard::preferredSuffix(ShaderType shaderType) const
@@ -152,5 +141,3 @@ QString GLSLFileWizard::preferredSuffix(ShaderType shaderType) const
         return QLatin1String("glsl");
     }
 }
-
-#include "glslfilewizard.moc"
diff --git a/src/plugins/glsleditor/glslfilewizard.h b/src/plugins/glsleditor/glslfilewizard.h
index 42445b4305..d209817a60 100644
--- a/src/plugins/glsleditor/glslfilewizard.h
+++ b/src/plugins/glsleditor/glslfilewizard.h
@@ -52,7 +52,7 @@ public:
 private:
     QString fileContents(const QString &baseName, ShaderType shaderType) const;
 
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w,
                                        QString *errorMessage) const;
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
index 2204e8f435..177548b0be 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.cpp
@@ -65,7 +65,7 @@ BaseProjectWizardDialogPrivate::BaseProjectWizardDialogPrivate(Utils::ProjectInt
 
 BaseProjectWizardDialog::BaseProjectWizardDialog(QWidget *parent,
                                                  const Core::WizardDialogParameters &parameters) :
-    Utils::Wizard(parent),
+    Core::BaseFileWizard(parent),
     d(new BaseProjectWizardDialogPrivate(new Utils::ProjectIntroPage))
 {
     setPath(parameters.defaultPath());
@@ -74,11 +74,10 @@ BaseProjectWizardDialog::BaseProjectWizardDialog(QWidget *parent,
     init();
 }
 
-BaseProjectWizardDialog::BaseProjectWizardDialog(Utils::ProjectIntroPage *introPage,
-                                                 int introId,
+BaseProjectWizardDialog::BaseProjectWizardDialog(Utils::ProjectIntroPage *introPage, int introId,
                                                  QWidget *parent,
                                                  const Core::WizardDialogParameters &parameters) :
-    Utils::Wizard(parent),
+    Core::BaseFileWizard(parent),
     d(new BaseProjectWizardDialogPrivate(introPage, introId))
 {
     setPath(parameters.defaultPath());
diff --git a/src/plugins/projectexplorer/baseprojectwizarddialog.h b/src/plugins/projectexplorer/baseprojectwizarddialog.h
index 767f778beb..8fe7669b2d 100644
--- a/src/plugins/projectexplorer/baseprojectwizarddialog.h
+++ b/src/plugins/projectexplorer/baseprojectwizarddialog.h
@@ -31,8 +31,9 @@
 #define BASEPROJECTWIZARDDIALOG_H
 
 #include "projectexplorer_export.h"
+
+#include <coreplugin/basefilewizard.h>
 #include <coreplugin/basefilewizardfactory.h>
-#include <utils/wizard.h>
 
 namespace Utils { class ProjectIntroPage; }
 
@@ -41,13 +42,12 @@ namespace ProjectExplorer {
 struct BaseProjectWizardDialogPrivate;
 
 // Documentation inside.
-class PROJECTEXPLORER_EXPORT BaseProjectWizardDialog : public Utils::Wizard
+class PROJECTEXPLORER_EXPORT BaseProjectWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 
 protected:
-    explicit BaseProjectWizardDialog(Utils::ProjectIntroPage *introPage,
-                                     int introId,
+    explicit BaseProjectWizardDialog(Utils::ProjectIntroPage *introPage, int introId,
                                      QWidget *parent, const Core::WizardDialogParameters &parameters);
 
 public:
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.cpp b/src/plugins/projectexplorer/customwizard/customwizard.cpp
index 1662850071..dbf0fd7ffd 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.cpp
+++ b/src/plugins/projectexplorer/customwizard/customwizard.cpp
@@ -135,7 +135,7 @@ static inline void addWizardPage(Utils::Wizard *w, QWizardPage *p, int id)
 }
 
 // Initialize a wizard with a custom file page.
-void CustomWizard::initWizardDialog(Utils::Wizard *wizard, const QString &defaultPath,
+void CustomWizard::initWizardDialog(Core::BaseFileWizard *wizard, const QString &defaultPath,
                                     const WizardPageList &extensionPages) const
 {
     QTC_ASSERT(!parameters().isNull(), return);
@@ -152,10 +152,10 @@ void CustomWizard::initWizardDialog(Utils::Wizard *wizard, const QString &defaul
         qDebug() << "initWizardDialog" << wizard << wizard->pageIds();
 }
 
-QWizard *CustomWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *CustomWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     QTC_ASSERT(!d->m_parameters.isNull(), return 0);
-    Utils::Wizard *wizard = new Utils::Wizard(parent);
+    Core::BaseFileWizard *wizard = new Core::BaseFileWizard(parent);
     initWizardDialog(wizard, parameters.defaultPath(), parameters.extensionPages());
     return wizard;
 }
@@ -502,7 +502,7 @@ CustomProjectWizard::CustomProjectWizard()
     initProjectWizardDialog() needs to be called.
 */
 
-QWizard *CustomProjectWizard::create(QWidget *parent,
+Core::BaseFileWizard *CustomProjectWizard::create(QWidget *parent,
                                      const Core::WizardDialogParameters &parameters) const
 {
     BaseProjectWizardDialog *projectDialog = new BaseProjectWizardDialog(parent, parameters);
diff --git a/src/plugins/projectexplorer/customwizard/customwizard.h b/src/plugins/projectexplorer/customwizard/customwizard.h
index 43ccb6ecad..2d8609158d 100644
--- a/src/plugins/projectexplorer/customwizard/customwizard.h
+++ b/src/plugins/projectexplorer/customwizard/customwizard.h
@@ -96,7 +96,7 @@ public:
 
     // Can be reimplemented to create custom wizards. initWizardDialog() needs to be
     // called.
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 
@@ -111,7 +111,7 @@ protected:
     typedef QSharedPointer<Internal::CustomWizardParameters> CustomWizardParametersPtr;
     typedef QSharedPointer<Internal::CustomWizardContext> CustomWizardContextPtr;
 
-    void initWizardDialog(Utils::Wizard *w, const QString &defaultPath,
+    void initWizardDialog(Core::BaseFileWizard *w, const QString &defaultPath,
                           const WizardPageList &extensionPages) const;
 
     // generate files in path
@@ -143,7 +143,7 @@ public:
     static bool postGenerateOpen(const Core::GeneratedFiles &l, QString *errorMessage = 0);
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp b/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
index 64eb63eb1f..02d873299d 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizard.cpp
@@ -55,7 +55,7 @@ ClassWizard::ClassWizard()
     setDescription(ClassWizard::tr(Constants::EN_PY_CLASS_DESCRIPTION));
 }
 
-QWizard *ClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *ClassWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     ClassWizardDialog *wizard = new ClassWizardDialog(parent);
     foreach (QWizardPage *p, parameters.extensionPages())
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizard.h b/src/plugins/pythoneditor/wizard/pythonclasswizard.h
index 90cd23461b..37af500090 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizard.h
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizard.h
@@ -49,7 +49,7 @@ public:
     ClassWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w,
                                        QString *errorMessage) const;
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
index ffe9adbff6..a8ddd34376 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.cpp
@@ -36,9 +36,9 @@
 namespace PythonEditor {
 namespace Internal {
 
-ClassWizardDialog::ClassWizardDialog(QWidget *parent)
-    : Utils::Wizard(parent)
-    , m_classNamePage(new ClassNamePage(this))
+ClassWizardDialog::ClassWizardDialog(QWidget *parent) :
+    Core::BaseFileWizard(parent),
+    m_classNamePage(new ClassNamePage(this))
 {
     setWindowTitle(tr("Python Class Wizard"));
     const int classNameId = addPage(m_classNamePage.data());
diff --git a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
index 3553e49d43..951f4b2c41 100644
--- a/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
+++ b/src/plugins/pythoneditor/wizard/pythonclasswizarddialog.h
@@ -30,7 +30,8 @@
 #ifndef PYTHONEDITOR_CLASSWIZARDDIALOG_H
 #define PYTHONEDITOR_CLASSWIZARDDIALOG_H
 
-#include <utils/wizard.h>
+#include <coreplugin/basefilewizard.h>
+
 #include <utils/newclasswidget.h>
 #include <QScopedPointer>
 #include <QVariantMap>
@@ -50,7 +51,7 @@ public:
     Utils::NewClassWidget::ClassType classType;
 };
 
-class ClassWizardDialog : public Utils::Wizard
+class ClassWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 public:
diff --git a/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp b/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
index c99d25e6e8..553bfd5a2c 100644
--- a/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
+++ b/src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
@@ -34,7 +34,7 @@
 #include "pythonfilewizard.h"
 #include "../pythoneditorconstants.h"
 
-#include <utils/filewizarddialog.h>
+#include <coreplugin/basefilewizard.h>
 #include <texteditor/textfilewizard.h>
 
 #include <QWizard>
@@ -61,15 +61,15 @@ FileWizard::FileWizard()
  * @param params
  * @return
  */
-QWizard *FileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *FileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
-    Utils::FileWizardDialog *pDialog = new Utils::FileWizardDialog(parent);
-    pDialog->setWindowTitle(tr("New %1").arg(displayName()));
-    pDialog->setPath(parameters.defaultPath());
+    Core::BaseFileWizard *wizard = new Core::BaseFileWizard(parent);
+    wizard->setWindowTitle(tr("New %1").arg(displayName()));
+    wizard->setPath(parameters.defaultPath());
     foreach (QWizardPage *p, parameters.extensionPages())
-        applyExtensionPageShortTitle(pDialog, pDialog->addPage(p));
+        applyExtensionPageShortTitle(wizard, wizard->addPage(p));
 
-    return pDialog;
+    return wizard;
 }
 
 Core::GeneratedFiles FileWizard::generateFiles(const QWizard *dialog,
diff --git a/src/plugins/pythoneditor/wizard/pythonfilewizard.h b/src/plugins/pythoneditor/wizard/pythonfilewizard.h
index f4af61e211..f33d944879 100644
--- a/src/plugins/pythoneditor/wizard/pythonfilewizard.h
+++ b/src/plugins/pythoneditor/wizard/pythonfilewizard.h
@@ -42,7 +42,7 @@ public:
     FileWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *dialog, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp
index e70eeb04cf..178eca962b 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.cpp
@@ -54,7 +54,7 @@ CustomWidgetWizard::CustomWidgetWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS));
 }
 
-QWizard *CustomWidgetWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *CustomWidgetWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     CustomWidgetWizardDialog *rc = new CustomWidgetWizardDialog(displayName(),
                                                                 icon(),
diff --git a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h
index 6f5fb18e69..8c9d8d045e 100644
--- a/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h
+++ b/src/plugins/qmakeprojectmanager/customwidgetwizard/customwidgetwizard.h
@@ -43,7 +43,7 @@ public:
     CustomWidgetWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp
index e61adea361..fc6fb90acb 100644
--- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.cpp
@@ -98,10 +98,9 @@ int AbstractMobileAppWizardDialog::addPageWithTitle(QWizardPage *page, const QSt
     return pageId;
 }
 
-QWizard *AbstractMobileAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *AbstractMobileAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
-    AbstractMobileAppWizardDialog * const wdlg
-        = createInternal(parent, parameters);
+    AbstractMobileAppWizardDialog * const wdlg = createInternal(parent, parameters);
     wdlg->setProjectName(ProjectExplorer::BaseProjectWizardDialog::uniqueProjectName(parameters.defaultPath()));
     connect(wdlg, SIGNAL(projectParametersChanged(QString,QString)),
         SLOT(useProjectPath(QString,QString)));
diff --git a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h
index f5a3e67df9..bb9e6a7983 100644
--- a/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/abstractmobileappwizard.h
@@ -77,7 +77,7 @@ protected:
     virtual QString fileToOpenPostGeneration() const = 0;
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
     Core::GeneratedFiles generateFiles(const QWizard *wizard, QString *errorMessage) const;
     bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
 
diff --git a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.cpp
index 6a8fb11206..b5589647fe 100644
--- a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.cpp
@@ -65,7 +65,7 @@ ConsoleAppWizard::ConsoleAppWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT_CONSOLE));
 }
 
-QWizard *ConsoleAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *ConsoleAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     ConsoleAppWizardDialog *dialog = new ConsoleAppWizardDialog(displayName(), icon(),
                                                                 showModulesPageForApplications(), parent, parameters);
diff --git a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h
index 12f9fab576..17882afff3 100644
--- a/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/consoleappwizard.h
@@ -45,7 +45,7 @@ public:
     ConsoleAppWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.cpp
index cad1ed2605..901355cd59 100644
--- a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.cpp
@@ -52,7 +52,7 @@ EmptyProjectWizard::EmptyProjectWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT));
 }
 
-QWizard *EmptyProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *EmptyProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     EmptyProjectWizardDialog *dialog = new EmptyProjectWizardDialog(displayName(), icon(), parent, parameters);
     dialog->setProjectName(EmptyProjectWizardDialog::uniqueProjectName(parameters.defaultPath()));
diff --git a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.h b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.h
index 42d9706eeb..fc0ac2257b 100644
--- a/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/emptyprojectwizard.h
@@ -43,7 +43,7 @@ public:
     EmptyProjectWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
index cb47657b9e..9ebbe54793 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.cpp
@@ -86,7 +86,7 @@ GuiAppWizard::GuiAppWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QWIDGETS));
 }
 
-QWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *GuiAppWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     GuiAppWizardDialog *dialog = new GuiAppWizardDialog(displayName(), icon(),
                                                         showModulesPageForApplications(),
diff --git a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
index 9f3cbc8c5a..290208c305 100644
--- a/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/guiappwizard.h
@@ -45,7 +45,7 @@ public:
     GuiAppWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 
diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp b/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp
index d8f74a2eb0..aeb3b2c9ad 100644
--- a/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/librarywizard.cpp
@@ -57,7 +57,7 @@ LibraryWizard::LibraryWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT));
 }
 
-QWizard *LibraryWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *LibraryWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     LibraryWizardDialog *dialog = new LibraryWizardDialog(displayName(), icon(),
                                                           showModulesPageForLibraries(), parent,
diff --git a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
index dbba8a07f7..6292058cbe 100644
--- a/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/librarywizard.h
@@ -44,7 +44,7 @@ public:
     LibraryWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
index d4de01f490..eed8510033 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.cpp
@@ -133,7 +133,7 @@ CustomQmakeProjectWizard::CustomQmakeProjectWizard()
 {
 }
 
-QWizard *CustomQmakeProjectWizard::create(QWidget *parent,
+Core::BaseFileWizard *CustomQmakeProjectWizard::create(QWidget *parent,
                                           const Core::WizardDialogParameters &parameters) const
 {
     BaseQmakeProjectWizardDialog *wizard = new BaseQmakeProjectWizardDialog(false, parent, parameters);
diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
index dee5d81c55..2734e9cf68 100644
--- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h
@@ -92,7 +92,7 @@ public:
     CustomQmakeProjectWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
     bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage);
 
 private:
diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
index 7bcee19733..1c230aad27 100644
--- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.cpp
@@ -53,7 +53,7 @@ SubdirsProjectWizard::SubdirsProjectWizard()
     setRequiredFeatures(Core::Feature(QtSupport::Constants::FEATURE_QT));
 }
 
-QWizard *SubdirsProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *SubdirsProjectWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     SubdirsProjectWizardDialog *dialog = new SubdirsProjectWizardDialog(displayName(), icon(), parent, parameters);
 
diff --git a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h
index 5bd79cd1ba..7d3dbe3fef 100644
--- a/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/subdirsprojectwizard.h
@@ -43,7 +43,7 @@ public:
     SubdirsProjectWizard();
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
     bool postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage);
diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp b/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
index ba9869e8ae..42b8e68cd6 100644
--- a/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
+++ b/src/plugins/qmakeprojectmanager/wizards/testwizard.cpp
@@ -58,7 +58,7 @@ TestWizard::TestWizard()
             Core::Feature(QtSupport::Constants::FEATURE_QT));
 }
 
-QWizard *TestWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *TestWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     TestWizardDialog *dialog = new TestWizardDialog(displayName(), icon(), parent, parameters);
     dialog->setProjectName(TestWizardDialog::uniqueProjectName(parameters.defaultPath()));
diff --git a/src/plugins/qmakeprojectmanager/wizards/testwizard.h b/src/plugins/qmakeprojectmanager/wizards/testwizard.h
index f90702430b..664362a03c 100644
--- a/src/plugins/qmakeprojectmanager/wizards/testwizard.h
+++ b/src/plugins/qmakeprojectmanager/wizards/testwizard.h
@@ -43,7 +43,7 @@ public:
     TestWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmljseditor/jsfilewizard.cpp b/src/plugins/qmljseditor/jsfilewizard.cpp
index b90a135e32..c84eb29247 100644
--- a/src/plugins/qmljseditor/jsfilewizard.cpp
+++ b/src/plugins/qmljseditor/jsfilewizard.cpp
@@ -31,7 +31,8 @@
 
 #include <qmljstools/qmljstoolsconstants.h>
 
-#include <utils/filewizarddialog.h>
+#include <coreplugin/basefilewizard.h>
+
 #include <utils/qtcassert.h>
 
 #include <QFileInfo>
@@ -71,13 +72,13 @@ private:
     QCheckBox *m_statelessLibrary;
 };
 
-class JsFileWizardDialog : public Utils::FileWizardDialog
+class JsFileWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 public:
-    JsFileWizardDialog(QWidget *parent = 0)
-        : Utils::FileWizardDialog(parent)
-        , m_optionsPage(new JsFileOptionsPage)
+    JsFileWizardDialog(QWidget *parent = 0) :
+        Core::BaseFileWizard(parent),
+        m_optionsPage(new JsFileOptionsPage)
     {
         addPage(m_optionsPage);
     }
@@ -122,7 +123,7 @@ QString JsFileWizard::fileContents(const QString &, bool statelessLibrary) const
     return contents;
 }
 
-QWizard *JsFileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
+Core::BaseFileWizard *JsFileWizard::create(QWidget *parent, const Core::WizardDialogParameters &parameters) const
 {
     JsFileWizardDialog *wizardDialog = new JsFileWizardDialog(parent);
     wizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
diff --git a/src/plugins/qmljseditor/jsfilewizard.h b/src/plugins/qmljseditor/jsfilewizard.h
index 9c41cbe077..5f02738d7b 100644
--- a/src/plugins/qmljseditor/jsfilewizard.h
+++ b/src/plugins/qmljseditor/jsfilewizard.h
@@ -44,7 +44,7 @@ public:
 private:
     QString fileContents(const QString &baseName, bool statelessLibrary) const;
 
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
 
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
 };
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
index 2b71887955..f65ebdfdfa 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.cpp
@@ -82,7 +82,7 @@ QmlApplicationWizard::QmlApplicationWizard()
     setDescription(tr("Creates a Qt Quick UI project."));
 }
 
-QWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const
+Core::BaseFileWizard *QmlApplicationWizard::create(QWidget *parent, const WizardDialogParameters &parameters) const
 {
     QmlApplicationWizardDialog *wizardDialog = new QmlApplicationWizardDialog(parent, parameters);
 
diff --git a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
index 0d19cb38e3..23c832affe 100644
--- a/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
+++ b/src/plugins/qmlprojectmanager/qmlapplicationwizard.h
@@ -66,7 +66,7 @@ public:
     static void createInstances(ExtensionSystem::IPlugin *plugin);
 
 private:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
     void writeUserFile(const QString &fileName) const;
     bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp b/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp
index c54c70f2ac..4c70678fcb 100644
--- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp
+++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp
@@ -62,8 +62,8 @@ namespace Internal {
 //
 //////////////////////////////////////////////////////////////////////////////
 
-CascadesImportWizardDialog::CascadesImportWizardDialog(QWidget *parent)
-    : Utils::Wizard(parent)
+CascadesImportWizardDialog::CascadesImportWizardDialog(QWidget *parent) :
+    Core::BaseFileWizard(parent)
 {
     setWindowTitle(tr("Import Existing Momentics Cascades Project"));
 
@@ -124,7 +124,7 @@ CascadesImportWizard::CascadesImportWizard()
     setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY));
 }
 
-QWizard *CascadesImportWizard::create(QWidget *parent,
+Core::BaseFileWizard *CascadesImportWizard::create(QWidget *parent,
                                       const Core::WizardDialogParameters &parameters) const
 {
     CascadesImportWizardDialog *wizard = new CascadesImportWizardDialog(parent);
diff --git a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
index 79f72614c4..b4870226c8 100644
--- a/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
+++ b/src/plugins/qnx/cascadesimport/cascadesimportwizard.h
@@ -32,6 +32,7 @@
 
 #include "fileconverter.h"
 
+#include <coreplugin/basefilewizard.h>
 #include <coreplugin/basefilewizardfactory.h>
 #include <utils/wizard.h>
 
@@ -42,7 +43,7 @@ namespace Internal {
 
 class SrcProjectWizardPage;
 
-class CascadesImportWizardDialog : public Utils::Wizard
+class CascadesImportWizardDialog : public Core::BaseFileWizard
 {
     Q_OBJECT
 public:
@@ -66,7 +67,7 @@ public:
     CascadesImportWizard();
 
 protected:
-    QWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
+    Core::BaseFileWizard *create(QWidget *parent, const Core::WizardDialogParameters &parameters) const;
     Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;
     bool postGenerateFiles(const QWizard *w, const Core::GeneratedFiles &l, QString *errorMessage);
 private: