ProjectExplorer: Using function objects for kit matching

Change-Id: I377298385df345a6d30217bb018964a64897d42e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

1 files changed, 5 insertions, 28 deletions

diff --git a/src/plugins/qtsupport/qtkitinformation.h b/src/plugins/qtsupport/qtkitinformation.h
index ebd5700246c..c9db7fedf19 100644
--- a/src/plugins/qtsupport/qtkitinformation.h
+++ b/src/plugins/qtsupport/qtkitinformation.h
@@ -66,6 +66,11 @@ public:
     static BaseQtVersion *qtVersion(const ProjectExplorer::Kit *k);
     static void setQtVersion(ProjectExplorer::Kit *k, const BaseQtVersion *v);
 
+    static ProjectExplorer::KitMatcher platformMatcher(const QString &platform);
+    static ProjectExplorer::KitMatcher qtVersionMatcher(const Core::FeatureSet &required = Core::FeatureSet(),
+                                 const QtVersionNumber &min = QtVersionNumber(0, 0, 0),
+                                 const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX));
+
 private slots:
     void qtVersionsChanged(const QList<int> &addedIds,
                            const QList<int> &removedIds,
@@ -73,34 +78,6 @@ private slots:
     void kitsWereLoaded();
 };
 
-class QTSUPPORT_EXPORT QtPlatformKitMatcher : public ProjectExplorer::KitMatcher
-{
-public:
-    QtPlatformKitMatcher(const QString &platform);
-
-    bool matches(const ProjectExplorer::Kit *k) const;
-
-private:
-    QString m_platform;
-};
-
-class QTSUPPORT_EXPORT QtVersionKitMatcher : public ProjectExplorer::KitMatcher
-{
-public:
-    explicit QtVersionKitMatcher(const Core::FeatureSet &required = Core::FeatureSet(),
-                                 const QtVersionNumber &min = QtVersionNumber(0, 0, 0),
-                                 const QtVersionNumber &max = QtVersionNumber(INT_MAX, INT_MAX, INT_MAX)) :
-        m_min(min), m_max(max), m_features(required)
-    { }
-
-    bool matches(const ProjectExplorer::Kit *k) const;
-
-private:
-    QtVersionNumber m_min;
-    QtVersionNumber m_max;
-    Core::FeatureSet m_features;
-};
-
 } // namespace QtSupport
 
 #endif // QTSUPPORT_QTKITINFORMATION_H