ProjectExplorer: Use more algorithms

Make heavy use of lambdas

Change-Id: I53197d0ffb4ae8eec076f15335cc22b74e1def1d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

1 files changed, 10 insertions, 16 deletions

diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp
index 207ce827f5..54c2ff783f 100644
--- a/src/plugins/projectexplorer/project.cpp
+++ b/src/plugins/projectexplorer/project.cpp
@@ -43,6 +43,7 @@
 #include <projectexplorer/kitmanager.h>
 #include <limits>
 #include <utils/qtcassert.h>
+#include <utils/algorithm.h>
 
 /*!
     \class ProjectExplorer::Project
@@ -226,20 +227,16 @@ void Project::setActiveTarget(Target *target)
 
 Target *Project::target(const Core::Id id) const
 {
-    foreach (Target *target, d->m_targets) {
-        if (target->id() == id)
-            return target;
-    }
-    return 0;
+    return Utils::findOr(d->m_targets, 0, [&id](Target *target) {
+        return target->id() == id;
+    });
 }
 
 Target *Project::target(Kit *k) const
 {
-    foreach (Target *target, d->m_targets) {
-        if (target->kit() == k)
-            return target;
-    }
-    return 0;
+    return Utils::findOr(d->m_targets, 0, [&k](Target *target) {
+        return target->kit() == k;
+    });
 }
 
 bool Project::supportsKit(Kit *k, QString *errorMessage) const
@@ -501,12 +498,9 @@ void Project::setup(QList<const BuildInfo *> infoList)
             continue;
         Target *t = target(k);
         if (!t) {
-            foreach (Target *i, toRegister) {
-                if (i->kit() == k) {
-                    t = i;
-                    break;
-                }
-            }
+            t = Utils::findOr(toRegister, 0, [&k](Target *i){
+                return i->kit() == k;
+            });
         }
         if (!t) {
             t = new Target(this, k);