diff options
author | hjk <hjk@qt.io> | 2019-06-13 14:15:15 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-06-14 10:59:06 +0000 |
commit | 7ceb26defc49ad281369ed87b45e46fe26268167 (patch) | |
tree | 946a641c7c526c0ae688f882f45a09dbc275465b | |
parent | 84659016e78b5a50be544535218c2ef0ddcde7d4 (diff) |
Project: Remove two MsvcToolChain constructors
Change-Id: I9ac3ef25e549bbfff9cb894524622a9401ad09e8
Reviewed-by: David Schulz <david.schulz@qt.io>
-rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 21 | ||||
-rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.h | 13 |
2 files changed, 10 insertions, 24 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 0343edb401..b81a98f4b9 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -834,13 +834,6 @@ Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environmen // MsvcToolChain // -------------------------------------------------------------------------- -MsvcToolChain::MsvcToolChain(const QString &name, - const Abi &abi, - const QString &varsBat, - const QString &varsBatArg) - : MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID, name, abi, varsBat, varsBatArg) -{} - static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain) { if (toolchain->typeId() != Constants::MSVC_TOOLCHAIN_TYPEID) @@ -898,10 +891,6 @@ void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags) flags |= WarningFlags::UnusedParams; } -MsvcToolChain::MsvcToolChain() - : MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID) -{} - MsvcToolChain::~MsvcToolChain() { g_availableMsvcToolchains.removeOne(this); @@ -1816,7 +1805,7 @@ MsvcToolChainFactory::MsvcToolChainFactory() setDisplayName(tr("MSVC")); setSupportedToolChainType(Constants::MSVC_TOOLCHAIN_TYPEID); setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}); - setToolchainConstructor([] { return new MsvcToolChain; }); + setToolchainConstructor([] { return new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID); }); } QString MsvcToolChainFactory::vcVarsBatFor(const QString &basePath, @@ -1854,7 +1843,7 @@ static QList<ToolChain *> findOrCreateToolChain(const QList<ToolChain *> &alread return mtc->varsBat() == varsBat && mtc->varsBatArg() == varsBatArg; }); if (!tc) { - tc = new MsvcToolChain(name, abi, varsBat, varsBatArg); + tc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID, name, abi, varsBat, varsBatArg); tc->setLanguage(language); } res << tc; @@ -1891,7 +1880,8 @@ static void detectCppBuildTools2015(QList<ToolChain *> *list) e.format, e.wordSize); for (auto language : {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { - auto tc = new MsvcToolChain(name + QLatin1String(e.postFix), + auto tc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID, + name + QLatin1String(e.postFix), abi, vcVarsBat, QLatin1String(e.varsBatArg)); @@ -2167,7 +2157,8 @@ bool MsvcToolChainFactory::canCreate() const ToolChain *MsvcToolChainFactory::create() { - return new MsvcToolChain("Microsoft Visual C++ Compiler", + return new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID, + "Microsoft Visual C++ Compiler", Abi::hostAbi(), g_availableMsvcToolchains.first()->varsBat(), ""); } diff --git a/src/plugins/projectexplorer/msvctoolchain.h b/src/plugins/projectexplorer/msvctoolchain.h index 4a2b5057a3..97e55da30b 100644 --- a/src/plugins/projectexplorer/msvctoolchain.h +++ b/src/plugins/projectexplorer/msvctoolchain.h @@ -57,11 +57,13 @@ public: enum Type { WindowsSDK, VS }; enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 }; - explicit MsvcToolChain(const QString &name, + explicit MsvcToolChain(Core::Id typeId, + const QString &name, const Abi &abi, const QString &varsBat, const QString &varsBatArg); - MsvcToolChain(); + explicit MsvcToolChain(Core::Id typeId); + ~MsvcToolChain() override; Abi targetAbi() const override; @@ -123,13 +125,6 @@ protected: bool triggered() const; }; - explicit MsvcToolChain(Core::Id typeId, - const QString &name, - const Abi &abi, - const QString &varsBat, - const QString &varsBatArg); - explicit MsvcToolChain(Core::Id typeId); - static void inferWarningsForLevel(int warningLevel, WarningFlags &flags); Utils::Environment readEnvironmentSetting(const Utils::Environment &env) const; |