diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-10-24 18:52:45 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-11-27 18:54:51 +0000 |
commit | 3e49f3cbb68a985ec1ed6f243988e486f0877a73 (patch) | |
tree | cfeda1e54b12eccf1417fc7ae35e895c20252a59 /src/lib/corelib/buildgraph/rulesapplicator.cpp | |
parent | 602ec12826f3b5522831b791efcbcddb2dfa8ed6 (diff) |
Replace more loops with range-for
...or raw iterators for reverse iterations.
Change-Id: I62a110ceeefaf70aaa41f6fb09d811f0eac05657
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/rulesapplicator.cpp')
-rw-r--r-- | src/lib/corelib/buildgraph/rulesapplicator.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/corelib/buildgraph/rulesapplicator.cpp b/src/lib/corelib/buildgraph/rulesapplicator.cpp index 3ebf27fe4..7def041cc 100644 --- a/src/lib/corelib/buildgraph/rulesapplicator.cpp +++ b/src/lib/corelib/buildgraph/rulesapplicator.cpp @@ -217,13 +217,14 @@ void RulesApplicator::doApply(const ArtifactSet &inputArtifacts, QScriptValue &p QScriptValue scriptValue; if (!ruleArtifactArtifactMap.empty()) engine()->setGlobalObject(prepareScriptContext); - for (int i = ruleArtifactArtifactMap.size(); --i >= 0;) { - const RuleArtifact *ra = ruleArtifactArtifactMap.at(i).first; + for (auto it = ruleArtifactArtifactMap.crbegin(), end = ruleArtifactArtifactMap.crend(); + it != end; ++it) { + const RuleArtifact *ra = it->first; if (ra->bindings.empty()) continue; // expose attributes of this artifact - Artifact *outputArtifact = ruleArtifactArtifactMap.at(i).second; + Artifact *outputArtifact = it->second; outputArtifact->properties = outputArtifact->properties->clone(); scope().setProperty(QLatin1String("fileName"), @@ -367,8 +368,7 @@ Artifact *RulesApplicator::createOutputArtifact(const QString &filePath, const F FileTags outputArtifactFileTags = fileTags.empty() ? m_product->fileTagsForFileName(outputArtifact->fileName()) : fileTags; - for (int i = 0; i < m_product->artifactProperties.size(); ++i) { - const ArtifactPropertiesConstPtr &props = m_product->artifactProperties.at(i); + for (const ArtifactPropertiesConstPtr &props : qAsConst(m_product->artifactProperties)) { if (outputArtifactFileTags.intersects(props->fileTagsFilter())) { outputArtifact->properties = props->propertyMap(); outputArtifactFileTags += props->extraFileTags(); |