Replace some uses of find_if with any_of and none_of

Calls to find_if that just compare the result with an end iterator are
replaced by calls to any_of or none_of. This leads to shorter, more
expressive code. For increased readability, versions of any_of/none_of
are provided that operate on whole containers instead of iterators.

Change-Id: Ia4ff449176f22f1820635e810724983866d3265e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 4 insertions, 4 deletions

diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp
index 9cd5be283..7f9d98d81 100644
--- a/src/app/qbs-setup-qt/setupqt.cpp
+++ b/src/app/qbs-setup-qt/setupqt.cpp
@@ -61,6 +61,7 @@
 #include <algorithm>
 
 namespace qbs {
+using Internal::none_of;
 using Internal::contains;
 using Internal::HostOsInfo;
 using Internal::Tr;
@@ -110,10 +111,9 @@ QList<QtEnvironment> SetupQt::fetchEnvironments()
     const auto qmakePaths = collectQmakePaths();
     for (const QString &qmakePath : qmakePaths) {
         const QtEnvironment env = fetchEnvironment(qmakePath);
-        if (std::find_if(qtEnvironments.cbegin(), qtEnvironments.cend(),
-                         [&env](const QtEnvironment &otherEnv) {
-                                 return env.includePath == otherEnv.includePath;
-                          }) == qtEnvironments.cend()) {
+        if (none_of(qtEnvironments, [&env](const QtEnvironment &otherEnv) {
+                        return env.includePath == otherEnv.includePath;
+                    })) {
             qtEnvironments.push_back(env);
         }
     }