feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BaseFileWizard: Rename selectExtensions method

Browse Source 
Rename selectExtensions method of BaseFileWizard to extensions and
fix the fallout.

Mark the method as const while at it.

Change-Id: I716988fec464e06df6b128e4b3754164e61cd7a1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-14 12:59:19 +01:00
parent 6b7c429c11
commit ac78d31549
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/coreplugin/basefilewizard.cpp
View File

@@ -175,7 +175,7 @@ void WizardEventLoop::rejected()
\sa Core::Internal::WizardEventLoop \sa Core::Internal::WizardEventLoop
*/ */
BaseFileWizard::ExtensionList BaseFileWizard::selectExtensions() BaseFileWizard::ExtensionList BaseFileWizard::extensions() const
{ {
return ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>(); return ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>();
} }
@@ -186,12 +186,12 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
QString errorMessage; QString errorMessage;
// Compile extension pages, purge out unused ones // Compile extension pages, purge out unused ones
ExtensionList extensions = selectExtensions(); ExtensionList extensionList = extensions();
WizardPageList allExtensionPages; WizardPageList allExtensionPages;
for (ExtensionList::iterator it = extensions.begin(); it != extensions.end(); ) { for (ExtensionList::iterator it = extensionList.begin(); it != extensionList.end(); ) {
const WizardPageList extensionPages = (*it)->extensionPages(this); const WizardPageList extensionPages = (*it)->extensionPages(this);
if (extensionPages.empty()) { if (extensionPages.empty()) {
it = extensions.erase(it); it = extensionList.erase(it);
} else { } else {
allExtensionPages += extensionPages; allExtensionPages += extensionPages;
++it; ++it;
@@ -199,7 +199,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
} }
if (debugWizard) if (debugWizard)
qDebug() << Q_FUNC_INFO << path << parent << "exs" << extensions.size() << allExtensionPages.size(); qDebug() << Q_FUNC_INFO << path << parent << "exs" << extensionList.size() << allExtensionPages.size();
QWizardPage *firstExtensionPage = 0; QWizardPage *firstExtensionPage = 0;
if (!allExtensionPages.empty()) if (!allExtensionPages.empty())
@@ -244,7 +244,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
} }
} }
if (firstExtensionPageHit) if (firstExtensionPageHit)
foreach (IFileWizardExtension *ex, extensions) foreach (IFileWizardExtension *ex, extensionList)
ex->firstExtensionPageShown(files, extraValues); ex->firstExtensionPageShown(files, extraValues);
if (accepted) if (accepted)
break; break;
@@ -262,7 +262,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
break; break;
} }
foreach (IFileWizardExtension *ex, extensions) { foreach (IFileWizardExtension *ex, extensionList) {
for (int i = 0; i < files.count(); i++) { for (int i = 0; i < files.count(); i++) {
ex->applyCodeStyle(&files[i]); ex->applyCodeStyle(&files[i]);
} }
@@ -276,7 +276,7 @@ void BaseFileWizard::runWizard(const QString &path, QWidget *parent, const QStri
bool removeOpenProjectAttribute = false; bool removeOpenProjectAttribute = false;
// Run the extensions // Run the extensions
foreach (IFileWizardExtension *ex, extensions) { foreach (IFileWizardExtension *ex, extensionList) {
bool remove; bool remove;
if (!ex->processFiles(files, &remove, &errorMessage)) { if (!ex->processFiles(files, &remove, &errorMessage)) {
if (!errorMessage.isEmpty()) if (!errorMessage.isEmpty())

2
src/plugins/coreplugin/basefilewizard.h
View File

@@ -118,7 +118,7 @@ protected:
typedef QList<QWizardPage *> WizardPageList; typedef QList<QWizardPage *> WizardPageList;
typedef QList<Core::IFileWizardExtension*> ExtensionList; typedef QList<Core::IFileWizardExtension*> ExtensionList;
virtual ExtensionList selectExtensions(); virtual ExtensionList extensions() const;
virtual QWizard *createWizardDialog(QWidget *parent, virtual QWizard *createWizardDialog(QWidget *parent,
const WizardDialogParameters &wizardDialogParameters) const = 0; const WizardDialogParameters &wizardDialogParameters) const = 0;

2
src/plugins/qnx/cascadesimport/cascadesimportwizard.cpp
View File

@@ -124,7 +124,7 @@ CascadesImportWizard::CascadesImportWizard()
setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY)); setDisplayCategory(QLatin1String(ProjectExplorer::Constants::IMPORT_WIZARD_CATEGORY_DISPLAY));
} }
Core::BaseFileWizard::ExtensionList CascadesImportWizard::selectExtensions() Core::BaseFileWizard::ExtensionList CascadesImportWizard::extensions() const
{ {
return Core::BaseFileWizard::ExtensionList(); return Core::BaseFileWizard::ExtensionList();
} }

2
src/plugins/qnx/cascadesimport/cascadesimportwizard.h
View File

@@ -66,7 +66,7 @@ public:
CascadesImportWizard(); CascadesImportWizard();
protected: protected:
ExtensionList selectExtensions(); ExtensionList extensions() const;
QWizard* createWizardDialog(QWidget *parent, QWizard* createWizardDialog(QWidget *parent,
const Core::WizardDialogParameters &wizardDialogParameters) const; const Core::WizardDialogParameters &wizardDialogParameters) const;
Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const; Core::GeneratedFiles generateFiles(const QWizard *w, QString *errorMessage) const;