IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactory

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

src/plugins/android/javafilewizard.cpp

@@ -56,7 +56,7 @@ Core::GeneratedFiles JavaFileWizard::generateFilesFromPath(const QString &path,
     QString capitalizedName = name;
     if (!capitalizedName.isEmpty())
         capitalizedName[0] = capitalizedName[0].toUpper();
-    const QString fileName = Core::BaseFileWizard::buildFileName(path, capitalizedName, preferredSuffix(mimeType));
+    const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, capitalizedName, preferredSuffix(mimeType));
 
     Core::GeneratedFile file(fileName);
     file.setContents(fileContents(fileName));

src/plugins/android/javafilewizard.h

@@ -30,7 +30,7 @@
 #ifndef JAVAFILEWIZARD_H
 #define JAVAFILEWIZARD_H
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 namespace Android {
 namespace Internal {

src/plugins/coreplugin/basefilewizard.cpp → src/plugins/coreplugin/basefilewizardfactory.cpp

@@ -27,7 +27,7 @@
 **
 ****************************************************************************/
 
-#include "basefilewizard.h"
+#include "basefilewizardfactory.h"
 #include "icore.h"
 #include "ifilewizardextension.h"
 #include "mimedatabase.h"
@@ -175,12 +175,12 @@ void WizardEventLoop::rejected()
     \sa Core::Internal::WizardEventLoop
 */
 
-BaseFileWizard::ExtensionList BaseFileWizard::extensions() const
+BaseFileWizardFactory::ExtensionList BaseFileWizardFactory::extensions() const
 {
     return ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>();
 }
 
-void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues)
+void BaseFileWizardFactory::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues)
 {
     QTC_ASSERT(!path.isEmpty(), return);
 
@@ -322,7 +322,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
     Re-implement (calling the base implementation) to create files with CustomGeneratorAttribute set.
 */
 
-bool BaseFileWizard::writeFiles(const GeneratedFiles &files, QString *errorMessage)
+bool BaseFileWizardFactory::writeFiles(const GeneratedFiles &files, QString *errorMessage)
 {
     const GeneratedFile::Attributes noWriteAttributes
         = GeneratedFile::CustomGeneratorAttribute|GeneratedFile::KeepExistingFileAttribute;
@@ -338,7 +338,7 @@ bool BaseFileWizard::writeFiles(const GeneratedFiles &files, QString *errorMessa
     the title of corresponding progress item.
 */
 
-void BaseFileWizard::applyExtensionPageShortTitle(Utils::Wizard *wizard, int pageId)
+void BaseFileWizardFactory::applyExtensionPageShortTitle(Utils::Wizard *wizard, int pageId)
 {
     if (pageId < 0)
         return;
@@ -359,16 +359,16 @@ void BaseFileWizard::applyExtensionPageShortTitle(Utils::Wizard *wizard, int pag
     The default implementation opens editors with the newly generated files.
 */
 
-bool BaseFileWizard::postGenerateFiles(const QWizard *, const GeneratedFiles &l, QString *errorMessage)
+bool BaseFileWizardFactory::postGenerateFiles(const QWizard *, const GeneratedFiles &l, QString *errorMessage)
 {
-    return BaseFileWizard::postGenerateOpenEditors(l, errorMessage);
+    return BaseFileWizardFactory::postGenerateOpenEditors(l, errorMessage);
 }
 
 /*!
     Opens the editors for the files whose attribute is set accordingly.
 */
 
-bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage)
+bool BaseFileWizardFactory::postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage)
 {
     foreach (const GeneratedFile &file, l) {
         if (file.attributes() & GeneratedFile::OpenEditorAttribute) {
@@ -387,7 +387,7 @@ bool BaseFileWizard::postGenerateOpenEditors(const GeneratedFiles &l, QString *e
     can be overwritten at all, and then prompts the user with a summary.
 */
 
-BaseFileWizard::OverwriteResult BaseFileWizard::promptOverwrite(GeneratedFiles *files,
+BaseFileWizardFactory::OverwriteResult BaseFileWizardFactory::promptOverwrite(GeneratedFiles *files,
                                                                 QString *errorMessage) const
 {
     if (debugWizard)
@@ -469,7 +469,7 @@ BaseFileWizard::OverwriteResult BaseFileWizard::promptOverwrite(GeneratedFiles *
     one.
 */
 
-QString BaseFileWizard::buildFileName(const QString &path,
+QString BaseFileWizardFactory::buildFileName(const QString &path,
                                       const QString &baseName,
                                       const QString &extension)
 {
@@ -493,7 +493,7 @@ QString BaseFileWizard::buildFileName(const QString &path,
     Returns the preferred suffix for \a mimeType.
 */
 
-QString BaseFileWizard::preferredSuffix(const QString &mimeType)
+QString BaseFileWizardFactory::preferredSuffix(const QString &mimeType)
 {
     const QString rc = MimeDatabase::preferredSuffixByType(mimeType);
     if (rc.isEmpty())
@@ -534,7 +534,7 @@ QWizard *StandardFileWizard::createWizardDialog(QWidget *parent,
     standardWizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
     standardWizardDialog->setPath(wizardDialogParameters.defaultPath());
     foreach (QWizardPage *p, wizardDialogParameters.extensionPages())
-        BaseFileWizard::applyExtensionPageShortTitle(standardWizardDialog, standardWizardDialog->addPage(p));
+        BaseFileWizardFactory::applyExtensionPageShortTitle(standardWizardDialog, standardWizardDialog->addPage(p));
     return standardWizardDialog;
 }
 
@@ -553,4 +553,4 @@ GeneratedFiles StandardFileWizard::generateFiles(const QWizard *w,
 
 } // namespace Core
 
-#include "basefilewizard.moc"
+#include "basefilewizardfactory.moc"

src/plugins/coreplugin/basefilewizard.h → src/plugins/coreplugin/basefilewizardfactory.h

@@ -27,8 +27,8 @@
 **
 ****************************************************************************/
 
-#ifndef BASEFILEWIZARD_H
-#define BASEFILEWIZARD_H
+#ifndef BASEFILEWIZARDFACTORY_H
+#define BASEFILEWIZARDFACTORY_H
 
 #include "core_global.h"
 #include "generatedfile.h"
@@ -103,7 +103,7 @@ private:
     QVariantMap m_extraValues;
 };
 
-class CORE_EXPORT BaseFileWizard : public IWizardFactory
+class CORE_EXPORT BaseFileWizardFactory : public IWizardFactory
 {
     Q_OBJECT
 
@@ -138,7 +138,7 @@ protected:
     static bool postGenerateOpenEditors(const GeneratedFiles &l, QString *errorMessage = 0);
 };
 
-class CORE_EXPORT StandardFileWizard : public BaseFileWizard
+class CORE_EXPORT StandardFileWizard : public BaseFileWizardFactory
 {
     Q_OBJECT
 
@@ -154,4 +154,4 @@ protected:
 Q_DECLARE_OPERATORS_FOR_FLAGS(Core::GeneratedFile::Attributes)
 Q_DECLARE_OPERATORS_FOR_FLAGS(Core::WizardDialogParameters::DialogParameterFlags)
 
-#endif // BASEFILEWIZARD_H
+#endif // BASEFILEWIZARDFACTORY_H

src/plugins/coreplugin/coreplugin.pro

@@ -55,7 +55,7 @@ SOURCES += mainwindow.cpp \
     coreplugin.cpp \
     variablemanager.cpp \
     modemanager.cpp \
-    basefilewizard.cpp \
+    basefilewizardfactory.cpp \
     generatedfile.cpp \
     plugindialog.cpp \
     inavigationwidgetfactory.cpp \
@@ -158,7 +158,7 @@ HEADERS += mainwindow.h \
     coreplugin.h \
     variablemanager.h \
     modemanager.h \
-    basefilewizard.h \
+    basefilewizardfactory.h \
     generatedfile.h \
     plugindialog.h \
     inavigationwidgetfactory.h \

src/plugins/coreplugin/coreplugin.qbs

@@ -28,7 +28,7 @@ QtcPlugin {
     Group {
         name: "General"
         files: [
-            "basefilewizard.cpp", "basefilewizard.h",
+            "basefilewizardfactory.cpp", "basefilewizardfactory.h",
             "core.qrc",
             "core_global.h",
             "coreconstants.h",

src/plugins/cppeditor/cppclasswizard.cpp

@@ -158,7 +158,7 @@ QWizard *CppClassWizard::createWizardDialog(QWidget *parent,
 {
     CppClassWizardDialog *wizard = new CppClassWizardDialog(parent);
     foreach (QWizardPage *p, wizardDialogParameters.extensionPages())
-        BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
+        BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
     wizard->setPath(wizardDialogParameters.defaultPath());
     return wizard;
 }
@@ -168,8 +168,8 @@ Core::GeneratedFiles CppClassWizard::generateFiles(const QWizard *w, QString *er
     const CppClassWizardDialog *wizard = qobject_cast<const CppClassWizardDialog *>(w);
     const CppClassWizardParameters params = wizard->parameters();
 
-    const QString sourceFileName = Core::BaseFileWizard::buildFileName(params.path, params.sourceFile, sourceSuffix());
-    const QString headerFileName = Core::BaseFileWizard::buildFileName(params.path, params.headerFile, headerSuffix());
+    const QString sourceFileName = Core::BaseFileWizardFactory::buildFileName(params.path, params.sourceFile, sourceSuffix());
+    const QString headerFileName = Core::BaseFileWizardFactory::buildFileName(params.path, params.headerFile, headerSuffix());
 
     Core::GeneratedFile sourceFile(sourceFileName);
     Core::GeneratedFile headerFile(headerFileName);

src/plugins/cppeditor/cppclasswizard.h

@@ -30,7 +30,7 @@
 #ifndef CPPCLASSWIZARD_H
 #define CPPCLASSWIZARD_H
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 #include <utils/wizard.h>
 
@@ -87,7 +87,7 @@ private:
 };
 
 
-class CppClassWizard : public Core::BaseFileWizard
+class CppClassWizard : public Core::BaseFileWizardFactory
 {
     Q_OBJECT
 

src/plugins/cppeditor/cppfilewizard.cpp

@@ -53,7 +53,7 @@ Core::GeneratedFiles CppFileWizard::generateFilesFromPath(const QString &path,
                                                           QString * /*errorMessage*/) const
 {
     const QString mimeType = m_type == Source ? QLatin1String(Constants::CPP_SOURCE_MIMETYPE) : QLatin1String(Constants::CPP_HEADER_MIMETYPE);
-    const QString fileName = Core::BaseFileWizard::buildFileName(path, name, preferredSuffix(mimeType));
+    const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, name, preferredSuffix(mimeType));
 
     Core::GeneratedFile file(fileName);
     file.setContents(fileContents(m_type, fileName));

src/plugins/cppeditor/cppfilewizard.h

@@ -32,7 +32,7 @@
 
 #include "cppeditorenums.h"
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 namespace CppEditor {
 namespace Internal {

src/plugins/designer/cpp/formclasswizard.h

@@ -32,12 +32,12 @@
 
 #include "formclasswizardparameters.h"
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 namespace Designer {
 namespace Internal {
 
-class FormClassWizard : public Core::BaseFileWizard
+class FormClassWizard : public Core::BaseFileWizardFactory
 {
     Q_OBJECT
 

src/plugins/designer/cpp/formclasswizarddialog.cpp

@@ -32,7 +32,7 @@
 #include "formclasswizardparameters.h"
 #include <designer/formtemplatewizardpage.h>
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 #include <QDebug>
 
@@ -57,7 +57,7 @@ FormClassWizardDialog::FormClassWizardDialog(const WizardPageList &extensionPage
     wizardProgress()->item(ClassPageId)->setTitle(tr("Class Details"));
 
     foreach (QWizardPage *p, extensionPages)
-        Core::BaseFileWizard::applyExtensionPageShortTitle(this, addPage(p));
+        Core::BaseFileWizardFactory::applyExtensionPageShortTitle(this, addPage(p));
 }
 
 QString FormClassWizardDialog::path() const

src/plugins/designer/formwizard.cpp

@@ -55,7 +55,7 @@ Core::GeneratedFiles FormWizard::generateFiles(const QWizard *w,
                                                QString *errorMessage) const
 {
     const FormFileWizardDialog *wizard = qobject_cast<const FormFileWizardDialog *>(w);
-    const QString fileName = Core::BaseFileWizard::buildFileName(wizard->path(), wizard->fileName(),
+    const QString fileName = Core::BaseFileWizardFactory::buildFileName(wizard->path(), wizard->fileName(),
                                                                  preferredSuffix(QLatin1String(Constants::FORM_MIMETYPE)));
 
     const QString formTemplate = wizard->templateContents();

src/plugins/designer/formwizard.h

@@ -30,12 +30,12 @@
 #ifndef FORMWIZARD_H
 #define FORMWIZARD_H
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 namespace Designer {
 namespace Internal {
 
-class FormWizard : public Core::BaseFileWizard
+class FormWizard : public Core::BaseFileWizardFactory
 {
     Q_OBJECT
 

src/plugins/designer/formwizarddialog.cpp

@@ -30,7 +30,7 @@
 #include "formwizarddialog.h"
 #include "formtemplatewizardpage.h"
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 #include <utils/filewizardpage.h>
 
@@ -62,7 +62,7 @@ void FormWizardDialog::init(const WizardPageList &extensionPages)
         int id = FirstExtensionPageId;
         foreach (QWizardPage *p, extensionPages) {
             setPage(id, p);
-            Core::BaseFileWizard::applyExtensionPageShortTitle(this, id);
+            Core::BaseFileWizardFactory::applyExtensionPageShortTitle(this, id);
             id++;
         }
     }

src/plugins/genericprojectmanager/genericprojectwizard.cpp

@@ -140,7 +140,7 @@ QWizard *GenericProjectWizard::createWizardDialog(QWidget *parent,
     wizard->setPath(wizardDialogParameters.defaultPath());
 
     foreach (QWizardPage *p, wizardDialogParameters.extensionPages())
-        BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
+        BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
 
     return wizard;
 }

src/plugins/genericprojectmanager/genericprojectwizard.h

@@ -30,7 +30,7 @@
 #ifndef GENERICPROJECTWIZARD_H
 #define GENERICPROJECTWIZARD_H
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 #include <utils/wizard.h>
 
 namespace Utils { class FileWizardPage; }
@@ -58,7 +58,7 @@ public:
     FilesSelectionWizardPage *m_secondPage;
 };
 
-class GenericProjectWizard : public Core::BaseFileWizard
+class GenericProjectWizard : public Core::BaseFileWizardFactory
 {
     Q_OBJECT
 

src/plugins/glsleditor/glslfilewizard.cpp

@@ -65,7 +65,7 @@ Core::GeneratedFiles GLSLFileWizard::generateFiles(const QWizard *w,
     const QString path = wizardDialog->path();
     const QString name = wizardDialog->fileName();
 
-    const QString fileName = Core::BaseFileWizard::buildFileName(path, name, preferredSuffix(m_shaderType));
+    const QString fileName = Core::BaseFileWizardFactory::buildFileName(path, name, preferredSuffix(m_shaderType));
 
     Core::GeneratedFile file(fileName);
     file.setContents(fileContents(fileName, m_shaderType));
@@ -134,7 +134,7 @@ QWizard *GLSLFileWizard::createWizardDialog(QWidget *parent,
     wizardDialog->setWindowTitle(tr("New %1").arg(displayName()));
     wizardDialog->setPath(wizardDialogParameters.defaultPath());
     foreach (QWizardPage *p, wizardDialogParameters.extensionPages())
-        BaseFileWizard::applyExtensionPageShortTitle(wizardDialog, wizardDialog->addPage(p));
+        BaseFileWizardFactory::applyExtensionPageShortTitle(wizardDialog, wizardDialog->addPage(p));
     return wizardDialog;
 }
 

src/plugins/glsleditor/glslfilewizard.h

@@ -30,11 +30,11 @@
 #ifndef GLSLFILEWIZARD_H
 #define GLSLFILEWIZARD_H
 
-#include <coreplugin/basefilewizard.h>
+#include <coreplugin/basefilewizardfactory.h>
 
 namespace GLSLEditor {
 
-class GLSLFileWizard: public Core::BaseFileWizard
+class GLSLFileWizard: public Core::BaseFileWizardFactory
 {
     Q_OBJECT
 

src/plugins/projectexplorer/baseprojectwizarddialog.cpp

@@ -185,7 +185,7 @@ QString BaseProjectWizardDialog::uniqueProjectName(const QString &path)
 void BaseProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wizardPageList)
 {
     foreach (QWizardPage *p,wizardPageList)
-        Core::BaseFileWizard::applyExtensionPageShortTitle(this, addPage(p));
+        Core::BaseFileWizardFactory::applyExtensionPageShortTitle(this, addPage(p));
 }
 
 QString BaseProjectWizardDialog::selectedPlatform() const