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

ToolChainFactory: Rename id() to typeId()

Browse Source 
This is the same as ToolChain::typeId(), so it should have the same
name.

Change-Id: Ifd344825be801aff3dab96bfe924a1984a77bbee
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
This commit is contained in:
Tobias Hunger
2015-07-07 14:24:27 +02:00
parent da5f911751
commit 6eec39c308
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -260,7 +260,7 @@ AndroidToolChainConfigWidget::AndroidToolChainConfigWidget(AndroidToolChain *tc)
AndroidToolChainFactory::AndroidToolChainFactory() AndroidToolChainFactory::AndroidToolChainFactory()
{ {
setId(Constants::ANDROID_TOOLCHAIN_ID); setTypeId(Constants::ANDROID_TOOLCHAIN_ID);
setDisplayName(tr("Android GCC")); setDisplayName(tr("Android GCC"));
} }

2
src/plugins/projectexplorer/customtoolchain.cpp
View File

@@ -377,7 +377,7 @@ namespace Internal {
CustomToolChainFactory::CustomToolChainFactory() CustomToolChainFactory::CustomToolChainFactory()
{ {
setId(Constants::CUSTOM_TOOLCHAIN_ID); setTypeId(Constants::CUSTOM_TOOLCHAIN_ID);
setDisplayName(tr("Custom")); setDisplayName(tr("Custom"));
} }

8
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -765,7 +765,7 @@ QString GccToolChain::detectVersion() const
GccToolChainFactory::GccToolChainFactory() GccToolChainFactory::GccToolChainFactory()
{ {
setId(Constants::GCC_TOOLCHAIN_ID); setTypeId(Constants::GCC_TOOLCHAIN_ID);
setDisplayName(tr("GCC")); setDisplayName(tr("GCC"));
} }
@@ -1117,7 +1117,7 @@ ToolChain *ClangToolChain::clone() const
ClangToolChainFactory::ClangToolChainFactory() ClangToolChainFactory::ClangToolChainFactory()
{ {
setDisplayName(tr("Clang")); setDisplayName(tr("Clang"));
setId(Constants::CLANG_TOOLCHAIN_ID); setTypeId(Constants::CLANG_TOOLCHAIN_ID);
} }
QList<ToolChain *> ClangToolChainFactory::autoDetect() QList<ToolChain *> ClangToolChainFactory::autoDetect()
@@ -1221,7 +1221,7 @@ ToolChain *MingwToolChain::clone() const
MingwToolChainFactory::MingwToolChainFactory() MingwToolChainFactory::MingwToolChainFactory()
{ {
setId(Constants::MINGW_TOOLCHAIN_ID); setTypeId(Constants::MINGW_TOOLCHAIN_ID);
setDisplayName(tr("MinGW")); setDisplayName(tr("MinGW"));
} }
@@ -1325,7 +1325,7 @@ ToolChain *LinuxIccToolChain::clone() const
LinuxIccToolChainFactory::LinuxIccToolChainFactory() LinuxIccToolChainFactory::LinuxIccToolChainFactory()
{ {
setDisplayName(tr("Linux ICC")); setDisplayName(tr("Linux ICC"));
setId(Constants::LINUXICC_TOOLCHAIN_ID); setTypeId(Constants::LINUXICC_TOOLCHAIN_ID);
} }
QList<ToolChain *> LinuxIccToolChainFactory::autoDetect() QList<ToolChain *> LinuxIccToolChainFactory::autoDetect()

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

@@ -486,7 +486,7 @@ void MsvcToolChainConfigWidget::setFromToolChain()
MsvcToolChainFactory::MsvcToolChainFactory() MsvcToolChainFactory::MsvcToolChainFactory()
{ {
setId(Constants::MSVC_TOOLCHAIN_ID); setTypeId(Constants::MSVC_TOOLCHAIN_ID);
setDisplayName(tr("MSVC")); setDisplayName(tr("MSVC"));
} }

6
src/plugins/projectexplorer/toolchain.h
View File

@@ -180,7 +180,7 @@ class PROJECTEXPLORER_EXPORT ToolChainFactory : public QObject
Q_OBJECT Q_OBJECT
public: public:
Core::Id id() const { return m_id; } Core::Id typeId() const { return m_typeId; }
QString displayName() const { return m_displayName; } QString displayName() const { return m_displayName; }
virtual QList<ToolChain *> autoDetect(); virtual QList<ToolChain *> autoDetect();
@@ -196,12 +196,12 @@ public:
static void autoDetectionToMap(QVariantMap &data, bool detected); static void autoDetectionToMap(QVariantMap &data, bool detected);
protected: protected:
void setId(Core::Id id) { m_id = id; } void setTypeId(Core::Id id) { m_typeId = id; }
void setDisplayName(const QString &name) { m_displayName = name; } void setDisplayName(const QString &name) { m_displayName = name; }
private: private:
QString m_displayName; QString m_displayName;
Core::Id m_id; Core::Id m_typeId;
}; };
} // namespace ProjectExplorer } // namespace ProjectExplorer

2
src/plugins/projectexplorer/wincetoolchain.cpp
View File

@@ -354,7 +354,7 @@ ToolChain *WinCEToolChain::clone() const
WinCEToolChainFactory::WinCEToolChainFactory() WinCEToolChainFactory::WinCEToolChainFactory()
{ {
setId(Constants::WINCE_TOOLCHAIN_ID); setTypeId(Constants::WINCE_TOOLCHAIN_ID);
setDisplayName(tr("WinCE")); setDisplayName(tr("WinCE"));
} }

2
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -157,7 +157,7 @@ QStringList QnxToolChain::reinterpretOptions(const QStringList &args) const
QnxToolChainFactory::QnxToolChainFactory() QnxToolChainFactory::QnxToolChainFactory()
{ {
setId(Constants::QNX_TOOLCHAIN_ID); setTypeId(Constants::QNX_TOOLCHAIN_ID);
setDisplayName(tr("QCC")); setDisplayName(tr("QCC"));
} }