BareMetal: Use new setup approach for toolchain factories

Change-Id: Ic91ccab925f054d80fbfa8bc018b3e86d207b186
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>

src/plugins/baremetal/baremetalplugin.cpp

@@ -16,15 +16,7 @@
 #include "keiltoolchain.h"
 #include "sdcctoolchain.h"
 
-#include <coreplugin/actionmanager/actioncontainer.h>
-#include <coreplugin/actionmanager/actionmanager.h>
-#include <coreplugin/actionmanager/command.h>
-#include <coreplugin/coreconstants.h>
-#include <coreplugin/icontext.h>
-#include <coreplugin/icore.h>
-
 #include <projectexplorer/deployconfiguration.h>
-#include <projectexplorer/projectexplorerconstants.h>
 
 using namespace ProjectExplorer;
 
@@ -46,9 +38,6 @@ public:
 class BareMetalPluginPrivate
 {
 public:
-    IarToolChainFactory iarToolChainFactory;
-    KeilToolChainFactory keilToolChainFactory;
-    SdccToolChainFactory sdccToolChainFactory;
     BareMetalDeviceFactory deviceFactory;
     BareMetalRunConfigurationFactory runConfigurationFactory;
     BareMetalCustomRunConfigurationFactory customRunConfigurationFactory;
@@ -67,6 +56,10 @@ BareMetalPlugin::~BareMetalPlugin()
 void BareMetalPlugin::initialize()
 {
     d = new BareMetalPluginPrivate;
+
+    setupIarToolChain();
+    setupKeilToolChain();
+    setupSdccToolChain();
 }
 
 void BareMetalPlugin::extensionsInitialized()

src/plugins/baremetal/iarewtoolchain.cpp

@@ -405,10 +405,12 @@ bool IarToolChain::operator==(const ToolChain &other) const
 }
 
 
-
 // IarToolChainFactory
 
-IarToolChainFactory::IarToolChainFactory()
+class IarToolChainFactory final : public ToolChainFactory
+{
+public:
+    IarToolChainFactory()
     {
         setDisplayName(Tr::tr("IAREW"));
         setSupportedToolChainType(Constants::IAREW_TOOLCHAIN_TYPEID);
@@ -418,6 +420,20 @@ IarToolChainFactory::IarToolChainFactory()
         setUserCreatable(true);
     }
 
+    Toolchains autoDetect(const ToolchainDetector &detector) const final;
+    Toolchains detectForImport(const ToolChainDescription &tcd) const final;
+
+private:
+    Toolchains autoDetectToolchains(const Candidates &candidates,
+                                    const Toolchains &alreadyKnown) const;
+    Toolchains autoDetectToolchain(const Candidate &candidate, Id languageId) const;
+};
+
+void setupIarToolChain()
+{
+    static IarToolChainFactory theIarToolChainFactory;
+}
+
 Toolchains IarToolChainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Candidates candidates;

src/plugins/baremetal/iarewtoolchain.h

@@ -3,25 +3,8 @@
 
 #pragma once
 
-#include <projectexplorer/toolchain.h>
-
 namespace BareMetal::Internal {
 
-class IarToolChainFactory final : public ProjectExplorer::ToolChainFactory
+void setupIarToolChain();
-{
-public:
-    IarToolChainFactory();
-
-    ProjectExplorer::Toolchains autoDetect(
-            const ProjectExplorer::ToolchainDetector &detector) const final;
-    ProjectExplorer::Toolchains detectForImport(
-            const ProjectExplorer::ToolChainDescription &tcd) const final;
-
-private:
-    ProjectExplorer::Toolchains autoDetectToolchains(const Candidates &candidates,
-            const ProjectExplorer::Toolchains &alreadyKnown) const;
-    ProjectExplorer::Toolchains autoDetectToolchain(
-            const Candidate &candidate, Utils::Id languageId) const;
-};
 
 } // BareMetal::Internal

src/plugins/baremetal/keiltoolchain.cpp

@@ -538,7 +538,10 @@ QStringList KeilToolChain::extraCodeModelFlags() const
 
 // KeilToolchainFactory
 
-KeilToolChainFactory::KeilToolChainFactory()
+class KeilToolChainFactory final : public ToolChainFactory
+{
+public:
+    KeilToolChainFactory()
     {
         setDisplayName(Tr::tr("KEIL"));
         setSupportedToolChainType(Constants::KEIL_TOOLCHAIN_TYPEID);
@@ -548,6 +551,20 @@ KeilToolChainFactory::KeilToolChainFactory()
         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.
 // Note: We can't use QSettings here!
 static QString extractVersion(const QString &toolsFile, const QString &section)

src/plugins/baremetal/keiltoolchain.h

@@ -3,23 +3,8 @@
 
 #pragma once
 
-#include <projectexplorer/toolchain.h>
-
 namespace BareMetal::Internal {
 
-class KeilToolChainFactory final : public ProjectExplorer::ToolChainFactory
+void setupKeilToolChain();
-{
-public:
-    KeilToolChainFactory();
-
-    ProjectExplorer::Toolchains autoDetect(
-            const ProjectExplorer::ToolchainDetector &detector) const final;
-
-private:
-    ProjectExplorer::Toolchains autoDetectToolchains(const Candidates &candidates,
-            const ProjectExplorer::Toolchains &alreadyKnown) const;
-    ProjectExplorer::Toolchains autoDetectToolchain(
-            const Candidate &candidate, Utils::Id language) const;
-};
 
 } // BareMetal::Internal

src/plugins/baremetal/sdcctoolchain.cpp

@@ -300,7 +300,10 @@ bool SdccToolChain::operator==(const ToolChain &other) const
 
 // SdccToolChainFactory
 
-SdccToolChainFactory::SdccToolChainFactory()
+class SdccToolChainFactory final : public ToolChainFactory
+{
+public:
+    SdccToolChainFactory()
     {
         setDisplayName(Tr::tr("SDCC"));
         setSupportedToolChainType(Constants::SDCC_TOOLCHAIN_TYPEID);
@@ -309,6 +312,19 @@ SdccToolChainFactory::SdccToolChainFactory()
         setUserCreatable(true);
     }
 
+    Toolchains autoDetect(const ToolchainDetector &detector) const final;
+
+private:
+    Toolchains autoDetectToolchains(const Candidates &candidates,
+                                    const Toolchains &alreadyKnown) const;
+    Toolchains autoDetectToolchain(const Candidate &candidate, Id language) const;
+};
+
+void setupSdccToolChain()
+{
+    static SdccToolChainFactory theSdccToolChainFactory;
+}
+
 Toolchains SdccToolChainFactory::autoDetect(const ToolchainDetector &detector) const
 {
     Candidates candidates;

src/plugins/baremetal/sdcctoolchain.h

@@ -3,23 +3,8 @@
 
 #pragma once
 
-#include <projectexplorer/toolchain.h>
-
 namespace BareMetal::Internal {
 
-class SdccToolChainFactory final : public ProjectExplorer::ToolChainFactory
+void setupSdccToolChain();
-{
-public:
-    SdccToolChainFactory();
-
-    ProjectExplorer::Toolchains autoDetect(
-            const ProjectExplorer::ToolchainDetector &detector) const final;
-
-private:
-    ProjectExplorer::Toolchains autoDetectToolchains(const Candidates &candidates,
-            const ProjectExplorer::Toolchains &alreadyKnown) const;
-    ProjectExplorer::Toolchains autoDetectToolchain(
-            const Candidate &candidate, Utils::Id language) const;
-};
 
 } // BareMetal::Internal