diff options
author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-02-02 18:26:51 +0100 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2016-02-03 08:29:08 +0000 |
commit | f4296d7504e87d291232bc13caa99a439d2393ab (patch) | |
tree | 66892ae3ded5333a7036401031effaf228921d3a /src/plugins/qtsupport/qtkitinformation.cpp | |
parent | 6a3e687d140cad3dec006b2d5fa8982d4b10f31c (diff) |
ProjectExplorer: Modernize
* Use override where appropriate
* Use pragma once
* Make more constructors explicit
Change-Id: I2865fe10f288e3de570826058e43b70a0cb4ee37
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/qtsupport/qtkitinformation.cpp')
-rw-r--r-- | src/plugins/qtsupport/qtkitinformation.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/qtsupport/qtkitinformation.cpp b/src/plugins/qtsupport/qtkitinformation.cpp index eea7e32c8d0..f4d9220785e 100644 --- a/src/plugins/qtsupport/qtkitinformation.cpp +++ b/src/plugins/qtsupport/qtkitinformation.cpp @@ -220,16 +220,16 @@ void QtKitInformation::kitsWereLoaded() KitMatcher QtKitInformation::platformMatcher(Core::Id platform) { - return std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool { + return KitMatcher(std::function<bool(const Kit *)>([platform](const Kit *kit) -> bool { BaseQtVersion *version = QtKitInformation::qtVersion(kit); return version && version->targetDeviceTypes().contains(platform); - }); + })); } KitMatcher QtKitInformation::qtVersionMatcher(const QSet<Core::Id> &required, const QtVersionNumber &min, const QtVersionNumber &max) { - return std::function<bool(const Kit *)>([required, min, max](const Kit *kit) -> bool { + return KitMatcher(std::function<bool(const Kit *)>([required, min, max](const Kit *kit) -> bool { BaseQtVersion *version = QtKitInformation::qtVersion(kit); if (!version) return false; @@ -239,7 +239,7 @@ KitMatcher QtKitInformation::qtVersionMatcher(const QSet<Core::Id> &required, if (max.majorVersion > -1 && current > max) return false; return version->availableFeatures().contains(required); - }); + })); } QSet<Core::Id> QtKitInformation::supportedPlatforms(const Kit *k) const |