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

KitManager: Get rid of KitMatcher class

Browse Source 
Use std::function instead. Clean up API while at it.

Change-Id: I6e401ab57f5375e36710c30508c596af3f4b3385
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
Tobias Hunger
2017-01-11 17:25:58 +01:00
parent 1d4bf8c157
commit 25fbcca96b
28 changed files with 126 additions and 157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/project.cpp
View File

@@ -100,8 +100,8 @@ public:
QVariantMap m_pluginSettings;
Internal::UserFileAccessor *m_accessor = nullptr;
KitMatcher m_requiredKitMatcher;
KitMatcher m_preferredKitMatcher;
Kit::Predicate m_requiredKitPredicate;
Kit::Predicate m_preferredKitPredicate;
Utils::MacroExpander m_macroExpander;
};
@@ -441,7 +441,7 @@ Target *Project::restoreTarget(const QVariantMap &data)
return nullptr;
}
Kit *k = KitManager::find(id);
Kit *k = KitManager::kit(id);
if (!k) {
qWarning("Warning: No kit '%s' found. Continuing.", qPrintable(id.toString()));
return nullptr;
@@ -685,7 +685,7 @@ void Project::setup(QList<const BuildInfo *> infoList)
{
QList<Target *> toRegister;
foreach (const BuildInfo *info, infoList) {
Kit *k = KitManager::find(info->kitId);
Kit *k = KitManager::kit(info->kitId);
if (!k)
continue;
Target *t = target(k);
@@ -719,24 +719,24 @@ ProjectImporter *Project::projectImporter() const
return nullptr;
}
KitMatcher Project::requiredKitMatcher() const
Kit::Predicate Project::requiredKitPredicate() const
{
return d->m_requiredKitMatcher;
return d->m_requiredKitPredicate;
}
void Project::setRequiredKitMatcher(const KitMatcher &matcher)
void Project::setRequiredKitPredicate(const Kit::Predicate &predicate)
{
d->m_requiredKitMatcher = matcher;
d->m_requiredKitPredicate = predicate;
}
KitMatcher Project::preferredKitMatcher() const
Kit::Predicate Project::preferredKitPredicate() const
{
return d->m_preferredKitMatcher;
return d->m_preferredKitPredicate;
}
void Project::setPreferredKitMatcher(const KitMatcher &matcher)
void Project::setPreferredKitPredicate(const Kit::Predicate &predicate)
{
d->m_preferredKitMatcher = matcher;
d->m_preferredKitPredicate = predicate;
}
void Project::onBuildDirectoryChanged()