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

Wizards: Simplify code a bit

Browse Source 
Change-Id: I3d80ca7810001cb02fe7e147fbfa013a9aaaebbf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-05-29 11:43:03 +02:00
parent c95b9d1d0c
commit 435f6caa1a
1 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/coreplugin/iwizardfactory.cpp
View File

@@ -38,7 +38,6 @@
#include <extensionsystem/pluginspec.h> #include <extensionsystem/pluginspec.h>
#include <extensionsystem/pluginmanager.h> #include <extensionsystem/pluginmanager.h>
#include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <QAction> #include <QAction>
@@ -159,16 +158,15 @@ bool s_areFactoriesLoaded = false;
} }
/* A utility to find all wizards supporting a view mode and matching a predicate */ /* A utility to find all wizards supporting a view mode and matching a predicate */
template <class Predicate> QList<IWizardFactory*> findWizardFactories(const std::function<bool(IWizardFactory*)> &predicate)
QList<IWizardFactory*> findWizardFactories(Predicate predicate)
{ {
// Filter all wizards
const QList<IWizardFactory *> allFactories = IWizardFactory::allWizardFactories(); const QList<IWizardFactory *> allFactories = IWizardFactory::allWizardFactories();
QList<IWizardFactory *> rc; QList<IWizardFactory *> rc;
const QList<IWizardFactory*>::const_iterator cend = allFactories.constEnd(); auto cend = allFactories.constEnd();
for (QList<IWizardFactory*>::const_iterator it = allFactories.constBegin(); it != cend; ++it) for (auto it = allFactories.constBegin(); it != cend; ++it) {
if (predicate(*(*it))) if (predicate(*it))
rc.push_back(*it); rc.push_back(*it);
}
return rc; return rc;
} }
@@ -218,18 +216,9 @@ QList<IWizardFactory*> IWizardFactory::allWizardFactories()
} }
// Utility to find all registered wizards of a certain kind // Utility to find all registered wizards of a certain kind
class WizardKindPredicate {
public:
WizardKindPredicate(IWizardFactory::WizardKind kind) : m_kind(kind) {}
bool operator()(const IWizardFactory &w) const { return w.kind() == m_kind; }
private:
const IWizardFactory::WizardKind m_kind;
};
QList<IWizardFactory*> IWizardFactory::wizardFactoriesOfKind(WizardKind kind) QList<IWizardFactory*> IWizardFactory::wizardFactoriesOfKind(WizardKind kind)
{ {
return findWizardFactories(WizardKindPredicate(kind)); return findWizardFactories([kind](IWizardFactory *f) { return f->kind() == kind; });
} }
QString IWizardFactory::runPath(const QString &defaultPath) QString IWizardFactory::runPath(const QString &defaultPath)