From b5937836f43d7d244ad803b27caddb0e7c2e5f46 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 27 Nov 2023 16:42:42 +0100 Subject: [PATCH] ProjectExplorer: Rename ToolChainManager to ToolchainManager Plus the private and some comments. Change-Id: I95d72d77f25cb1c969a1a6148e7186150a697d1f Reviewed-by: Christian Kandeler --- src/plugins/android/androidconfigurations.cpp | 14 ++-- src/plugins/android/androidtoolchain.cpp | 2 +- src/plugins/baremetal/iarewtoolchain.cpp | 6 +- src/plugins/baremetal/keiltoolchain.cpp | 6 +- src/plugins/baremetal/sdcctoolchain.cpp | 2 +- .../cmakeprojectimporter.cpp | 8 +- .../compilationdatabaseproject.cpp | 4 +- .../compilationdatabasetests.cpp | 2 +- src/plugins/docker/kitdetector.cpp | 12 +-- src/plugins/ios/iosconfigurations.cpp | 2 +- src/plugins/mcusupport/mcupackage.cpp | 16 ++-- src/plugins/mcusupport/mcusupportsdk.cpp | 2 +- src/plugins/mcusupport/test/unittest.cpp | 6 +- src/plugins/nim/nimplugin.cpp | 2 +- src/plugins/projectexplorer/gcctoolchain.cpp | 32 ++++---- src/plugins/projectexplorer/kitaspects.cpp | 52 ++++++------- src/plugins/projectexplorer/kitmanager.cpp | 2 +- src/plugins/projectexplorer/project.cpp | 4 +- .../projectexplorer/projectexplorer.cpp | 12 +-- .../projectexplorer/projectimporter.cpp | 10 +-- src/plugins/projectexplorer/toolchain.cpp | 12 +-- .../projectexplorer/toolchainmanager.cpp | 74 +++++++++---------- .../projectexplorer/toolchainmanager.h | 10 +-- .../projectexplorer/toolchainoptionspage.cpp | 26 +++---- .../qmakeprojectmanager/qmakeproject.cpp | 2 +- .../qmakeprojectimporter.cpp | 2 +- src/plugins/qnx/qnxsettingspage.cpp | 8 +- src/plugins/qtsupport/baseqtversion.cpp | 2 +- src/plugins/qtsupport/qtkitaspect.cpp | 2 +- src/plugins/qtsupport/qtoptionspage.cpp | 6 +- src/plugins/qtsupport/qtversionmanager.cpp | 6 +- .../webassembly/webassemblytoolchain.cpp | 14 ++-- 32 files changed, 180 insertions(+), 180 deletions(-) diff --git a/src/plugins/android/androidconfigurations.cpp b/src/plugins/android/androidconfigurations.cpp index 8cf6d186a1e..afbdb7f322d 100644 --- a/src/plugins/android/androidconfigurations.cpp +++ b/src/plugins/android/androidconfigurations.cpp @@ -1147,24 +1147,24 @@ static bool matchToolChain(const Toolchain *atc, const Toolchain *btc) void AndroidConfigurations::registerNewToolChains() { const Toolchains existingAndroidToolChains - = ToolChainManager::toolchains(Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); + = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); const Toolchains newToolchains = AndroidToolchainFactory::autodetectToolChains( existingAndroidToolChains); for (Toolchain *tc : newToolchains) - ToolChainManager::registerToolChain(tc); + ToolchainManager::registerToolChain(tc); registerCustomToolChainsAndDebuggers(); } void AndroidConfigurations::removeOldToolChains() { - const auto tcs = ToolChainManager::toolchains(Utils::equal(&Toolchain::typeId, + const auto tcs = ToolchainManager::toolchains(Utils::equal(&Toolchain::typeId, Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); for (Toolchain *tc : tcs) { if (!tc->isValid()) - ToolChainManager::deregisterToolChain(tc); + ToolchainManager::deregisterToolChain(tc); } } @@ -1306,7 +1306,7 @@ static QVariant findOrRegisterDebugger(Toolchain *tc, void AndroidConfigurations::registerCustomToolChainsAndDebuggers() { - const Toolchains existingAndroidToolChains = ToolChainManager::toolchains( + const Toolchains existingAndroidToolChains = ToolchainManager::toolchains( Utils::equal(&Toolchain::typeId, Utils::Id(Constants::ANDROID_TOOLCHAIN_TYPEID))); const FilePaths customNdks = FileUtils::toFilePathList(currentConfig().getCustomNdkList()); @@ -1315,7 +1315,7 @@ void AndroidConfigurations::registerCustomToolChainsAndDebuggers() customNdks, true); for (Toolchain *tc : customToolchains) { - ToolChainManager::registerToolChain(tc); + ToolchainManager::registerToolChain(tc); const auto androidToolChain = static_cast(tc); QString abiStr; if (androidToolChain) @@ -1359,7 +1359,7 @@ void AndroidConfigurations::updateAutomaticKitList() } // register new kits - const Toolchains toolchains = ToolChainManager::toolchains([](const Toolchain *tc) { + const Toolchains toolchains = ToolchainManager::toolchains([](const Toolchain *tc) { return tc->isAutoDetected() && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPEID && tc->isValid(); }); diff --git a/src/plugins/android/androidtoolchain.cpp b/src/plugins/android/androidtoolchain.cpp index a71f43528b4..90142293b42 100644 --- a/src/plugins/android/androidtoolchain.cpp +++ b/src/plugins/android/androidtoolchain.cpp @@ -215,7 +215,7 @@ ToolChainList AndroidToolchainFactory::autodetectToolChainsFromNdks( QLatin1String customStr = isCustom ? QLatin1String("Custom ") : QLatin1String(); const QString displayName(customStr + QString("Android Clang (%1, %2, NDK %3)") - .arg(ToolChainManager::displayNameOfLanguageId(lang), + .arg(ToolchainManager::displayNameOfLanguageId(lang), AndroidConfig::displayName(abi), config.ndkVersion(ndkLocation).toString())); if (tc) { diff --git a/src/plugins/baremetal/iarewtoolchain.cpp b/src/plugins/baremetal/iarewtoolchain.cpp index bfc851fb654..b66b5ab230e 100644 --- a/src/plugins/baremetal/iarewtoolchain.cpp +++ b/src/plugins/baremetal/iarewtoolchain.cpp @@ -249,7 +249,7 @@ static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, const QString &version) { const auto archName = Abi::toString(arch); - const auto langName = ToolChainManager::displayNameOfLanguageId(language); + const auto langName = ToolchainManager::displayNameOfLanguageId(language); return Tr::tr("IAREW %1 (%2, %3)").arg(version, langName, archName); } @@ -540,12 +540,12 @@ Toolchains IarToolchainFactory::autoDetectToolchains( Toolchains IarToolchainFactory::autoDetectToolchain(const Candidate &candidate, Id languageId) const { - if (ToolChainManager::isBadToolchain(candidate.compilerPath)) + if (ToolchainManager::isBadToolchain(candidate.compilerPath)) return {}; const auto env = Environment::systemEnvironment(); const Macros macros = dumpPredefinedMacros(candidate.compilerPath, {}, languageId, env); if (macros.isEmpty()) { - ToolChainManager::addBadToolchain(candidate.compilerPath); + ToolchainManager::addBadToolchain(candidate.compilerPath); return {}; } const Abi abi = guessAbi(macros); diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp index 0db09bf7d92..164638cc134 100644 --- a/src/plugins/baremetal/keiltoolchain.cpp +++ b/src/plugins/baremetal/keiltoolchain.cpp @@ -373,7 +373,7 @@ static QString buildDisplayName(Abi::Architecture arch, Utils::Id language, const QString &version) { const QString archName = Abi::toString(arch); - const QString langName = ToolChainManager::displayNameOfLanguageId(language); + const QString langName = ToolchainManager::displayNameOfLanguageId(language); return Tr::tr("KEIL %1 (%2, %3)").arg(version, langName, archName); } @@ -689,7 +689,7 @@ Toolchains KeilToolchainFactory::autoDetectToolchains( Toolchains KeilToolchainFactory::autoDetectToolchain(const Candidate &candidate, Id language) const { - if (ToolChainManager::isBadToolchain(candidate.compilerPath)) + if (ToolchainManager::isBadToolchain(candidate.compilerPath)) return {}; const auto env = Environment::systemEnvironment(); @@ -697,7 +697,7 @@ Toolchains KeilToolchainFactory::autoDetectToolchain(const Candidate &candidate, addDefaultCpuArgs(candidate.compilerPath, extraArgs); const Macros macros = dumpPredefinedMacros(candidate.compilerPath, extraArgs, env); if (macros.isEmpty()) { - ToolChainManager::addBadToolchain(candidate.compilerPath); + ToolchainManager::addBadToolchain(candidate.compilerPath); return {}; } diff --git a/src/plugins/baremetal/sdcctoolchain.cpp b/src/plugins/baremetal/sdcctoolchain.cpp index 24e34d48a67..dc0d998dc33 100644 --- a/src/plugins/baremetal/sdcctoolchain.cpp +++ b/src/plugins/baremetal/sdcctoolchain.cpp @@ -164,7 +164,7 @@ static Abi guessAbi(const Macros ¯os) static QString buildDisplayName(Abi::Architecture arch, Id language, const QString &version) { const QString archName = Abi::toString(arch); - const QString langName = ToolChainManager::displayNameOfLanguageId(language); + const QString langName = ToolchainManager::displayNameOfLanguageId(language); return Tr::tr("SDCC %1 (%2, %3)").arg(version, langName, archName); } diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp index c38dc44054f..162b60102d0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp +++ b/src/plugins/cmakeprojectmanager/cmakeprojectimporter.cpp @@ -601,7 +601,7 @@ Toolchain *findExternalToolchain(const QString &presetArchitecture, const QStrin // "strategy": "external" // } - auto msvcToolchains = ToolChainManager::toolchains([](const Toolchain *tc) { + auto msvcToolchains = ToolchainManager::toolchains([](const Toolchain *tc) { return tc->typeId() == ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID; }); @@ -609,7 +609,7 @@ Toolchain *findExternalToolchain(const QString &presetArchitecture, const QStrin return tc->targetAbi().osFlavor(); })); - return ToolChainManager::toolChain( + return ToolchainManager::toolChain( [presetArchitecture, presetToolset, msvcFlavors](const Toolchain *tc) -> bool { if (tc->typeId() != ProjectExplorer::Constants::MSVC_TOOLCHAIN_TYPEID) return false; @@ -932,7 +932,7 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const return false; const bool compilersMatch = [k, data] { - const QList allLanguages = ToolChainManager::allLanguages(); + const QList allLanguages = ToolchainManager::allLanguages(); for (const ToolChainDescription &tcd : data->toolChains) { if (!Utils::contains(allLanguages, [&tcd](const Id &language) { return language == tcd.language; })) @@ -945,7 +945,7 @@ bool CMakeProjectImporter::matchKit(void *directoryData, const Kit *k) const return true; }(); const bool noCompilers = [k, data] { - const QList allLanguages = ToolChainManager::allLanguages(); + const QList allLanguages = ToolchainManager::allLanguages(); for (const ToolChainDescription &tcd : data->toolChains) { if (!Utils::contains(allLanguages, [&tcd](const Id &language) { return language == tcd.language; })) diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp index 67fcd19d2c4..bf92e71e779 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabaseproject.cpp @@ -77,7 +77,7 @@ Utils::Id getCompilerId(QString compilerName) Toolchain *toolchainFromCompilerId(const Utils::Id &compilerId, const Utils::Id &language) { - return ToolChainManager::toolChain([&compilerId, &language](const Toolchain *tc) { + return ToolchainManager::toolChain([&compilerId, &language](const Toolchain *tc) { if (!tc->isValid() || tc->language() != language) return false; return tc->typeId() == compilerId; @@ -112,7 +112,7 @@ Toolchain *toolchainFromFlags(const Kit *kit, const QStringList &flags, const Ut // Try exact compiler match. const Utils::FilePath compiler = Utils::FilePath::fromUserInput(compilerPath(flags.front())); - Toolchain *toolchain = ToolChainManager::toolChain([&compiler, &language](const Toolchain *tc) { + Toolchain *toolchain = ToolchainManager::toolChain([&compiler, &language](const Toolchain *tc) { return tc->isValid() && tc->language() == language && tc->compilerCommand() == compiler; }); if (toolchain) diff --git a/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp b/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp index 24882d045f1..46a81a0b18f 100644 --- a/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp +++ b/src/plugins/compilationdatabaseprojectmanager/compilationdatabasetests.cpp @@ -39,7 +39,7 @@ void CompilationDatabaseTests::initTestCase() if (allKits.empty()) QSKIP("This test requires at least one kit to be present."); - Toolchain *toolchain = ToolChainManager::toolChain([](const Toolchain *tc) { + Toolchain *toolchain = ToolchainManager::toolChain([](const Toolchain *tc) { return tc->isValid() && tc->language() == ProjectExplorer::Constants::CXX_LANGUAGE_ID; }); if (!toolchain) diff --git a/src/plugins/docker/kitdetector.cpp b/src/plugins/docker/kitdetector.cpp index d2176760fad..fa6172541e8 100644 --- a/src/plugins/docker/kitdetector.cpp +++ b/src/plugins/docker/kitdetector.cpp @@ -106,11 +106,11 @@ void KitDetectorPrivate::undoAutoDetect() const }; emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Removing toolchain entries...")); - const Toolchains toolchains = ToolChainManager::toolchains(); + const Toolchains toolchains = ToolchainManager::toolchains(); for (Toolchain *toolChain : toolchains) { if (toolChain && toolChain->detectionSource() == m_sharedId) { emit q->logOutput(ProjectExplorer::Tr::tr("Removed \"%1\"").arg(toolChain->displayName())); - ToolChainManager::deregisterToolChain(toolChain); + ToolchainManager::deregisterToolChain(toolChain); } }; @@ -164,7 +164,7 @@ void KitDetectorPrivate::listAutoDetected() const } emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Toolchains:")); - for (Toolchain *toolChain : ToolChainManager::toolchains()) { + for (Toolchain *toolChain : ToolchainManager::toolchains()) { if (toolChain->detectionSource() == m_sharedId) emit q->logOutput(toolChain->displayName()); } @@ -251,7 +251,7 @@ Toolchains KitDetectorPrivate::autoDetectToolChains() { const QList factories = ToolchainFactory::allToolchainFactories(); - Toolchains alreadyKnown = ToolChainManager::toolchains(); + Toolchains alreadyKnown = ToolchainManager::toolchains(); Toolchains allNewToolChains; QApplication::processEvents(); emit q->logOutput('\n' + ProjectExplorer::Tr::tr("Searching toolchains...")); @@ -262,7 +262,7 @@ Toolchains KitDetectorPrivate::autoDetectToolChains() for (Toolchain *toolChain : newToolChains) { emit q->logOutput(ProjectExplorer::Tr::tr("Found \"%1\"").arg(toolChain->compilerCommand().toUserOutput())); toolChain->setDetectionSource(m_sharedId); - ToolChainManager::registerToolChain(toolChain); + ToolchainManager::registerToolChain(toolChain); alreadyKnown.append(toolChain); } allNewToolChains.append(newToolChains); @@ -359,7 +359,7 @@ void KitDetectorPrivate::autoDetect() QtSupport::QtKitAspect::setQtVersion(k, qt); } Toolchains toolchainsToSet; - toolchainsToSet = ToolChainManager::toolchains([qt, this](const Toolchain *tc) { + toolchainsToSet = ToolchainManager::toolchains([qt, this](const Toolchain *tc) { return tc->detectionSource() == m_sharedId && (!qt || qt->qtAbis().contains(tc->targetAbi())); }); diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index c205f3a6d59..a999fa82b1c 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -109,7 +109,7 @@ static QList clangToolChains(const Toolchains &toolChains) static QList autoDetectedIosToolChains() { - const QList toolChains = clangToolChains(ToolChainManager::toolchains()); + const QList toolChains = clangToolChains(ToolchainManager::toolchains()); return filtered(toolChains, [](GccToolChain *toolChain) { return toolChain->isAutoDetected() && (toolChain->displayName().startsWith("iphone") diff --git a/src/plugins/mcusupport/mcupackage.cpp b/src/plugins/mcusupport/mcupackage.cpp index 619efa18902..350c89c8715 100644 --- a/src/plugins/mcusupport/mcupackage.cpp +++ b/src/plugins/mcusupport/mcupackage.cpp @@ -366,7 +366,7 @@ bool McuToolChainPackage::isDesktopToolchain() const Toolchain *McuToolChainPackage::msvcToolChain(Id language) { - Toolchain *toolChain = ToolChainManager::toolChain([language](const Toolchain *t) { + Toolchain *toolChain = ToolchainManager::toolChain([language](const Toolchain *t) { const Abi abi = t->targetAbi(); return abi.osFlavor() == Abi::WindowsMsvc2019Flavor && abi.architecture() == Abi::X86Architecture && abi.wordWidth() == 64 @@ -378,7 +378,7 @@ Toolchain *McuToolChainPackage::msvcToolChain(Id language) Toolchain *McuToolChainPackage::gccToolChain(Id language) { - Toolchain *toolChain = ToolChainManager::toolChain([language](const Toolchain *t) { + Toolchain *toolChain = ToolchainManager::toolChain([language](const Toolchain *t) { const Abi abi = t->targetAbi(); return abi.os() != Abi::WindowsOS && abi.architecture() == Abi::X86Architecture && abi.wordWidth() == 64 && t->language() == language; @@ -388,7 +388,7 @@ Toolchain *McuToolChainPackage::gccToolChain(Id language) static Toolchain *mingwToolChain(const FilePath &path, Id language) { - Toolchain *toolChain = ToolChainManager::toolChain([&path, language](const Toolchain *t) { + Toolchain *toolChain = ToolchainManager::toolChain([&path, language](const Toolchain *t) { // find a MinGW toolchain having the same path from registered toolchains const Abi abi = t->targetAbi(); return t->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID @@ -398,7 +398,7 @@ static Toolchain *mingwToolChain(const FilePath &path, Id language) if (!toolChain) { // if there's no MinGW toolchain having the same path, // a proper MinGW would be selected from the registered toolchains. - toolChain = ToolChainManager::toolChain([language](const Toolchain *t) { + toolChain = ToolchainManager::toolChain([language](const Toolchain *t) { const Abi abi = t->targetAbi(); return t->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID && abi.architecture() == Abi::X86Architecture && abi.wordWidth() == 64 @@ -410,7 +410,7 @@ static Toolchain *mingwToolChain(const FilePath &path, Id language) static Toolchain *armGccToolChain(const FilePath &path, Id language) { - Toolchain *toolChain = ToolChainManager::toolChain([&path, language](const Toolchain *t) { + Toolchain *toolChain = ToolchainManager::toolChain([&path, language](const Toolchain *t) { return t->compilerCommand() == path && t->language() == language; }); if (!toolChain) { @@ -426,7 +426,7 @@ static Toolchain *armGccToolChain(const FilePath &path, Id language) toolChain = detected.first(); toolChain->setDetection(Toolchain::ManualDetection); toolChain->setDisplayName("Arm GCC"); - ToolChainManager::registerToolChain(toolChain); + ToolchainManager::registerToolChain(toolChain); } } } @@ -436,7 +436,7 @@ static Toolchain *armGccToolChain(const FilePath &path, Id language) static Toolchain *iarToolChain(const FilePath &path, Id language) { - Toolchain *toolChain = ToolChainManager::toolChain([language](const Toolchain *t) { + Toolchain *toolChain = ToolchainManager::toolChain([language](const Toolchain *t) { return t->typeId() == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID && t->language() == language; }); @@ -457,7 +457,7 @@ static Toolchain *iarToolChain(const FilePath &path, Id language) toolChain = tc; toolChain->setDetection(Toolchain::ManualDetection); toolChain->setDisplayName("IAREW"); - ToolChainManager::registerToolChain(toolChain); + ToolchainManager::registerToolChain(toolChain); } } } diff --git a/src/plugins/mcusupport/mcusupportsdk.cpp b/src/plugins/mcusupport/mcusupportsdk.cpp index ff7d20b3f82..589fa27e1d5 100644 --- a/src/plugins/mcusupport/mcusupportsdk.cpp +++ b/src/plugins/mcusupport/mcusupportsdk.cpp @@ -328,7 +328,7 @@ McuToolChainPackagePtr createIarToolChainPackage(const SettingsHandler::Ptr &set if (qtcEnvironmentVariableIsSet(envVar)) defaultPath = FilePath::fromUserInput(qtcEnvironmentVariable(envVar)); else { - const ProjectExplorer::Toolchain *tc = ProjectExplorer::ToolChainManager::toolChain( + const ProjectExplorer::Toolchain *tc = ProjectExplorer::ToolchainManager::toolChain( [](const ProjectExplorer::Toolchain *t) { return t->typeId() == BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID; }); diff --git a/src/plugins/mcusupport/test/unittest.cpp b/src/plugins/mcusupport/test/unittest.cpp index ea16af2cd96..2175f3ab653 100644 --- a/src/plugins/mcusupport/test/unittest.cpp +++ b/src/plugins/mcusupport/test/unittest.cpp @@ -71,7 +71,7 @@ using CMakeProjectManager::CMakeConfigurationKitAspect; using ProjectExplorer::Kit; using ProjectExplorer::KitManager; using ProjectExplorer::Toolchain; -using ProjectExplorer::ToolChainManager; +using ProjectExplorer::ToolchainManager; using testing::_; using testing::Return; @@ -216,7 +216,7 @@ void verifyIarToolchain(const McuToolChainPackagePtr &iarToolchainPackage) Id iarId{BareMetal::Constants::IAREW_TOOLCHAIN_TYPEID}; Toolchain *iarToolchain{ProjectExplorer::ToolchainFactory::createToolChain(iarId)}; iarToolchain->setLanguage(cxxLanguageId); - ToolChainManager::registerToolChain(iarToolchain); + ToolchainManager::registerToolChain(iarToolchain); QVERIFY(iarToolchainPackage != nullptr); QCOMPARE(iarToolchainPackage->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); @@ -240,7 +240,7 @@ void verifyArmGccToolchain(const McuToolChainPackagePtr &armGccPackage, const QS Toolchain *armToolchain{ProjectExplorer::ToolchainFactory::createToolChain(armGccId)}; armToolchain->setLanguage(cxxLanguageId); - ToolChainManager::registerToolChain(armToolchain); + ToolchainManager::registerToolChain(armToolchain); QVERIFY(armGccPackage != nullptr); QCOMPARE(armGccPackage->cmakeVariableName(), TOOLCHAIN_DIR_CMAKE_VARIABLE); diff --git a/src/plugins/nim/nimplugin.cpp b/src/plugins/nim/nimplugin.cpp index d3495f0a24a..6cca4f90057 100644 --- a/src/plugins/nim/nimplugin.cpp +++ b/src/plugins/nim/nimplugin.cpp @@ -69,7 +69,7 @@ void NimPlugin::initialize() { d = new NimPluginPrivate; - ToolChainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME); + ToolchainManager::registerLanguage(Constants::C_NIMLANGUAGE_ID, Constants::C_NIMLANGUAGE_NAME); TextEditor::SnippetProvider::registerGroup(Constants::C_NIMSNIPPETSGROUP_ID, Tr::tr("Nim", "SnippetProvider"), diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 1989e322143..c8a4cbf7060 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -283,7 +283,7 @@ static Abis guessGccAbi(const QString &m, const ProjectExplorer::Macros ¯os) } else if (arch == Abi::X86Architecture && (width == 0 || width == 64)) { abiList << Abi(arch, os, flavor, format, 64); if (width != 64 || (!m.contains("mingw") - && ToolChainManager::detectionSettings().detectX64AsX32)) { + && ToolchainManager::detectionSettings().detectX64AsX32)) { abiList << Abi(arch, os, flavor, format, 32); } } else { @@ -424,7 +424,7 @@ QString GccToolChain::defaultDisplayName() const if (abi.architecture() == Abi::UnknownArchitecture || abi.wordWidth() == 0) return type; return Tr::tr("%1 (%2, %3 %4 at %5)").arg(type, - ToolChainManager::displayNameOfLanguageId(language()), + ToolchainManager::displayNameOfLanguageId(language()), Abi::toString(abi.architecture()), Abi::toString(abi.wordWidth()), compilerCommand().toUserOutput()); @@ -437,7 +437,7 @@ LanguageExtensions GccToolChain::defaultLanguageExtensions() const static const Toolchains mingwToolChains() { - return ToolChainManager::toolchains([](const Toolchain *tc) -> bool { + return ToolchainManager::toolchains([](const Toolchain *tc) -> bool { return tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID; }); } @@ -866,7 +866,7 @@ QStringList GccToolChain::suggestedMkspecList() const } if (m_subType == Clang) { - if (const Toolchain * const parentTc = ToolChainManager::findToolChain(m_parentToolChainId)) + if (const Toolchain * const parentTc = ToolchainManager::findToolChain(m_parentToolChainId)) return parentTc->suggestedMkspecList(); const Abi abi = targetAbi(); if (abi.os() == Abi::DarwinOS) @@ -1624,13 +1624,13 @@ Toolchains GccToolchainFactory::autoDetectToolChain(const ToolChainDescription & Environment systemEnvironment = tcd.compilerPath.deviceEnvironment(); GccToolChain::addCommandPathToEnvironment(tcd.compilerPath, systemEnvironment); const FilePath localCompilerPath = findLocalCompiler(tcd.compilerPath, systemEnvironment); - if (ToolChainManager::isBadToolchain(localCompilerPath)) + if (ToolchainManager::isBadToolchain(localCompilerPath)) return result; Macros macros = gccPredefinedMacros(localCompilerPath, gccPredefinedMacrosOptions(tcd.language), systemEnvironment); if (macros.isEmpty()) { - ToolChainManager::addBadToolchain(localCompilerPath); + ToolchainManager::addBadToolchain(localCompilerPath); return result; } const GccToolChain::DetectedAbisResult detectedAbis = guessGccAbi(localCompilerPath, @@ -1757,19 +1757,19 @@ GccToolChainConfigWidget::GccToolChainConfigWidget(GccToolChain *tc) : Tr::tr("Parent toolchain:"), m_parentToolchainCombo); - ToolChainManager *tcManager = ToolChainManager::instance(); + ToolchainManager *tcManager = ToolchainManager::instance(); m_parentToolChainConnections.append( - connect(tcManager, &ToolChainManager::toolChainUpdated, this, [this](Toolchain *tc) { + connect(tcManager, &ToolchainManager::toolChainUpdated, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID) updateParentToolChainComboBox(); })); m_parentToolChainConnections.append( - connect(tcManager, &ToolChainManager::toolChainAdded, this, [this](Toolchain *tc) { + connect(tcManager, &ToolchainManager::toolChainAdded, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID) updateParentToolChainComboBox(); })); m_parentToolChainConnections.append( - connect(tcManager, &ToolChainManager::toolChainRemoved, this, [this](Toolchain *tc) { + connect(tcManager, &ToolchainManager::toolChainRemoved, this, [this](Toolchain *tc) { if (tc->id() == toolChain()->id()) { for (QMetaObject::Connection &connection : m_parentToolChainConnections) QObject::disconnect(connection); @@ -1956,10 +1956,10 @@ void GccToolChain::syncAutodetectedWithParentToolchains() QObject::disconnect(m_thisToolchainRemovedConnection); QObject::disconnect(m_mingwToolchainAddedConnection); - if (!ToolChainManager::isLoaded()) { - connect(ToolChainManager::instance(), &ToolChainManager::toolChainsLoaded, this, + if (!ToolchainManager::isLoaded()) { + connect(ToolchainManager::instance(), &ToolchainManager::toolChainsLoaded, this, [id = id()] { - if (Toolchain * const tc = ToolChainManager::findToolChain(id)) { + if (Toolchain * const tc = ToolchainManager::findToolChain(id)) { if (tc->typeId() == Constants::CLANG_TOOLCHAIN_TYPEID) static_cast(tc)->syncAutodetectedWithParentToolchains(); } @@ -1973,16 +1973,16 @@ void GccToolChain::syncAutodetectedWithParentToolchains() } // Subscribe only autodetected toolchains. - ToolChainManager *tcManager = ToolChainManager::instance(); + ToolchainManager *tcManager = ToolchainManager::instance(); m_mingwToolchainAddedConnection - = connect(tcManager, &ToolChainManager::toolChainAdded, this, [this](Toolchain *tc) { + = connect(tcManager, &ToolchainManager::toolChainAdded, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID && !mingwToolChainFromId(m_parentToolChainId)) { m_parentToolChainId = tc->id(); } }); m_thisToolchainRemovedConnection - = connect(tcManager, &ToolChainManager::toolChainRemoved, this, [this](Toolchain *tc) { + = connect(tcManager, &ToolchainManager::toolChainRemoved, this, [this](Toolchain *tc) { if (tc == this) { QObject::disconnect(m_thisToolchainRemovedConnection); QObject::disconnect(m_mingwToolchainAddedConnection); diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index 218deea329c..068c663c2c0 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -204,14 +204,14 @@ public: layout->setContentsMargins(0, 0, 0, 0); layout->setColumnStretch(1, 2); - const QList languageList = sorted(ToolChainManager::allLanguages(), [](Id l1, Id l2) { - return ToolChainManager::displayNameOfLanguageId(l1) - < ToolChainManager::displayNameOfLanguageId(l2); + const QList languageList = sorted(ToolchainManager::allLanguages(), [](Id l1, Id l2) { + return ToolchainManager::displayNameOfLanguageId(l1) + < ToolchainManager::displayNameOfLanguageId(l2); }); QTC_ASSERT(!languageList.isEmpty(), return); int row = 0; for (Id l : std::as_const(languageList)) { - layout->addWidget(new QLabel(ToolChainManager::displayNameOfLanguageId(l) + ':'), row, 0); + layout->addWidget(new QLabel(ToolchainManager::displayNameOfLanguageId(l) + ':'), row, 0); auto cb = new QComboBox; cb->setSizePolicy(QSizePolicy::Ignored, cb->sizePolicy().verticalPolicy()); cb->setToolTip(factory->description()); @@ -249,7 +249,7 @@ private: const GuardLocker locker(m_ignoreChanges); const QList keys = m_languageComboboxMap.keys(); for (const Id l : keys) { - const Toolchains ltcList = ToolChainManager::toolchains(equal(&Toolchain::language, l)); + const Toolchains ltcList = ToolchainManager::toolchains(equal(&Toolchain::language, l)); QComboBox *cb = m_languageComboboxMap.value(l); cb->clear(); @@ -292,7 +292,7 @@ private: return; const QByteArray id = m_languageComboboxMap.value(language)->itemData(idx).toByteArray(); - Toolchain *tc = ToolChainManager::findToolChain(id); + Toolchain *tc = ToolchainManager::findToolChain(id); QTC_ASSERT(!tc || tc->language() == language, return); if (tc) ToolchainKitAspect::setToolChain(m_kit, tc); @@ -361,8 +361,8 @@ static QMap defaultToolChainIds() { QMap toolChains; const Abi abi = Abi::hostAbi(); - const Toolchains tcList = ToolChainManager::toolchains(equal(&Toolchain::targetAbi, abi)); - const QList languages = ToolChainManager::allLanguages(); + const Toolchains tcList = ToolchainManager::toolchains(equal(&Toolchain::targetAbi, abi)); + const QList languages = ToolchainManager::allLanguages(); for (Id l : languages) { Toolchain *tc = findOrDefault(tcList, equal(&Toolchain::language, l)); toolChains.insert(l, tc ? tc->id() : QByteArray()); @@ -404,14 +404,14 @@ Tasks ToolchainKitAspectFactory::validate(const Kit *k) const void ToolchainKitAspectFactory::fix(Kit *k) { - QTC_ASSERT(ToolChainManager::isLoaded(), return); - const QList languages = ToolChainManager::allLanguages(); + QTC_ASSERT(ToolchainManager::isLoaded(), return); + const QList languages = ToolchainManager::allLanguages(); for (const Id l : languages) { const QByteArray tcId = ToolchainKitAspect::toolChainId(k, l); - if (!tcId.isEmpty() && !ToolChainManager::findToolChain(tcId)) { + if (!tcId.isEmpty() && !ToolchainManager::findToolChain(tcId)) { qWarning("Tool chain set up in kit \"%s\" for \"%s\" not found.", qPrintable(k->displayName()), - qPrintable(ToolChainManager::displayNameOfLanguageId(l))); + qPrintable(ToolchainManager::displayNameOfLanguageId(l))); ToolchainKitAspect::clearToolChain(k, l); // make sure to clear out no longer known tool chains } } @@ -420,13 +420,13 @@ void ToolchainKitAspectFactory::fix(Kit *k) static Id findLanguage(const QString &ls) { QString lsUpper = ls.toUpper(); - return Utils::findOrDefault(ToolChainManager::allLanguages(), + return Utils::findOrDefault(ToolchainManager::allLanguages(), [lsUpper](Id l) { return lsUpper == l.toString().toUpper(); }); } void ToolchainKitAspectFactory::setup(Kit *k) { - QTC_ASSERT(ToolChainManager::isLoaded(), return); + QTC_ASSERT(ToolchainManager::isLoaded(), return); QTC_ASSERT(k, return); Store value = storeFromVariant(k->value(id())); @@ -443,14 +443,14 @@ void ToolchainKitAspectFactory::setup(Kit *k) } const QByteArray id = i.value().toByteArray(); - Toolchain *tc = ToolChainManager::findToolChain(id); + Toolchain *tc = ToolchainManager::findToolChain(id); if (tc) continue; // ID is not found: Might be an ABI string... lockToolchains = false; const QString abi = QString::fromUtf8(id); - const Toolchains possibleTcs = ToolChainManager::toolchains([abi, l](const Toolchain *t) { + const Toolchains possibleTcs = ToolchainManager::toolchains([abi, l](const Toolchain *t) { return t->targetAbi().toString() == abi && t->language() == l; }); Toolchain *bestTc = nullptr; @@ -548,7 +548,7 @@ Id ToolchainKitAspect::id() QByteArray ToolchainKitAspect::toolChainId(const Kit *k, Id language) { - QTC_ASSERT(ToolChainManager::isLoaded(), return nullptr); + QTC_ASSERT(ToolchainManager::isLoaded(), return nullptr); if (!k) return {}; Store value = storeFromVariant(k->value(ToolchainKitAspect::id())); @@ -557,17 +557,17 @@ QByteArray ToolchainKitAspect::toolChainId(const Kit *k, Id language) Toolchain *ToolchainKitAspect::toolChain(const Kit *k, Id language) { - return ToolChainManager::findToolChain(toolChainId(k, language)); + return ToolchainManager::findToolChain(toolChainId(k, language)); } Toolchain *ToolchainKitAspect::cToolChain(const Kit *k) { - return ToolChainManager::findToolChain(toolChainId(k, ProjectExplorer::Constants::C_LANGUAGE_ID)); + return ToolchainManager::findToolChain(toolChainId(k, ProjectExplorer::Constants::C_LANGUAGE_ID)); } Toolchain *ToolchainKitAspect::cxxToolChain(const Kit *k) { - return ToolChainManager::findToolChain(toolChainId(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)); + return ToolchainManager::findToolChain(toolChainId(k, ProjectExplorer::Constants::CXX_LANGUAGE_ID)); } @@ -577,8 +577,8 @@ QList ToolchainKitAspect::toolChains(const Kit *k) const Store value = storeFromVariant(k->value(ToolchainKitAspect::id())); const QList tcList - = transform(ToolChainManager::allLanguages(), [&value](Id l) { - return ToolChainManager::findToolChain(value.value(l.toKey()).toByteArray()); + = transform(ToolchainManager::allLanguages(), [&value](Id l) { + return ToolchainManager::findToolChain(value.value(l.toKey()).toByteArray()); }); return filtered(tcList, [](Toolchain *tc) { return tc; }); } @@ -608,13 +608,13 @@ void ToolchainKitAspect::setAllToolChainsToMatch(Kit *k, Toolchain *tc) QTC_ASSERT(tc, return); QTC_ASSERT(k, return); - const Toolchains allTcList = ToolChainManager::toolchains(); + const Toolchains allTcList = ToolchainManager::toolchains(); QTC_ASSERT(allTcList.contains(tc), return); Store result = storeFromVariant(k->value(ToolchainKitAspect::id())); result.insert(tc->language().toKey(), tc->id()); - for (const Id l : ToolChainManager::allLanguages()) { + for (const Id l : ToolchainManager::allLanguages()) { if (l == tc->language()) continue; @@ -695,9 +695,9 @@ void ToolchainKitAspectFactory::onKitsLoaded() for (Kit *k : KitManager::kits()) fix(k); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainRemoved, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainRemoved, this, &ToolchainKitAspectFactory::toolChainRemoved); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainUpdated, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainUpdated, this, &ToolchainKitAspectFactory::toolChainUpdated); } diff --git a/src/plugins/projectexplorer/kitmanager.cpp b/src/plugins/projectexplorer/kitmanager.cpp index b228ea7c698..1778c560892 100644 --- a/src/plugins/projectexplorer/kitmanager.cpp +++ b/src/plugins/projectexplorer/kitmanager.cpp @@ -306,7 +306,7 @@ void KitManager::restoreKits() // TODO: This should not need to be done here. Instead, it should be a convenience // operation on some lower level, e.g. in the toolchain class(es). // Also, we shouldn't detect so many doublets in the first place. - for (Toolchain * const tc : ToolChainManager::toolchains()) { + for (Toolchain * const tc : ToolchainManager::toolchains()) { Toolchain *&bestTc = uniqueToolchains[tc->targetAbi()][tc->language()]; if (!bestTc) { bestTc = tc; diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index 711a934d5f9..cfd3e55910a 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -1560,8 +1560,8 @@ void ProjectExplorerPlugin::testSourceToBinaryMapping() QVERIFY(toolchain); if (const auto msvcToolchain = dynamic_cast(toolchain)) { while (!msvcToolchain->environmentInitialized()) { - QSignalSpy parsingFinishedSpy(ToolChainManager::instance(), - &ToolChainManager::toolChainUpdated); + QSignalSpy parsingFinishedSpy(ToolchainManager::instance(), + &ToolchainManager::toolChainUpdated); QVERIFY(parsingFinishedSpy.wait(10000)); } } diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp index f6c61bded15..1b8ac5f4971 100644 --- a/src/plugins/projectexplorer/projectexplorer.cpp +++ b/src/plugins/projectexplorer/projectexplorer.cpp @@ -632,7 +632,7 @@ public: bool m_shouldHaveRunConfiguration = false; Id m_runMode = Constants::NO_RUN_MODE; - ToolChainManager *m_toolChainManager = nullptr; + ToolchainManager *m_toolChainManager = nullptr; #ifdef WITH_JOURNALD JournaldWatcher m_journalWatcher; @@ -826,11 +826,11 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er handleCommandLineArguments(arguments); - dd->m_toolChainManager = new ToolChainManager; + dd->m_toolChainManager = new ToolchainManager; // Register languages - ToolChainManager::registerLanguage(Constants::C_LANGUAGE_ID, Tr::tr("C")); - ToolChainManager::registerLanguage(Constants::CXX_LANGUAGE_ID, Tr::tr("C++")); + ToolchainManager::registerLanguage(Constants::C_LANGUAGE_ID, Tr::tr("C")); + ToolchainManager::registerLanguage(Constants::CXX_LANGUAGE_ID, Tr::tr("C++")); IWizardFactory::registerFeatureProvider(new KitFeatureProvider); IWizardFactory::registerFactoryCreator([] { return new SimpleProjectWizard; }); @@ -2118,7 +2118,7 @@ bool ProjectExplorerPlugin::delayedInitialize() { NANOTRACE_SCOPE("ProjectExplorer", "ProjectExplorerPlugin::restoreKits"); ExtraAbi::load(); // Load this before Toolchains! - ToolChainManager::restoreToolChains(); + ToolchainManager::restoreToolChains(); KitManager::restoreKits(); return true; } @@ -2133,7 +2133,7 @@ IPlugin::ShutdownFlag ProjectExplorerPlugin::aboutToShutdown() disconnect(ModeManager::instance(), &ModeManager::currentModeChanged, dd, &ProjectExplorerPluginPrivate::currentModeChanged); ProjectTree::aboutToShutDown(); - ToolChainManager::aboutToShutdown(); + ToolchainManager::aboutToShutdown(); ProjectManager::closeAllProjects(); // Attempt to synchronously shutdown all run controls. diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index b55888159b2..4bf718348fd 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -313,7 +313,7 @@ bool ProjectImporter::findTemporaryHandler(Utils::Id id) const static Toolchain *toolChainFromVariant(const QVariant &v) { const QByteArray tcId = v.toByteArray(); - return ToolChainManager::findToolChain(tcId); + return ToolchainManager::findToolChain(tcId); } void ProjectImporter::cleanupTemporaryToolChains(Kit *k, const QVariantList &vl) @@ -321,7 +321,7 @@ void ProjectImporter::cleanupTemporaryToolChains(Kit *k, const QVariantList &vl) for (const QVariant &v : vl) { Toolchain *tc = toolChainFromVariant(v); QTC_ASSERT(tc, continue); - ToolChainManager::deregisterToolChain(tc); + ToolchainManager::deregisterToolChain(tc); ToolchainKitAspect::setToolChain(k, nullptr); } } @@ -333,7 +333,7 @@ void ProjectImporter::persistTemporaryToolChains(Kit *k, const QVariantList &vl) QTC_ASSERT(tmpTc, continue); Toolchain *actualTc = ToolchainKitAspect::toolChain(k, tmpTc->language()); if (tmpTc && actualTc != tmpTc) - ToolChainManager::deregisterToolChain(tmpTc); + ToolchainManager::deregisterToolChain(tmpTc); } } @@ -376,7 +376,7 @@ static ProjectImporter::ToolChainData createToolChains(const ToolChainDescriptio continue; for (Toolchain *tc : std::as_const(data.tcs)) - ToolChainManager::registerToolChain(tc); + ToolchainManager::registerToolChain(tc); data.areTemporary = true; break; @@ -389,7 +389,7 @@ ProjectImporter::ToolChainData ProjectImporter::findOrCreateToolChains(const ToolChainDescription &tcd) const { ToolChainData result; - result.tcs = ToolChainManager::toolchains([&tcd](const Toolchain *tc) { + result.tcs = ToolchainManager::toolchains([&tcd](const Toolchain *tc) { return tc->language() == tcd.language && tc->matchesCompilerCommand(tcd.compilerPath); }); for (const Toolchain *tc : std::as_const(result.tcs)) { diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp index 30eb101ef44..6407f393933 100644 --- a/src/plugins/projectexplorer/toolchain.cpp +++ b/src/plugins/projectexplorer/toolchain.cpp @@ -112,9 +112,9 @@ QString languageId(Language l) using namespace Internal; /*! - \class ProjectExplorer::ToolChain - \brief The ToolChain class represents a tool chain. - \sa ProjectExplorer::ToolChainManager + \class ProjectExplorer::Toolchain + \brief The Toolchain class represents a tool chain. + \sa ProjectExplorer::ToolchainManager */ // -------------------------------------------------------------------------- @@ -128,7 +128,7 @@ void Toolchain::setLanguage(Id language) { QTC_ASSERT(!d->m_language.isValid() || isAutoDetected(), return); QTC_ASSERT(language.isValid(), return); - QTC_ASSERT(ToolChainManager::isLanguageSupported(language), return); + QTC_ASSERT(ToolchainManager::isLanguageSupported(language), return); d->m_language = language; } @@ -272,7 +272,7 @@ void Toolchain::toolChainUpdated() d->m_predefinedMacrosCache->invalidate(); d->m_headerPathsCache->invalidate(); - ToolChainManager::notifyAboutUpdate(this); + ToolchainManager::notifyAboutUpdate(this); } void Toolchain::setDetection(Toolchain::Detection de) @@ -648,7 +648,7 @@ Toolchain *ToolchainFactory::createToolChain(Id toolChainType) QList ToolchainFactory::supportedLanguages() const { - return m_supportsAllLanguages ? ToolChainManager::allLanguages() : m_supportedLanguages; + return m_supportsAllLanguages ? ToolchainManager::allLanguages() : m_supportedLanguages; } Id ToolchainFactory::supportedToolChainType() const diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index f3b507aee68..6c8242c936e 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -24,7 +24,7 @@ namespace ProjectExplorer { namespace Internal { // -------------------------------------------------------------------------- -// ToolChainManagerPrivate +// ToolchainManagerPrivate // -------------------------------------------------------------------------- struct LanguageDisplayPair @@ -33,10 +33,10 @@ struct LanguageDisplayPair QString displayName; }; -class ToolChainManagerPrivate +class ToolchainManagerPrivate { public: - ~ToolChainManagerPrivate(); + ~ToolchainManagerPrivate(); std::unique_ptr m_accessor; @@ -47,14 +47,14 @@ public: bool m_loaded = false; }; -ToolChainManagerPrivate::~ToolChainManagerPrivate() +ToolchainManagerPrivate::~ToolchainManagerPrivate() { qDeleteAll(m_toolChains); m_toolChains.clear(); } -static ToolChainManager *m_instance = nullptr; -static ToolChainManagerPrivate *d = nullptr; +static ToolchainManager *m_instance = nullptr; +static ToolchainManagerPrivate *d = nullptr; } // namespace Internal @@ -65,22 +65,22 @@ const char DETECT_X64_AS_X32_KEY[] = "ProjectExplorer/Toolchains/DetectX64AsX32" static Key badToolchainsKey() { return "BadToolChains"; } // -------------------------------------------------------------------------- -// ToolChainManager +// ToolchainManager // -------------------------------------------------------------------------- -ToolChainManager::ToolChainManager(QObject *parent) : +ToolchainManager::ToolchainManager(QObject *parent) : QObject(parent) { Q_ASSERT(!m_instance); m_instance = this; - d = new ToolChainManagerPrivate; + d = new ToolchainManagerPrivate; connect(Core::ICore::instance(), &Core::ICore::saveSettingsRequested, - this, &ToolChainManager::saveToolChains); - connect(this, &ToolChainManager::toolChainAdded, this, &ToolChainManager::toolChainsChanged); - connect(this, &ToolChainManager::toolChainRemoved, this, &ToolChainManager::toolChainsChanged); - connect(this, &ToolChainManager::toolChainUpdated, this, &ToolChainManager::toolChainsChanged); + this, &ToolchainManager::saveToolChains); + connect(this, &ToolchainManager::toolChainAdded, this, &ToolchainManager::toolChainsChanged); + connect(this, &ToolchainManager::toolChainRemoved, this, &ToolchainManager::toolChainsChanged); + connect(this, &ToolchainManager::toolChainUpdated, this, &ToolchainManager::toolChainsChanged); QtcSettings * const s = Core::ICore::settings(); d->m_detectionSettings.detectX64AsX32 @@ -88,21 +88,21 @@ ToolChainManager::ToolChainManager(QObject *parent) : d->m_badToolchains = BadToolchains::fromVariant(s->value(badToolchainsKey())); } -ToolChainManager::~ToolChainManager() +ToolchainManager::~ToolchainManager() { m_instance = nullptr; delete d; d = nullptr; } -ToolChainManager *ToolChainManager::instance() +ToolchainManager *ToolchainManager::instance() { return m_instance; } -void ToolChainManager::restoreToolChains() +void ToolchainManager::restoreToolChains() { - NANOTRACE_SCOPE("ProjectExplorer", "ToolChainManager::restoreToolChains"); + NANOTRACE_SCOPE("ProjectExplorer", "ToolchainManager::restoreToolChains"); QTC_ASSERT(!d->m_accessor, return); d->m_accessor = std::make_unique(); @@ -113,7 +113,7 @@ void ToolChainManager::restoreToolChains() emit m_instance->toolChainsLoaded(); } -void ToolChainManager::saveToolChains() +void ToolchainManager::saveToolChains() { QTC_ASSERT(d->m_accessor, return); @@ -125,25 +125,25 @@ void ToolChainManager::saveToolChains() s->setValue(badToolchainsKey(), d->m_badToolchains.toVariant()); } -const Toolchains &ToolChainManager::toolchains() +const Toolchains &ToolchainManager::toolchains() { QTC_CHECK(d->m_loaded); return d->m_toolChains; } -Toolchains ToolChainManager::toolchains(const Toolchain::Predicate &predicate) +Toolchains ToolchainManager::toolchains(const Toolchain::Predicate &predicate) { QTC_ASSERT(predicate, return {}); return Utils::filtered(d->m_toolChains, predicate); } -Toolchain *ToolChainManager::toolChain(const Toolchain::Predicate &predicate) +Toolchain *ToolchainManager::toolChain(const Toolchain::Predicate &predicate) { QTC_CHECK(d->m_loaded); return Utils::findOrDefault(d->m_toolChains, predicate); } -Toolchains ToolChainManager::findToolChains(const Abi &abi) +Toolchains ToolchainManager::findToolChains(const Abi &abi) { QTC_CHECK(d->m_loaded); Toolchains result; @@ -158,7 +158,7 @@ Toolchains ToolChainManager::findToolChains(const Abi &abi) return result; } -Toolchain *ToolChainManager::findToolChain(const QByteArray &id) +Toolchain *ToolchainManager::findToolChain(const QByteArray &id) { QTC_CHECK(d->m_loaded); if (id.isEmpty()) @@ -179,19 +179,19 @@ Toolchain *ToolChainManager::findToolChain(const QByteArray &id) return tc; } -bool ToolChainManager::isLoaded() +bool ToolchainManager::isLoaded() { return d->m_loaded; } -void ToolChainManager::notifyAboutUpdate(Toolchain *tc) +void ToolchainManager::notifyAboutUpdate(Toolchain *tc) { if (!tc || !d->m_toolChains.contains(tc)) return; emit m_instance->toolChainUpdated(tc); } -bool ToolChainManager::registerToolChain(Toolchain *tc) +bool ToolchainManager::registerToolChain(Toolchain *tc) { QTC_ASSERT(tc, return false); QTC_ASSERT(isLanguageSupported(tc->language()), @@ -214,7 +214,7 @@ bool ToolChainManager::registerToolChain(Toolchain *tc) return true; } -void ToolChainManager::deregisterToolChain(Toolchain *tc) +void ToolchainManager::deregisterToolChain(Toolchain *tc) { QTC_CHECK(d->m_loaded); if (!tc || !d->m_toolChains.contains(tc)) @@ -224,12 +224,12 @@ void ToolChainManager::deregisterToolChain(Toolchain *tc) delete tc; } -QList ToolChainManager::allLanguages() +QList ToolchainManager::allLanguages() { return Utils::transform(d->m_languages, &LanguageDisplayPair::id); } -bool ToolChainManager::registerLanguage(const Utils::Id &language, const QString &displayName) +bool ToolchainManager::registerLanguage(const Utils::Id &language, const QString &displayName) { QTC_ASSERT(language.isValid(), return false); QTC_ASSERT(!isLanguageSupported(language), return false); @@ -238,7 +238,7 @@ bool ToolChainManager::registerLanguage(const Utils::Id &language, const QString return true; } -QString ToolChainManager::displayNameOfLanguageId(const Utils::Id &id) +QString ToolchainManager::displayNameOfLanguageId(const Utils::Id &id) { QTC_ASSERT(id.isValid(), return Tr::tr("None")); auto entry = Utils::findOrDefault(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id)); @@ -246,38 +246,38 @@ QString ToolChainManager::displayNameOfLanguageId(const Utils::Id &id) return entry.displayName; } -bool ToolChainManager::isLanguageSupported(const Utils::Id &id) +bool ToolchainManager::isLanguageSupported(const Utils::Id &id) { return Utils::contains(d->m_languages, Utils::equal(&LanguageDisplayPair::id, id)); } -void ToolChainManager::aboutToShutdown() +void ToolchainManager::aboutToShutdown() { if (HostOsInfo::isWindowsHost()) MsvcToolChain::cancelMsvcToolChainDetection(); } -ToolchainDetectionSettings ToolChainManager::detectionSettings() +ToolchainDetectionSettings ToolchainManager::detectionSettings() { return d->m_detectionSettings; } -void ToolChainManager::setDetectionSettings(const ToolchainDetectionSettings &settings) +void ToolchainManager::setDetectionSettings(const ToolchainDetectionSettings &settings) { d->m_detectionSettings = settings; } -void ToolChainManager::resetBadToolchains() +void ToolchainManager::resetBadToolchains() { d->m_badToolchains.toolchains.clear(); } -bool ToolChainManager::isBadToolchain(const Utils::FilePath &toolchain) +bool ToolchainManager::isBadToolchain(const Utils::FilePath &toolchain) { return d->m_badToolchains.isBadToolchain(toolchain); } -void ToolChainManager::addBadToolchain(const Utils::FilePath &toolchain) +void ToolchainManager::addBadToolchain(const Utils::FilePath &toolchain) { d->m_badToolchains.toolchains << toolchain; } diff --git a/src/plugins/projectexplorer/toolchainmanager.h b/src/plugins/projectexplorer/toolchainmanager.h index c43c029c015..a85ff96de0f 100644 --- a/src/plugins/projectexplorer/toolchainmanager.h +++ b/src/plugins/projectexplorer/toolchainmanager.h @@ -28,16 +28,16 @@ public: }; // -------------------------------------------------------------------------- -// ToolChainManager +// ToolchainManager // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT ToolChainManager : public QObject +class PROJECTEXPLORER_EXPORT ToolchainManager : public QObject { Q_OBJECT public: - static ToolChainManager *instance(); - ~ToolChainManager() override; + static ToolchainManager *instance(); + ~ToolchainManager() override; static const Toolchains &toolchains(); static Toolchains toolchains(const Toolchain::Predicate &predicate); @@ -79,7 +79,7 @@ signals: void toolChainsLoaded(); private: - explicit ToolChainManager(QObject *parent = nullptr); + explicit ToolchainManager(QObject *parent = nullptr); // Make sure the this is only called after all toolchain factories are registered! static void restoreToolChains(); diff --git a/src/plugins/projectexplorer/toolchainoptionspage.cpp b/src/plugins/projectexplorer/toolchainoptionspage.cpp index 822b386b372..e1a857bcf48 100644 --- a/src/plugins/projectexplorer/toolchainoptionspage.cpp +++ b/src/plugins/projectexplorer/toolchainoptionspage.cpp @@ -154,7 +154,7 @@ class ToolChainOptionsWidget final : public Core::IOptionsPageWidget public: ToolChainOptionsWidget() { - m_detectionSettings = ToolChainManager::detectionSettings(); + m_detectionSettings = ToolchainManager::detectionSettings(); m_factories = Utils::filtered(ToolchainFactory::allToolchainFactories(), [](ToolchainFactory *factory) { return factory->canCreate();}); @@ -163,9 +163,9 @@ public: {ProjectExplorer::Constants::msgAutoDetectedToolTip()}); auto manualRoot = new StaticTreeItem(ProjectExplorer::Constants::msgManual()); - const QList languages = ToolChainManager::allLanguages(); + const QList languages = ToolchainManager::allLanguages(); for (const Utils::Id &l : languages) { - const QString dn = ToolChainManager::displayNameOfLanguageId(l); + const QString dn = ToolchainManager::displayNameOfLanguageId(l); auto autoNode = new StaticTreeItem(dn); auto manualNode = new StaticTreeItem(dn); @@ -203,11 +203,11 @@ public: addMenu->addAction(createAction(factory->displayName(), factory, languages.at(0))); } else { Utils::sort(languages, [](const Utils::Id &l1, const Utils::Id &l2) { - return ToolChainManager::displayNameOfLanguageId(l1) < ToolChainManager::displayNameOfLanguageId(l2); + return ToolchainManager::displayNameOfLanguageId(l1) < ToolchainManager::displayNameOfLanguageId(l2); }); auto subMenu = addMenu->addMenu(factory->displayName()); for (const Utils::Id &l : std::as_const(languages)) - subMenu->addAction(createAction(ToolChainManager::displayNameOfLanguageId(l), factory, l)); + subMenu->addAction(createAction(ToolchainManager::displayNameOfLanguageId(l), factory, l)); } } m_addButton->setMenu(addMenu); @@ -253,7 +253,7 @@ public: m_widgetStack = new QStackedWidget; m_container->setWidget(m_widgetStack); - for (Toolchain *tc : ToolChainManager::toolchains()) + for (Toolchain *tc : ToolchainManager::toolchains()) insertToolChain(tc); auto buttonLayout = new QVBoxLayout; @@ -275,14 +275,14 @@ public: horizontalLayout->addLayout(verticalLayout); horizontalLayout->addLayout(buttonLayout); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainAdded, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainAdded, this, &ToolChainOptionsWidget::addToolChain); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainRemoved, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainRemoved, this, &ToolChainOptionsWidget::removeToolChain); connect(m_toolChainView->selectionModel(), &QItemSelectionModel::currentChanged, this, &ToolChainOptionsWidget::toolChainSelectionChanged); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainsChanged, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainsChanged, this, &ToolChainOptionsWidget::toolChainSelectionChanged); connect(m_delButton, &QAbstractButton::clicked, this, [this] { @@ -413,7 +413,7 @@ void ToolChainOptionsWidget::redetectToolchains() }); Toolchains toAdd; QSet toDelete; - ToolChainManager::resetBadToolchains(); + ToolchainManager::resetBadToolchains(); for (ToolchainFactory *f : ToolchainFactory::allToolchainFactories()) { const ToolchainDetector detector(knownTcs, DeviceManager::defaultDesktopDevice(), {}); // FIXME: Pass search paths for (Toolchain * const tc : f->autoDetect(detector)) { @@ -455,7 +455,7 @@ void ToolChainOptionsWidget::apply() // Remove unused tool chains: QList nodes = m_toRemoveList; for (const ToolChainTreeItem *n : std::as_const(nodes)) - ToolChainManager::deregisterToolChain(n->toolChain); + ToolchainManager::deregisterToolChain(n->toolChain); Q_ASSERT(m_toRemoveList.isEmpty()); @@ -479,7 +479,7 @@ void ToolChainOptionsWidget::apply() QStringList removedTcs; nodes = m_toAddList; for (const ToolChainTreeItem *n : std::as_const(nodes)) { - if (!ToolChainManager::registerToolChain(n->toolChain)) + if (!ToolchainManager::registerToolChain(n->toolChain)) removedTcs << n->toolChain->displayName(); } // @@ -505,7 +505,7 @@ void ToolChainOptionsWidget::apply() "They were not configured again.") .arg(removedTcs.join(QLatin1String(",
 ")))); } - ToolChainManager::setDetectionSettings(m_detectionSettings); + ToolchainManager::setDetectionSettings(m_detectionSettings); } void ToolChainOptionsWidget::createToolChain(ToolchainFactory *factory, const Utils::Id &language) diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 2daf3c31d45..5c88a53e103 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -236,7 +236,7 @@ QmakeBuildSystem::QmakeBuildSystem(QmakeBuildConfiguration *bc) connect(bc, &BuildConfiguration::environmentChanged, this, &QmakeBuildSystem::scheduleUpdateAllNowOrLater); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainUpdated, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainUpdated, this, [this](Toolchain *tc) { if (ToolchainKitAspect::cxxToolChain(kit()) == tc) scheduleUpdateAllNowOrLater(); diff --git a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp index 711b30bcf32..3e32bc822ea 100644 --- a/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp @@ -215,7 +215,7 @@ static const Toolchains preferredToolChains(QtVersion *qtVersion, const QString { const QString spec = ms.isEmpty() ? qtVersion->mkspec() : ms; - const Toolchains toolchains = ToolChainManager::toolchains(); + const Toolchains toolchains = ToolchainManager::toolchains(); const Abis qtAbis = qtVersion->qtAbis(); const auto matcher = [&](const Toolchain *tc) { return qtAbis.contains(tc->targetAbi()) && tc->suggestedMkspecList().contains(spec); diff --git a/src/plugins/qnx/qnxsettingspage.cpp b/src/plugins/qnx/qnxsettingspage.cpp index 86da2f4c176..4e96e7aefab 100644 --- a/src/plugins/qnx/qnxsettingspage.cpp +++ b/src/plugins/qnx/qnxsettingspage.cpp @@ -99,7 +99,7 @@ public: bool isActive() const { - const bool hasToolChain = ToolChainManager::toolChain(Utils::equal(&Toolchain::compilerCommand, + const bool hasToolChain = ToolchainManager::toolChain(Utils::equal(&Toolchain::compilerCommand, m_qccCompiler)); const bool hasDebugger = Utils::contains(DebuggerItemManager::debuggers(), [this](const DebuggerItem &di) { return findTargetByDebuggerPath(di.command()); @@ -169,7 +169,7 @@ void QnxConfiguration::deactivate() QTC_ASSERT(isActive(), return); const Toolchains toolChainsToRemove = - ToolChainManager::toolchains(Utils::equal(&Toolchain::compilerCommand, m_qccCompiler)); + ToolchainManager::toolchains(Utils::equal(&Toolchain::compilerCommand, m_qccCompiler)); QList debuggersToRemove; const QList debuggerItems = DebuggerItemManager::debuggers(); @@ -188,7 +188,7 @@ void QnxConfiguration::deactivate() } for (Toolchain *tc : toolChainsToRemove) - ToolChainManager::deregisterToolChain(tc); + ToolchainManager::deregisterToolChain(tc); for (const DebuggerItem &debuggerItem : std::as_const(debuggersToRemove)) DebuggerItemManager::deregisterDebugger(debuggerItem.id()); @@ -241,7 +241,7 @@ Toolchains QnxConfiguration::createToolChains(const QnxTarget &target) toolChain->sdpPath.setValue(m_envFile.parentDir()); toolChain->cpuDir.setValue(target.cpuDir()); toolChain->resetToolChain(m_qccCompiler); - ToolChainManager::registerToolChain(toolChain); + ToolchainManager::registerToolChain(toolChain); toolChains.append(toolChain); } diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index b74d9c25b32..abb7e36de9f 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -1866,7 +1866,7 @@ bool QtVersionPrivate::queryQMakeVariables(const FilePath &binary, const Environ // This is required to make non-static qmakes work on windows where every tool chain // tries to be incompatible with any other. const Abis abiList = Abi::abisOfBinary(binary); - const Toolchains tcList = ToolChainManager::toolchains([&abiList](const Toolchain *t) { + const Toolchains tcList = ToolchainManager::toolchains([&abiList](const Toolchain *t) { return abiList.contains(t->targetAbi()); }); for (Toolchain *tc : tcList) { diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index e2591d9260e..560149a0663 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -230,7 +230,7 @@ void QtKitAspectFactory::fix(Kit *k) return; const QString spec = version->mkspec(); - Toolchains possibleTcs = ToolChainManager::toolchains([version](const Toolchain *t) { + Toolchains possibleTcs = ToolchainManager::toolchains([version](const Toolchain *t) { if (!t->isValid() || t->language() != ProjectExplorer::Constants::CXX_LANGUAGE_ID) return false; return Utils::anyOf(version->qtAbis(), [t](const Abi &qtAbi) { diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index 15da26a439a..249f8aca943 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -369,7 +369,7 @@ QtOptionsPageWidget::QtOptionsPageWidget() connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, this, &QtOptionsPageWidget::updateQtVersions); - connect(ProjectExplorer::ToolChainManager::instance(), &ToolChainManager::toolChainsChanged, + connect(ProjectExplorer::ToolchainManager::instance(), &ToolchainManager::toolChainsChanged, this, &QtOptionsPageWidget::toolChainsUpdated); auto chooser = new VariableChooser(this); @@ -493,7 +493,7 @@ QtOptionsPageWidget::ValidityInfo QtOptionsPageWidget::validInformation(const Qt [&abi](const Abi &sabi) { return sabi.isCompatibleWith(abi); }); }; - if (!ToolChainManager::toolChain(abiCompatePred)) + if (!ToolchainManager::toolChain(abiCompatePred)) missingToolChains.append(abi); } @@ -539,7 +539,7 @@ QList QtOptionsPageWidget::toolChains(const QtVersion *version) QSet ids; const Abis abis = version->qtAbis(); for (const Abi &a : abis) { - const Toolchains tcList = ToolChainManager::findToolChains(a); + const Toolchains tcList = ToolchainManager::findToolChains(a); for (Toolchain *tc : tcList) { if (Utils::insert(ids, tc->id())) toolChains.append(tc); diff --git a/src/plugins/qtsupport/qtversionmanager.cpp b/src/plugins/qtsupport/qtversionmanager.cpp index 88c88ae15a0..8f3a7753c06 100644 --- a/src/plugins/qtsupport/qtversionmanager.cpp +++ b/src/plugins/qtsupport/qtversionmanager.cpp @@ -97,7 +97,7 @@ public: m_fileWatcherTimer.setInterval(2000); connect(&m_fileWatcherTimer, &QTimer::timeout, this, [this] { updateFromInstaller(); }); - connect(ToolChainManager::instance(), &ToolChainManager::toolChainsLoaded, + connect(ToolchainManager::instance(), &ToolchainManager::toolChainsLoaded, this, &QtVersionManagerImpl::triggerQtVersionRestore); } @@ -143,8 +143,8 @@ QtVersionManagerImpl &qtVersionManagerImpl() void QtVersionManagerImpl::triggerQtVersionRestore() { NANOTRACE_SCOPE("QtSupport", "QtVersionManagerImpl::triggerQtVersionRestore"); - disconnect(ToolChainManager::instance(), - &ToolChainManager::toolChainsLoaded, + disconnect(ToolchainManager::instance(), + &ToolchainManager::toolChainsLoaded, this, &QtVersionManagerImpl::triggerQtVersionRestore); diff --git a/src/plugins/webassembly/webassemblytoolchain.cpp b/src/plugins/webassembly/webassemblytoolchain.cpp index 42855145881..ae55fbeface 100644 --- a/src/plugins/webassembly/webassemblytoolchain.cpp +++ b/src/plugins/webassembly/webassemblytoolchain.cpp @@ -42,13 +42,13 @@ static const Abi &toolChainAbi() static void addRegisteredMinGWToEnvironment(Environment &env) { - if (!ToolChainManager::isLoaded()) { - // Avoid querying the ToolChainManager before it is loaded, which is the case during + if (!ToolchainManager::isLoaded()) { + // Avoid querying the ToolchainManager before it is loaded, which is the case during // toolchain restoration. The compiler version can be determined without MinGW in path. return; } - const Toolchain *toolChain = ToolChainManager::toolChain([](const Toolchain *t){ + const Toolchain *toolChain = ToolchainManager::toolChain([](const Toolchain *t){ return t->typeId() == ProjectExplorer::Constants::MINGW_TOOLCHAIN_TYPEID; }); if (toolChain) @@ -140,17 +140,17 @@ static Toolchains doAutoDetect(const ToolchainDetector &detector) void WebAssemblyToolChain::registerToolChains() { // Remove old toolchains - for (Toolchain *tc : ToolChainManager::findToolChains(toolChainAbi())) { + for (Toolchain *tc : ToolchainManager::findToolChains(toolChainAbi())) { if (tc->detection() != Toolchain::AutoDetection) continue; - ToolChainManager::deregisterToolChain(tc); + ToolchainManager::deregisterToolChain(tc); }; // Create new toolchains and register them ToolchainDetector detector({}, {}, {}); const Toolchains toolchains = doAutoDetect(detector); for (auto toolChain : toolchains) - ToolChainManager::registerToolChain(toolChain); + ToolchainManager::registerToolChain(toolChain); // Let kits pick up the new toolchains for (Kit *kit : KitManager::kits()) { @@ -165,7 +165,7 @@ void WebAssemblyToolChain::registerToolChains() bool WebAssemblyToolChain::areToolChainsRegistered() { - return !ToolChainManager::findToolChains(toolChainAbi()).isEmpty(); + return !ToolchainManager::findToolChains(toolChainAbi()).isEmpty(); } WebAssemblyToolchainFactory::WebAssemblyToolchainFactory()