Commit 93564323 authored by Tobias Hunger's avatar Tobias Hunger

IWizardFactory: Rename BaseFileWizard to BaseFileWizardFactory

Change-Id: I92977422bf8088b53e920370737907d60cf8708b
Reviewed-by: Orgad Shaneh's avatarOrgad Shaneh <orgads@gmail.com>
parent 857ebee2
......@@ -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));
......
......@@ -30,7 +30,7 @@
#ifndef JAVAFILEWIZARD_H
#define JAVAFILEWIZARD_H
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
namespace Android {
namespace Internal {
......
......@@ -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"
......@@ -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
......@@ -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 \
......
......@@ -28,7 +28,7 @@ QtcPlugin {
Group {
name: "General"
files: [
"basefilewizard.cpp", "basefilewizard.h",
"basefilewizardfactory.cpp", "basefilewizardfactory.h",
"core.qrc",
"core_global.h",
"coreconstants.h",
......
......@@ -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);
......
......@@ -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
......
......@@ -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));
......
......@@ -32,7 +32,7 @@
#include "cppeditorenums.h"
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
namespace CppEditor {
namespace Internal {
......
......@@ -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
......
......@@ -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
......
......@@ -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();
......
......@@ -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
......
......@@ -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++;
}
}
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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;
}
......
......@@ -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
......
......@@ -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
......
......@@ -31,7 +31,7 @@
#define BASEPROJECTWIZARDDIALOG_H
#include "projectexplorer_export.h"
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <utils/wizard.h>
namespace Utils { class ProjectIntroPage; }
......
......@@ -147,7 +147,7 @@ void CustomWizard::initWizardDialog(Utils::Wizard *wizard, const QString &defaul
if (!parameters()->fieldPageTitle.isEmpty())
customPage->setTitle(parameters()->fieldPageTitle);
foreach (QWizardPage *ep, extensionPages)
BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(ep));
BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(ep));
if (CustomWizardPrivate::verbose)
qDebug() << "initWizardDialog" << wizard << wizard->pageIds();
}
......@@ -251,7 +251,7 @@ Core::GeneratedFiles CustomWizard::generateFiles(const QWizard *dialog, QString
bool CustomWizard::writeFiles(const Core::GeneratedFiles &files, QString *errorMessage)
{
if (!Core::BaseFileWizard::writeFiles(files, errorMessage))
if (!Core::BaseFileWizardFactory::writeFiles(files, errorMessage))
return false;
if (d->m_parameters->filesGeneratorScript.isEmpty())
return true;
......@@ -534,7 +534,7 @@ void CustomProjectWizard::initProjectWizardDialog(BaseProjectWizardDialog *w,
cp->setTitle(pa->fieldPageTitle);
}
foreach (QWizardPage *ep, extensionPages)
BaseFileWizard::applyExtensionPageShortTitle(w, w->addPage(ep));
BaseFileWizardFactory::applyExtensionPageShortTitle(w, w->addPage(ep));
w->setPath(defaultPath);
w->setProjectName(BaseProjectWizardDialog::uniqueProjectName(defaultPath));
......@@ -575,7 +575,7 @@ bool CustomProjectWizard::postGenerateOpen(const Core::GeneratedFiles &l, QStrin
return false;
}
}
return BaseFileWizard::postGenerateOpenEditors(l, errorMessage);
return BaseFileWizardFactory::postGenerateOpenEditors(l, errorMessage);
}
bool CustomProjectWizard::postGenerateFiles(const QWizard *, const Core::GeneratedFiles &l, QString *errorMessage)
......
......@@ -32,7 +32,7 @@
#include "../projectexplorer_export.h"
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <QSharedPointer>
#include <QList>
......@@ -83,7 +83,7 @@ public:
};
// Documentation inside.
class PROJECTEXPLORER_EXPORT CustomWizard : public Core::BaseFileWizard
class PROJECTEXPLORER_EXPORT CustomWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT
......
......@@ -30,7 +30,7 @@
#ifndef CUSTOMWIZARDPARAMETERS_H
#define CUSTOMWIZARDPARAMETERS_H
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <QStringList>
#include <QMap>
......
......@@ -38,7 +38,7 @@
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <coreplugin/icore.h>
#include <coreplugin/iversioncontrol.h>
#include <coreplugin/vcsmanager.h>
......
......@@ -61,7 +61,7 @@ QWizard *ClassWizard::createWizardDialog(
{
ClassWizardDialog *wizard = new ClassWizardDialog(parent);
foreach (QWizardPage *p, params.extensionPages())
BaseFileWizard::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
BaseFileWizardFactory::applyExtensionPageShortTitle(wizard, wizard->addPage(p));
wizard->setPath(params.defaultPath());
wizard->setExtraValues(params.extraValues());
return wizard;
......@@ -75,7 +75,7 @@ Core::GeneratedFiles ClassWizard::generateFiles(const QWizard *w,
const ClassWizardDialog *wizard = qobject_cast<const ClassWizardDialog *>(w);
const ClassWizardParameters params = wizard->parameters();
const QString fileName = Core::BaseFileWizard::buildFileName(
const QString fileName = Core::BaseFileWizardFactory::buildFileName(
params.path, params.fileName, QLatin1String(Constants::C_PY_EXTENSION));
Core::GeneratedFile sourceFile(fileName);
......
......@@ -30,7 +30,7 @@
#ifndef PYTHONEDITOR_CLASSWIZARD_H
#define PYTHONEDITOR_CLASSWIZARD_H
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <utils/wizard.h>
namespace Utils { class NewClassWidget; }
......@@ -41,7 +41,7 @@ namespace Internal {
class ClassWizardDialog;
class ClassWizard : public Core::BaseFileWizard
class ClassWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT
......
......@@ -31,7 +31,7 @@
#include "pythonclassnamepage.h"
#include <utils/newclasswidget.h>
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
namespace PythonEditor {
namespace Internal {
......
......@@ -84,7 +84,7 @@ Core::GeneratedFiles FileWizard::generateFiles(const QWizard *dialog,
QString folder = pWizard->path();
QString name = pWizard->fileName();
name = Core::BaseFileWizard::buildFileName(
name = Core::BaseFileWizardFactory::buildFileName(
folder, name, QLatin1String(Constants::C_PY_EXTENSION));
Core::GeneratedFile file(name);
file.setContents(QLatin1String(Constants::C_PY_SOURCE_CONTENT));
......
......@@ -30,11 +30,11 @@
#ifndef PYTHONFILEWIZARD_H
#define PYTHONFILEWIZARD_H
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
namespace PythonEditor {
class FileWizard : public Core::BaseFileWizard
class FileWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT
......
......@@ -30,7 +30,7 @@
#include "plugingenerator.h"
#include "pluginoptions.h"
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#include <utils/fileutils.h>
......
......@@ -35,7 +35,7 @@
#include <QPair>
#ifndef CREATORLESSTEST
#include <coreplugin/basefilewizard.h>
#include <coreplugin/basefilewizardfactory.h>
#endif // CREATORLESSTEST
QT_FORWARD_DECLARE_CLASS(QTextStream)
......
......@@ -66,7 +66,7 @@ private:
};
/// \internal
class QMAKEPROJECTMANAGER_EXPORT AbstractMobileAppWizard : public Core::BaseFileWizard
class QMAKEPROJECTMANAGER_EXPORT AbstractMobileAppWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT
......
......@@ -84,12 +84,12 @@ Core::GeneratedFiles
// Create files: Source
const QString sourceFileName = Core::BaseFileWizard::buildFileName(projectPath, QLatin1String(mainSourceFileC), sourceSuffix());
const QString sourceFileName = Core::BaseFileWizardFactory::buildFileName(projectPath, QLatin1String(mainSourceFileC), sourceSuffix());
Core::GeneratedFile source(sourceFileName);
source.setContents(CppTools::AbstractEditorSupport::licenseTemplate(sourceFileName) + QLatin1String(mainCppC));
source.setAttributes(Core::GeneratedFile::OpenEditorAttribute);
// Create files: Profile
const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.fileName, profileSuffix());
const QString profileName = Core::BaseFileWizardFactory::buildFileName(projectPath, params.fileName, profileSuffix());
Core::GeneratedFile profile(profileName);
profile.setAttributes(Core::GeneratedFile::OpenProjectAttribute);
......
......@@ -67,7 +67,7 @@ Core::GeneratedFiles
const EmptyProjectWizardDialog *wizard = qobject_cast< const EmptyProjectWizardDialog *>(w);
const QtProjectParameters params = wizard->parameters();
const QString projectPath = params.projectPath();
const QString profileName = Core::BaseFileWizard::buildFileName(projectPath, params.fileName, profileSuffix());
const QString profileName = Core::BaseFileWizardFactory::buildFileName(projectPath, params.fileName, profileSuffix());
Core::GeneratedFile profile(profileName);
profile.setAttributes(Core::GeneratedFile::OpenProjectAttribute | Core::GeneratedFile::OpenEditorAttribute);
......
......@@ -306,7 +306,7 @@ QList<Core::Id> BaseQmakeProjectWizardDialog::selectedKits() const
void BaseQmakeProjectWizardDialog::addExtensionPages(const QList<QWizardPage *> &wizardPageList)
{
foreach (QWizardPage *p,wizardPageList)
Core::BaseFileWizard::applyExtensionPageShortTitle(this, addPage(p));
Core::BaseFileWizardFactory::applyExtensionPageShortTitle(this, addPage(p));
}
void BaseQmakeProjectWizardDialog::generateProfileName(const QString &name, const QString &path)
......
......@@ -55,7 +55,7 @@ class ModulesPage;
* the finished project in postGenerateFiles().
* The pro-file must be the last one of the generated files. */
class QtWizard : public Core::BaseFileWizard
class QtWizard : public Core::BaseFileWizardFactory
{
Q_OBJECT