ToolChainFactory: Rename id() to typeId()

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>

src/plugins/android/androidtoolchain.cpp

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

src/plugins/projectexplorer/customtoolchain.cpp

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

src/plugins/projectexplorer/gcctoolchain.cpp

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

src/plugins/projectexplorer/msvctoolchain.cpp

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

src/plugins/projectexplorer/toolchain.h

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

src/plugins/projectexplorer/wincetoolchain.cpp

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

src/plugins/qnx/qnxtoolchain.cpp

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