corelib: Apply modernize-use-auto

Use more auto.

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

8 files changed, 13 insertions, 15 deletions

diff --git a/src/lib/corelib/buildgraph/artifact.cpp b/src/lib/corelib/buildgraph/artifact.cpp
index f46e24d78..e82919560 100644
--- a/src/lib/corelib/buildgraph/artifact.cpp
+++ b/src/lib/corelib/buildgraph/artifact.cpp
@@ -153,7 +153,7 @@ void Artifact::load(PersistentPool &pool)
     children.load(pool);
 
     // restore parents of the loaded children
-    for (NodeSet::const_iterator it = children.constBegin(); it != children.constEnd(); ++it)
+    for (auto it = children.constBegin(); it != children.constEnd(); ++it)
         (*it)->parents.insert(this);
 
     pool.load(childrenAddedByScanner);
diff --git a/src/lib/corelib/buildgraph/buildgraph.cpp b/src/lib/corelib/buildgraph/buildgraph.cpp
index d949cc831..27e28ce44 100644
--- a/src/lib/corelib/buildgraph/buildgraph.cpp
+++ b/src/lib/corelib/buildgraph/buildgraph.cpp
@@ -450,7 +450,7 @@ void connect(BuildGraphNode *p, BuildGraphNode *c)
     QBS_CHECK(p != c);
     qCDebug(lcBuildGraph).noquote() << "connect" << p->toString() << "->" << c->toString();
     if (c->type() == BuildGraphNode::ArtifactNodeType) {
-        Artifact * const ac = static_cast<Artifact *>(c);
+        auto const ac = static_cast<Artifact *>(c);
         for (const Artifact *child : filterByType<Artifact>(p->children)) {
             if (child == ac)
                 return;
@@ -562,7 +562,7 @@ Artifact *lookupArtifact(const ResolvedProductConstPtr &product,
             it != lookupResults.constEnd(); ++it) {
         if ((*it)->fileType() != FileResourceBase::FileTypeArtifact)
             continue;
-        Artifact *artifact = static_cast<Artifact *>(*it);
+        auto artifact = static_cast<Artifact *>(*it);
         if (compareByName
                 ? artifact->product->uniqueName() == product->uniqueName()
                 : artifact->product == product) {
@@ -749,7 +749,7 @@ static void doSanityChecksForProduct(const ResolvedProductConstPtr &product,
                 ? static_cast<Artifact *>(node) : nullptr;
         if (!artifact) {
             QBS_CHECK(node->type() == BuildGraphNode::RuleNodeType);
-            RuleNode * const ruleNode = static_cast<RuleNode *>(node);
+            auto const ruleNode = static_cast<RuleNode *>(node);
             QBS_CHECK(ruleNode->rule());
             QBS_CHECK(ruleNode->rule()->product);
             QBS_CHECK(ruleNode->rule()->product == ruleNode->product.get());
diff --git a/src/lib/corelib/buildgraph/executor.cpp b/src/lib/corelib/buildgraph/executor.cpp
index 368fa6ccb..ce20391cd 100644
--- a/src/lib/corelib/buildgraph/executor.cpp
+++ b/src/lib/corelib/buildgraph/executor.cpp
@@ -247,7 +247,7 @@ void Executor::doBuild()
             for (const FileResourceBase * const file : files) {
                 if (file->fileType() != FileResourceBase::FileTypeArtifact)
                     continue;
-                const Artifact * const artifact = static_cast<const Artifact *>(file);
+                auto const artifact = static_cast<const Artifact *>(file);
                 if (contains(m_productsToBuild, artifact->product.lock())) {
                     m_tagsOfFilesToConsider.unite(artifact->fileTags());
                     m_productsOfFilesToConsider << artifact->product.lock();
@@ -327,7 +327,7 @@ void Executor::updateLeaves(BuildGraphNode *node, NodeSet &seenNodes)
     if (node->buildState == BuildGraphNode::Untouched) {
         node->buildState = BuildGraphNode::Buildable;
         if (node->type() == BuildGraphNode::ArtifactNodeType) {
-            Artifact * const artifact = static_cast<Artifact *>(node);
+            auto const artifact = static_cast<Artifact *>(node);
             if (artifact->artifactType == Artifact::SourceFile)
                 retrieveSourceFileTimestamp(artifact);
         }
@@ -1032,7 +1032,7 @@ void Executor::possiblyInstallArtifact(const Artifact *artifact)
 void Executor::onJobFinished(const qbs::ErrorInfo &err)
 {
     try {
-        ExecutorJob * const job = qobject_cast<ExecutorJob *>(sender());
+        auto const job = qobject_cast<ExecutorJob *>(sender());
         QBS_CHECK(job);
         if (m_evalContext->engine()->isActive()) {
             qCDebug(lcExec) << "Executor job finished while rule execution is pausing. "
diff --git a/src/lib/corelib/buildgraph/inputartifactscanner.cpp b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
index d183b1879..7255a36ba 100644
--- a/src/lib/corelib/buildgraph/inputartifactscanner.cpp
+++ b/src/lib/corelib/buildgraph/inputartifactscanner.cpp
@@ -84,7 +84,7 @@ static void resolveDepencency(const RawScannedDependency &dependency,
             fileDependencyArtifact = static_cast<FileDependency *>(lookupResult);
             break;
         case FileResourceBase::FileTypeArtifact: {
-            Artifact * const foundArtifact = static_cast<Artifact *>(lookupResult);
+            auto const foundArtifact = static_cast<Artifact *>(lookupResult);
             if (foundArtifact->product == product)
                 dependencyInProduct = foundArtifact;
             else
@@ -277,8 +277,7 @@ resolved:
         if (artifactsToScan && resolvedDependency.file) {
             if (resolvedDependency.file->fileType() == FileResourceBase::FileTypeArtifact) {
                 // Do not scan an artifact that is not built yet: Its contents might still change.
-                Artifact * const artifactDependency
-                        = static_cast<Artifact *>(resolvedDependency.file);
+                auto const artifactDependency = static_cast<Artifact *>(resolvedDependency.file);
                 if (artifactDependency->artifactType == Artifact::SourceFile
                         || artifactDependency->buildState == BuildGraphNode::Built) {
                     artifactsToScan->push_back(artifactDependency);
diff --git a/src/lib/corelib/buildgraph/projectbuilddata.cpp b/src/lib/corelib/buildgraph/projectbuilddata.cpp
index a658a331a..ccb6c5123 100644
--- a/src/lib/corelib/buildgraph/projectbuilddata.cpp
+++ b/src/lib/corelib/buildgraph/projectbuilddata.cpp
@@ -167,7 +167,7 @@ static void disconnectArtifactParents(Artifact *artifact)
         parent->children.remove(artifact);
         if (parent->type() != BuildGraphNode::ArtifactNodeType)
             continue;
-        Artifact * const parentArtifact = static_cast<Artifact *>(parent);
+        auto const parentArtifact = static_cast<Artifact *>(parent);
         QBS_CHECK(parentArtifact->transformer);
         parentArtifact->childrenAddedByScanner.remove(artifact);
         parentArtifact->transformer->inputs.remove(artifact);
diff --git a/src/lib/corelib/buildgraph/rulecommands.cpp b/src/lib/corelib/buildgraph/rulecommands.cpp
index f7620dbf8..4bc005ccb 100644
--- a/src/lib/corelib/buildgraph/rulecommands.cpp
+++ b/src/lib/corelib/buildgraph/rulecommands.cpp
@@ -395,8 +395,7 @@ bool JavaScriptCommand::equals(const AbstractCommand *otherAbstractCommand) cons
 {
     if (!AbstractCommand::equals(otherAbstractCommand))
         return false;
-    const JavaScriptCommand * const other
-            = static_cast<const JavaScriptCommand *>(otherAbstractCommand);
+    auto const other = static_cast<const JavaScriptCommand *>(otherAbstractCommand);
     return m_sourceCode == other->m_sourceCode;
 }
 
diff --git a/src/lib/corelib/buildgraph/transformer.cpp b/src/lib/corelib/buildgraph/transformer.cpp
index 4569b9955..0a067f6a4 100644
--- a/src/lib/corelib/buildgraph/transformer.cpp
+++ b/src/lib/corelib/buildgraph/transformer.cpp
@@ -227,7 +227,7 @@ AbstractCommandPtr Transformer::createCommandFromScriptValue(const QScriptValue
     if (cmdBase)
         cmdBase->fillFromScriptValue(&scriptValue, codeLocation);
     if (className == StringConstants::commandType()) {
-        ProcessCommand *procCmd = static_cast<ProcessCommand *>(cmdBase.get());
+        auto procCmd = static_cast<ProcessCommand *>(cmdBase.get());
         procCmd->clearRelevantEnvValues();
         for (const QString &key : procCmd->relevantEnvVars())
             procCmd->addRelevantEnvValue(key, product()->buildEnvironment.value(key));
diff --git a/src/lib/corelib/buildgraph/transformerchangetracking.cpp b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
index aa13f967f..551d2b1b1 100644
--- a/src/lib/corelib/buildgraph/transformerchangetracking.cpp
+++ b/src/lib/corelib/buildgraph/transformerchangetracking.cpp
@@ -231,7 +231,7 @@ const Artifact *TrafoChangeTracker::getArtifact(const QString &filePath,
     const Artifact *artifact = nullptr;
     for (const FileResourceBase * const candidate : candidates) {
         if (candidate->fileType() == FileResourceBase::FileTypeArtifact) {
-            const Artifact * const a = static_cast<const Artifact *>(candidate);
+            auto const a = static_cast<const Artifact *>(candidate);
             if (a->product.get() == product) {
                 m_lastArtifact = artifact = a;
                 break;