Update to upstream change

(T|t)oolChain most became (T|t)oolchain

Change-Id: I4623a90a2ee3ffc5b0c7662f14552fc8cc63019a
Reviewed-by: hjk <hjk@qt.io>

2 files changed, 24 insertions, 23 deletions

diff --git a/src/datasources/kitsource.cpp b/src/datasources/kitsource.cpp
index 5037357..39eb5f9 100644
--- a/src/datasources/kitsource.cpp
+++ b/src/datasources/kitsource.cpp
@@ -57,12 +57,12 @@ KitSource::KitSource()
                          const Project *project = ProjectManager::startupProject();
                          const Target *target = project ? project->activeTarget() : nullptr;
                          const Kit *kit = target ? target->kit() : nullptr;
-                         const ToolChain *toolChain = ToolChainKitAspect::toolChain(
+                         const Toolchain *toolchain = ToolchainKitAspect::toolChain(
                              kit, Constants::CXX_LANGUAGE_ID);
-                         const Abi abi = toolChain ? toolChain->targetAbi() : Abi();
+                         const Abi abi = toolchain ? toolchain->targetAbi() : Abi();
                          const QString abiName = abi.toString();
-                         QVariantMap &bucket = success ? m_buildSuccessesForToolChain
-                                                       : m_buildFailsForToolChain;
+                         QVariantMap &bucket = success ? m_buildSuccessesForToolchain
+                                                       : m_buildFailsForToolchain;
                          bucket[abiName] = bucket.value(abiName, 0).toInt() + 1;
                      });
 }
@@ -83,10 +83,10 @@ static QString kitsInfoKey() { return QStringLiteral("kitsInfo"); }
 static QString buildSuccessesKey() { return  QStringLiteral("buildSuccesses"); }
 static QString buildFailsKey() { return QStringLiteral("buildFails"); }
 
-static QString extractToolChainVersion(const ToolChain &toolChain)
+static QString extractToolchainVersion(const Toolchain &toolchain)
 {
     try {
-        return dynamic_cast<const GccToolChain &>(toolChain).version();
+        return dynamic_cast<const GccToolchain &>(toolchain).version();
     } catch (...) {
         return {};
     }
@@ -95,21 +95,21 @@ static QString extractToolChainVersion(const ToolChain &toolChain)
 void KitSource::loadImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
-    m_buildSuccessesForToolChain = settings->value(buildSuccessesKey(), QVariantMap{}).toMap();
-    m_buildFailsForToolChain = settings->value(buildFailsKey(), QVariantMap{}).toMap();
+    m_buildSuccessesForToolchain = settings->value(buildSuccessesKey(), QVariantMap{}).toMap();
+    m_buildFailsForToolchain = settings->value(buildFailsKey(), QVariantMap{}).toMap();
 }
 
 void KitSource::storeImpl(QSettings *settings)
 {
     auto setter = ScopedSettingsGroupSetter::forDataSource(*this, *settings);
-    settings->setValue(buildSuccessesKey(), m_buildSuccessesForToolChain);
-    settings->setValue(buildFailsKey(), m_buildFailsForToolChain);
+    settings->setValue(buildSuccessesKey(), m_buildSuccessesForToolchain);
+    settings->setValue(buildFailsKey(), m_buildFailsForToolchain);
 }
 
 void KitSource::resetImpl(QSettings *settings)
 {
-    m_buildSuccessesForToolChain.clear();
-    m_buildFailsForToolChain.clear();
+    m_buildSuccessesForToolchain.clear();
+    m_buildFailsForToolchain.clear();
 
     storeImpl(settings);
 }
@@ -146,15 +146,16 @@ public:
     {
         static const QString compilerKey = QStringLiteral("compiler");
 
-        if (auto toolChain = ToolChainKitAspect::toolChain(&m_kit, Constants::CXX_LANGUAGE_ID)) {
-            const QString abiName = toolChain->targetAbi().toString();
-            m_map.insert(compilerKey, QVariantMap{
-                {nameKey(), toolChain->typeDisplayName()},
-                {abiKey(), abiName},
-                {versionKey(), extractToolChainVersion(*toolChain)},
-                {buildSuccessesKey(), m_source.m_buildSuccessesForToolChain.value(abiName).toInt()},
-                {buildFailsKey(), m_source.m_buildFailsForToolChain.value(abiName).toInt()}
-            });
+        if (auto toolchain = ToolchainKitAspect::toolChain(&m_kit, Constants::CXX_LANGUAGE_ID)) {
+            const QString abiName = toolchain->targetAbi().toString();
+            m_map.insert(compilerKey,
+                         QVariantMap{{nameKey(), toolchain->typeDisplayName()},
+                                     {abiKey(), abiName},
+                                     {versionKey(), extractToolchainVersion(*toolchain)},
+                                     {buildSuccessesKey(),
+                                      m_source.m_buildSuccessesForToolchain.value(abiName).toInt()},
+                                     {buildFailsKey(),
+                                      m_source.m_buildFailsForToolchain.value(abiName).toInt()}});
         }
 
         return *this;
diff --git a/src/datasources/kitsource.h b/src/datasources/kitsource.h
index 38afd09..23e2edf 100644
--- a/src/datasources/kitsource.h
+++ b/src/datasources/kitsource.h
@@ -88,8 +88,8 @@ private:
     void resetImpl(QSettings *settings) override;
 
     friend class KitInfo;
-    QVariantMap m_buildSuccessesForToolChain;
-    QVariantMap m_buildFailsForToolChain;
+    QVariantMap m_buildSuccessesForToolchain;
+    QVariantMap m_buildFailsForToolchain;
 };
 
 } // namespace Internal