From 52737be344ba20625a2a0d305517eafadb78c74d Mon Sep 17 00:00:00 2001 From: Ivan Komissarov Date: Sun, 19 May 2019 02:16:39 +0200 Subject: Apply modernize-loop-convert fix-it Makes clang-tidy happier Change-Id: Ic29b552572719ea58c7ad385cc6e1d68cef9eedc Reviewed-by: Christian Kandeler --- src/app/qbs-setup-android/android-setup.cpp | 4 +-- src/lib/corelib/buildgraph/buildgraphloader.cpp | 7 ++--- src/lib/corelib/buildgraph/requestedartifacts.cpp | 35 ++++++++++------------ .../buildgraph/transformerchangetracking.cpp | 4 +-- src/lib/corelib/language/moduleloader.cpp | 11 ++++--- src/lib/corelib/language/scriptengine.cpp | 4 +-- src/lib/corelib/tools/joblimits.cpp | 3 +- src/shared/json/json.cpp | 8 ++--- tests/auto/blackbox/tst_blackbox.cpp | 4 +-- 9 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/app/qbs-setup-android/android-setup.cpp b/src/app/qbs-setup-android/android-setup.cpp index dc74debe0..029628419 100644 --- a/src/app/qbs-setup-android/android-setup.cpp +++ b/src/app/qbs-setup-android/android-setup.cpp @@ -139,8 +139,8 @@ static QtInfoPerArch getQtAndroidInfo(const QString &qtSdkDir) QDirIterator dit(qtSdkDir, QStringList() << QStringLiteral("android_*"), QDir::Dirs); while (dit.hasNext()) qtDirs << dit.next(); - for (auto it = qtDirs.cbegin(); it != qtDirs.cend(); ++it) { - const QtAndroidInfo info = getInfoForQtDir(*it); + for (const auto &qtDir : qtDirs) { + const QtAndroidInfo info = getInfoForQtDir(qtDir); if (info.isValid()) archs.insert(info.arch, info); } diff --git a/src/lib/corelib/buildgraph/buildgraphloader.cpp b/src/lib/corelib/buildgraph/buildgraphloader.cpp index 289dcea26..bf6c30dcd 100644 --- a/src/lib/corelib/buildgraph/buildgraphloader.cpp +++ b/src/lib/corelib/buildgraph/buildgraphloader.cpp @@ -438,11 +438,10 @@ void BuildGraphLoader::trackProjectChanges() allNewlyResolvedProducts); } - for (auto it = m_changedSourcesByProduct.cbegin(); it != m_changedSourcesByProduct.cend(); - ++it) { - const ResolvedProductPtr product = m_freshProductsByName.value(it->first); + for (const auto &kv : m_changedSourcesByProduct) { + const ResolvedProductPtr product = m_freshProductsByName.value(kv.first); QBS_CHECK(!!product); - for (const SourceArtifactConstPtr &sa : it->second) + for (const SourceArtifactConstPtr &sa : kv.second) updateArtifactFromSourceArtifact(product, sa); } diff --git a/src/lib/corelib/buildgraph/requestedartifacts.cpp b/src/lib/corelib/buildgraph/requestedartifacts.cpp index 7fbaf65f1..e4730d2f1 100644 --- a/src/lib/corelib/buildgraph/requestedartifacts.cpp +++ b/src/lib/corelib/buildgraph/requestedartifacts.cpp @@ -55,9 +55,8 @@ bool RequestedArtifacts::isUpToDate(const TopLevelProject *project) const if (m_requestedArtifactsPerProduct.empty()) return true; const std::vector &allProducts = project->allProducts(); - for (auto it = m_requestedArtifactsPerProduct.cbegin(); - it != m_requestedArtifactsPerProduct.cend(); ++it) { - const QString &productName = it->first; + for (const auto &kv : m_requestedArtifactsPerProduct) { + const QString &productName = kv.first; const auto findProduct = [productName](const ResolvedProductConstPtr &p) { return p->uniqueName() == productName; }; @@ -67,7 +66,7 @@ bool RequestedArtifacts::isUpToDate(const TopLevelProject *project) const << "does not exist anymore"; return false; } - if (!it->second.isUpToDate(productIt->get())) + if (!kv.second.isUpToDate(productIt->get())) return false; } return true; @@ -110,18 +109,14 @@ void RequestedArtifacts::setArtifactsEnumerated(const ResolvedProduct *product) void RequestedArtifacts::unite(const RequestedArtifacts &other) { - for (auto it = other.m_requestedArtifactsPerProduct.begin(); - it != other.m_requestedArtifactsPerProduct.end(); ++it) { - m_requestedArtifactsPerProduct[it->first].unite(it->second); - } + for (const auto &kv : other.m_requestedArtifactsPerProduct) + m_requestedArtifactsPerProduct[kv.first].unite(kv.second); } void RequestedArtifacts::doSanityChecks() const { - for (auto it = m_requestedArtifactsPerProduct.cbegin(); - it != m_requestedArtifactsPerProduct.cend(); ++it) { - it->second.doSanityChecks(); - } + for (const auto &kv : m_requestedArtifactsPerProduct) + kv.second.doSanityChecks(); } void RequestedArtifacts::load(PersistentPool &pool) @@ -147,17 +142,17 @@ bool RequestedArtifacts::RequestedArtifactsPerProduct::isUpToDate( return true; const ArtifactSetByFileTag currentArtifacts = product->buildData->artifactsByFileTag(); - for (auto reqIt = requestedTags.cbegin(); reqIt != requestedTags.cend(); ++reqIt) { - const FileTag tag = FileTag(reqIt->first.toUtf8()); + for (const auto &kv : requestedTags) { + const FileTag tag = FileTag(kv.first.toUtf8()); const auto currentIt = currentArtifacts.constFind(tag); Set currentFilePathsForTag; if (currentIt != currentArtifacts.constEnd()) { for (const Artifact * const a : currentIt.value()) currentFilePathsForTag.insert(a->filePath()); } - if (currentFilePathsForTag != reqIt->second) { + if (currentFilePathsForTag != kv.second) { qCDebug(lcBuildGraph) << "artifacts map not up to date: requested artifact set for " - "file tag" << reqIt->first << "in product" + "file tag" << kv.first << "in product" << product->uniqueName() << "differs from the current one"; return false; } @@ -185,14 +180,14 @@ void RequestedArtifacts::RequestedArtifactsPerProduct::unite( return; } allTags = other.allTags; - for (auto it = other.requestedTags.begin(); it != other.requestedTags.end(); ++it) - requestedTags[it->first] = it->second; + for (const auto &kv : other.requestedTags) + requestedTags[kv.first] = kv.second; } void RequestedArtifacts::RequestedArtifactsPerProduct::doSanityChecks() const { - for (auto it = requestedTags.begin(); it != requestedTags.end(); ++it) - QBS_CHECK(allTags.contains(it->first) || it->second.empty()); + for (const auto &kv : requestedTags) + QBS_CHECK(allTags.contains(kv.first) || kv.second.empty()); } void RequestedArtifacts::RequestedArtifactsPerProduct::load(PersistentPool &pool) diff --git a/src/lib/corelib/buildgraph/transformerchangetracking.cpp b/src/lib/corelib/buildgraph/transformerchangetracking.cpp index 4ee4394fd..eadc99272 100644 --- a/src/lib/corelib/buildgraph/transformerchangetracking.cpp +++ b/src/lib/corelib/buildgraph/transformerchangetracking.cpp @@ -209,8 +209,8 @@ bool TrafoChangeTracker::isExportedModuleUpToDate(const QString &productName, bool TrafoChangeTracker::areExportedModulesUpToDate( const std::unordered_map exportedModules) const { - for (auto it = exportedModules.begin(); it != exportedModules.end(); ++it) { - if (!isExportedModuleUpToDate(it->first, it->second)) + for (const auto &kv : exportedModules) { + if (!isExportedModuleUpToDate(kv.first, kv.second)) return false; } return true; diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index f8206031b..67d60e05d 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -2122,12 +2122,12 @@ void ModuleLoader::checkProductNamesInOverrides() if (m_erroneousProducts.contains(productNameInOverride)) continue; bool found = false; - for (auto it = m_productsByName.cbegin(); it != m_productsByName.cend(); ++it) { + for (const auto &kv : m_productsByName) { // In an override string such as "a.b.c:d, we cannot tell whether we have a product // "a" and a module "b.c" or a product "a.b" and a module "c", so we need to take // care not to emit false positives here. - if (it->first == productNameInOverride - || it->first.startsWith(productNameInOverride + StringConstants::dot())) { + if (kv.first == productNameInOverride + || kv.first.startsWith(productNameInOverride + StringConstants::dot())) { found = true; break; } @@ -4031,9 +4031,8 @@ void ModuleLoader::handleProductError(const ErrorInfo &error, << "in product" << productContext->name; return; } - const auto &deps = productContext->productModuleDependencies; - for (auto it = deps.cbegin(); it != deps.cend(); ++it) { - const auto rangeForName = m_productsByName.equal_range(it->first); + for (const auto &kv : productContext->productModuleDependencies) { + const auto rangeForName = m_productsByName.equal_range(kv.first); for (auto rangeIt = rangeForName.first; rangeIt != rangeForName.second; ++rangeIt) { const ProductContext * const dep = rangeIt->second; if (dep->info.delayedError.hasError()) { diff --git a/src/lib/corelib/language/scriptengine.cpp b/src/lib/corelib/language/scriptengine.cpp index 205a3a4d9..7c531e764 100644 --- a/src/lib/corelib/language/scriptengine.cpp +++ b/src/lib/corelib/language/scriptengine.cpp @@ -609,8 +609,8 @@ Set ScriptEngine::imports() const for (const QString &filePath : jsImport.filePaths) filePaths << filePath; } - for (auto it = m_filePathsPerImport.cbegin(); it != m_filePathsPerImport.cend(); ++it) { - for (const QString &fp : it->second) + for (const auto &kv : m_filePathsPerImport) { + for (const QString &fp : kv.second) filePaths << fp; } return filePaths; diff --git a/src/lib/corelib/tools/joblimits.cpp b/src/lib/corelib/tools/joblimits.cpp index 3b1fde83d..912b15a65 100644 --- a/src/lib/corelib/tools/joblimits.cpp +++ b/src/lib/corelib/tools/joblimits.cpp @@ -118,8 +118,7 @@ JobLimits::~JobLimits() {} void JobLimits::setJobLimit(const JobLimit &limit) { - for (std::size_t i = 0; i < d->jobLimits.size(); ++i) { - JobLimit ¤tLimit = d->jobLimits.at(i); + for (auto ¤tLimit : d->jobLimits) { if (currentLimit.pool() == limit.pool()) { if (currentLimit.limit() != limit.limit()) currentLimit = limit; diff --git a/src/shared/json/json.cpp b/src/shared/json/json.cpp index 10b211ca8..3a838a177 100644 --- a/src/shared/json/json.cpp +++ b/src/shared/json/json.cpp @@ -1251,8 +1251,8 @@ JsonArray::JsonArray() JsonArray::JsonArray(std::initializer_list args) : d(nullptr), a(nullptr) { - for (auto i = args.begin(); i != args.end(); ++i) - append(*i); + for (const auto &arg : args) + append(arg); } /*! @@ -2284,8 +2284,8 @@ JsonObject::JsonObject() JsonObject::JsonObject(std::initializer_list > args) : d(nullptr), o(nullptr) { - for (auto i = args.begin(); i != args.end(); ++i) - insert(i->first, i->second); + for (const auto &arg : args) + insert(arg.first, arg.second); } /*! diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index 99e1142f8..84322a7c7 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -882,8 +882,8 @@ void TestBlackbox::dependenciesProperty() QJsonArray cpp_dependencies = product2_cpp.value("dependencies").toArray(); QVERIFY(!cpp_dependencies.isEmpty()); int qbsCount = 0; - for (int i = 0; i < cpp_dependencies.size(); ++i) { - if (cpp_dependencies.at(i).toObject().value("name").toString() == "qbs") + for (const auto &dep : cpp_dependencies) { + if (dep.toObject().value("name").toString() == "qbs") ++qbsCount; } QCOMPARE(qbsCount, 1); -- cgit v1.2.3