From 03ad5ccc44e7385bd0d16a12755e7cfc9e2f0964 Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@theqtcompany.com>
Date: Wed, 8 Jul 2015 12:33:55 +0200
Subject: [PATCH] ToolChainFactories: Remove some code that is not necessary

Change-Id: I2cd3940960bad385bc2bf70959df57847dcd101f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
---
 .../projectexplorer/customtoolchain.cpp       |  7 +--
 src/plugins/projectexplorer/customtoolchain.h |  5 --
 src/plugins/projectexplorer/gcctoolchain.cpp  | 61 +------------------
 .../projectexplorer/gcctoolchainfactories.h   | 11 ----
 4 files changed, 3 insertions(+), 81 deletions(-)

diff --git a/src/plugins/projectexplorer/customtoolchain.cpp b/src/plugins/projectexplorer/customtoolchain.cpp
index bf14b14cb45..e471c97c157 100644
--- a/src/plugins/projectexplorer/customtoolchain.cpp
+++ b/src/plugins/projectexplorer/customtoolchain.cpp
@@ -383,7 +383,7 @@ bool CustomToolChainFactory::canCreate()
 
 ToolChain *CustomToolChainFactory::create()
 {
-    return createToolChain(false);
+    return new CustomToolChain(ToolChain::ManualDetection);
 }
 
 // Used by the ToolChainManager to restore user-generated tool chains
@@ -402,11 +402,6 @@ ToolChain *CustomToolChainFactory::restore(const QVariantMap &data)
     return 0;
 }
 
-CustomToolChain *CustomToolChainFactory::createToolChain(bool autoDetect)
-{
-    return new CustomToolChain(autoDetect ? ToolChain::AutoDetection : ToolChain::ManualDetection);
-}
-
 // --------------------------------------------------------------------------
 // Helper for ConfigWidget
 // --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/customtoolchain.h b/src/plugins/projectexplorer/customtoolchain.h
index 7cffdf1a162..a2169a61f26 100644
--- a/src/plugins/projectexplorer/customtoolchain.h
+++ b/src/plugins/projectexplorer/customtoolchain.h
@@ -159,11 +159,6 @@ public:
     // Used by the ToolChainManager to restore user-generated tool chains
     bool canRestore(const QVariantMap &data) override;
     ToolChain *restore(const QVariantMap &data) override;
-
-protected:
-    virtual CustomToolChain *createToolChain(bool autoDetect);
-    QList<ToolChain *> autoDetectToolchains(const QString &compiler,
-                                            const Abi &);
 };
 
 // --------------------------------------------------------------------------
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 16f7f558001..74c51eef1ba 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -795,10 +795,8 @@ bool GccToolChainFactory::canRestore(const QVariantMap &data)
 
 ToolChain *GccToolChainFactory::restore(const QVariantMap &data)
 {
-    GccToolChain *tc = new GccToolChain(ToolChain::ManualDetection);
-    // Updating from 2.5:
-    QVariantMap updated = data;
-    if (tc->fromMap(updated))
+    GccToolChain *tc = createToolChain(false);
+    if (tc->fromMap(data))
         return tc;
 
     delete tc;
@@ -1116,31 +1114,11 @@ QList<ToolChain *> ClangToolChainFactory::autoDetect()
     return autoDetectToolchains(QLatin1String("clang++"), ha);
 }
 
-bool ClangToolChainFactory::canCreate()
-{
-    return true;
-}
-
-ToolChain *ClangToolChainFactory::create()
-{
-    return createToolChain(false);
-}
-
 bool ClangToolChainFactory::canRestore(const QVariantMap &data)
 {
     return typeIdFromMap(data) == Constants::CLANG_TOOLCHAIN_TYPEID;
 }
 
-ToolChain *ClangToolChainFactory::restore(const QVariantMap &data)
-{
-    ClangToolChain *tc = new ClangToolChain(ToolChain::ManualDetection);
-    if (tc->fromMap(data))
-        return tc;
-
-    delete tc;
-    return 0;
-}
-
 GccToolChain *ClangToolChainFactory::createToolChain(bool autoDetect)
 {
     return new ClangToolChain(autoDetect ? ToolChain::AutoDetection : ToolChain::ManualDetection);
@@ -1217,31 +1195,11 @@ QList<ToolChain *> MingwToolChainFactory::autoDetect()
                                 Abi(ha.architecture(), Abi::WindowsOS, Abi::WindowsMSysFlavor, Abi::PEFormat, ha.wordWidth()));
 }
 
-bool MingwToolChainFactory::canCreate()
-{
-    return true;
-}
-
-ToolChain *MingwToolChainFactory::create()
-{
-    return createToolChain(false);
-}
-
 bool MingwToolChainFactory::canRestore(const QVariantMap &data)
 {
     return typeIdFromMap(data) == Constants::MINGW_TOOLCHAIN_TYPEID;
 }
 
-ToolChain *MingwToolChainFactory::restore(const QVariantMap &data)
-{
-    MingwToolChain *tc = new MingwToolChain(ToolChain::ManualDetection);
-    if (tc->fromMap(data))
-        return tc;
-
-    delete tc;
-    return 0;
-}
-
 GccToolChain *MingwToolChainFactory::createToolChain(bool autoDetect)
 {
     return new MingwToolChain(autoDetect ? ToolChain::AutoDetection : ToolChain::ManualDetection);
@@ -1313,26 +1271,11 @@ QList<ToolChain *> LinuxIccToolChainFactory::autoDetect()
     return autoDetectToolchains(QLatin1String("icpc"), Abi::hostAbi());
 }
 
-ToolChain *LinuxIccToolChainFactory::create()
-{
-    return createToolChain(false);
-}
-
 bool LinuxIccToolChainFactory::canRestore(const QVariantMap &data)
 {
     return typeIdFromMap(data) == Constants::LINUXICC_TOOLCHAIN_TYPEID;
 }
 
-ToolChain *LinuxIccToolChainFactory::restore(const QVariantMap &data)
-{
-    LinuxIccToolChain *tc = new LinuxIccToolChain(ToolChain::ManualDetection);
-    if (tc->fromMap(data))
-        return tc;
-
-    delete tc;
-    return 0;
-}
-
 GccToolChain *LinuxIccToolChainFactory::createToolChain(bool autoDetect)
 {
     return new LinuxIccToolChain(autoDetect ? ToolChain::AutoDetection : ToolChain::ManualDetection);
diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h
index 5a7bc2060ed..8117da6bb73 100644
--- a/src/plugins/projectexplorer/gcctoolchainfactories.h
+++ b/src/plugins/projectexplorer/gcctoolchainfactories.h
@@ -116,11 +116,7 @@ public:
 
     QList<ToolChain *> autoDetect();
 
-    bool canCreate();
-    ToolChain *create();
-
     bool canRestore(const QVariantMap &data);
-    ToolChain *restore(const QVariantMap &data);
 
 protected:
     GccToolChain *createToolChain(bool autoDetect);
@@ -139,11 +135,7 @@ public:
 
     QList<ToolChain *> autoDetect();
 
-    bool canCreate();
-    ToolChain *create();
-
     bool canRestore(const QVariantMap &data);
-    ToolChain *restore(const QVariantMap &data);
 
 protected:
     GccToolChain *createToolChain(bool autoDetect);
@@ -162,10 +154,7 @@ public:
 
     QList<ToolChain *> autoDetect();
 
-    ToolChain *create();
-
     bool canRestore(const QVariantMap &data);
-    ToolChain *restore(const QVariantMap &data);
 
 protected:
     GccToolChain *createToolChain(bool autoDetect);