From a9a4fe1dd97c0260add9bd75b97b5c40b6dabf02 Mon Sep 17 00:00:00 2001 From: hjk Date: Wed, 15 Jan 2020 18:53:49 +0100 Subject: [PATCH] BareMetal: De-QObject-ify IDebugServerProviderFactory Change-Id: Ibdbe4656efce6667815671627464e914962a19dc Reviewed-by: Christian Stenger --- .../debugservers/gdb/eblinkgdbserverprovider.cpp | 4 ++-- .../baremetal/debugservers/gdb/eblinkgdbserverprovider.h | 2 -- .../baremetal/debugservers/gdb/gdbserverprovider.h | 2 ++ .../baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp | 4 ++-- .../baremetal/debugservers/gdb/jlinkgdbserverprovider.h | 4 +--- .../debugservers/gdb/openocdgdbserverprovider.cpp | 4 ++-- .../baremetal/debugservers/gdb/openocdgdbserverprovider.h | 4 +--- .../debugservers/gdb/stlinkutilgdbserverprovider.cpp | 4 ++-- .../debugservers/gdb/stlinkutilgdbserverprovider.h | 4 +--- src/plugins/baremetal/idebugserverprovider.cpp | 2 ++ src/plugins/baremetal/idebugserverprovider.h | 8 +++++--- 11 files changed, 20 insertions(+), 22 deletions(-) diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp index bce173282cc..c36865cad39 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.cpp +++ b/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; }); } diff --git a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h index ddc55b03255..f1bba6ee23b 100644 --- a/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/eblinkgdbserverprovider.h @@ -86,8 +86,6 @@ private: class EBlinkGdbServerProviderFactory final : public IDebugServerProviderFactory { - Q_OBJECT - public: explicit EBlinkGdbServerProviderFactory(); }; diff --git a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h index 91e4630287d..259cd246ca6 100644 --- a/src/plugins/baremetal/debugservers/gdb/gdbserverprovider.h +++ b/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, diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp index 78c94def6f2..b8d0d3463ea 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.cpp +++ b/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; }); } diff --git a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h index ba0c86e25cc..524fb044ffb 100644 --- a/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/jlinkgdbserverprovider.h @@ -75,10 +75,8 @@ private: class JLinkGdbServerProviderFactory final : public IDebugServerProviderFactory { - Q_OBJECT - public: - explicit JLinkGdbServerProviderFactory(); + JLinkGdbServerProviderFactory(); }; // JLinkGdbServerProviderConfigWidget diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp index 1d84b6a1818..1f555396623 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.cpp +++ b/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; }); } diff --git a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h index 6bd5a16cdc4..ab64d8c7dc6 100644 --- a/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/openocdgdbserverprovider.h @@ -72,10 +72,8 @@ private: class OpenOcdGdbServerProviderFactory final : public IDebugServerProviderFactory { - Q_OBJECT - public: - explicit OpenOcdGdbServerProviderFactory(); + OpenOcdGdbServerProviderFactory(); }; // OpenOcdGdbServerProviderConfigWidget diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp index 95fa2ed1e57..eabba4c0834 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.cpp +++ b/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; }); } diff --git a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h index 2215b8c9f5b..4114e452596 100644 --- a/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h +++ b/src/plugins/baremetal/debugservers/gdb/stlinkutilgdbserverprovider.h @@ -76,10 +76,8 @@ private: class StLinkUtilGdbServerProviderFactory final : public IDebugServerProviderFactory { - Q_OBJECT - public: - explicit StLinkUtilGdbServerProviderFactory(); + StLinkUtilGdbServerProviderFactory(); }; // StLinkUtilGdbServerProviderConfigWidget diff --git a/src/plugins/baremetal/idebugserverprovider.cpp b/src/plugins/baremetal/idebugserverprovider.cpp index b092de9049d..b78095b71eb 100644 --- a/src/plugins/baremetal/idebugserverprovider.cpp +++ b/src/plugins/baremetal/idebugserverprovider.cpp @@ -210,6 +210,8 @@ void IDebugServerProvider::setConfigurationWidgetCreator(const std::function &creator); private: + IDebugServerProviderFactory(const IDebugServerProviderFactory &) = delete; + IDebugServerProviderFactory &operator=(const IDebugServerProviderFactory &) = delete; + QString m_displayName; QString m_id; std::function m_creator;