All: More ToolChain->Toolchain renamings

And removal of one unused function declaration.

Change-Id: I594e23401d8f247d3be081ce850005574951899d
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

12 files changed, 34 insertions, 35 deletions

diff --git a/src/plugins/cppeditor/builtineditordocumentparser.cpp b/src/plugins/cppeditor/builtineditordocumentparser.cpp
index 7c8444098e..627e36d3b3 100644
--- a/src/plugins/cppeditor/builtineditordocumentparser.cpp
+++ b/src/plugins/cppeditor/builtineditordocumentparser.cpp
@@ -80,7 +80,7 @@ void BuiltinEditorDocumentParser::updateImpl(const QPromise<void> &promise,
     }
 
     if (const ProjectPart::ConstPtr part = baseState.projectPartInfo.projectPart) {
-        configFile += ProjectExplorer::Macro::toByteArray(part->toolChainMacros);
+        configFile += ProjectExplorer::Macro::toByteArray(part->toolchainMacros);
         configFile += overwrittenToolchainDefines(*part.data());
         configFile += ProjectExplorer::Macro::toByteArray(part->projectMacros);
         if (!part->projectConfigFile.isEmpty())
diff --git a/src/plugins/cppeditor/compileroptionsbuilder.cpp b/src/plugins/cppeditor/compileroptionsbuilder.cpp
index 12403bd153..be40b9c914 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder.cpp
@@ -234,9 +234,9 @@ QStringList createLanguageOptionGcc(Language language, ProjectFile::Kind fileKin
 
 void CompilerOptionsBuilder::addWordWidth()
 {
-    if (m_projectPart.toolChainAbi.architecture() != Abi::X86Architecture)
+    if (m_projectPart.toolchainAbi.architecture() != Abi::X86Architecture)
         return;
-    const QString argument = m_projectPart.toolChainAbi.wordWidth() == 64
+    const QString argument = m_projectPart.toolchainAbi.wordWidth() == 64
                                  ? QLatin1String("-m64")
                                  : QLatin1String("-m32");
     add(argument);
@@ -250,7 +250,7 @@ void CompilerOptionsBuilder::addTargetTriple()
     }
 
     const QString target = m_explicitTarget.isEmpty() || m_projectPart.targetTripleIsAuthoritative
-            ? m_projectPart.toolChainTargetTriple : m_explicitTarget;
+            ? m_projectPart.toolchainTargetTriple : m_explicitTarget;
 
     // Only "--target=" style is accepted in both g++ and cl driver modes.
     if (!target.isEmpty())
@@ -284,7 +284,7 @@ void CompilerOptionsBuilder::addMsvcExceptions()
 {
     if (!m_clStyle)
         return;
-    if (Utils::anyOf(m_projectPart.toolChainMacros, [](const Macro &macro) {
+    if (Utils::anyOf(m_projectPart.toolchainMacros, [](const Macro &macro) {
         return macro.key == "_CPPUNWIND";
     })) {
         enableExceptions();
@@ -421,7 +421,7 @@ void CompilerOptionsBuilder::addProjectMacros()
     if (m_projectPart.toolchainType == ProjectExplorer::Constants::CUSTOM_TOOLCHAIN_TYPEID
         || m_projectPart.toolchainType == Qnx::Constants::QNX_TOOLCHAIN_ID
         || m_projectPart.toolchainType.name().contains("BareMetal") || useMacros) {
-        addMacros(m_projectPart.toolChainMacros);
+        addMacros(m_projectPart.toolchainMacros);
     }
 
     addMacros(m_projectPart.projectMacros);
@@ -579,7 +579,7 @@ static QByteArray msCompatibilityVersionFromDefines(const Macros &macros)
 
 QByteArray CompilerOptionsBuilder::msvcVersion() const
 {
-    const QByteArray version = msCompatibilityVersionFromDefines(m_projectPart.toolChainMacros);
+    const QByteArray version = msCompatibilityVersionFromDefines(m_projectPart.toolchainMacros);
     return !version.isEmpty() ? version
                               : msCompatibilityVersionFromDefines(m_projectPart.projectMacros);
 }
diff --git a/src/plugins/cppeditor/compileroptionsbuilder.h b/src/plugins/cppeditor/compileroptionsbuilder.h
index 55d775120a..3a8c1446a5 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder.h
+++ b/src/plugins/cppeditor/compileroptionsbuilder.h
@@ -69,7 +69,6 @@ public:
     void prepend(const QString &arg);
     void add(const QStringList &args, bool gccOnlyOptions = false);
 
-    static UseToolchainMacros useToolChainMacros();
     void reset();
 
     void evaluateCompilerFlags();
diff --git a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
index 9a94ba8651..ed53ef9922 100644
--- a/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
+++ b/src/plugins/cppeditor/compileroptionsbuilder_test.cpp
@@ -43,7 +43,7 @@ public:
             tcInfo.abi = Abi(Abi::X86Architecture, Abi::DarwinOS, Abi::FreeBsdFlavor,
                              Abi::MachOFormat, 64);
         }
-        tcInfo.isMsvc2015ToolChain = isMsvc2015;
+        tcInfo.isMsvc2015Toolchain = isMsvc2015;
         tcInfo.extraCodeModelFlags = extraFlags;
         tcInfo.macroInspectionRunner = [this](const QStringList &) {
             return Toolchain::MacroInspectionReport{toolchainMacros, languageVersion};
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
index 0b4c5d9af3..542edbd57a 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
@@ -1937,9 +1937,9 @@ void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Const
         {QString::fromLatin1("Buildsystem Target"), buildSystemTarget},
         {QString::fromLatin1("Build Target Type"), CMI::Utils::toString(part->buildTargetType)},
         {QString::fromLatin1("ToolChain Type"), part->toolchainType.toString()},
-        {QString::fromLatin1("ToolChain Target Triple"), part->toolChainTargetTriple},
-        {QString::fromLatin1("ToolChain Word Width"), CMI::Utils::toString(part->toolChainAbi.wordWidth())},
-        {QString::fromLatin1("ToolChain Install Dir"), part->toolChainInstallDir.toString()},
+        {QString::fromLatin1("ToolChain Target Triple"), part->toolchainTargetTriple},
+        {QString::fromLatin1("ToolChain Word Width"), CMI::Utils::toString(part->toolchainAbi.wordWidth())},
+        {QString::fromLatin1("ToolChain Install Dir"), part->toolchainInstallDir.toString()},
         {QString::fromLatin1("Language Version"), CMI::Utils::toString(part->languageVersion)},
         {QString::fromLatin1("Language Extensions"), CMI::Utils::toString(part->languageExtensions)},
         {QString::fromLatin1("Qt Version"), CMI::Utils::toString(part->qtVersion)}
@@ -1957,9 +1957,9 @@ void CppCodeModelInspectorDialog::updateProjectPartData(const ProjectPart::Const
     m_projectPartTab->setTabText(ProjectPartFilesTab,
         partTabName(ProjectPartFilesTab, part->files.size()));
 
-    int numberOfDefines = defineCount(part->toolChainMacros) + defineCount(part->projectMacros);
+    int numberOfDefines = defineCount(part->toolchainMacros) + defineCount(part->projectMacros);
 
-    m_partToolchainDefinesEdit->setPlainText(QString::fromUtf8(ProjectExplorer::Macro::toByteArray(part->toolChainMacros)));
+    m_partToolchainDefinesEdit->setPlainText(QString::fromUtf8(ProjectExplorer::Macro::toByteArray(part->toolchainMacros)));
     m_partProjectDefinesEdit->setPlainText(QString::fromUtf8(ProjectExplorer::Macro::toByteArray(part->projectMacros)));
     m_projectPartTab->setTabText(ProjectPartDefinesTab,
         partTabName(ProjectPartDefinesTab, numberOfDefines));
diff --git a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp
index 28d96779d6..4a9cff3454 100644
--- a/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp
+++ b/src/plugins/cppeditor/cppcodemodelinspectordumper.cpp
@@ -515,9 +515,9 @@ void Dumper::dumpProjectInfos(const QList<ProjectInfo::ConstPtr> &projectInfos)
             m_out << i3 << "Project Name           : " << projectName << "\n";
             m_out << i3 << "Project File           : " << projectFilePath << "\n";
             m_out << i3 << "ToolChain Type         : " << part->toolchainType.toString() << "\n";
-            m_out << i3 << "ToolChain Target Triple: " << part->toolChainTargetTriple << "\n";
-            m_out << i3 << "ToolChain Word Width   : " << part->toolChainAbi.wordWidth() << "\n";
-            m_out << i3 << "ToolChain Install Dir  : " << part->toolChainInstallDir << "\n";
+            m_out << i3 << "ToolChain Target Triple: " << part->toolchainTargetTriple << "\n";
+            m_out << i3 << "ToolChain Word Width   : " << part->toolchainAbi.wordWidth() << "\n";
+            m_out << i3 << "ToolChain Install Dir  : " << part->toolchainInstallDir << "\n";
             m_out << i3 << "Compiler Flags         : " << part->compilerFlags.join(", ") << "\n";
             m_out << i3 << "Selected For Building  : " << part->selectedForBuilding << "\n";
             m_out << i3 << "Build System Target    : " << part->buildSystemTarget << "\n";
@@ -537,10 +537,10 @@ void Dumper::dumpProjectInfos(const QList<ProjectInfo::ConstPtr> &projectInfos)
                 }
             }
 
-            if (!part->toolChainMacros.isEmpty()) {
+            if (!part->toolchainMacros.isEmpty()) {
                 m_out << i3 << "Toolchain Defines:{{{4\n";
                 const QList<QByteArray> defineLines =
-                        ProjectExplorer::Macro::toByteArray(part->toolChainMacros).split('\n');
+                        ProjectExplorer::Macro::toByteArray(part->toolchainMacros).split('\n');
                 for (const QByteArray &defineLine : defineLines)
                     m_out << i4 << defineLine << "\n";
             }
diff --git a/src/plugins/cppeditor/cppmodelmanager.cpp b/src/plugins/cppeditor/cppmodelmanager.cpp
index 67470745bb..ed2c0419ab 100644
--- a/src/plugins/cppeditor/cppmodelmanager.cpp
+++ b/src/plugins/cppeditor/cppmodelmanager.cpp
@@ -1134,7 +1134,7 @@ Macros CppModelManagerPrivate::internalDefinedMacros(SyncedProjectData &ld)
     QSet<ProjectExplorer::Macro> alreadyIn;
     for (const ProjectData &projectData : std::as_const(ld.m_projectData)) {
         for (const ProjectPart::ConstPtr &part : projectData.projectInfo->projectParts()) {
-            addUnique(part->toolChainMacros, macros, alreadyIn);
+            addUnique(part->toolchainMacros, macros, alreadyIn);
             addUnique(part->projectMacros, macros, alreadyIn);
         }
     }
diff --git a/src/plugins/cppeditor/headerpathfilter.cpp b/src/plugins/cppeditor/headerpathfilter.cpp
index bc1625643f..f1f8addd76 100644
--- a/src/plugins/cppeditor/headerpathfilter.cpp
+++ b/src/plugins/cppeditor/headerpathfilter.cpp
@@ -44,10 +44,10 @@ void HeaderPathFilter::removeGccInternalIncludePaths()
         return;
     }
 
-    if (projectPart.toolChainInstallDir.isEmpty())
+    if (projectPart.toolchainInstallDir.isEmpty())
         return;
 
-    const Utils::FilePath gccInstallDir = projectPart.toolChainInstallDir;
+    const Utils::FilePath gccInstallDir = projectPart.toolchainInstallDir;
     auto isGccInternalInclude = [gccInstallDir](const HeaderPath &headerPath) {
         const auto filePath = Utils::FilePath::fromString(headerPath.path);
         return filePath == gccInstallDir.pathAppended("include")
diff --git a/src/plugins/cppeditor/projectinfo.cpp b/src/plugins/cppeditor/projectinfo.cpp
index d7b0b58a7a..57466d1cd9 100644
--- a/src/plugins/cppeditor/projectinfo.cpp
+++ b/src/plugins/cppeditor/projectinfo.cpp
@@ -64,7 +64,7 @@ static ProjectExplorer::Macros getDefines(const QVector<ProjectPart::ConstPtr> &
 {
     ProjectExplorer::Macros defines;
     for (const ProjectPart::ConstPtr &part : projectParts) {
-        defines.append(part->toolChainMacros);
+        defines.append(part->toolchainMacros);
         defines.append(part->projectMacros);
     }
     return defines;
diff --git a/src/plugins/cppeditor/projectinfo_test.cpp b/src/plugins/cppeditor/projectinfo_test.cpp
index d7bcd99a1f..19c869c148 100644
--- a/src/plugins/cppeditor/projectinfo_test.cpp
+++ b/src/plugins/cppeditor/projectinfo_test.cpp
@@ -355,9 +355,9 @@ class ProjectInfoGeneratorTestHelper
 public:
     ProjectInfoGeneratorTestHelper()
     {
-        TestToolchain aToolChain;
-        projectUpdateInfo.cxxToolchainInfo = {&aToolChain, {}, {}};
-        projectUpdateInfo.cToolchainInfo = {&aToolChain, {}, {}};
+        TestToolchain toolchain;
+        projectUpdateInfo.cxxToolchainInfo = {&toolchain, {}, {}};
+        projectUpdateInfo.cToolchainInfo = {&toolchain, {}, {}};
     }
 
     ProjectInfo::ConstPtr generate()
diff --git a/src/plugins/cppeditor/projectpart.cpp b/src/plugins/cppeditor/projectpart.cpp
index be33d77a9d..680723750f 100644
--- a/src/plugins/cppeditor/projectpart.cpp
+++ b/src/plugins/cppeditor/projectpart.cpp
@@ -142,11 +142,11 @@ ProjectPart::ProjectPart(const Utils::FilePath &topLevelProject,
       buildTargetType(rpp.buildTargetType),
       selectedForBuilding(rpp.selectedForBuilding),
       toolchainType(tcInfo.type),
-      isMsvc2015Toolchain(tcInfo.isMsvc2015ToolChain),
-      toolChainTargetTriple(tcInfo.targetTriple),
+      isMsvc2015Toolchain(tcInfo.isMsvc2015Toolchain),
+      toolchainTargetTriple(tcInfo.targetTriple),
       targetTripleIsAuthoritative(tcInfo.targetTripleIsAuthoritative),
-      toolChainAbi(tcInfo.abi),
-      toolChainInstallDir(tcInfo.installDir),
+      toolchainAbi(tcInfo.abi),
+      toolchainInstallDir(tcInfo.installDir),
       compilerFilePath(tcInfo.compilerFilePath),
       warningFlags(flags.warningFlags),
       extraCodeModelFlags(tcInfo.extraCodeModelFlags),
diff --git a/src/plugins/cppeditor/projectpart.h b/src/plugins/cppeditor/projectpart.h
index 459f8eb1c7..a55adb2a0c 100644
--- a/src/plugins/cppeditor/projectpart.h
+++ b/src/plugins/cppeditor/projectpart.h
@@ -76,7 +76,7 @@ public:
 
     // Macros
     const ProjectExplorer::Macros projectMacros;
-    const ProjectExplorer::Macros &toolChainMacros = m_macroReport.macros;
+    const ProjectExplorer::Macros &toolchainMacros = m_macroReport.macros;
 
     // Build system
     const QString buildSystemTarget;
@@ -84,13 +84,13 @@ public:
         = ProjectExplorer::BuildTargetType::Unknown;
     const bool selectedForBuilding = true;
 
-    // ToolChain
+    // Toolchain
     const Utils::Id toolchainType;
     const bool isMsvc2015Toolchain = false;
-    const QString toolChainTargetTriple;
+    const QString toolchainTargetTriple;
     const bool targetTripleIsAuthoritative;
-    const ProjectExplorer::Abi toolChainAbi = ProjectExplorer::Abi::hostAbi();
-    const Utils::FilePath toolChainInstallDir;
+    const ProjectExplorer::Abi toolchainAbi = ProjectExplorer::Abi::hostAbi();
+    const Utils::FilePath toolchainInstallDir;
     const Utils::FilePath compilerFilePath;
     const Utils::WarningFlags warningFlags = Utils::WarningFlags::Default;