Fix Clang-Tidy & Clazy 'readability-use-anyofallof' warnings

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

9 files changed, 42 insertions, 46 deletions

diff --git a/src/app/qbs/parser/commandlineparser.cpp b/src/app/qbs/parser/commandlineparser.cpp
index cc7da79dc..0f70b3fe9 100644
--- a/src/app/qbs/parser/commandlineparser.cpp
+++ b/src/app/qbs/parser/commandlineparser.cpp
@@ -58,6 +58,7 @@
 #include <tools/qttools.h>
 #include <tools/settings.h>
 #include <tools/settingsrepresentation.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qcoreapplication.h>
 #include <QtCore/qdir.h>
@@ -588,11 +589,9 @@ QString CommandLineParser::CommandLineParserPrivate::propertyName(const QString
 bool CommandLineParser::CommandLineParserPrivate::checkForExistingBuildConfiguration(
         const QList<QVariantMap> &buildConfigs, const QString &configurationName)
 {
-    for (const QVariantMap &buildConfig : buildConfigs) {
-        if (configurationName == getBuildConfigurationName(buildConfig))
-            return true;
-    }
-    return false;
+    return Internal::any_of(buildConfigs, [&configurationName](const auto &buildConfig) {
+        return configurationName == getBuildConfigurationName(buildConfig);
+    });
 }
 
 bool CommandLineParser::CommandLineParserPrivate::withNonDefaultProducts() const
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index 82dae98b5..23d141dd8 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -62,9 +62,10 @@
 #include <logging/translator.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
-#include <tools/scripttools.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/scripttools.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
@@ -493,12 +494,9 @@ static bool existsPath_impl(BuildGraphNode *u, BuildGraphNode *v, NodeSet *seen)
     if (!seen->insert(u).second)
         return false;
 
-    for (BuildGraphNode * const childNode : qAsConst(u->children)) {
-        if (existsPath_impl(childNode, v, seen))
-            return true;
-    }
-
-    return false;
+    return Internal::any_of(u->children, [v, seen](const auto &child) {
+        return existsPath_impl(child, v, seen);
+    });
 }
 
 static bool existsPath(BuildGraphNode *u, BuildGraphNode *v)
diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp
index 73c84db8e..145bca293 100644
--- a/src/lib/corelib/buildgraph/buildgraphloader.cpp
+++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp
@@ -65,6 +65,7 @@
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qdir.h>
@@ -479,12 +480,9 @@ bool BuildGraphLoader::probeExecutionForced(
     if (!restoredProject->probes.empty())
         return true;
 
-    for (const auto &p : qAsConst(restoredProducts)) {
-        if (!p->probes.empty())
-            return true;
-    }
-
-    return false;
+    return Internal::any_of(restoredProducts, [](const auto &p) {
+        return !p->probes.empty();
+    });
 }
 
 bool BuildGraphLoader::hasEnvironmentChanged(const TopLevelProjectConstPtr &restoredProject) const
diff --git a/src/lib/corelib/buildgraph/transformerchangetracking.cpp b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
index f85e18345..710590654 100644
--- a/src/lib/corelib/buildgraph/transformerchangetracking.cpp
+++ b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
@@ -39,6 +39,7 @@
 #include <tools/fileinfo.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qvariant.h>
 
@@ -209,11 +210,9 @@ bool TrafoChangeTracker::isExportedModuleUpToDate(const QString &productName,
 bool TrafoChangeTracker::areExportedModulesUpToDate(
         const std::unordered_map<QString, ExportedModule> &exportedModules) const
 {
-    for (const auto &kv : exportedModules) {
-        if (!isExportedModuleUpToDate(kv.first, kv.second))
-            return false;
-    }
-    return true;
+    return Internal::all_of(exportedModules, [this](const auto &kv) {
+        return isExportedModuleUpToDate(kv.first, kv.second);
+    });
 }
 
 const Artifact *TrafoChangeTracker::getArtifact(const QString &filePath,
diff --git a/src/lib/corelib/language/language.cpp b/src/lib/corelib/language/language.cpp
index 8bb855564..8c90d0ba8 100644
--- a/src/lib/corelib/language/language.cpp
+++ b/src/lib/corelib/language/language.cpp
@@ -57,9 +57,10 @@
 #include <tools/hostosinfo.h>
 #include <tools/error.h>
 #include <tools/fileinfo.h>
-#include <tools/scripttools.h>
 #include <tools/qbsassert.h>
 #include <tools/qttools.h>
+#include <tools/scripttools.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qcryptographichash.h>
@@ -824,14 +825,13 @@ bool listsAreEqual(const L &l1, const L &l2)
     using V = typename L::value_type;
     const QMap<QString, V> map1 = listToMap(l1);
     const QMap<QString, V> map2 = listToMap(l2);
-    for (const QString &key : map1.keys()) {
+    const auto keys = map1.keys();
+    return Internal::all_of(keys, [&map1, &map2](const auto &key) {
         const V &value2 = map2.value(key);
         if (!value2)
             return false;
-        if (!equals(map1.value(key).get(), value2.get()))
-            return false;
-    }
-    return true;
+        return equals(map1.value(key).get(), value2.get());
+    });
 }
 
 QString keyFromElem(const SourceArtifactPtr &sa) { return sa->absoluteFilePath; }
diff --git a/src/lib/corelib/tools/fileinfo.cpp b/src/lib/corelib/tools/fileinfo.cpp
index 058ead049..f56762c04 100644
--- a/src/lib/corelib/tools/fileinfo.cpp
+++ b/src/lib/corelib/tools/fileinfo.cpp
@@ -41,6 +41,7 @@
 
 #include <logging/translator.h>
 #include <tools/qbsassert.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qcoreapplication.h>
@@ -182,13 +183,10 @@ bool FileInfo::isAbsolute(const QString &path, HostOsInfo::HostOs hostOs)
 
 bool FileInfo::isPattern(QStringView str)
 {
-    for (const QChar &ch : str) {
-        if (ch == QLatin1Char('*') || ch == QLatin1Char('?')
-                || ch == QLatin1Char(']') || ch == QLatin1Char('[')) {
-            return true;
-        }
-    }
-    return false;
+    return Internal::any_of(str, [](const auto &ch) {
+        return (ch == QLatin1Char('*') || ch == QLatin1Char('?') || ch == QLatin1Char(']')
+                || ch == QLatin1Char('['));
+    });
 }
 
 /**
diff --git a/src/lib/corelib/tools/settingsmodel.cpp b/src/lib/corelib/tools/settingsmodel.cpp
index 7b75cc050..31aa0f5f1 100644
--- a/src/lib/corelib/tools/settingsmodel.cpp
+++ b/src/lib/corelib/tools/settingsmodel.cpp
@@ -42,6 +42,7 @@
 #include <tools/profile.h>
 #include <tools/qttools.h>
 #include <tools/settings.h>
+#include <tools/stlutils.h>
 #include <tools/stringconstants.h>
 
 #include <QtCore/qlist.h>
@@ -90,11 +91,9 @@ QString Node::uniqueChildName() const
 
 bool Node::hasDirectChildWithName(const QString &name) const
 {
-    for (const Node * const child : qAsConst(children)) {
-        if (child->name == name)
-            return true;
-    }
-    return false;
+    return Internal::any_of(children, [&name](const auto &child){
+        return child->name == name;
+    });
 }
 
 } // namespace Internal
diff --git a/src/lib/corelib/tools/stlutils.h b/src/lib/corelib/tools/stlutils.h
index 5aff5cc54..0a19957b5 100644
--- a/src/lib/corelib/tools/stlutils.h
+++ b/src/lib/corelib/tools/stlutils.h
@@ -118,6 +118,12 @@ bool any_of(const Container &container, const UnaryPredicate &predicate)
 }
 
 template <class Container, class UnaryPredicate>
+bool all_of(const Container &container, const UnaryPredicate &predicate)
+{
+    return std::all_of(std::begin(container), std::end(container), predicate);
+}
+
+template <class Container, class UnaryPredicate>
 bool none_of(const Container &container, const UnaryPredicate &predicate)
 {
     return std::none_of(std::begin(container), std::end(container), predicate);
diff --git a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
index cdf95135d..fc1a36c96 100644
--- a/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
+++ b/src/plugins/generator/clangcompilationdb/clangcompilationdbgenerator.cpp
@@ -45,6 +45,7 @@
 #include <tools/error.h>
 #include <tools/installoptions.h>
 #include <tools/shellutils.h>
+#include <tools/stlutils.h>
 
 #include <QtCore/qdir.h>
 #include <QtCore/qfile.h>
@@ -146,11 +147,9 @@ bool ClangCompilationDatabaseGenerator::hasValidInputFileTag(const QStringList &
         QStringLiteral("objcpp")
     };
 
-    for (const QString &tag : fileTags) {
-        if (validFileTags.contains(tag))
-            return true;
-    }
-    return false;
+    return Internal::any_of(fileTags, [](const auto &tag) {
+        return validFileTags.contains(tag);
+    });
 }
 
 } // namespace qbs