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

ToolChain: Get rid of type() in favor of typeId()

Browse Source 
Change-Id: I8fc68c266acb55a7c3e014697a7b526784914f7a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 15:24:27 +02:00
parent 3b364f70e8
commit e6d1141e1e
20 changed files with 18 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/android/androidconfigurations.cpp
View File

@@ -1218,9 +1218,9 @@ static bool equalKits(Kit *a, Kit *b)
ToolChain *btc = ToolChainKitInformation::toolChain(b);
if (atc == btc)
return true;
if (!atc || atc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
if (!atc || atc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE)
return false;
if (!btc || btc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
if (!btc || btc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE)
return false;
AndroidToolChain *aatc = static_cast<AndroidToolChain *>(atc);
AndroidToolChain *bbtc = static_cast<AndroidToolChain *>(btc);
@@ -1252,7 +1252,7 @@ void AndroidConfigurations::registerNewToolChains()
void AndroidConfigurations::removeOldToolChains()
{
foreach (ToolChain *tc, ToolChainManager::toolChains()) {
if (tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)) {
if (tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE) {
if (!tc->isValid())
ToolChainManager::deregisterToolChain(tc);
}
@@ -1268,7 +1268,7 @@ void AndroidConfigurations::updateAutomaticKitList()
foreach (ToolChain *tc, ToolChainManager::toolChains()) {
if (!tc->isAutoDetected())
continue;
if (tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
if (tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE)
continue;
if (!tc->isValid()) // going to be deleted
continue;
@@ -1369,7 +1369,7 @@ void AndroidConfigurations::updateAutomaticKitList()
foreach (Kit *k, existingKits) {
ToolChain *tc = ToolChainKitInformation::toolChain(k);
QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
if (tc && tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE)
if (tc && tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE
&& tc->isValid()
&& qtVersion && qtVersion->type() == QLatin1String(Constants::ANDROIDQT)) {
k->makeUnSticky();

4
src/plugins/android/androidgdbserverkitinformation.cpp
View File

@@ -90,7 +90,7 @@ bool AndroidGdbServerKitInformation::isAndroidKit(const Kit *kit)
ToolChain *tc = ToolChainKitInformation::toolChain(kit);
if (qt && tc)
return qt->type() == QLatin1String(Constants::ANDROIDQT)
&& tc->type() == QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE);
&& tc->typeId() == Constants::ANDROID_TOOLCHAIN_TYPE;
return false;
}
@@ -108,7 +108,7 @@ void AndroidGdbServerKitInformation::setGdbSever(Kit *kit, const FileName &gdbSe
FileName AndroidGdbServerKitInformation::autoDetect(Kit *kit)
{
ToolChain *tc = ToolChainKitInformation::toolChain(kit);
if (!tc || tc->type() != QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE))
if (!tc || tc->typeId() != Constants::ANDROID_TOOLCHAIN_TYPE)
return FileName();
AndroidToolChain *atc = static_cast<AndroidToolChain *>(tc);
return atc->suggestedGdbServer();

5
src/plugins/android/androidtoolchain.cpp
View File

@@ -92,11 +92,6 @@ AndroidToolChain::AndroidToolChain(const AndroidToolChain &tc) :
AndroidToolChain::~AndroidToolChain()
{ }
QString AndroidToolChain::type() const
{
return QLatin1String(Constants::ANDROID_TOOLCHAIN_TYPE);
}
QString AndroidToolChain::typeDisplayName() const
{
return AndroidToolChainFactory::tr("Android GCC");

1
src/plugins/android/androidtoolchain.h
View File

@@ -42,7 +42,6 @@ class AndroidToolChain : public ProjectExplorer::GccToolChain
public:
~AndroidToolChain() override;
QString type() const override;
QString typeDisplayName() const override;
bool isValid() const override;