BareMetal: De-QObject-ify IDebugServerProviderFactory

Change-Id: Ibdbe4656efce6667815671627464e914962a19dc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>

src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp

@@ -68,7 +68,7 @@ EBlinkGdbServerProvider::EBlinkGdbServerProvider()
     setResetCommands(defaultResetCommands());
     setChannel("127.0.0.1", 2331);
     setSettingsKeyBase("BareMetal.EBlinkGdbServerProvider");
-    setTypeDisplayName(EBlinkGdbServerProviderFactory::tr("EBlink"));
+    setTypeDisplayName(GdbServerProvider::tr("EBlink"));
     setConfigurationWidgetCreator([this] { return new EBlinkGdbServerProviderConfigWidget(this); });
 }
 
@@ -233,7 +233,7 @@ bool EBlinkGdbServerProvider::operator==(const IDebugServerProvider &other) cons
 EBlinkGdbServerProviderFactory::EBlinkGdbServerProviderFactory()
 {
     setId(Constants::GDBSERVER_EBLINK_PROVIDER_ID);
-    setDisplayName(tr("EBlink"));
+    setDisplayName(GdbServerProvider::tr("EBlink"));
     setCreator([] { return new EBlinkGdbServerProvider; });
 }
 

src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h

@@ -86,8 +86,6 @@ private:
 class EBlinkGdbServerProviderFactory final
         : public IDebugServerProviderFactory
 {
-    Q_OBJECT
-
 public:
     explicit EBlinkGdbServerProviderFactory();
 };

src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h

@@ -42,6 +42,8 @@ namespace Internal {
 
 class GdbServerProvider : public IDebugServerProvider
 {
+    Q_DECLARE_TR_FUNCTIONS(BareMetal::Internal::GdbServerProvider)
+
 public:
     enum StartupMode {
         StartupOnNetwork,

src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp

@@ -64,7 +64,7 @@ JLinkGdbServerProvider::JLinkGdbServerProvider()
     setResetCommands(defaultResetCommands());
     setChannel("localhost", 2331);
     setSettingsKeyBase("BareMetal.JLinkGdbServerProvider");
-    setTypeDisplayName(JLinkGdbServerProviderFactory::tr("JLink"));
+    setTypeDisplayName(tr("JLink"));
     setConfigurationWidgetCreator([this] { return new JLinkGdbServerProviderConfigWidget(this); });
 }
 
@@ -185,7 +185,7 @@ bool JLinkGdbServerProvider::operator==(const IDebugServerProvider &other) const
 JLinkGdbServerProviderFactory::JLinkGdbServerProviderFactory()
 {
     setId(Constants::GDBSERVER_JLINK_PROVIDER_ID);
-    setDisplayName(tr("JLink"));
+    setDisplayName(GdbServerProvider::tr("JLink"));
     setCreator([] { return new JLinkGdbServerProvider; });
 }
 

src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h

@@ -75,10 +75,8 @@ private:
 class JLinkGdbServerProviderFactory final
         : public IDebugServerProviderFactory
 {
-    Q_OBJECT
-
 public:
-    explicit JLinkGdbServerProviderFactory();
+    JLinkGdbServerProviderFactory();
 };
 
 // JLinkGdbServerProviderConfigWidget

src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp

@@ -59,7 +59,7 @@ OpenOcdGdbServerProvider::OpenOcdGdbServerProvider()
     setResetCommands(defaultResetCommands());
     setChannel("localhost", 3333);
     setSettingsKeyBase("BareMetal.OpenOcdGdbServerProvider");
-    setTypeDisplayName(OpenOcdGdbServerProviderFactory::tr("OpenOCD"));
+    setTypeDisplayName(tr("OpenOCD"));
     setConfigurationWidgetCreator([this] { return new OpenOcdGdbServerProviderConfigWidget(this); });
 }
 
@@ -188,7 +188,7 @@ bool OpenOcdGdbServerProvider::operator==(const IDebugServerProvider &other) con
 OpenOcdGdbServerProviderFactory::OpenOcdGdbServerProviderFactory()
 {
     setId(Constants::GDBSERVER_OPENOCD_PROVIDER_ID);
-    setDisplayName(tr("OpenOCD"));
+    setDisplayName(GdbServerProvider::tr("OpenOCD"));
     setCreator([] { return new OpenOcdGdbServerProvider; });
 }
 

src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h

@@ -72,10 +72,8 @@ private:
 class OpenOcdGdbServerProviderFactory final
         : public IDebugServerProviderFactory
 {
-    Q_OBJECT
-
 public:
-    explicit OpenOcdGdbServerProviderFactory();
+    OpenOcdGdbServerProviderFactory();
 };
 
 // OpenOcdGdbServerProviderConfigWidget

src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp

@@ -60,7 +60,7 @@ StLinkUtilGdbServerProvider::StLinkUtilGdbServerProvider()
     setResetCommands(defaultResetCommands());
     setChannel("localhost", 4242);
     setSettingsKeyBase("BareMetal.StLinkUtilGdbServerProvider");
-    setTypeDisplayName(StLinkUtilGdbServerProviderFactory::tr("ST-LINK Utility"));
+    setTypeDisplayName(GdbServerProvider::tr("ST-LINK Utility"));
     setConfigurationWidgetCreator([this] { return new StLinkUtilGdbServerProviderConfigWidget(this); });
 }
 
@@ -174,7 +174,7 @@ bool StLinkUtilGdbServerProvider::operator==(const IDebugServerProvider &other)
 StLinkUtilGdbServerProviderFactory::StLinkUtilGdbServerProviderFactory()
 {
     setId(Constants::GDBSERVER_STLINK_UTIL_PROVIDER_ID);
-    setDisplayName(tr("ST-LINK Utility"));
+    setDisplayName(GdbServerProvider::tr("ST-LINK Utility"));
     setCreator([] { return new StLinkUtilGdbServerProvider; });
 }
 

src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h

@@ -76,10 +76,8 @@ private:
 class StLinkUtilGdbServerProviderFactory final
         : public IDebugServerProviderFactory
 {
-    Q_OBJECT
-
 public:
-    explicit StLinkUtilGdbServerProviderFactory();
+    StLinkUtilGdbServerProviderFactory();
 };
 
 // StLinkUtilGdbServerProviderConfigWidget

src/plugins/baremetal/idebugserverprovider.cpp

@@ -210,6 +210,8 @@ void IDebugServerProvider::setConfigurationWidgetCreator(const std::function<IDe
 
 // IDebugServerProviderFactory
 
+IDebugServerProviderFactory::IDebugServerProviderFactory() = default;
+
 QString IDebugServerProviderFactory::id() const
 {
     return m_id;

src/plugins/baremetal/idebugserverprovider.h

@@ -125,10 +125,8 @@ protected:
 
 // IDebugServerProviderFactory
 
-class IDebugServerProviderFactory : public QObject
+class IDebugServerProviderFactory
 {
-    Q_OBJECT
-
 public:
     QString id() const;
     QString displayName() const;
@@ -142,11 +140,15 @@ public:
     static void idToMap(QVariantMap &data, const QString &id);
 
 protected:
+    IDebugServerProviderFactory();
     void setId(const QString &id);
     void setDisplayName(const QString &name);
     void setCreator(const std::function<IDebugServerProvider *()> &creator);
 
 private:
+    IDebugServerProviderFactory(const IDebugServerProviderFactory &) = delete;
+    IDebugServerProviderFactory &operator=(const IDebugServerProviderFactory &) = delete;
+
     QString m_displayName;
     QString m_id;
     std::function<IDebugServerProvider *()> m_creator;