feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Project: Remove two MsvcToolChain constructors

Browse Source 
Change-Id: I9ac3ef25e549bbfff9cb894524622a9401ad09e8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
hjk
2019-06-13 14:15:15 +02:00
parent 84659016e7
commit 7ceb26defc
2 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -834,13 +834,6 @@ Utils::Environment MsvcToolChain::readEnvironmentSetting(const Utils::Environmen
// MsvcToolChain // 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) static void addToAvailableMsvcToolchains(const MsvcToolChain *toolchain)
{ {
if (toolchain->typeId() != Constants::MSVC_TOOLCHAIN_TYPEID) if (toolchain->typeId() != Constants::MSVC_TOOLCHAIN_TYPEID)
@@ -898,10 +891,6 @@ void MsvcToolChain::inferWarningsForLevel(int warningLevel, WarningFlags &flags)
flags |= WarningFlags::UnusedParams; flags |= WarningFlags::UnusedParams;
} }
MsvcToolChain::MsvcToolChain()
: MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID)
{}
MsvcToolChain::~MsvcToolChain() MsvcToolChain::~MsvcToolChain()
{ {
g_availableMsvcToolchains.removeOne(this); g_availableMsvcToolchains.removeOne(this);
@@ -1816,7 +1805,7 @@ MsvcToolChainFactory::MsvcToolChainFactory()
setDisplayName(tr("MSVC")); setDisplayName(tr("MSVC"));
setSupportedToolChainType(Constants::MSVC_TOOLCHAIN_TYPEID); setSupportedToolChainType(Constants::MSVC_TOOLCHAIN_TYPEID);
setSupportedLanguages({Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}); 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, 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; return mtc->varsBat() == varsBat && mtc->varsBatArg() == varsBatArg;
}); });
if (!tc) { if (!tc) {
tc = new MsvcToolChain(name, abi, varsBat, varsBatArg); tc = new MsvcToolChain(Constants::MSVC_TOOLCHAIN_TYPEID, name, abi, varsBat, varsBatArg);
tc->setLanguage(language); tc->setLanguage(language);
} }
res << tc; res << tc;
@@ -1891,7 +1880,8 @@ static void detectCppBuildTools2015(QList<ToolChain *> *list)
e.format, e.format,
e.wordSize); e.wordSize);
for (auto language : {Constants::C_LANGUAGE_ID, Constants::CXX_LANGUAGE_ID}) { 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, abi,
vcVarsBat, vcVarsBat,
QLatin1String(e.varsBatArg)); QLatin1String(e.varsBatArg));
@@ -2167,7 +2157,8 @@ bool MsvcToolChainFactory::canCreate() const
ToolChain *MsvcToolChainFactory::create() 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(), ""); Abi::hostAbi(), g_availableMsvcToolchains.first()->varsBat(), "");
} }

13
src/plugins/projectexplorer/msvctoolchain.h
View File

@@ -57,11 +57,13 @@ public:
enum Type { WindowsSDK, VS }; enum Type { WindowsSDK, VS };
enum Platform { x86, amd64, x86_amd64, ia64, x86_ia64, arm, x86_arm, amd64_arm, amd64_x86 }; 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 Abi &abi,
const QString &varsBat, const QString &varsBat,
const QString &varsBatArg); const QString &varsBatArg);
MsvcToolChain(); explicit MsvcToolChain(Core::Id typeId);
~MsvcToolChain() override; ~MsvcToolChain() override;
Abi targetAbi() const override; Abi targetAbi() const override;
@@ -123,13 +125,6 @@ protected:
bool triggered() const; 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); static void inferWarningsForLevel(int warningLevel, WarningFlags &flags);
Utils::Environment readEnvironmentSetting(const Utils::Environment &env) const; Utils::Environment readEnvironmentSetting(const Utils::Environment &env) const;