diff --git a/src/plugins/ios/iosconfigurations.cpp b/src/plugins/ios/iosconfigurations.cpp index 69be96f3e2a..a1d857d4e33 100644 --- a/src/plugins/ios/iosconfigurations.cpp +++ b/src/plugins/ios/iosconfigurations.cpp @@ -586,14 +586,14 @@ Toolchains IosToolchainFactory::autoDetect(const ToolchainDetector &detector) co if (detector.device->type() != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) return {}; - QList existingClangToolChains = clangToolchains(detector.alreadyKnown); + QList existingClangToolchains = clangToolchains(detector.alreadyKnown); const QList platforms = XcodeProbe::detectPlatforms().values(); Toolchains toolchains; toolchains.reserve(platforms.size()); for (const XcodePlatform &platform : platforms) { for (const XcodePlatform::ToolchainTarget &target : platform.targets) { ToolchainPair platformToolchains = findToolchainForPlatform(platform, target, - existingClangToolChains); + existingClangToolchains); auto createOrAdd = [&](GccToolchain *toolChain, Id l) { if (!toolChain) { toolChain = new GccToolchain(ProjectExplorer::Constants::CLANG_TOOLCHAIN_TYPEID, @@ -606,7 +606,7 @@ Toolchains IosToolchainFactory::autoDetect(const ToolchainDetector &detector) co toolChain->setPlatformLinkerFlags(target.backendFlags); toolChain->resetToolchain(l == ProjectExplorer::Constants::CXX_LANGUAGE_ID ? platform.cxxCompilerPath : platform.cCompilerPath); - existingClangToolChains.append(toolChain); + existingClangToolchains.append(toolChain); } toolchains.append(toolChain); }; diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp index 4d1eebc3056..4da4c01945e 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.cpp +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.cpp @@ -254,8 +254,8 @@ void MesonProjectParser::update(const QFuture RawProjectPart MesonProjectParser::buildRawPart( const Target &target, const Target::SourceGroup &sources, - const Toolchain *cxxToolChain, - const Toolchain *cToolChain) + const Toolchain *cxxToolchain, + const Toolchain *cToolchain) { RawProjectPart part; part.setDisplayName(target.name); @@ -266,24 +266,24 @@ RawProjectPart MesonProjectParser::buildRawPart( part.setIncludePaths(toAbsolutePath(m_buildDir, flags.includePaths)); part.setProjectFileLocation(target.definedIn); if (sources.language == "cpp") - part.setFlagsForCxx({cxxToolChain, flags.args, {}}); + part.setFlagsForCxx({cxxToolchain, flags.args, {}}); else if (sources.language == "c") - part.setFlagsForC({cToolChain, flags.args, {}}); + part.setFlagsForC({cToolchain, flags.args, {}}); part.setQtVersion(m_qtVersion); return part; } RawProjectParts MesonProjectParser::buildProjectParts( - const Toolchain *cxxToolChain, const Toolchain *cToolChain) + const Toolchain *cxxToolchain, const Toolchain *cToolchain) { RawProjectParts parts; for_each_source_group(m_parserResult.targets, [&parts, - &cxxToolChain, - &cToolChain, + &cxxToolchain, + &cToolchain, this](const Target &target, const Target::SourceGroup &sourceList) { parts.push_back( - buildRawPart(target, sourceList, cxxToolChain, cToolChain)); + buildRawPart(target, sourceList, cxxToolchain, cToolchain)); }); return parts; } diff --git a/src/plugins/mesonprojectmanager/mesonprojectparser.h b/src/plugins/mesonprojectmanager/mesonprojectparser.h index 415a9d660b2..126d9b4d0fd 100644 --- a/src/plugins/mesonprojectmanager/mesonprojectparser.h +++ b/src/plugins/mesonprojectmanager/mesonprojectparser.h @@ -57,8 +57,8 @@ public: QList appsTargets() const; ProjectExplorer::RawProjectParts buildProjectParts( - const ProjectExplorer::Toolchain *cxxToolChain, - const ProjectExplorer::Toolchain *cToolChain); + const ProjectExplorer::Toolchain *cxxToolchain, + const ProjectExplorer::Toolchain *cToolchain); void setEnvironment(const Utils::Environment &environment) { m_env = environment; } @@ -78,8 +78,8 @@ private: void update(const QFuture &data); ProjectExplorer::RawProjectPart buildRawPart(const Target &target, const Target::SourceGroup &sources, - const ProjectExplorer::Toolchain *cxxToolChain, - const ProjectExplorer::Toolchain *cToolChain); + const ProjectExplorer::Toolchain *cxxToolchain, + const ProjectExplorer::Toolchain *cToolchain); MesonOutputParser m_outputParser; Utils::Environment m_env; diff --git a/src/plugins/nim/nimconstants.h b/src/plugins/nim/nimconstants.h index 31dfd8c469e..94b65d0fa97 100644 --- a/src/plugins/nim/nimconstants.h +++ b/src/plugins/nim/nimconstants.h @@ -13,7 +13,7 @@ const char C_NIMPROJECT_ID[] = "Nim.NimProject"; const char C_NIMBLEPROJECT_ID[] = "Nim.NimbleProject"; const char C_NIMEDITOR_ID[] = "Nim.NimEditor"; -// NimToolChain +// NimToolchain const char C_NIMTOOLCHAIN_TYPEID[] = "Nim.NimToolChain"; // NimProject diff --git a/src/plugins/nim/project/nimtoolchain.cpp b/src/plugins/nim/project/nimtoolchain.cpp index e0ef172fff8..61362314d73 100644 --- a/src/plugins/nim/project/nimtoolchain.cpp +++ b/src/plugins/nim/project/nimtoolchain.cpp @@ -27,11 +27,11 @@ using namespace Utils; namespace Nim { -NimToolChain::NimToolChain() - : NimToolChain(Constants::C_NIMTOOLCHAIN_TYPEID) +NimToolchain::NimToolchain() + : NimToolchain(Constants::C_NIMTOOLCHAIN_TYPEID) {} -NimToolChain::NimToolChain(Utils::Id typeId) +NimToolchain::NimToolchain(Utils::Id typeId) : Toolchain(typeId) , m_version(std::make_tuple(-1,-1,-1)) { @@ -41,45 +41,45 @@ NimToolChain::NimToolChain(Utils::Id typeId) setCompilerCommandKey("Nim.NimToolChain.CompilerCommand"); } -Toolchain::MacroInspectionRunner NimToolChain::createMacroInspectionRunner() const +Toolchain::MacroInspectionRunner NimToolchain::createMacroInspectionRunner() const { return Toolchain::MacroInspectionRunner(); } -LanguageExtensions NimToolChain::languageExtensions(const QStringList &) const +LanguageExtensions NimToolchain::languageExtensions(const QStringList &) const { return LanguageExtension::None; } -WarningFlags NimToolChain::warningFlags(const QStringList &) const +WarningFlags NimToolchain::warningFlags(const QStringList &) const { return WarningFlags::NoWarnings; } -Toolchain::BuiltInHeaderPathsRunner NimToolChain::createBuiltInHeaderPathsRunner( +Toolchain::BuiltInHeaderPathsRunner NimToolchain::createBuiltInHeaderPathsRunner( const Environment &) const { return Toolchain::BuiltInHeaderPathsRunner(); } -void NimToolChain::addToEnvironment(Environment &env) const +void NimToolchain::addToEnvironment(Environment &env) const { if (isValid()) env.prependOrSetPath(compilerCommand().parentDir()); } -FilePath NimToolChain::makeCommand(const Environment &env) const +FilePath NimToolchain::makeCommand(const Environment &env) const { const FilePath tmp = env.searchInPath("make"); return tmp.isEmpty() ? FilePath("make") : tmp; } -QList NimToolChain::createOutputParsers() const +QList NimToolchain::createOutputParsers() const { return {}; } -QString NimToolChain::compilerVersion() const +QString NimToolchain::compilerVersion() const { return compilerCommand().isEmpty() || m_version == std::make_tuple(-1,-1,-1) ? QString() @@ -89,7 +89,7 @@ QString NimToolChain::compilerVersion() const std::get<2>(m_version)); } -void NimToolChain::fromMap(const Store &data) +void NimToolchain::fromMap(const Store &data) { Toolchain::fromMap(data); if (hasError()) @@ -97,7 +97,7 @@ void NimToolChain::fromMap(const Store &data) parseVersion(compilerCommand(), m_version); } -bool NimToolChain::parseVersion(const FilePath &path, std::tuple &result) +bool NimToolchain::parseVersion(const FilePath &path, std::tuple &result) { Process process; process.setCommand({path, {"--version"}}); @@ -123,7 +123,7 @@ bool NimToolChain::parseVersion(const FilePath &path, std::tuple class NimToolchainConfigWidget : public ToolchainConfigWidget { public: - explicit NimToolchainConfigWidget(NimToolChain *tc) + explicit NimToolchainConfigWidget(NimToolchain *tc) : ToolchainConfigWidget(tc) , m_compilerCommand(new PathChooser) , m_compilerVersion(new QLineEdit) @@ -142,7 +142,7 @@ public: // Connect connect(m_compilerCommand, &PathChooser::validChanged, this, [this] { const FilePath path = m_compilerCommand->rawFilePath(); - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); QTC_ASSERT(tc, return); tc->setCompilerCommand(path); fillUI(); @@ -164,7 +164,7 @@ private: void NimToolchainConfigWidget::applyImpl() { - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); Q_ASSERT(tc); if (tc->isAutoDetected()) return; @@ -178,7 +178,7 @@ void NimToolchainConfigWidget::discardImpl() bool NimToolchainConfigWidget::isDirtyImpl() const { - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); Q_ASSERT(tc); return tc->compilerCommand() != m_compilerCommand->filePath(); } @@ -190,13 +190,13 @@ void NimToolchainConfigWidget::makeReadOnlyImpl() void NimToolchainConfigWidget::fillUI() { - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); Q_ASSERT(tc); m_compilerCommand->setFilePath(tc->compilerCommand()); m_compilerVersion->setText(tc->compilerVersion()); } -std::unique_ptr NimToolChain::createConfigurationWidget() +std::unique_ptr NimToolchain::createConfigurationWidget() { return std::make_unique(this); } @@ -208,7 +208,7 @@ NimToolchainFactory::NimToolchainFactory() setDisplayName(Tr::tr("Nim")); setSupportedToolchainType(Constants::C_NIMTOOLCHAIN_TYPEID); setSupportedLanguages({Constants::C_NIMLANGUAGE_ID}); - setToolchainConstructor([] { return new NimToolChain; }); + setToolchainConstructor([] { return new NimToolchain; }); setUserCreatable(true); } @@ -228,7 +228,7 @@ Toolchains NimToolchainFactory::autoDetect(const ToolchainDetector &detector) co if (!result.empty()) return result; - auto tc = new NimToolChain; + auto tc = new NimToolchain; tc->setDetection(Toolchain::AutoDetection); tc->setCompilerCommand(compilerPath); result.append(tc); @@ -239,7 +239,7 @@ Toolchains NimToolchainFactory::detectForImport(const ToolchainDescription &tcd) { Toolchains result; if (tcd.language == Constants::C_NIMLANGUAGE_ID) { - auto tc = new NimToolChain; + auto tc = new NimToolchain; tc->setDetection(Toolchain::ManualDetection); // FIXME: sure? tc->setCompilerCommand(tcd.compilerPath); result.append(tc); diff --git a/src/plugins/nim/project/nimtoolchain.h b/src/plugins/nim/project/nimtoolchain.h index 80c2a9ad64e..6304143d8b8 100644 --- a/src/plugins/nim/project/nimtoolchain.h +++ b/src/plugins/nim/project/nimtoolchain.h @@ -8,11 +8,11 @@ namespace Nim { -class NimToolChain : public ProjectExplorer::Toolchain +class NimToolchain : public ProjectExplorer::Toolchain { public: - NimToolChain(); - explicit NimToolChain(Utils::Id typeId); + NimToolchain(); + explicit NimToolchain(Utils::Id typeId); MacroInspectionRunner createMacroInspectionRunner() const override; Utils::LanguageExtensions languageExtensions(const QStringList &flags) const final; diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index d1bd01b89bc..7dffb6ba010 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -22,7 +22,7 @@ \brief The Abi class represents the Application Binary Interface (ABI) of a target platform. - \sa ProjectExplorer::ToolChain + \sa ProjectExplorer::Toolchain */ namespace ProjectExplorer { diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp index 1eda6750c2f..7af523c4376 100644 --- a/src/plugins/projectexplorer/customtoolchain.cpp +++ b/src/plugins/projectexplorer/customtoolchain.cpp @@ -42,13 +42,13 @@ const char mkspecsKeyC[] = "ProjectExplorer.CustomToolChain.Mkspecs"; const char outputParserKeyC[] = "ProjectExplorer.CustomToolChain.OutputParser"; // -------------------------------------------------------------------------- -// CustomToolChain +// CustomToolchain // -------------------------------------------------------------------------- -class CustomToolChain : public Toolchain +class CustomToolchain : public Toolchain { public: - CustomToolChain() + CustomToolchain() : Toolchain(Constants::CUSTOM_TOOLCHAIN_TYPEID) , m_outputParserId(GccParser::id()) { @@ -96,7 +96,7 @@ public: Id outputParserId() const; void setOutputParserId(Id parserId); - static QList parsers(); + static QList parsers(); CustomParserSettings customParserSettings() const; @@ -111,7 +111,7 @@ private: Id m_outputParserId; }; -CustomParserSettings CustomToolChain::customParserSettings() const +CustomParserSettings CustomToolchain::customParserSettings() const { return findOrDefault(ProjectExplorerPlugin::customParsers(), [this](const CustomParserSettings &s) { @@ -119,12 +119,12 @@ CustomParserSettings CustomToolChain::customParserSettings() const }); } -bool CustomToolChain::isValid() const +bool CustomToolchain::isValid() const { return true; } -Toolchain::MacroInspectionRunner CustomToolChain::createMacroInspectionRunner() const +Toolchain::MacroInspectionRunner CustomToolchain::createMacroInspectionRunner() const { const Macros theMacros = m_predefinedMacros; const Id lang = language(); @@ -143,23 +143,23 @@ Toolchain::MacroInspectionRunner CustomToolChain::createMacroInspectionRunner() }; } -LanguageExtensions CustomToolChain::languageExtensions(const QStringList &) const +LanguageExtensions CustomToolchain::languageExtensions(const QStringList &) const { return LanguageExtension::None; } -WarningFlags CustomToolChain::warningFlags(const QStringList &cxxflags) const +WarningFlags CustomToolchain::warningFlags(const QStringList &cxxflags) const { Q_UNUSED(cxxflags) return WarningFlags::Default; } -const Macros &CustomToolChain::rawPredefinedMacros() const +const Macros &CustomToolchain::rawPredefinedMacros() const { return m_predefinedMacros; } -void CustomToolChain::setPredefinedMacros(const Macros ¯os) +void CustomToolchain::setPredefinedMacros(const Macros ¯os) { if (m_predefinedMacros == macros) return; @@ -167,7 +167,7 @@ void CustomToolChain::setPredefinedMacros(const Macros ¯os) toolChainUpdated(); } -Toolchain::BuiltInHeaderPathsRunner CustomToolChain::createBuiltInHeaderPathsRunner( +Toolchain::BuiltInHeaderPathsRunner CustomToolchain::createBuiltInHeaderPathsRunner( const Environment &) const { const HeaderPaths builtInHeaderPaths = m_builtInHeaderPaths; @@ -185,7 +185,7 @@ Toolchain::BuiltInHeaderPathsRunner CustomToolChain::createBuiltInHeaderPathsRun }; } -void CustomToolChain::addToEnvironment(Environment &env) const +void CustomToolchain::addToEnvironment(Environment &env) const { const FilePath compiler = compilerCommand(); if (compiler.isEmpty()) @@ -197,12 +197,12 @@ void CustomToolChain::addToEnvironment(Environment &env) const env.prependOrSetPath(makePath); } -QStringList CustomToolChain::suggestedMkspecList() const +QStringList CustomToolchain::suggestedMkspecList() const { return m_mkspecs; } -QList CustomToolChain::createOutputParsers() const +QList CustomToolchain::createOutputParsers() const { if (m_outputParserId == GccParser::id()) return GccParser::gccParserSuite(); @@ -215,12 +215,12 @@ QList CustomToolChain::createOutputParsers() const return {new CustomParser(customParserSettings())}; } -QStringList CustomToolChain::headerPathsList() const +QStringList CustomToolchain::headerPathsList() const { return Utils::transform(m_builtInHeaderPaths, &HeaderPath::path); } -void CustomToolChain::setHeaderPaths(const QStringList &list) +void CustomToolchain::setHeaderPaths(const QStringList &list) { HeaderPaths tmp = Utils::transform(list, [](const QString &headerPath) { return HeaderPath::makeBuiltIn(headerPath.trimmed()); @@ -232,7 +232,7 @@ void CustomToolChain::setHeaderPaths(const QStringList &list) toolChainUpdated(); } -void CustomToolChain::setMakeCommand(const FilePath &path) +void CustomToolchain::setMakeCommand(const FilePath &path) { if (path == m_makeCommand) return; @@ -240,12 +240,12 @@ void CustomToolChain::setMakeCommand(const FilePath &path) toolChainUpdated(); } -FilePath CustomToolChain::makeCommand(const Environment &) const +FilePath CustomToolchain::makeCommand(const Environment &) const { return m_makeCommand; } -void CustomToolChain::setCxx11Flags(const QStringList &flags) +void CustomToolchain::setCxx11Flags(const QStringList &flags) { if (flags == m_cxx11Flags) return; @@ -253,12 +253,12 @@ void CustomToolChain::setCxx11Flags(const QStringList &flags) toolChainUpdated(); } -const QStringList &CustomToolChain::cxx11Flags() const +const QStringList &CustomToolchain::cxx11Flags() const { return m_cxx11Flags; } -void CustomToolChain::setMkspecs(const QString &specs) +void CustomToolchain::setMkspecs(const QString &specs) { const QStringList tmp = specs.split(','); if (tmp == m_mkspecs) @@ -267,12 +267,12 @@ void CustomToolChain::setMkspecs(const QString &specs) toolChainUpdated(); } -QString CustomToolChain::mkspecs() const +QString CustomToolchain::mkspecs() const { return m_mkspecs.join(','); } -void CustomToolChain::toMap(Store &data) const +void CustomToolchain::toMap(Store &data) const { Toolchain::toMap(data); data.insert(makeCommandKeyC, m_makeCommand.toString()); @@ -284,7 +284,7 @@ void CustomToolChain::toMap(Store &data) const data.insert(outputParserKeyC, m_outputParserId.toSetting()); } -void CustomToolChain::fromMap(const Store &data) +void CustomToolchain::fromMap(const Store &data) { Toolchain::fromMap(data); if (hasError()) @@ -299,12 +299,12 @@ void CustomToolChain::fromMap(const Store &data) setOutputParserId(Id::fromSetting(data.value(outputParserKeyC))); } -bool CustomToolChain::operator ==(const Toolchain &other) const +bool CustomToolchain::operator ==(const Toolchain &other) const { if (!Toolchain::operator ==(other)) return false; - auto customTc = static_cast(&other); + auto customTc = static_cast(&other); return m_makeCommand == customTc->m_makeCommand && compilerCommand() == customTc->compilerCommand() && targetAbi() == customTc->targetAbi() @@ -312,12 +312,12 @@ bool CustomToolChain::operator ==(const Toolchain &other) const && m_builtInHeaderPaths == customTc->m_builtInHeaderPaths; } -Id CustomToolChain::outputParserId() const +Id CustomToolchain::outputParserId() const { return m_outputParserId; } -void CustomToolChain::setOutputParserId(Id parserId) +void CustomToolchain::setOutputParserId(Id parserId) { if (m_outputParserId == parserId) return; @@ -325,9 +325,9 @@ void CustomToolChain::setOutputParserId(Id parserId) toolChainUpdated(); } -QList CustomToolChain::parsers() +QList CustomToolchain::parsers() { - QList result; + QList result; result.append({GccParser::id(), Tr::tr("GCC")}); result.append({ClangParser::id(), Tr::tr("Clang")}); result.append({LinuxIccParser::id(), Tr::tr("ICC")}); @@ -380,13 +380,13 @@ public: }; // -------------------------------------------------------------------------- -// CustomToolChainConfigWidget +// CustomToolchainConfigWidget // -------------------------------------------------------------------------- -class CustomToolChainConfigWidget final : public ToolchainConfigWidget +class CustomToolchainConfigWidget final : public ToolchainConfigWidget { public: - explicit CustomToolChainConfigWidget(CustomToolChain *); + explicit CustomToolchainConfigWidget(CustomToolchain *); private: void updateSummaries(TextEditDetailsWidget *detailsWidget); @@ -411,7 +411,7 @@ private: QComboBox *m_errorParserComboBox; }; -CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) : +CustomToolchainConfigWidget::CustomToolchainConfigWidget(CustomToolchain *tc) : ToolchainConfigWidget(tc), m_compilerCommand(new PathChooser), m_makeCommand(new PathChooser), @@ -426,7 +426,7 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) : { Q_ASSERT(tc); - const QList parsers = CustomToolChain::parsers(); + const QList parsers = CustomToolchain::parsers(); for (const auto &parser : parsers) m_errorParserComboBox->addItem(parser.displayName, parser.parserId.toString()); for (const CustomParserSettings &s : ProjectExplorerPlugin::customParsers()) @@ -471,27 +471,27 @@ CustomToolChainConfigWidget::CustomToolChainConfigWidget(CustomToolChain *tc) : connect(m_cxx11Flags, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty); connect(m_mkspecs, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty); connect(m_errorParserComboBox, &QComboBox::currentIndexChanged, - this, &CustomToolChainConfigWidget::errorParserChanged); + this, &CustomToolchainConfigWidget::errorParserChanged); errorParserChanged(); } -void CustomToolChainConfigWidget::updateSummaries(TextEditDetailsWidget *detailsWidget) +void CustomToolchainConfigWidget::updateSummaries(TextEditDetailsWidget *detailsWidget) { detailsWidget->updateSummaryText(); emit dirty(); } -void CustomToolChainConfigWidget::errorParserChanged(int ) +void CustomToolchainConfigWidget::errorParserChanged(int ) { emit dirty(); } -void CustomToolChainConfigWidget::applyImpl() +void CustomToolchainConfigWidget::applyImpl() { if (toolchain()->isAutoDetected()) return; - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); Q_ASSERT(tc); QString displayName = tc->displayName(); tc->setCompilerCommand(m_compilerCommand->filePath()); @@ -513,11 +513,11 @@ void CustomToolChainConfigWidget::applyImpl() // macro parser did with the input. } -void CustomToolChainConfigWidget::setFromToolchain() +void CustomToolchainConfigWidget::setFromToolchain() { // subwidgets are not yet connected! QSignalBlocker blocker(this); - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); m_compilerCommand->setFilePath(tc->compilerCommand()); m_makeCommand->setFilePath(tc->makeCommand(Environment())); m_abiWidget->setAbis(Abis(), tc->targetAbi()); @@ -532,9 +532,9 @@ void CustomToolChainConfigWidget::setFromToolchain() m_errorParserComboBox->setCurrentIndex(index); } -bool CustomToolChainConfigWidget::isDirtyImpl() const +bool CustomToolchainConfigWidget::isDirtyImpl() const { - auto tc = static_cast(toolchain()); + auto tc = static_cast(toolchain()); Q_ASSERT(tc); return m_compilerCommand->filePath() != tc->compilerCommand() || m_makeCommand->filePath().toString() != tc->makeCommand(Environment()).toString() @@ -546,17 +546,17 @@ bool CustomToolChainConfigWidget::isDirtyImpl() const || Id::fromSetting(m_errorParserComboBox->currentData()) == tc->outputParserId(); } -void CustomToolChainConfigWidget::makeReadOnlyImpl() +void CustomToolchainConfigWidget::makeReadOnlyImpl() { m_mainLayout->setEnabled(false); } -std::unique_ptr CustomToolChain::createConfigurationWidget() +std::unique_ptr CustomToolchain::createConfigurationWidget() { - return std::make_unique(this); + return std::make_unique(this); } -// CustomToolChainFactory +// CustomToolchainFactory class CustomToolchainFactory final : public ToolchainFactory { @@ -566,7 +566,7 @@ public: setDisplayName(Tr::tr("Custom")); setSupportedToolchainType(Constants::CUSTOM_TOOLCHAIN_TYPEID); setSupportsAllLanguages(true); - setToolchainConstructor([] { return new CustomToolChain; }); + setToolchainConstructor([] { return new CustomToolchain; }); setUserCreatable(true); } }; diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 4a97b796902..17536749991 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -121,7 +121,7 @@ private: void setFromToolchain(); - void updateParentToolChainComboBox(); // Clang + void updateParentToolchainComboBox(); // Clang AbiWidget *m_abiWidget; @@ -136,7 +136,7 @@ private: ProjectExplorer::Macros m_macros; // Clang only - QList m_parentToolChainConnections; + QList m_parentToolchainConnections; QComboBox *m_parentToolchainCombo = nullptr; }; @@ -153,7 +153,7 @@ const char compilerPlatformLinkerFlagsKeyC[] = "ProjectExplorer.GccToolChain.Pla const char targetAbiKeyC[] = "ProjectExplorer.GccToolChain.TargetAbi"; const char originalTargetTripleKeyC[] = "ProjectExplorer.GccToolChain.OriginalTargetTriple"; const char supportedAbisKeyC[] = "ProjectExplorer.GccToolChain.SupportedAbis"; -const char parentToolChainIdKeyC[] = "ProjectExplorer.ClangToolChain.ParentToolChainId"; +const char parentToolchainIdKeyC[] = "ProjectExplorer.ClangToolChain.ParentToolChainId"; const char priorityKeyC[] = "ProjectExplorer.ClangToolChain.Priority"; const char binaryRegexp[] = "(?:^|-|\\b)(?:gcc|g\\+\\+|clang(?:\\+\\+)?)(?:-([\\d.]+))?$"; @@ -434,19 +434,19 @@ LanguageExtensions GccToolchain::defaultLanguageExtensions() const return LanguageExtension::Gnu; } -static const Toolchains mingwToolChains() +static const Toolchains mingwToolchains() { return ToolchainManager::toolchains([](const Toolchain *tc) -> bool { return tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID; }); } -static const GccToolchain *mingwToolChainFromId(const QByteArray &id) +static const GccToolchain *mingwToolchainFromId(const QByteArray &id) { if (id.isEmpty()) return nullptr; - for (const Toolchain *tc : mingwToolChains()) { + for (const Toolchain *tc : mingwToolchains()) { if (tc->id() == id) return static_cast(tc); } @@ -457,7 +457,7 @@ static const GccToolchain *mingwToolChainFromId(const QByteArray &id) QString GccToolchain::originalTargetTriple() const { if (m_subType == Clang) { - if (const GccToolchain *parentTC = mingwToolChainFromId(m_parentToolchainId)) + if (const GccToolchain *parentTC = mingwToolchainFromId(m_parentToolchainId)) return parentTC->originalTargetTriple(); } @@ -1020,7 +1020,7 @@ void GccToolchain::toMap(Store &data) const data.insert(supportedAbisKeyC, Utils::transform(m_supportedAbis, &Abi::toString)); if (m_subType == Clang) { - data.insert(parentToolChainIdKeyC, m_parentToolchainId); + data.insert(parentToolchainIdKeyC, m_parentToolchainId); data.insert(priorityKeyC, m_priority); } } @@ -1044,7 +1044,7 @@ void GccToolchain::fromMap(const Store &data) resetToolchain(compilerCommand()); if (m_subType == Clang) { - m_parentToolchainId = data.value(parentToolChainIdKeyC).toByteArray(); + m_parentToolchainId = data.value(parentToolchainIdKeyC).toByteArray(); m_priority = data.value(priorityKeyC, PriorityNormal).toInt(); syncAutodetectedWithParentToolchains(); } @@ -1316,7 +1316,7 @@ private: const Id requiredTypeId, const Toolchains &known, const GccToolchain::SubType subType); - static Toolchains autoDetectToolChain(const ToolchainDescription &tcd, + static Toolchains autoDetectToolchain(const ToolchainDescription &tcd, const GccToolchain::SubType subType); static Toolchains autoDetectSdkClangToolchain(const Toolchains &known); @@ -1518,7 +1518,7 @@ Toolchains GccToolchainFactory::detectForImport(const ToolchainDescription &tcd) if ((tcd.language == Constants::CXX_LANGUAGE_ID && fileName.startsWith("icpc")) || (tcd.language == Constants::C_LANGUAGE_ID && fileName.startsWith("icc"))) { - result += autoDetectToolChain(tcd, GccToolchain::LinuxIcc); + result += autoDetectToolchain(tcd, GccToolchain::LinuxIcc); } bool isCCompiler = tcd.language == Constants::C_LANGUAGE_ID @@ -1530,7 +1530,7 @@ Toolchains GccToolchainFactory::detectForImport(const ToolchainDescription &tcd) || (fileName == "c++" && resolvedSymlinksFileName.contains("clang"))); if (isCCompiler || isCxxCompiler) - result += autoDetectToolChain(tcd, GccToolchain::Clang); + result += autoDetectToolchain(tcd, GccToolchain::Clang); // GCC @@ -1545,7 +1545,7 @@ Toolchains GccToolchainFactory::detectForImport(const ToolchainDescription &tcd) || (fileName == "c++" && !resolvedSymlinksFileName.contains("clang"))); if (isCCompiler || isCxxCompiler) - result += autoDetectToolChain(tcd, GccToolchain::RealGcc); + result += autoDetectToolchain(tcd, GccToolchain::RealGcc); return result; } @@ -1561,7 +1561,7 @@ Toolchains GccToolchainFactory::autoDetectSdkClangToolchain(const Toolchains &kn return {existingTc}; } - return {autoDetectToolChain({compilerPath, Constants::C_LANGUAGE_ID}, GccToolchain::Clang)}; + return {autoDetectToolchain({compilerPath, Constants::C_LANGUAGE_ID}, GccToolchain::Clang)}; } Toolchains GccToolchainFactory::autoDetectToolchains(const FilePaths &compilerPaths, @@ -1606,7 +1606,7 @@ Toolchains GccToolchainFactory::autoDetectToolchains(const FilePaths &compilerPa } } if (!alreadyExists) { - const Toolchains newToolchains = autoDetectToolChain({compilerPath, language}, subType); + const Toolchains newToolchains = autoDetectToolchain({compilerPath, language}, subType); result << newToolchains; existingCandidates << newToolchains; } @@ -1615,7 +1615,7 @@ Toolchains GccToolchainFactory::autoDetectToolchains(const FilePaths &compilerPa return result; } -Toolchains GccToolchainFactory::autoDetectToolChain(const ToolchainDescription &tcd, +Toolchains GccToolchainFactory::autoDetectToolchain(const ToolchainDescription &tcd, GccToolchain::SubType subType) { Toolchains result; @@ -1757,28 +1757,28 @@ GccToolchainConfigWidget::GccToolchainConfigWidget(GccToolchain *tc) : m_parentToolchainCombo); ToolchainManager *tcManager = ToolchainManager::instance(); - m_parentToolChainConnections.append( + m_parentToolchainConnections.append( connect(tcManager, &ToolchainManager::toolchainUpdated, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID) - updateParentToolChainComboBox(); + updateParentToolchainComboBox(); })); - m_parentToolChainConnections.append( + m_parentToolchainConnections.append( connect(tcManager, &ToolchainManager::toolhainAdded, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID) - updateParentToolChainComboBox(); + updateParentToolchainComboBox(); })); - m_parentToolChainConnections.append( + m_parentToolchainConnections.append( connect(tcManager, &ToolchainManager::toolchainRemoved, this, [this](Toolchain *tc) { if (tc->id() == toolchain()->id()) { - for (QMetaObject::Connection &connection : m_parentToolChainConnections) + for (QMetaObject::Connection &connection : m_parentToolchainConnections) QObject::disconnect(connection); return; } if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID) - updateParentToolChainComboBox(); + updateParentToolchainComboBox(); })); - updateParentToolChainComboBox(); + updateParentToolchainComboBox(); } } @@ -1817,7 +1817,7 @@ void GccToolchainConfigWidget::applyImpl() const QByteArray parentId = m_parentToolchainCombo->currentData().toByteArray(); if (!parentId.isEmpty()) { - for (const Toolchain *mingwTC : mingwToolChains()) { + for (const Toolchain *mingwTC : mingwToolchains()) { if (parentId == mingwTC->id()) { tc->m_parentToolchainId = mingwTC->id(); tc->setTargetAbi(mingwTC->targetAbi()); @@ -1846,7 +1846,7 @@ void GccToolchainConfigWidget::setFromToolchain() } if (m_parentToolchainCombo) - updateParentToolChainComboBox(); + updateParentToolchainComboBox(); } bool GccToolchainConfigWidget::isDirtyImpl() const @@ -1867,7 +1867,7 @@ bool GccToolchainConfigWidget::isDirtyImpl() const if (!m_parentToolchainCombo) return false; - const GccToolchain *parentTC = mingwToolChainFromId(tc->m_parentToolchainId); + const GccToolchain *parentTC = mingwToolchainFromId(tc->m_parentToolchainId); const QByteArray parentId = parentTC ? parentTC->id() : QByteArray(); return parentId != m_parentToolchainCombo->currentData(); } @@ -1942,7 +1942,7 @@ void GccToolchainConfigWidget::handlePlatformLinkerFlagsChange() } // -------------------------------------------------------------------------- -// ClangToolChain +// ClangToolchain // -------------------------------------------------------------------------- void GccToolchain::syncAutodetectedWithParentToolchains() @@ -1966,8 +1966,8 @@ void GccToolchain::syncAutodetectedWithParentToolchains() return; } - if (!mingwToolChainFromId(m_parentToolchainId)) { - const Toolchains mingwTCs = mingwToolChains(); + if (!mingwToolchainFromId(m_parentToolchainId)) { + const Toolchains mingwTCs = mingwToolchains(); m_parentToolchainId = mingwTCs.isEmpty() ? QByteArray() : mingwTCs.front()->id(); } @@ -1976,7 +1976,7 @@ void GccToolchain::syncAutodetectedWithParentToolchains() m_mingwToolchainAddedConnection = connect(tcManager, &ToolchainManager::toolhainAdded, this, [this](Toolchain *tc) { if (tc->typeId() == Constants::MINGW_TOOLCHAIN_TYPEID - && !mingwToolChainFromId(m_parentToolchainId)) { + && !mingwToolchainFromId(m_parentToolchainId)) { m_parentToolchainId = tc->id(); } }); @@ -1986,7 +1986,7 @@ void GccToolchain::syncAutodetectedWithParentToolchains() QObject::disconnect(m_thisToolchainRemovedConnection); QObject::disconnect(m_mingwToolchainAddedConnection); } else if (m_parentToolchainId == tc->id()) { - const Toolchains mingwTCs = mingwToolChains(); + const Toolchains mingwTCs = mingwToolchains(); m_parentToolchainId = mingwTCs.isEmpty() ? QByteArray() : mingwTCs.front()->id(); } }); @@ -2017,7 +2017,7 @@ bool GccToolchain::matchesCompilerCommand(const FilePath &command) const QString GccToolchain::sysRoot() const { if (m_subType == Clang) { - if (const GccToolchain *parentTC = mingwToolChainFromId(m_parentToolchainId)) { + if (const GccToolchain *parentTC = mingwToolchainFromId(m_parentToolchainId)) { const FilePath mingwCompiler = parentTC->compilerCommand(); return mingwCompiler.parentDir().parentDir().toString(); } @@ -2025,7 +2025,7 @@ QString GccToolchain::sysRoot() const return {}; } -void GccToolchainConfigWidget::updateParentToolChainComboBox() +void GccToolchainConfigWidget::updateParentToolchainComboBox() { QTC_ASSERT(m_parentToolchainCombo, return); @@ -2034,7 +2034,7 @@ void GccToolchainConfigWidget::updateParentToolChainComboBox() if (tc->isAutoDetected() || m_parentToolchainCombo->count() == 0) parentId = tc->m_parentToolchainId; - const GccToolchain *parentTC = mingwToolChainFromId(parentId); + const GccToolchain *parentTC = mingwToolchainFromId(parentId); m_parentToolchainCombo->clear(); m_parentToolchainCombo->addItem(parentTC ? parentTC->displayName() : QString(), @@ -2043,7 +2043,7 @@ void GccToolchainConfigWidget::updateParentToolChainComboBox() if (tc->isAutoDetected()) return; - for (const Toolchain *mingwTC : mingwToolChains()) { + for (const Toolchain *mingwTC : mingwToolchains()) { if (mingwTC->id() == parentId) continue; if (mingwTC->language() != tc->language()) diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index f5f9a485aa3..5b2033b87f5 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -223,7 +223,7 @@ public: ++row; connect(cb, &QComboBox::currentIndexChanged, this, [this, l](int idx) { - currentToolChainChanged(l, idx); + currentToolchainChanged(l, idx); }); } @@ -286,7 +286,7 @@ private: cb->setEnabled(false); } - void currentToolChainChanged(Id language, int idx) + void currentToolchainChanged(Id language, int idx) { if (m_ignoreChanges.isLocked() || idx < 0) return; @@ -370,7 +370,7 @@ static QMap defaultToolChainIds() return toolChains; } -static Store defaultToolChainValue() +static Store defaultToolchainValue() { const QMap toolChains = defaultToolChainIds(); Store result; @@ -432,7 +432,7 @@ void ToolchainKitAspectFactory::setup(Kit *k) Store value = storeFromVariant(k->value(id())); bool lockToolchains = k->isSdkProvided() && !value.isEmpty(); if (value.empty()) - value = defaultToolChainValue(); + value = defaultToolchainValue(); for (auto i = value.constBegin(); i != value.constEnd(); ++i) { Id l = findLanguage(stringFromKey(i.key())); @@ -594,7 +594,7 @@ void ToolchainKitAspect::setToolchain(Kit *k, Toolchain *tc) } /** - * @brief ToolChainKitAspect::setAllToolChainsToMatch + * @brief ToolchainKitAspect::setAllToolchainsToMatch * * Set up all toolchains to be similar to the one toolchain provided. Similar ideally means * that all toolchains use the "same" compiler from the same installation, but we will diff --git a/src/plugins/projectexplorer/makestep.cpp b/src/plugins/projectexplorer/makestep.cpp index 1a1a8fae413..fe3796bb303 100644 --- a/src/plugins/projectexplorer/makestep.cpp +++ b/src/plugins/projectexplorer/makestep.cpp @@ -127,7 +127,7 @@ QString MakeStep::defaultDisplayName() return Tr::tr("Make"); } -static const QList preferredToolChains(const Kit *kit) +static const QList preferredToolchains(const Kit *kit) { // prefer CXX, then C, then others return Utils::sorted(ToolchainKitAspect::toolChains(kit), [](Toolchain *tcA, Toolchain *tcB) { @@ -146,7 +146,7 @@ static const QList preferredToolChains(const Kit *kit) FilePath MakeStep::defaultMakeCommand() const { const Environment env = makeEnvironment(); - for (const Toolchain *tc : preferredToolChains(kit())) { + for (const Toolchain *tc : preferredToolchains(kit())) { FilePath make = tc->makeCommand(env); if (!make.isEmpty()) { IDevice::ConstPtr dev = BuildDeviceKitAspect::device(kit()); @@ -169,7 +169,7 @@ Task MakeStep::makeCommandMissingTask() bool MakeStep::isJobCountSupported() const { - const QList tcs = preferredToolChains(kit()); + const QList tcs = preferredToolchains(kit()); const Toolchain *tc = tcs.isEmpty() ? nullptr : tcs.constFirst(); return tc && tc->isJobCountSupported(); } @@ -236,7 +236,7 @@ Environment MakeStep::makeEnvironment() const env.setupEnglishOutput(); if (makeCommand().isEmpty()) { // We also prepend "L" to the MAKEFLAGS, so that nmake / jom are less verbose - const QList tcs = preferredToolChains(target()->kit()); + const QList tcs = preferredToolchains(target()->kit()); const Toolchain *tc = tcs.isEmpty() ? nullptr : tcs.constFirst(); if (tc && tc->targetAbi().os() == Abi::WindowsOS && tc->targetAbi().osFlavor() != Abi::WindowsMSysFlavor) { diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index dd3b2908754..e767a62db8d 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -4,6 +4,7 @@ #include "msvctoolchain.h" #include "devicesupport/idevice.h" +#include "abiwidget.h" #include "gcctoolchain.h" #include "msvcparser.h" #include "projectexplorer.h" @@ -71,29 +72,29 @@ static QThreadPool *envModThreadPool() struct MsvcPlatform { - MsvcToolChain::Platform platform; + MsvcToolchain::Platform platform; const char *name; const char *prefix; // VS up until 14.0 (MSVC2015) const char *bat; }; const MsvcPlatform platforms[] - = {{MsvcToolChain::x86, "x86", "/bin", "vcvars32.bat"}, - {MsvcToolChain::amd64, "amd64", "/bin/amd64", "vcvars64.bat"}, - {MsvcToolChain::x86_amd64, "x86_amd64", "/bin/x86_amd64", "vcvarsx86_amd64.bat"}, - {MsvcToolChain::ia64, "ia64", "/bin/ia64", "vcvars64.bat"}, - {MsvcToolChain::x86_ia64, "x86_ia64", "/bin/x86_ia64", "vcvarsx86_ia64.bat"}, - {MsvcToolChain::arm, "arm", "/bin/arm", "vcvarsarm.bat"}, - {MsvcToolChain::x86_arm, "x86_arm", "/bin/x86_arm", "vcvarsx86_arm.bat"}, - {MsvcToolChain::amd64_arm, "amd64_arm", "/bin/amd64_arm", "vcvarsamd64_arm.bat"}, - {MsvcToolChain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat"}, - {MsvcToolChain::x86_arm64, "x86_arm64", "/bin/x86_arm64", "vcvarsx86_arm64.bat"}, - {MsvcToolChain::amd64_arm64, "amd64_arm64", "/bin/amd64_arm64", "vcvarsamd64_arm64.bat"}, - {MsvcToolChain::arm64, "arm64", "/bin/arm64", "vcvarsarm64.bat"}, - {MsvcToolChain::arm64_x86, "arm64_x86", "/bin/arm64_x86", "vcvarsarm64_x86.bat"}, - {MsvcToolChain::arm64_amd64, "arm64_amd64", "/bin/arm64_amd64", "vcvarsarm64_amd64.bat"}}; + = {{MsvcToolchain::x86, "x86", "/bin", "vcvars32.bat"}, + {MsvcToolchain::amd64, "amd64", "/bin/amd64", "vcvars64.bat"}, + {MsvcToolchain::x86_amd64, "x86_amd64", "/bin/x86_amd64", "vcvarsx86_amd64.bat"}, + {MsvcToolchain::ia64, "ia64", "/bin/ia64", "vcvars64.bat"}, + {MsvcToolchain::x86_ia64, "x86_ia64", "/bin/x86_ia64", "vcvarsx86_ia64.bat"}, + {MsvcToolchain::arm, "arm", "/bin/arm", "vcvarsarm.bat"}, + {MsvcToolchain::x86_arm, "x86_arm", "/bin/x86_arm", "vcvarsx86_arm.bat"}, + {MsvcToolchain::amd64_arm, "amd64_arm", "/bin/amd64_arm", "vcvarsamd64_arm.bat"}, + {MsvcToolchain::amd64_x86, "amd64_x86", "/bin/amd64_x86", "vcvarsamd64_x86.bat"}, + {MsvcToolchain::x86_arm64, "x86_arm64", "/bin/x86_arm64", "vcvarsx86_arm64.bat"}, + {MsvcToolchain::amd64_arm64, "amd64_arm64", "/bin/amd64_arm64", "vcvarsamd64_arm64.bat"}, + {MsvcToolchain::arm64, "arm64", "/bin/arm64", "vcvarsarm64.bat"}, + {MsvcToolchain::arm64_x86, "arm64_x86", "/bin/arm64_x86", "vcvarsarm64_x86.bat"}, + {MsvcToolchain::arm64_amd64, "arm64_amd64", "/bin/arm64_amd64", "vcvarsarm64_amd64.bat"}}; -static QList g_availableMsvcToolchains; +static QList g_availableMsvcToolchains; static const MsvcPlatform *platformEntryFromName(const QString &name) { @@ -104,7 +105,7 @@ static const MsvcPlatform *platformEntryFromName(const QString &name) return nullptr; } -static const MsvcPlatform *platformEntry(MsvcToolChain::Platform t) +static const MsvcPlatform *platformEntry(MsvcToolchain::Platform t) { for (const MsvcPlatform &p : platforms) { if (p.platform == t) @@ -113,36 +114,36 @@ static const MsvcPlatform *platformEntry(MsvcToolChain::Platform t) return nullptr; } -static QString platformName(MsvcToolChain::Platform t) +static QString platformName(MsvcToolchain::Platform t) { if (const MsvcPlatform *p = platformEntry(t)) return QLatin1String(p->name); return {}; } -static bool hostPrefersPlatform(MsvcToolChain::Platform platform) +static bool hostPrefersPlatform(MsvcToolchain::Platform platform) { switch (HostOsInfo::hostArchitecture()) { case HostOsInfo::HostArchitectureAMD64: - return platform == MsvcToolChain::amd64 || platform == MsvcToolChain::amd64_arm - || platform == MsvcToolChain::amd64_x86 || platform == MsvcToolChain::amd64_arm64; + return platform == MsvcToolchain::amd64 || platform == MsvcToolchain::amd64_arm + || platform == MsvcToolchain::amd64_x86 || platform == MsvcToolchain::amd64_arm64; case HostOsInfo::HostArchitectureX86: - return platform == MsvcToolChain::x86 || platform == MsvcToolChain::x86_amd64 - || platform == MsvcToolChain::x86_ia64 || platform == MsvcToolChain::x86_arm - || platform == MsvcToolChain::x86_arm64; + return platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64 + || platform == MsvcToolchain::x86_ia64 || platform == MsvcToolchain::x86_arm + || platform == MsvcToolchain::x86_arm64; case HostOsInfo::HostArchitectureArm: - return platform == MsvcToolChain::arm; + return platform == MsvcToolchain::arm; case HostOsInfo::HostArchitectureArm64: - return platform == MsvcToolChain::arm64 - || platform == MsvcToolChain::arm64_x86 || platform == MsvcToolChain::arm64_amd64; + return platform == MsvcToolchain::arm64 + || platform == MsvcToolchain::arm64_x86 || platform == MsvcToolchain::arm64_amd64; case HostOsInfo::HostArchitectureItanium: - return platform == MsvcToolChain::ia64; + return platform == MsvcToolchain::ia64; default: return false; } } -static bool hostSupportsPlatform(MsvcToolChain::Platform platform) +static bool hostSupportsPlatform(MsvcToolchain::Platform platform) { if (hostPrefersPlatform(platform)) return true; @@ -151,15 +152,15 @@ static bool hostSupportsPlatform(MsvcToolChain::Platform platform) // The x86 host toolchains are not the preferred toolchains on amd64 but they are still // supported by that host case HostOsInfo::HostArchitectureAMD64: - return platform == MsvcToolChain::x86 || platform == MsvcToolChain::x86_amd64 - || platform == MsvcToolChain::x86_ia64 || platform == MsvcToolChain::x86_arm - || platform == MsvcToolChain::x86_arm64; + return platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64 + || platform == MsvcToolchain::x86_ia64 || platform == MsvcToolchain::x86_arm + || platform == MsvcToolchain::x86_arm64; // The Arm64 host can run the cross-compilers via emulation of x86 and amd64 case HostOsInfo::HostArchitectureArm64: - return platform == MsvcToolChain::x86_arm || platform == MsvcToolChain::x86_arm64 - || platform == MsvcToolChain::amd64_arm || platform == MsvcToolChain::amd64_arm64 - || platform == MsvcToolChain::x86 || platform == MsvcToolChain::x86_amd64 - || platform == MsvcToolChain::amd64 || platform == MsvcToolChain::amd64_x86; + return platform == MsvcToolchain::x86_arm || platform == MsvcToolchain::x86_arm64 + || platform == MsvcToolchain::amd64_arm || platform == MsvcToolchain::amd64_arm64 + || platform == MsvcToolchain::x86 || platform == MsvcToolchain::x86_amd64 + || platform == MsvcToolchain::amd64 || platform == MsvcToolchain::amd64_x86; default: return false; } @@ -356,63 +357,63 @@ static QVector detectVisualStudio() return detectVisualStudioFromRegistry(); } -static unsigned char wordWidthForPlatform(MsvcToolChain::Platform platform) +static unsigned char wordWidthForPlatform(MsvcToolchain::Platform platform) { switch (platform) { - case ProjectExplorer::Internal::MsvcToolChain::x86: - case ProjectExplorer::Internal::MsvcToolChain::arm: - case ProjectExplorer::Internal::MsvcToolChain::x86_arm: - case ProjectExplorer::Internal::MsvcToolChain::amd64_arm: - case ProjectExplorer::Internal::MsvcToolChain::amd64_x86: - case ProjectExplorer::Internal::MsvcToolChain::arm64_x86: + case ProjectExplorer::Internal::MsvcToolchain::x86: + case ProjectExplorer::Internal::MsvcToolchain::arm: + case ProjectExplorer::Internal::MsvcToolchain::x86_arm: + case ProjectExplorer::Internal::MsvcToolchain::amd64_arm: + case ProjectExplorer::Internal::MsvcToolchain::amd64_x86: + case ProjectExplorer::Internal::MsvcToolchain::arm64_x86: return 32; - case ProjectExplorer::Internal::MsvcToolChain::amd64: - case ProjectExplorer::Internal::MsvcToolChain::x86_amd64: - case ProjectExplorer::Internal::MsvcToolChain::ia64: - case ProjectExplorer::Internal::MsvcToolChain::x86_ia64: - case ProjectExplorer::Internal::MsvcToolChain::amd64_arm64: - case ProjectExplorer::Internal::MsvcToolChain::x86_arm64: - case ProjectExplorer::Internal::MsvcToolChain::arm64: - case ProjectExplorer::Internal::MsvcToolChain::arm64_amd64: + case ProjectExplorer::Internal::MsvcToolchain::amd64: + case ProjectExplorer::Internal::MsvcToolchain::x86_amd64: + case ProjectExplorer::Internal::MsvcToolchain::ia64: + case ProjectExplorer::Internal::MsvcToolchain::x86_ia64: + case ProjectExplorer::Internal::MsvcToolchain::amd64_arm64: + case ProjectExplorer::Internal::MsvcToolchain::x86_arm64: + case ProjectExplorer::Internal::MsvcToolchain::arm64: + case ProjectExplorer::Internal::MsvcToolchain::arm64_amd64: return 64; } return 0; } -static Abi::Architecture archForPlatform(MsvcToolChain::Platform platform) +static Abi::Architecture archForPlatform(MsvcToolchain::Platform platform) { switch (platform) { - case ProjectExplorer::Internal::MsvcToolChain::x86: - case ProjectExplorer::Internal::MsvcToolChain::amd64: - case ProjectExplorer::Internal::MsvcToolChain::x86_amd64: - case ProjectExplorer::Internal::MsvcToolChain::amd64_x86: - case ProjectExplorer::Internal::MsvcToolChain::arm64_x86: - case ProjectExplorer::Internal::MsvcToolChain::arm64_amd64: + case ProjectExplorer::Internal::MsvcToolchain::x86: + case ProjectExplorer::Internal::MsvcToolchain::amd64: + case ProjectExplorer::Internal::MsvcToolchain::x86_amd64: + case ProjectExplorer::Internal::MsvcToolchain::amd64_x86: + case ProjectExplorer::Internal::MsvcToolchain::arm64_x86: + case ProjectExplorer::Internal::MsvcToolchain::arm64_amd64: return Abi::X86Architecture; - case ProjectExplorer::Internal::MsvcToolChain::arm: - case ProjectExplorer::Internal::MsvcToolChain::x86_arm: - case ProjectExplorer::Internal::MsvcToolChain::amd64_arm: - case ProjectExplorer::Internal::MsvcToolChain::x86_arm64: - case ProjectExplorer::Internal::MsvcToolChain::amd64_arm64: - case ProjectExplorer::Internal::MsvcToolChain::arm64: + case ProjectExplorer::Internal::MsvcToolchain::arm: + case ProjectExplorer::Internal::MsvcToolchain::x86_arm: + case ProjectExplorer::Internal::MsvcToolchain::amd64_arm: + case ProjectExplorer::Internal::MsvcToolchain::x86_arm64: + case ProjectExplorer::Internal::MsvcToolchain::amd64_arm64: + case ProjectExplorer::Internal::MsvcToolchain::arm64: return Abi::ArmArchitecture; - case ProjectExplorer::Internal::MsvcToolChain::ia64: - case ProjectExplorer::Internal::MsvcToolChain::x86_ia64: + case ProjectExplorer::Internal::MsvcToolchain::ia64: + case ProjectExplorer::Internal::MsvcToolchain::x86_ia64: return Abi::ItaniumArchitecture; } return Abi::UnknownArchitecture; } -static Abi findAbiOfMsvc(MsvcToolChain::Type type, - MsvcToolChain::Platform platform, +static Abi findAbiOfMsvc(MsvcToolchain::Type type, + MsvcToolchain::Platform platform, const QString &version) { Abi::OSFlavor flavor = Abi::UnknownFlavor; QString msvcVersionString = version; - if (type == MsvcToolChain::WindowsSDK) { + if (type == MsvcToolchain::WindowsSDK) { if (version == QLatin1String("v7.0") || version.startsWith(QLatin1String("6."))) msvcVersionString = QLatin1String("9.0"); else if (version == QLatin1String("v7.0A") || version == QLatin1String("v7.1")) @@ -446,10 +447,10 @@ static Abi findAbiOfMsvc(MsvcToolChain::Type type, } static QString generateDisplayName(const QString &name, - MsvcToolChain::Type t, - MsvcToolChain::Platform p) + MsvcToolchain::Type t, + MsvcToolchain::Platform p) { - if (t == MsvcToolChain::WindowsSDK) { + if (t == MsvcToolchain::WindowsSDK) { QString sdkName = name; sdkName += QString::fromLatin1(" (%1)").arg(platformName(p)); return sdkName; @@ -600,7 +601,7 @@ static QByteArray msvcCompilationFile() // // [1] https://msdn.microsoft.com/en-us/library/b0084kay.aspx // [2] http://stackoverflow.com/questions/3665537/how-to-find-out-cl-exes-built-in-macros -Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags, +Macros MsvcToolchain::msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const { Macros predefinedMacros; @@ -675,7 +676,7 @@ Macros MsvcToolChain::msvcPredefinedMacros(const QStringList &cxxflags, // // For _MSV_VER values, see https://docs.microsoft.com/en-us/cpp/preprocessor/predefined-macros?view=vs-2017. // -Utils::LanguageVersion MsvcToolChain::msvcLanguageVersion(const QStringList & /*cxxflags*/, +Utils::LanguageVersion MsvcToolchain::msvcLanguageVersion(const QStringList & /*cxxflags*/, const Utils::Id &language, const Macros ¯os) const { @@ -731,7 +732,7 @@ static QString winExpandDelayedEnvReferences(QString in, const Utils::Environmen return in; } -void MsvcToolChain::environmentModifications(QPromise &promise, +void MsvcToolchain::environmentModifications(QPromise &promise, QString vcvarsBat, QString varsBatArg) { const Utils::Environment inEnv = Utils::Environment::systemEnvironment(); @@ -758,10 +759,10 @@ void MsvcToolChain::environmentModifications(QPromise &future) +void MsvcToolchain::initEnvModWatcher(const QFuture &future) { connect(&m_envModWatcher, &QFutureWatcher::resultReadyAt, this, [this] { const GenerateEnvResult &result = m_envModWatcher.result(); @@ -786,7 +787,7 @@ void MsvcToolChain::initEnvModWatcher(const QFuture &future) m_envModWatcher.setFuture(future); } -void MsvcToolChain::updateEnvironmentModifications(Utils::EnvironmentItems modifications) +void MsvcToolchain::updateEnvironmentModifications(Utils::EnvironmentItems modifications) { Utils::EnvironmentItem::sort(&modifications); if (modifications != m_environmentModifications) { @@ -803,7 +804,7 @@ void MsvcToolChain::updateEnvironmentModifications(Utils::EnvironmentItems modif } } -Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environment &env) const +Utils::Environment MsvcToolchain::readEnvironmentSetting(const Utils::Environment &env) const { Utils::Environment resultEnv = env; if (m_environmentModifications.isEmpty()) { @@ -825,10 +826,10 @@ Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environmen } // -------------------------------------------------------------------------- -// MsvcToolChain +// MsvcToolchain // -------------------------------------------------------------------------- -static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain) +static void addToAvailableMsvcToolchains(const MsvcToolchain *toolchain) { if (toolchain->typeId() != Constants::MSVC_TOOLCHAIN_TYPEID) return; @@ -837,7 +838,7 @@ static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain) g_availableMsvcToolchains.push_back(toolchain); } -MsvcToolChain::MsvcToolChain(Utils::Id typeId) +MsvcToolchain::MsvcToolchain(Utils::Id typeId) : Toolchain(typeId) { setDisplayName("Microsoft Visual C++ Compiler"); @@ -846,7 +847,7 @@ MsvcToolChain::MsvcToolChain(Utils::Id typeId) setTargetAbiKey(KEY_ROOT "SupportedAbi"); } -void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags) +void MsvcToolchain::inferWarningsForLevel(int warningLevel, WarningFlags &flags) { // reset all except unrelated flag flags = flags & WarningFlags::AsErrors; @@ -865,12 +866,12 @@ void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags) flags |= WarningFlags::UnusedParams; } -MsvcToolChain::~MsvcToolChain() +MsvcToolchain::~MsvcToolchain() { g_availableMsvcToolchains.removeOne(this); } -bool MsvcToolChain::isValid() const +bool MsvcToolchain::isValid() const { if (m_vcvarsBat.isEmpty()) return false; @@ -878,13 +879,13 @@ bool MsvcToolChain::isValid() const return fi.isFile() && fi.isExecutable(); } -QString MsvcToolChain::originalTargetTriple() const +QString MsvcToolchain::originalTargetTriple() const { return targetAbi().wordWidth() == 64 ? QLatin1String("x86_64-pc-windows-msvc") : QLatin1String("i686-pc-windows-msvc"); } -QStringList MsvcToolChain::suggestedMkspecList() const +QStringList MsvcToolchain::suggestedMkspecList() const { // "win32-msvc" is the common MSVC mkspec introduced in Qt 5.8.1 switch (targetAbi().osFlavor()) { @@ -926,7 +927,7 @@ QStringList MsvcToolChain::suggestedMkspecList() const return {}; } -Abis MsvcToolChain::supportedAbis() const +Abis MsvcToolchain::supportedAbis() const { Abi abi = targetAbi(); Abis abis = {abi}; @@ -961,7 +962,7 @@ Abis MsvcToolChain::supportedAbis() const return abis; } -void MsvcToolChain::toMap(Store &data) const +void MsvcToolchain::toMap(Store &data) const { Toolchain::toMap(data); data.insert(varsBatKeyC, m_vcvarsBat); @@ -971,7 +972,7 @@ void MsvcToolChain::toMap(Store &data) const data.insert(environModsKeyC, EnvironmentItem::toVariantList(m_environmentModifications)); } -void MsvcToolChain::fromMap(const Store &data) +void MsvcToolchain::fromMap(const Store &data) { Toolchain::fromMap(data); if (hasError()) { @@ -985,7 +986,7 @@ void MsvcToolChain::fromMap(const Store &data) data.value(environModsKeyC).toList()); rescanForCompiler(); - initEnvModWatcher(Utils::asyncRun(envModThreadPool(), &MsvcToolChain::environmentModifications, + initEnvModWatcher(Utils::asyncRun(envModThreadPool(), &MsvcToolchain::environmentModifications, m_vcvarsBat, m_varsBatArg)); if (m_vcvarsBat.isEmpty() || !targetAbi().isValid()) { @@ -994,7 +995,7 @@ void MsvcToolChain::fromMap(const Store &data) } } -bool MsvcToolChain::hostPrefersToolchain() const +bool MsvcToolchain::hostPrefersToolchain() const { return hostPrefersPlatform(platform()); } @@ -1013,7 +1014,7 @@ bool static hasFlagEffectOnMacros(const QString &flag) return true; } -Toolchain::MacroInspectionRunner MsvcToolChain::createMacroInspectionRunner() const +Toolchain::MacroInspectionRunner MsvcToolchain::createMacroInspectionRunner() const { Utils::Environment env(m_lastEnvironment); addToEnvironment(env); @@ -1040,7 +1041,7 @@ Toolchain::MacroInspectionRunner MsvcToolChain::createMacroInspectionRunner() co }; } -Utils::LanguageExtensions MsvcToolChain::languageExtensions(const QStringList &cxxflags) const +Utils::LanguageExtensions MsvcToolchain::languageExtensions(const QStringList &cxxflags) const { using Utils::LanguageExtension; Utils::LanguageExtensions extensions(LanguageExtension::Microsoft); @@ -1054,7 +1055,7 @@ Utils::LanguageExtensions MsvcToolChain::languageExtensions(const QStringList &c return extensions; } -WarningFlags MsvcToolChain::warningFlags(const QStringList &cflags) const +WarningFlags MsvcToolchain::warningFlags(const QStringList &cflags) const { WarningFlags flags = WarningFlags::NoWarnings; for (QString flag : cflags) { @@ -1101,13 +1102,13 @@ WarningFlags MsvcToolChain::warningFlags(const QStringList &cflags) const return flags; } -FilePaths MsvcToolChain::includedFiles(const QStringList &flags, +FilePaths MsvcToolchain::includedFiles(const QStringList &flags, const FilePath &directoryPath) const { return Toolchain::includedFiles("/FI", flags, directoryPath, PossiblyConcatenatedFlag::Yes); } -Toolchain::BuiltInHeaderPathsRunner MsvcToolChain::createBuiltInHeaderPathsRunner( +Toolchain::BuiltInHeaderPathsRunner MsvcToolchain::createBuiltInHeaderPathsRunner( const Environment &env) const { Utils::Environment fullEnv = env; @@ -1124,7 +1125,7 @@ Toolchain::BuiltInHeaderPathsRunner MsvcToolChain::createBuiltInHeaderPathsRunne }; } -void MsvcToolChain::addToEnvironment(Utils::Environment &env) const +void MsvcToolchain::addToEnvironment(Utils::Environment &env) const { // We cache the full environment (incoming + modifications by setup script). if (!m_resultEnvironment.hasChanges() || env != m_lastEnvironment) { @@ -1148,7 +1149,7 @@ static QString wrappedMakeCommand(const QString &command) return wrapperPath; } -FilePath MsvcToolChain::makeCommand(const Environment &environment) const +FilePath MsvcToolchain::makeCommand(const Environment &environment) const { bool useJom = ProjectExplorerPlugin::projectExplorerSettings().useJom; const QString jom("jom.exe"); @@ -1179,7 +1180,7 @@ FilePath MsvcToolChain::makeCommand(const Environment &environment) const return command; } -void MsvcToolChain::rescanForCompiler() +void MsvcToolchain::rescanForCompiler() { Utils::Environment env = Utils::Environment::systemEnvironment(); addToEnvironment(env); @@ -1196,12 +1197,12 @@ void MsvcToolChain::rescanForCompiler() })); } -QList MsvcToolChain::createOutputParsers() const +QList MsvcToolchain::createOutputParsers() const { return {new MsvcParser}; } -void MsvcToolChain::setupVarsBat(const Abi &abi, const QString &varsBat, const QString &varsBatArg) +void MsvcToolchain::setupVarsBat(const Abi &abi, const QString &varsBat, const QString &varsBatArg) { m_lastEnvironment = Utils::Environment::systemEnvironment(); setTargetAbiNoSignal(abi); @@ -1210,11 +1211,11 @@ void MsvcToolChain::setupVarsBat(const Abi &abi, const QString &varsBat, const Q if (!varsBat.isEmpty()) { initEnvModWatcher(Utils::asyncRun(envModThreadPool(), - &MsvcToolChain::environmentModifications, varsBat, varsBatArg)); + &MsvcToolchain::environmentModifications, varsBat, varsBatArg)); } } -void MsvcToolChain::resetVarsBat() +void MsvcToolchain::resetVarsBat() { m_lastEnvironment = Utils::Environment::systemEnvironment(); setTargetAbiNoSignal(Abi()); @@ -1222,7 +1223,7 @@ void MsvcToolChain::resetVarsBat() m_varsBatArg.clear(); } -MsvcToolChain::Platform MsvcToolChain::platform() const +MsvcToolchain::Platform MsvcToolchain::platform() const { QStringList args = m_varsBatArg.split(' '); if (const MsvcPlatform *entry = platformEntryFromName(args.value(0))) @@ -1232,12 +1233,12 @@ MsvcToolChain::Platform MsvcToolChain::platform() const } // -------------------------------------------------------------------------- -// MsvcBasedToolChainConfigWidget: Creates a simple GUI without error label +// MsvcBasedToolchainConfigWidget: Creates a simple GUI without error label // to display name and varsBat. Derived classes should add the error label and -// call setFromMsvcToolChain(). +// call setFromMsvcToolchain(). // -------------------------------------------------------------------------- -static QString msvcVarsToDisplay(const MsvcToolChain &tc) +static QString msvcVarsToDisplay(const MsvcToolchain &tc) { QString varsBatDisplay = QDir::toNativeSeparators(tc.varsBat()); if (!tc.varsBatArg().isEmpty()) { @@ -1247,10 +1248,10 @@ static QString msvcVarsToDisplay(const MsvcToolChain &tc) return varsBatDisplay; } -class MsvcBasedToolChainConfigWidget : public ToolchainConfigWidget +class MsvcBasedToolchainConfigWidget : public ToolchainConfigWidget { public: - explicit MsvcBasedToolChainConfigWidget(Toolchain *tc) + explicit MsvcBasedToolchainConfigWidget(Toolchain *tc) : ToolchainConfigWidget(tc) , m_nameDisplayLabel(new QLabel(this)) , m_varsBatDisplayLabel(new QLabel(this)) @@ -1269,7 +1270,7 @@ protected: void setFromMsvcToolChain() { - const auto *tc = static_cast(toolchain()); + const auto *tc = static_cast(toolchain()); QTC_ASSERT(tc, return ); m_nameDisplayLabel->setText(tc->displayName()); m_varsBatDisplayLabel->setText(msvcVarsToDisplay(*tc)); @@ -1281,14 +1282,14 @@ protected: }; // -------------------------------------------------------------------------- -// MsvcToolChainConfigWidget +// MsvcToolchainConfigWidget // -------------------------------------------------------------------------- -class MsvcToolChainConfigWidget final : public MsvcBasedToolChainConfigWidget +class MsvcToolchainConfigWidget final : public MsvcBasedToolchainConfigWidget { public: - explicit MsvcToolChainConfigWidget(Toolchain *tc) - : MsvcBasedToolChainConfigWidget(tc) + explicit MsvcToolchainConfigWidget(Toolchain *tc) + : MsvcBasedToolchainConfigWidget(tc) , m_varsBatPathCombo(new QComboBox(this)) , m_varsBatArchCombo(new QComboBox(this)) , m_varsBatArgumentsEdit(new QLineEdit(this)) @@ -1300,7 +1301,7 @@ public: m_varsBatPathCombo->setObjectName("varsBatCombo"); m_varsBatPathCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); m_varsBatPathCombo->setEditable(true); - for (const MsvcToolChain *tmpTc : std::as_const(g_availableMsvcToolchains)) { + for (const MsvcToolchain *tmpTc : std::as_const(g_availableMsvcToolchains)) { const QString nativeVcVars = QDir::toNativeSeparators(tmpTc->varsBat()); if (!tmpTc->varsBat().isEmpty() && m_varsBatPathCombo->findText(nativeVcVars) == -1) { @@ -1310,21 +1311,21 @@ public: const bool isAmd64 = Utils::HostOsInfo::hostArchitecture() == Utils::HostOsInfo::HostArchitectureAMD64; // TODO: Add missing values to MsvcToolChain::Platform - m_varsBatArchCombo->addItem(Tr::tr(""), isAmd64 ? MsvcToolChain::amd64 : MsvcToolChain::x86); - m_varsBatArchCombo->addItem("x86", MsvcToolChain::x86); - m_varsBatArchCombo->addItem("amd64", MsvcToolChain::amd64); - m_varsBatArchCombo->addItem("arm", MsvcToolChain::arm); - m_varsBatArchCombo->addItem("x86_amd64", MsvcToolChain::x86_amd64); - m_varsBatArchCombo->addItem("x86_arm", MsvcToolChain::x86_arm); - m_varsBatArchCombo->addItem("x86_arm64", MsvcToolChain::x86_arm64); - m_varsBatArchCombo->addItem("amd64_x86", MsvcToolChain::amd64_x86); - m_varsBatArchCombo->addItem("amd64_arm", MsvcToolChain::amd64_arm); - m_varsBatArchCombo->addItem("amd64_arm64", MsvcToolChain::amd64_arm64); - m_varsBatArchCombo->addItem("ia64", MsvcToolChain::ia64); - m_varsBatArchCombo->addItem("x86_ia64", MsvcToolChain::x86_ia64); - m_varsBatArchCombo->addItem("arm64", MsvcToolChain::arm64); - m_varsBatArchCombo->addItem("arm64_x86", MsvcToolChain::arm64_x86); - m_varsBatArchCombo->addItem("arm64_amd64", MsvcToolChain::arm64_amd64); + m_varsBatArchCombo->addItem(Tr::tr(""), isAmd64 ? MsvcToolchain::amd64 : MsvcToolchain::x86); + m_varsBatArchCombo->addItem("x86", MsvcToolchain::x86); + m_varsBatArchCombo->addItem("amd64", MsvcToolchain::amd64); + m_varsBatArchCombo->addItem("arm", MsvcToolchain::arm); + m_varsBatArchCombo->addItem("x86_amd64", MsvcToolchain::x86_amd64); + m_varsBatArchCombo->addItem("x86_arm", MsvcToolchain::x86_arm); + m_varsBatArchCombo->addItem("x86_arm64", MsvcToolchain::x86_arm64); + m_varsBatArchCombo->addItem("amd64_x86", MsvcToolchain::amd64_x86); + m_varsBatArchCombo->addItem("amd64_arm", MsvcToolchain::amd64_arm); + m_varsBatArchCombo->addItem("amd64_arm64", MsvcToolchain::amd64_arm64); + m_varsBatArchCombo->addItem("ia64", MsvcToolchain::ia64); + m_varsBatArchCombo->addItem("x86_ia64", MsvcToolchain::x86_ia64); + m_varsBatArchCombo->addItem("arm64", MsvcToolchain::arm64); + m_varsBatArchCombo->addItem("arm64_x86", MsvcToolchain::arm64_x86); + m_varsBatArchCombo->addItem("arm64_amd64", MsvcToolchain::arm64_amd64); m_varsBatArgumentsEdit->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed); m_varsBatArgumentsEdit->setToolTip(Tr::tr("Additional arguments for the vcvarsall.bat call")); hLayout->addWidget(m_varsBatPathCombo); @@ -1333,12 +1334,12 @@ public: m_mainLayout->addRow(Tr::tr("Initialization:"), hLayout); m_mainLayout->addRow(Tr::tr("&ABI:"), m_abiWidget); addErrorLabel(); - setFromMsvcToolChain(); + setFromMsvcToolchain(); connect(m_varsBatPathCombo, &QComboBox::currentTextChanged, - this, &MsvcToolChainConfigWidget::handleVcVarsChange); + this, &MsvcToolchainConfigWidget::handleVcVarsChange); connect(m_varsBatArchCombo, &QComboBox::currentTextChanged, - this, &MsvcToolChainConfigWidget::handleVcVarsArchChange); + this, &MsvcToolchainConfigWidget::handleVcVarsArchChange); connect(m_varsBatArgumentsEdit, &QLineEdit::textChanged, this, &ToolchainConfigWidget::dirty); connect(m_abiWidget, &AbiWidget::abiChanged, this, &ToolchainConfigWidget::dirty); @@ -1350,7 +1351,7 @@ private: bool isDirtyImpl() const final; void makeReadOnlyImpl() final; - void setFromMsvcToolChain(); + void setFromMsvcToolchain(); void updateAbis(); void handleVcVarsChange(const QString &vcVars); @@ -1364,30 +1365,30 @@ private: AbiWidget *m_abiWidget; }; -void MsvcToolChainConfigWidget::applyImpl() +void MsvcToolchainConfigWidget::applyImpl() { - auto *tc = static_cast(toolchain()); + auto *tc = static_cast(toolchain()); QTC_ASSERT(tc, return ); const QString vcVars = QDir::fromNativeSeparators(m_varsBatPathCombo->currentText()); tc->setupVarsBat(m_abiWidget->currentAbi(), vcVars, vcVarsArguments()); - setFromMsvcToolChain(); + setFromMsvcToolchain(); } -void MsvcToolChainConfigWidget::discardImpl() +void MsvcToolchainConfigWidget::discardImpl() { - setFromMsvcToolChain(); + setFromMsvcToolchain(); } -bool MsvcToolChainConfigWidget::isDirtyImpl() const +bool MsvcToolchainConfigWidget::isDirtyImpl() const { - auto msvcToolChain = static_cast(toolchain()); + auto msvcToolchain = static_cast(toolchain()); - return msvcToolChain->varsBat() != QDir::fromNativeSeparators(m_varsBatPathCombo->currentText()) - || msvcToolChain->varsBatArg() != vcVarsArguments() - || msvcToolChain->targetAbi() != m_abiWidget->currentAbi(); + return msvcToolchain->varsBat() != QDir::fromNativeSeparators(m_varsBatPathCombo->currentText()) + || msvcToolchain->varsBatArg() != vcVarsArguments() + || msvcToolchain->targetAbi() != m_abiWidget->currentAbi(); } -void MsvcToolChainConfigWidget::makeReadOnlyImpl() +void MsvcToolchainConfigWidget::makeReadOnlyImpl() { m_varsBatPathCombo->setEnabled(false); m_varsBatArchCombo->setEnabled(false); @@ -1395,9 +1396,9 @@ void MsvcToolChainConfigWidget::makeReadOnlyImpl() m_abiWidget->setEnabled(false); } -void MsvcToolChainConfigWidget::setFromMsvcToolChain() +void MsvcToolchainConfigWidget::setFromMsvcToolchain() { - const auto *tc = static_cast(toolchain()); + const auto *tc = static_cast(toolchain()); QTC_ASSERT(tc, return ); m_nameDisplayLabel->setText(tc->displayName()); QString args = tc->varsBatArg(); @@ -1415,12 +1416,12 @@ void MsvcToolChainConfigWidget::setFromMsvcToolChain() m_abiWidget->setAbis(tc->supportedAbis(), tc->targetAbi()); } -void MsvcToolChainConfigWidget::updateAbis() +void MsvcToolchainConfigWidget::updateAbis() { const QString normalizedVcVars = QDir::fromNativeSeparators(m_varsBatPathCombo->currentText()); - const auto *currentTc = static_cast(toolchain()); + const auto *currentTc = static_cast(toolchain()); QTC_ASSERT(currentTc, return ); - const MsvcToolChain::Platform platform = m_varsBatArchCombo->currentData().value(); + const MsvcToolchain::Platform platform = m_varsBatArchCombo->currentData().value(); const Abi::Architecture arch = archForPlatform(platform); const unsigned char wordWidth = wordWidthForPlatform(platform); @@ -1429,7 +1430,7 @@ void MsvcToolChainConfigWidget::updateAbis() // choose one appropriately. Abis supportedAbis; Abi targetAbi; - for (const MsvcToolChain *tc : std::as_const(g_availableMsvcToolchains)) { + for (const MsvcToolchain *tc : std::as_const(g_availableMsvcToolchains)) { if (tc->varsBat() == normalizedVcVars && tc->targetAbi().wordWidth() == wordWidth && tc->targetAbi().architecture() == arch && tc->language() == currentTc->language()) { // We need to filter out duplicates as there might be multiple toolchains with @@ -1445,8 +1446,8 @@ void MsvcToolChainConfigWidget::updateAbis() // If we didn't find an exact match, try to find a fallback according to varsBat only. // This can happen when the toolchain does not support user-selected arch/wordWidth. if (!targetAbi.isValid()) { - const MsvcToolChain *tc = Utils::findOrDefault(g_availableMsvcToolchains, - [normalizedVcVars](const MsvcToolChain *tc) { + const MsvcToolchain *tc = Utils::findOrDefault(g_availableMsvcToolchains, + [normalizedVcVars](const MsvcToolchain *tc) { return tc->varsBat() == normalizedVcVars; }); if (tc) { @@ -1465,19 +1466,19 @@ void MsvcToolChainConfigWidget::updateAbis() emit dirty(); } -void MsvcToolChainConfigWidget::handleVcVarsChange(const QString &) +void MsvcToolchainConfigWidget::handleVcVarsChange(const QString &) { updateAbis(); } -void MsvcToolChainConfigWidget::handleVcVarsArchChange(const QString &) +void MsvcToolchainConfigWidget::handleVcVarsArchChange(const QString &) { // supportedAbi list in the widget only contains matching ABIs to whatever arch was selected. // We need to reupdate it from scratch with new arch parameters updateAbis(); } -QString MsvcToolChainConfigWidget::vcVarsArguments() const +QString MsvcToolchainConfigWidget::vcVarsArguments() const { QString varsBatArg = m_varsBatArchCombo->currentText() == Tr::tr("") @@ -1487,20 +1488,20 @@ QString MsvcToolChainConfigWidget::vcVarsArguments() const return varsBatArg; } -std::unique_ptr MsvcToolChain::createConfigurationWidget() +std::unique_ptr MsvcToolchain::createConfigurationWidget() { - return std::make_unique(this); + return std::make_unique(this); } // -------------------------------------------------------------------------- // ClangClToolChainConfigWidget // -------------------------------------------------------------------------- -class ClangClToolChainConfigWidget final : public MsvcBasedToolChainConfigWidget +class ClangClToolchainConfigWidget final : public MsvcBasedToolchainConfigWidget { public: - explicit ClangClToolChainConfigWidget(Toolchain *tc) - : MsvcBasedToolChainConfigWidget(tc) + explicit ClangClToolchainConfigWidget(Toolchain *tc) + : MsvcBasedToolchainConfigWidget(tc) , m_varsBatDisplayCombo(new QComboBox(this)) { m_mainLayout->removeRow(m_mainLayout->rowCount() - 1); @@ -1522,13 +1523,13 @@ public: m_mainLayout->addRow(Tr::tr("&Compiler path:"), m_compilerCommand); } addErrorLabel(); - setFromClangClToolChain(); + setFromClangClToolchain(); if (m_compilerCommand) { connect(m_compilerCommand, &Utils::PathChooser::rawPathChanged, this, - &ClangClToolChainConfigWidget::dirty); + &ClangClToolchainConfigWidget::dirty); } } @@ -1539,45 +1540,45 @@ protected: void makeReadOnlyImpl() final; private: - void setFromClangClToolChain(); + void setFromClangClToolchain(); QLabel *m_llvmDirLabel = nullptr; QComboBox *m_varsBatDisplayCombo = nullptr; PathChooser *m_compilerCommand = nullptr; }; -void ClangClToolChainConfigWidget::setFromClangClToolChain() +void ClangClToolchainConfigWidget::setFromClangClToolchain() { - const auto *currentTC = static_cast(toolchain()); + const auto *currentTC = static_cast(toolchain()); m_nameDisplayLabel->setText(currentTC->displayName()); m_varsBatDisplayCombo->clear(); m_varsBatDisplayCombo->addItem(msvcVarsToDisplay(*currentTC)); - for (const MsvcToolChain *tc : std::as_const(g_availableMsvcToolchains)) { + for (const MsvcToolchain *tc : std::as_const(g_availableMsvcToolchains)) { const QString varsToDisplay = msvcVarsToDisplay(*tc); if (m_varsBatDisplayCombo->findText(varsToDisplay) == -1) m_varsBatDisplayCombo->addItem(varsToDisplay); } - const auto *clangClToolChain = static_cast(toolchain()); - if (clangClToolChain->isAutoDetected()) - m_llvmDirLabel->setText(clangClToolChain->clangPath().toUserOutput()); + const auto *clangClToolchain = static_cast(toolchain()); + if (clangClToolchain->isAutoDetected()) + m_llvmDirLabel->setText(clangClToolchain->clangPath().toUserOutput()); else - m_compilerCommand->setFilePath(clangClToolChain->clangPath()); + m_compilerCommand->setFilePath(clangClToolchain->clangPath()); } -static const MsvcToolChain *findMsvcToolChain(unsigned char wordWidth, Abi::OSFlavor flavor) +static const MsvcToolchain *findMsvcToolChain(unsigned char wordWidth, Abi::OSFlavor flavor) { return Utils::findOrDefault(g_availableMsvcToolchains, - [wordWidth, flavor](const MsvcToolChain *tc) { + [wordWidth, flavor](const MsvcToolchain *tc) { const Abi abi = tc->targetAbi(); return abi.osFlavor() == flavor && wordWidth == abi.wordWidth(); }); } -static const MsvcToolChain *findMsvcToolChain(const QString &displayedVarsBat) +static const MsvcToolchain *findMsvcToolChain(const QString &displayedVarsBat) { return Utils::findOrDefault(g_availableMsvcToolchains, - [&displayedVarsBat] (const MsvcToolChain *tc) { + [&displayedVarsBat] (const MsvcToolchain *tc) { return msvcVarsToDisplay(*tc) == displayedVarsBat; }); } @@ -1603,11 +1604,11 @@ static QVersionNumber clangClVersion(const FilePath &clangClPath) return QVersionNumber::fromString(match.captured(1)); } -static const MsvcToolChain *selectMsvcToolChain(const QString &displayedVarsBat, +static const MsvcToolchain *selectMsvcToolChain(const QString &displayedVarsBat, const FilePath &clangClPath, unsigned char wordWidth) { - const MsvcToolChain *toolChain = nullptr; + const MsvcToolchain *toolChain = nullptr; if (!displayedVarsBat.isEmpty()) { toolChain = findMsvcToolChain(displayedVarsBat); if (toolChain) @@ -1638,7 +1639,7 @@ static Toolchains detectClangClToolChainInPath(const FilePath &clangClPath, { Toolchains res; const unsigned char wordWidth = Utils::is64BitWindowsBinary(clangClPath) ? 64 : 32; - const MsvcToolChain *toolChain = selectMsvcToolChain(displayedVarsBat, clangClPath, wordWidth); + const MsvcToolchain *toolChain = selectMsvcToolChain(displayedVarsBat, clangClPath, wordWidth); if (!toolChain) { qWarning("Unable to find a suitable MSVC version for \"%s\".", @@ -1652,7 +1653,7 @@ static Toolchains detectClangClToolChainInPath(const FilePath &clangClPath, .arg(wordWidth) .arg(Abi::toString(targetAbi.osFlavor()).toUpper()); for (auto language : {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { - ClangClToolChain *tc = static_cast( + ClangClToolchain *tc = static_cast( Utils::findOrDefault(alreadyKnown, [&](Toolchain *tc) -> bool { if (tc->typeId() != Constants::CLANG_CL_TOOLCHAIN_TYPEID) return false; @@ -1665,7 +1666,7 @@ static Toolchains detectClangClToolChainInPath(const FilePath &clangClPath, if (tc) { res << tc; } else { - auto cltc = new ClangClToolChain; + auto cltc = new ClangClToolchain; cltc->setClangPath(clangClPath); cltc->setDisplayName(name); cltc->setDetection(Toolchain::AutoDetection); @@ -1677,15 +1678,15 @@ static Toolchains detectClangClToolChainInPath(const FilePath &clangClPath, return res; } -void ClangClToolChainConfigWidget::applyImpl() +void ClangClToolchainConfigWidget::applyImpl() { Utils::FilePath clangClPath = m_compilerCommand->filePath(); - auto clangClToolChain = static_cast(toolchain()); - clangClToolChain->setClangPath(clangClPath); + auto clangClToolchain = static_cast(toolchain()); + clangClToolchain->setClangPath(clangClPath); if (clangClPath.fileName() != "clang-cl.exe") { - clangClToolChain->resetVarsBat(); - setFromClangClToolChain(); + clangClToolchain->resetVarsBat(); + setFromClangClToolchain(); return; } @@ -1693,27 +1694,27 @@ void ClangClToolChainConfigWidget::applyImpl() Toolchains results = detectClangClToolChainInPath(clangClPath, {}, displayedVarsBat); if (results.isEmpty()) { - clangClToolChain->resetVarsBat(); + clangClToolchain->resetVarsBat(); } else { for (const Toolchain *toolchain : results) { - if (toolchain->language() == clangClToolChain->language()) { - auto mstc = static_cast(toolchain); - clangClToolChain->setupVarsBat(mstc->targetAbi(), mstc->varsBat(), mstc->varsBatArg()); + if (toolchain->language() == clangClToolchain->language()) { + auto mstc = static_cast(toolchain); + clangClToolchain->setupVarsBat(mstc->targetAbi(), mstc->varsBat(), mstc->varsBatArg()); break; } } qDeleteAll(results); } - setFromClangClToolChain(); + setFromClangClToolchain(); } -void ClangClToolChainConfigWidget::discardImpl() +void ClangClToolchainConfigWidget::discardImpl() { - setFromClangClToolChain(); + setFromClangClToolchain(); } -void ClangClToolChainConfigWidget::makeReadOnlyImpl() +void ClangClToolchainConfigWidget::makeReadOnlyImpl() { m_varsBatDisplayCombo->setEnabled(false); } @@ -1723,37 +1724,37 @@ void ClangClToolChainConfigWidget::makeReadOnlyImpl() // clang-cl.exe as a [to some extent] compatible drop-in replacement for cl. // -------------------------------------------------------------------------- -ClangClToolChain::ClangClToolChain() - : MsvcToolChain(Constants::CLANG_CL_TOOLCHAIN_TYPEID) +ClangClToolchain::ClangClToolchain() + : MsvcToolchain(Constants::CLANG_CL_TOOLCHAIN_TYPEID) { setDisplayName("clang-cl"); setTypeDisplayName(Tr::tr("Clang")); } -bool ClangClToolChain::isValid() const +bool ClangClToolchain::isValid() const { const FilePath clang = clangPath(); - return MsvcToolChain::isValid() && clang.exists() && clang.fileName() == "clang-cl.exe"; + return MsvcToolchain::isValid() && clang.exists() && clang.fileName() == "clang-cl.exe"; } -void ClangClToolChain::addToEnvironment(Utils::Environment &env) const +void ClangClToolchain::addToEnvironment(Utils::Environment &env) const { - MsvcToolChain::addToEnvironment(env); + MsvcToolchain::addToEnvironment(env); env.prependOrSetPath(m_clangPath.parentDir()); // bin folder } -Utils::FilePath ClangClToolChain::compilerCommand() const +Utils::FilePath ClangClToolchain::compilerCommand() const { return m_clangPath; } -QStringList ClangClToolChain::suggestedMkspecList() const +QStringList ClangClToolchain::suggestedMkspecList() const { const QString mkspec = "win32-clang-" + Abi::toString(targetAbi().osFlavor()); return {mkspec, "win32-clang-msvc"}; } -QList ClangClToolChain::createOutputParsers() const +QList ClangClToolchain::createOutputParsers() const { return {new ClangClParser}; } @@ -1763,15 +1764,15 @@ static Key llvmDirKey() return "ProjectExplorer.ClangClToolChain.LlvmDir"; } -void ClangClToolChain::toMap(Store &data) const +void ClangClToolchain::toMap(Store &data) const { - MsvcToolChain::toMap(data); + MsvcToolchain::toMap(data); data.insert(llvmDirKey(), m_clangPath.toString()); } -void ClangClToolChain::fromMap(const Store &data) +void ClangClToolchain::fromMap(const Store &data) { - MsvcToolChain::fromMap(data); + MsvcToolchain::fromMap(data); if (hasError()) return; @@ -1784,30 +1785,30 @@ void ClangClToolChain::fromMap(const Store &data) m_clangPath = FilePath::fromString(clangPath); } -std::unique_ptr ClangClToolChain::createConfigurationWidget() +std::unique_ptr ClangClToolchain::createConfigurationWidget() { - return std::make_unique(this); + return std::make_unique(this); } -bool ClangClToolChain::operator==(const Toolchain &other) const +bool ClangClToolchain::operator==(const Toolchain &other) const { - if (!MsvcToolChain::operator==(other)) + if (!MsvcToolchain::operator==(other)) return false; - const auto *clangClTc = static_cast(&other); + const auto *clangClTc = static_cast(&other); return m_clangPath == clangClTc->m_clangPath; } -int ClangClToolChain::priority() const +int ClangClToolchain::priority() const { - return MsvcToolChain::priority() - 1; + return MsvcToolchain::priority() - 1; } -Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags, +Macros ClangClToolchain::msvcPredefinedMacros(const QStringList &cxxflags, const Utils::Environment &env) const { if (!cxxflags.contains("--driver-mode=g++")) - return MsvcToolChain::msvcPredefinedMacros(cxxflags, env); + return MsvcToolchain::msvcPredefinedMacros(cxxflags, env); Process cpp; cpp.setEnvironment(env); @@ -1826,16 +1827,16 @@ Macros ClangClToolChain::msvcPredefinedMacros(const QStringList &cxxflags, return Macro::toMacros(cpp.allRawOutput()); } -LanguageVersion ClangClToolChain::msvcLanguageVersion(const QStringList &cxxflags, +LanguageVersion ClangClToolchain::msvcLanguageVersion(const QStringList &cxxflags, const Id &language, const Macros ¯os) const { if (cxxflags.contains("--driver-mode=g++")) return Toolchain::languageVersion(language, macros); - return MsvcToolChain::msvcLanguageVersion(cxxflags, language, macros); + return MsvcToolchain::msvcLanguageVersion(cxxflags, language, macros); } -ClangClToolChain::BuiltInHeaderPathsRunner ClangClToolChain::createBuiltInHeaderPathsRunner( +ClangClToolchain::BuiltInHeaderPathsRunner ClangClToolchain::createBuiltInHeaderPathsRunner( const Environment &env) const { { @@ -1843,7 +1844,7 @@ ClangClToolChain::BuiltInHeaderPathsRunner ClangClToolChain::createBuiltInHeader m_headerPathsPerEnv.clear(); } - return MsvcToolChain::createBuiltInHeaderPathsRunner(env); + return MsvcToolchain::createBuiltInHeaderPathsRunner(env); } // -------------------------------------------------------------------------- @@ -1858,7 +1859,7 @@ public: setDisplayName(Tr::tr("MSVC")); setSupportedToolchainType(Constants::MSVC_TOOLCHAIN_TYPEID); setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}); - setToolchainConstructor([] { return new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID); }); + setToolchainConstructor([] { return new MsvcToolchain(Constants::MSVC_TOOLCHAIN_TYPEID); }); } Toolchains autoDetect(const ToolchainDetector &detector) const final; @@ -1866,12 +1867,12 @@ public: bool canCreate() const final { return !g_availableMsvcToolchains.isEmpty(); } static QString vcVarsBatFor(const QString &basePath, - MsvcToolChain::Platform platform, + MsvcToolchain::Platform platform, const QVersionNumber &v); }; QString MsvcToolchainFactory::vcVarsBatFor(const QString &basePath, - MsvcToolChain::Platform platform, + MsvcToolchain::Platform platform, const QVersionNumber &v) { QString result; @@ -1901,13 +1902,13 @@ static Toolchains findOrCreateToolchains(const ToolchainDetector &detector, return false; if (tc->language() != language) return false; - auto mtc = static_cast(tc); + auto mtc = static_cast(tc); return mtc->varsBat() == varsBat && mtc->varsBatArg() == varsBatArg; }); if (tc) { res << tc; } else { - auto mstc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID); + auto mstc = new MsvcToolchain(Constants::MSVC_TOOLCHAIN_TYPEID); mstc->setupVarsBat(abi, varsBat, varsBatArg); mstc->setDisplayName(name); mstc->setLanguage(language); @@ -1947,7 +1948,7 @@ static void detectCppBuildTools2015(Toolchains *list) e.format, e.wordSize); for (auto language : {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { - auto tc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID); + auto tc = new MsvcToolchain(Constants::MSVC_TOOLCHAIN_TYPEID); tc->setupVarsBat(abi, vcVarsBat, QLatin1String(e.varsBatArg)); tc->setDisplayName(name + QLatin1String(e.postFix)); tc->setDetection(Toolchain::AutoDetection); @@ -1990,18 +1991,18 @@ Toolchains MsvcToolchainFactory::autoDetect(const ToolchainDetector &detector) c continue; QList tmp; - const QVector> platforms = { - {MsvcToolChain::x86, "x86"}, - {MsvcToolChain::amd64, "x64"}, - {MsvcToolChain::ia64, "ia64"}, - {MsvcToolChain::arm64, "arm64"}, + const QVector> platforms = { + {MsvcToolchain::x86, "x86"}, + {MsvcToolchain::amd64, "x64"}, + {MsvcToolchain::ia64, "ia64"}, + {MsvcToolchain::arm64, "arm64"}, }; for (const auto &platform : platforms) { tmp.append(findOrCreateToolchains(detector, generateDisplayName(name, - MsvcToolChain::WindowsSDK, + MsvcToolchain::WindowsSDK, platform.first), - findAbiOfMsvc(MsvcToolChain::WindowsSDK, + findAbiOfMsvc(MsvcToolchain::WindowsSDK, platform.first, sdkKey), fi.absoluteFilePath(), @@ -2020,31 +2021,31 @@ Toolchains MsvcToolchainFactory::autoDetect(const ToolchainDetector &detector) c // x86_arm was put before amd64_arm as a workaround for auto detected windows phone // toolchains. As soon as windows phone builds support x64 cross builds, this change // can be reverted. - const MsvcToolChain::Platform platforms[] = {MsvcToolChain::x86, - MsvcToolChain::amd64_x86, - MsvcToolChain::amd64, - MsvcToolChain::x86_amd64, - MsvcToolChain::arm, - MsvcToolChain::x86_arm, - MsvcToolChain::amd64_arm, - MsvcToolChain::x86_arm64, - MsvcToolChain::amd64_arm64, - MsvcToolChain::ia64, - MsvcToolChain::x86_ia64, - MsvcToolChain::arm64, - MsvcToolChain::arm64_x86, - MsvcToolChain::arm64_amd64}; + const MsvcToolchain::Platform platforms[] = {MsvcToolchain::x86, + MsvcToolchain::amd64_x86, + MsvcToolchain::amd64, + MsvcToolchain::x86_amd64, + MsvcToolchain::arm, + MsvcToolchain::x86_arm, + MsvcToolchain::amd64_arm, + MsvcToolchain::x86_arm64, + MsvcToolchain::amd64_arm64, + MsvcToolchain::ia64, + MsvcToolchain::x86_ia64, + MsvcToolchain::arm64, + MsvcToolchain::arm64_x86, + MsvcToolchain::arm64_amd64}; const QVector studios = detectVisualStudio(); for (const VisualStudioInstallation &i : studios) { - for (MsvcToolChain::Platform platform : platforms) { + for (MsvcToolchain::Platform platform : platforms) { const bool toolchainInstalled = QFileInfo(vcVarsBatFor(i.vcVarsPath, platform, i.version)).isFile(); if (hostSupportsPlatform(platform) && toolchainInstalled) { results.append( findOrCreateToolchains(detector, - generateDisplayName(i.vsName, MsvcToolChain::VS, platform), - findAbiOfMsvc(MsvcToolChain::VS, platform, i.vsName), + generateDisplayName(i.vsName, MsvcToolchain::VS, platform), + findAbiOfMsvc(MsvcToolchain::VS, platform, i.vsName), i.vcVarsAll, platformName(platform))); } @@ -2059,27 +2060,27 @@ Toolchains MsvcToolchainFactory::autoDetect(const ToolchainDetector &detector) c return results; } -bool MsvcToolChain::operator==(const Toolchain &other) const +bool MsvcToolchain::operator==(const Toolchain &other) const { if (!Toolchain::operator==(other)) return false; - const auto *msvcTc = dynamic_cast(&other); + const auto *msvcTc = dynamic_cast(&other); return targetAbi() == msvcTc->targetAbi() && m_vcvarsBat == msvcTc->m_vcvarsBat && m_varsBatArg == msvcTc->m_varsBatArg; } -int MsvcToolChain::priority() const +int MsvcToolchain::priority() const { return hostPrefersToolchain() ? PriorityHigh : PriorityNormal; } -void MsvcToolChain::cancelMsvcToolChainDetection() +void MsvcToolchain::cancelMsvcToolChainDetection() { envModThreadPool()->clear(); } -std::optional MsvcToolChain::generateEnvironmentSettings(const Utils::Environment &env, +std::optional MsvcToolchain::generateEnvironmentSettings(const Utils::Environment &env, const QString &batchFile, const QString &batchArgs, QMap &envPairs) @@ -2178,7 +2179,7 @@ std::optional MsvcToolChain::generateEnvironmentSettings(const Utils::E return std::nullopt; } -MsvcToolChain::WarningFlagAdder::WarningFlagAdder(const QString &flag, WarningFlags &flags) +MsvcToolchain::WarningFlagAdder::WarningFlagAdder(const QString &flag, WarningFlags &flags) : m_flags(flags) { if (flag.startsWith(QLatin1String("-wd"))) { @@ -2198,7 +2199,7 @@ MsvcToolChain::WarningFlagAdder::WarningFlagAdder(const QString &flag, WarningFl m_triggered = true; } -void MsvcToolChain::WarningFlagAdder::operator()(int warningCode, WarningFlags flagsSet) +void MsvcToolchain::WarningFlagAdder::operator()(int warningCode, WarningFlags flagsSet) { if (m_triggered) return; @@ -2211,7 +2212,7 @@ void MsvcToolChain::WarningFlagAdder::operator()(int warningCode, WarningFlags f } } -bool MsvcToolChain::WarningFlagAdder::triggered() const +bool MsvcToolchain::WarningFlagAdder::triggered() const { return m_triggered; } @@ -2228,7 +2229,7 @@ public: setDisplayName(Tr::tr("clang-cl")); setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}); setSupportedToolchainType(Constants::CLANG_CL_TOOLCHAIN_TYPEID); - setToolchainConstructor([] { return new ClangClToolChain; }); + setToolchainConstructor([] { return new ClangClToolchain; }); } Toolchains autoDetect(const ToolchainDetector &detector) const final; @@ -2293,4 +2294,4 @@ void setupClangClToolchain() } // namespace ProjectExplorer::Internal -Q_DECLARE_METATYPE(ProjectExplorer::Internal::MsvcToolChain::Platform) +Q_DECLARE_METATYPE(ProjectExplorer::Internal::MsvcToolchain::Platform) diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 511ae6eb21a..f22a7af38c2 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -4,7 +4,6 @@ #pragma once #include "abi.h" -#include "abiwidget.h" #include "toolchain.h" #include "toolchainconfigwidget.h" @@ -20,15 +19,15 @@ namespace ProjectExplorer::Internal { // MsvcToolChain // -------------------------------------------------------------------------- -class MsvcToolChain : public Toolchain +class MsvcToolchain : public Toolchain { public: enum Type { WindowsSDK, VS }; enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86, x86_arm64, amd64_arm64, arm64, arm64_x86, arm64_amd64 }; - explicit MsvcToolChain(Utils::Id typeId); - ~MsvcToolChain() override; + explicit MsvcToolchain(Utils::Id typeId); + ~MsvcToolchain() override; bool isValid() const override; @@ -127,10 +126,10 @@ protected: QString m_varsBatArg; // Argument }; -class PROJECTEXPLORER_EXPORT ClangClToolChain : public MsvcToolChain +class PROJECTEXPLORER_EXPORT ClangClToolchain : public MsvcToolchain { public: - ClangClToolChain(); + ClangClToolchain(); bool isValid() const override; QStringList suggestedMkspecList() const override; @@ -143,7 +142,7 @@ public: BuiltInHeaderPathsRunner createBuiltInHeaderPathsRunner( const Utils::Environment &env) const override; - const QList &msvcToolchains() const; + const QList &msvcToolchains() const; Utils::FilePath clangPath() const { return m_clangPath; } void setClangPath(const Utils::FilePath &path) { m_clangPath = path; } diff --git a/src/plugins/projectexplorer/project.cpp b/src/plugins/projectexplorer/project.cpp index c3019e2e203..65627702a06 100644 --- a/src/plugins/projectexplorer/project.cpp +++ b/src/plugins/projectexplorer/project.cpp @@ -1617,7 +1617,7 @@ void ProjectExplorerPlugin::testSourceToBinaryMapping() const auto toolchain = ToolchainKitAspect::cxxToolchain(kit); QVERIFY(toolchain); - if (const auto msvcToolchain = dynamic_cast(toolchain)) { + if (const auto msvcToolchain = dynamic_cast(toolchain)) { while (!msvcToolchain->environmentInitialized()) { QSignalSpy parsingFinishedSpy(ToolchainManager::instance(), &ToolchainManager::toolchainUpdated); diff --git a/src/plugins/projectexplorer/projectimporter.cpp b/src/plugins/projectexplorer/projectimporter.cpp index d1239088b7e..2dc61fe8e8c 100644 --- a/src/plugins/projectexplorer/projectimporter.cpp +++ b/src/plugins/projectexplorer/projectimporter.cpp @@ -54,8 +54,8 @@ static bool hasOtherUsers(Utils::Id id, const QVariant &v, Kit *k) ProjectImporter::ProjectImporter(const Utils::FilePath &path) : m_projectPath(path) { useTemporaryKitAspect(ToolchainKitAspect::id(), - [this](Kit *k, const QVariantList &vl) { cleanupTemporaryToolChains(k, vl); }, - [this](Kit *k, const QVariantList &vl) { persistTemporaryToolChains(k, vl); }); + [this](Kit *k, const QVariantList &vl) { cleanupTemporaryToolchains(k, vl); }, + [this](Kit *k, const QVariantList &vl) { persistTemporaryToolchains(k, vl); }); } ProjectImporter::~ProjectImporter() @@ -316,7 +316,7 @@ static Toolchain *toolChainFromVariant(const QVariant &v) return ToolchainManager::findToolchain(tcId); } -void ProjectImporter::cleanupTemporaryToolChains(Kit *k, const QVariantList &vl) +void ProjectImporter::cleanupTemporaryToolchains(Kit *k, const QVariantList &vl) { for (const QVariant &v : vl) { Toolchain *tc = toolChainFromVariant(v); @@ -326,7 +326,7 @@ void ProjectImporter::cleanupTemporaryToolChains(Kit *k, const QVariantList &vl) } } -void ProjectImporter::persistTemporaryToolChains(Kit *k, const QVariantList &vl) +void ProjectImporter::persistTemporaryToolchains(Kit *k, const QVariantList &vl) { for (const QVariant &v : vl) { Toolchain *tmpTc = toolChainFromVariant(v); diff --git a/src/plugins/projectexplorer/projectimporter.h b/src/plugins/projectexplorer/projectimporter.h index f5d563c0e65..1bb19fc239d 100644 --- a/src/plugins/projectexplorer/projectimporter.h +++ b/src/plugins/projectexplorer/projectimporter.h @@ -93,8 +93,8 @@ private: void markKitAsTemporary(Kit *k) const; bool findTemporaryHandler(Utils::Id id) const; - void cleanupTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl); - void persistTemporaryToolChains(ProjectExplorer::Kit *k, const QVariantList &vl); + void cleanupTemporaryToolchains(ProjectExplorer::Kit *k, const QVariantList &vl); + void persistTemporaryToolchains(ProjectExplorer::Kit *k, const QVariantList &vl); const Utils::FilePath m_projectPath; mutable bool m_isUpdating = false; diff --git a/src/plugins/projectexplorer/rawprojectpart.cpp b/src/plugins/projectexplorer/rawprojectpart.cpp index 38c695f6d85..3f525ea095a 100644 --- a/src/plugins/projectexplorer/rawprojectpart.cpp +++ b/src/plugins/projectexplorer/rawprojectpart.cpp @@ -21,7 +21,7 @@ RawProjectPartFlags::RawProjectPartFlags(const Toolchain *toolChain, const Utils::FilePath &includeFileBaseDir) { // Keep the following cheap/non-blocking for the ui thread. Expensive - // operations are encapsulated in ToolChainInfo as "runners". + // operations are encapsulated in ToolchainInfo as "runners". this->commandLineFlags = commandLineFlags; if (toolChain) { warningFlags = toolChain->warningFlags(commandLineFlags); diff --git a/src/plugins/projectexplorer/toolchainmanager.cpp b/src/plugins/projectexplorer/toolchainmanager.cpp index 60988ad7b28..e09ece5e102 100644 --- a/src/plugins/projectexplorer/toolchainmanager.cpp +++ b/src/plugins/projectexplorer/toolchainmanager.cpp @@ -106,7 +106,7 @@ void ToolchainManager::restoreToolchains() QTC_ASSERT(!d->m_accessor, return); d->m_accessor = std::make_unique(); - for (Toolchain *tc : d->m_accessor->restoreToolChains(Core::ICore::dialogParent())) + for (Toolchain *tc : d->m_accessor->restoreToolchains(Core::ICore::dialogParent())) registerToolchain(tc); d->m_loaded = true; @@ -117,7 +117,7 @@ void ToolchainManager::saveToolchains() { QTC_ASSERT(d->m_accessor, return); - d->m_accessor->saveToolChains(d->m_toolChains, Core::ICore::dialogParent()); + d->m_accessor->saveToolchains(d->m_toolChains, Core::ICore::dialogParent()); QtcSettings *const s = Core::ICore::settings(); s->setValueWithDefault(DETECT_X64_AS_X32_KEY, d->m_detectionSettings.detectX64AsX32, @@ -254,7 +254,7 @@ bool ToolchainManager::isLanguageSupported(const Utils::Id &id) void ToolchainManager::aboutToShutdown() { if (HostOsInfo::isWindowsHost()) - MsvcToolChain::cancelMsvcToolChainDetection(); + MsvcToolchain::cancelMsvcToolChainDetection(); } ToolchainDetectionSettings ToolchainManager::detectionSettings() diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp index f04adcb2157..75830c0bed3 100644 --- a/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp +++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.cpp @@ -193,7 +193,7 @@ ToolchainSettingsAccessor::ToolchainSettingsAccessor() addVersionUpgrader(std::make_unique()); } -Toolchains ToolchainSettingsAccessor::restoreToolChains(QWidget *parent) const +Toolchains ToolchainSettingsAccessor::restoreToolchains(QWidget *parent) const { NANOTRACE_SCOPE("ProjectExplorer", "ToolChainSettingsAccessor::restoreToolChains"); // read all tool chains from SDK @@ -229,7 +229,7 @@ Toolchains ToolchainSettingsAccessor::restoreToolChains(QWidget *parent) const return ops.toRegister; } -void ToolchainSettingsAccessor::saveToolChains(const Toolchains &toolchains, QWidget *parent) +void ToolchainSettingsAccessor::saveToolchains(const Toolchains &toolchains, QWidget *parent) { Store data; diff --git a/src/plugins/projectexplorer/toolchainsettingsaccessor.h b/src/plugins/projectexplorer/toolchainsettingsaccessor.h index b633fd41bb0..c068e7f1282 100644 --- a/src/plugins/projectexplorer/toolchainsettingsaccessor.h +++ b/src/plugins/projectexplorer/toolchainsettingsaccessor.h @@ -18,9 +18,9 @@ class ToolchainSettingsAccessor : public Utils::UpgradingSettingsAccessor public: ToolchainSettingsAccessor(); - QList restoreToolChains(QWidget *parent) const; + QList restoreToolchains(QWidget *parent) const; - void saveToolChains(const QList &toolchains, QWidget *parent); + void saveToolchains(const QList &toolchains, QWidget *parent); private: QList toolChains(const Utils::Store &data) const; diff --git a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp index 0f372624a29..402c97bc8b2 100644 --- a/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp +++ b/src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp @@ -316,7 +316,7 @@ QVariantMap DefaultPropertyProvider::autoGeneratedProperties(const ProjectExplor if (toolchain.contains(QLatin1String("clang-cl"))) { data.insert(QLatin1String(CPP_COMPILERNAME), mainCompilerName); const auto clangClToolchain = - static_cast(mainTc); + static_cast(mainTc); data.insert(QLatin1String(CPP_VCVARSALLPATH), clangClToolchain->varsBat()); } else if (toolchain.contains(QLatin1String("msvc"))) { data.insert(QLatin1String(CPP_COMPILERNAME), mainCompilerName); diff --git a/src/plugins/qbsprojectmanager/qbsproject.cpp b/src/plugins/qbsprojectmanager/qbsproject.cpp index 19b38873987..1fd19772257 100644 --- a/src/plugins/qbsprojectmanager/qbsproject.cpp +++ b/src/plugins/qbsprojectmanager/qbsproject.cpp @@ -827,8 +827,8 @@ static void getExpandedCompilerFlags(QStringList &cFlags, QStringList &cxxFlags, static RawProjectPart generateProjectPart( const QJsonObject &product, const QJsonObject &group, - const std::shared_ptr &cToolChain, - const std::shared_ptr &cxxToolChain, + const std::shared_ptr &cToolchain, + const std::shared_ptr &cxxToolchain, QtMajorVersion qtVersion, QString cPch, QString cxxPch, @@ -850,8 +850,8 @@ static RawProjectPart generateProjectPart( QStringList cFlags; QStringList cxxFlags; getExpandedCompilerFlags(cFlags, cxxFlags, props); - rpp.setFlagsForC({cToolChain.get(), cFlags, {}}); - rpp.setFlagsForCxx({cxxToolChain.get(), cxxFlags, {}}); + rpp.setFlagsForC({cToolchain.get(), cFlags, {}}); + rpp.setFlagsForCxx({cxxToolchain.get(), cxxFlags, {}}); const QStringList defines = arrayToStringList(props.value("cpp.defines")) + arrayToStringList(props.value("cpp.platformDefines")); @@ -952,8 +952,8 @@ static RawProjectPart generateProjectPart( static RawProjectParts generateProjectParts( const QJsonObject &projectData, - const std::shared_ptr &cToolChain, - const std::shared_ptr &cxxToolChain, + const std::shared_ptr &cToolchain, + const std::shared_ptr &cxxToolchain, QtMajorVersion qtVersion ) { @@ -986,11 +986,11 @@ static RawProjectParts generateProjectParts( }; for (const QJsonValue &g : groups) { appendIfNotEmpty(generateProjectPart( - prd, g.toObject(), cToolChain, cxxToolChain, qtVersionForPart, + prd, g.toObject(), cToolchain, cxxToolchain, qtVersionForPart, cPch, cxxPch, objcPch, objcxxPch)); } appendIfNotEmpty(generateProjectPart( - prd, {}, cToolChain, cxxToolChain, qtVersionForPart, + prd, {}, cToolchain, cxxToolchain, qtVersionForPart, cPch, cxxPch, objcPch, objcxxPch)); }); return rpps; diff --git a/src/plugins/qnx/qnxplugin.cpp b/src/plugins/qnx/qnxplugin.cpp index ab76fcb839f..6f2b8e840cd 100644 --- a/src/plugins/qnx/qnxplugin.cpp +++ b/src/plugins/qnx/qnxplugin.cpp @@ -84,7 +84,7 @@ class QnxPlugin final : public ExtensionSystem::IPlugin void initialize() final { setupQnxDevice(); - setupQnxToolChain(); + setupQnxToolchain(); setupQnxQtVersion(); setupQnxDeployment(); setupQnxRunnning(); diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp index c2fda324054..6978a16611c 100644 --- a/src/plugins/qnx/qnxtoolchain.cpp +++ b/src/plugins/qnx/qnxtoolchain.cpp @@ -277,7 +277,7 @@ public: } }; -void setupQnxToolChain() +void setupQnxToolchain() { static QnxToolchainFactory theQnxToolChainFactory; } diff --git a/src/plugins/qnx/qnxtoolchain.h b/src/plugins/qnx/qnxtoolchain.h index 674a94c9326..47a9a706439 100644 --- a/src/plugins/qnx/qnxtoolchain.h +++ b/src/plugins/qnx/qnxtoolchain.h @@ -26,6 +26,6 @@ protected: DetectedAbisResult detectSupportedAbis() const override; }; -void setupQnxToolChain(); +void setupQnxToolchain(); } // Qnx::Internal diff --git a/src/plugins/qtsupport/qtkitaspect.cpp b/src/plugins/qtsupport/qtkitaspect.cpp index c44506254d1..8059c1059a3 100644 --- a/src/plugins/qtsupport/qtkitaspect.cpp +++ b/src/plugins/qtsupport/qtkitaspect.cpp @@ -242,7 +242,7 @@ void QtKitAspectFactory::fix(Kit *k) if (!possibleTcs.isEmpty()) { // Prefer exact matches. // TODO: We should probably prefer the compiler with the highest version number instead, - // but this information is currently not exposed by the ToolChain class. + // but this information is currently not exposed by the Toolchain class. const FilePaths envPathVar = Environment::systemEnvironment().path(); sort(possibleTcs, [version, &envPathVar](const Toolchain *tc1, const Toolchain *tc2) { const QVector &qtAbis = version->qtAbis(); diff --git a/src/plugins/qtsupport/qtoptionspage.cpp b/src/plugins/qtsupport/qtoptionspage.cpp index ec5a06a6b49..6b724ccee7d 100644 --- a/src/plugins/qtsupport/qtoptionspage.cpp +++ b/src/plugins/qtsupport/qtoptionspage.cpp @@ -192,7 +192,7 @@ private: }; ValidityInfo validInformation(const QtVersion *version); QList toolChains(const QtVersion *version); - QByteArray defaultToolChainId(const QtVersion *version); + QByteArray defaultToolchainId(const QtVersion *version); bool isNameUnique(const QtVersion *version); void updateVersionItem(QtVersionItem *item); @@ -484,7 +484,7 @@ QtSettingsPageWidget::ValidityInfo QtSettingsPageWidget::validInformation(const } // Do we have tool chain issues? - Abis missingToolChains; + Abis missingToolchains; const Abis qtAbis = version->qtAbis(); for (const Abi &abi : qtAbis) { @@ -495,7 +495,7 @@ QtSettingsPageWidget::ValidityInfo QtSettingsPageWidget::validInformation(const }; if (!ToolchainManager::toolchain(abiCompatePred)) - missingToolChains.append(abi); + missingToolchains.append(abi); } bool useable = true; @@ -503,8 +503,8 @@ QtSettingsPageWidget::ValidityInfo QtSettingsPageWidget::validInformation(const if (!isNameUnique(version)) warnings << Tr::tr("Display Name is not unique."); - if (!missingToolChains.isEmpty()) { - if (missingToolChains.count() == qtAbis.size()) { + if (!missingToolchains.isEmpty()) { + if (missingToolchains.count() == qtAbis.size()) { // Yes, this Qt version can't be used at all! info.message = Tr::tr("No compiler can produce code for this Qt version." @@ -515,7 +515,7 @@ QtSettingsPageWidget::ValidityInfo QtSettingsPageWidget::validInformation(const // Yes, some ABIs are unsupported warnings << Tr::tr("Not all possible target environments can be supported due to missing compilers."); info.toolTip = Tr::tr("The following ABIs are currently not supported: %1") - .arg(formatAbiHtmlList(missingToolChains)); + .arg(formatAbiHtmlList(missingToolchains)); info.icon = m_warningVersionIcon; } } @@ -550,7 +550,7 @@ QList QtSettingsPageWidget::toolChains(const QtVersion *version) return toolChains; } -QByteArray QtSettingsPageWidget::defaultToolChainId(const QtVersion *version) +QByteArray QtSettingsPageWidget::defaultToolchainId(const QtVersion *version) { QList possibleToolChains = toolChains(version); if (!possibleToolChains.isEmpty())