BareMetal: Use new setup approach for toolchain factories

Change-Id: Ic91ccab925f054d80fbfa8bc018b3e86d207b186
Reviewed-by: Jarek Kobus <[email protected]>

1 files changed, 25 insertions, 8 deletions

diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index d39dc9f03b0..f6a097f0a41 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -538,14 +538,31 @@ QStringList KeilToolChain::extraCodeModelFlags() const
 
 // KeilToolchainFactory
 
-KeilToolChainFactory::KeilToolChainFactory()
-{
-    setDisplayName(Tr::tr("KEIL"));
-    setSupportedToolChainType(Constants::KEIL_TOOLCHAIN_TYPEID);
-    setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
-                           ProjectExplorer::Constants::CXX_LANGUAGE_ID});
-    setToolchainConstructor([] { return new KeilToolChain; });
-    setUserCreatable(true);
+class KeilToolChainFactory final : public ToolChainFactory
+{
+public:
+    KeilToolChainFactory()
+    {
+        setDisplayName(Tr::tr("KEIL"));
+        setSupportedToolChainType(Constants::KEIL_TOOLCHAIN_TYPEID);
+        setSupportedLanguages({ProjectExplorer::Constants::C_LANGUAGE_ID,
+                               ProjectExplorer::Constants::CXX_LANGUAGE_ID});
+        setToolchainConstructor([] { return new KeilToolChain; });
+        setUserCreatable(true);
+    }
+
+    Toolchains autoDetect(const ToolchainDetector &detector) const final;
+
+private:
+    Toolchains autoDetectToolchains(const Candidates &candidates,
+            const Toolchains &alreadyKnown) const;
+    Toolchains autoDetectToolchain(
+            const Candidate &candidate, Utils::Id language) const;
+};
+
+void setupKeilToolChain()
+{
+    static KeilToolChainFactory theKeilToolChainFactory;
 }
 
 // Parse the 'tools.ini' file to fetch a toolchain version.