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

BaseFileWizardFactory: Remove ExtensionList type and extensions() method

Browse Source 
Change-Id: Ia68924fac19739e26ddb1c660eb23d2df3e5b0c1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2014-05-27 14:12:36 +02:00
parent 55f625465d
commit c4ab83f5ce
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/basefilewizardfactory.cpp
View File

@@ -177,20 +177,15 @@ void WizardEventLoop::rejected()
\sa Core::Internal::WizardEventLoop \sa Core::Internal::WizardEventLoop
*/ */
BaseFileWizardFactory::ExtensionList BaseFileWizardFactory::extensions() const
{
return ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>();
}
void BaseFileWizardFactory::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); QTC_ASSERT(!path.isEmpty(), return);
QString errorMessage; QString errorMessage;
// Compile extension pages, purge out unused ones // Compile extension pages, purge out unused ones
ExtensionList extensionList = extensions(); QList<IFileWizardExtension *> extensionList = ExtensionSystem::PluginManager::getObjects<IFileWizardExtension>();
WizardPageList allExtensionPages; 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); const WizardPageList extensionPages = (*it)->extensionPages(this);
if (extensionPages.empty()) { if (extensionPages.empty()) {
it = extensionList.erase(it); it = extensionList.erase(it);

4
src/plugins/coreplugin/basefilewizardfactory.h
View File

@@ -53,7 +53,6 @@ namespace Utils { class Wizard; }
namespace Core { namespace Core {
class BaseFileWizard; class BaseFileWizard;
class IFileWizardExtension;
class CORE_EXPORT WizardDialogParameters class CORE_EXPORT WizardDialogParameters
{ {
@@ -117,9 +116,6 @@ public:
protected: protected:
typedef QList<QWizardPage *> WizardPageList; typedef QList<QWizardPage *> WizardPageList;
typedef QList<Core::IFileWizardExtension*> ExtensionList;
virtual ExtensionList extensions() const;
virtual BaseFileWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const = 0; virtual BaseFileWizard *create(QWidget *parent, const WizardDialogParameters &parameters) const = 0;