From c4ab83f5ce66eebd3880f36dad9d0f7071304848 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 27 May 2014 14:12:36 +0200 Subject: [PATCH] BaseFileWizardFactory: Remove ExtensionList type and extensions() method Change-Id: Ia68924fac19739e26ddb1c660eb23d2df3e5b0c1 Reviewed-by: Orgad Shaneh --- src/plugins/coreplugin/basefilewizardfactory.cpp | 9 ++------- src/plugins/coreplugin/basefilewizardfactory.h | 4 ---- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/src/plugins/coreplugin/basefilewizardfactory.cpp b/src/plugins/coreplugin/basefilewizardfactory.cpp index 9be35b87d6..5e35d7ba23 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.cpp +++ b/src/plugins/coreplugin/basefilewizardfactory.cpp @@ -177,20 +177,15 @@ void WizardEventLoop::rejected() \sa Core::Internal::WizardEventLoop */ -BaseFileWizardFactory::ExtensionList BaseFileWizardFactory::extensions() const -{ - return ExtensionSystem::PluginManager::getObjects(); -} - void BaseFileWizardFactory::runWizard(const QString &path, QWidget *parent, const QString &platform, const QVariantMap &extraValues) { QTC_ASSERT(!path.isEmpty(), return); QString errorMessage; // Compile extension pages, purge out unused ones - ExtensionList extensionList = extensions(); + QList extensionList = ExtensionSystem::PluginManager::getObjects(); WizardPageList allExtensionPages; - for (ExtensionList::iterator it = extensionList.begin(); it != extensionList.end(); ) { + for (auto it = extensionList.begin(); it != extensionList.end(); ) { const WizardPageList extensionPages = (*it)->extensionPages(this); if (extensionPages.empty()) { it = extensionList.erase(it); diff --git a/src/plugins/coreplugin/basefilewizardfactory.h b/src/plugins/coreplugin/basefilewizardfactory.h index 643609a4a7..2ab73f0e5a 100644 --- a/src/plugins/coreplugin/basefilewizardfactory.h +++ b/src/plugins/coreplugin/basefilewizardfactory.h @@ -53,7 +53,6 @@ namespace Utils { class Wizard; } namespace Core { class BaseFileWizard; -class IFileWizardExtension; class CORE_EXPORT WizardDialogParameters { @@ -117,9 +116,6 @@ public: protected: typedef QList WizardPageList; - typedef QList ExtensionList; - - virtual ExtensionList extensions() const; virtual BaseFileWizard *create(QWidget *parent, const WizardDialogParameters ¶meters) const = 0; -- GitLab