From 82c1a3a934fce4c081ffea314ebe26a49021dcce Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Fri, 6 Jan 2023 14:32:11 +0100
Subject: [PATCH] WebAssembly: use a dedicated class to create EmrunRunWorker

Change-Id: Idbeece82d8b59f02148207b0459a76aae162bb51
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
---
 src/plugins/webassembly/webassemblyplugin.cpp | 12 +++---------
 src/plugins/webassembly/webassemblyplugin.h   |  6 ++----
 .../webassemblyrunconfiguration.cpp           | 19 ++++++++++---------
 .../webassembly/webassemblyrunconfiguration.h | 12 +++++++-----
 4 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/plugins/webassembly/webassemblyplugin.cpp b/src/plugins/webassembly/webassemblyplugin.cpp
index 4413b197d20..c0c05d20bd4 100644
--- a/src/plugins/webassembly/webassemblyplugin.cpp
+++ b/src/plugins/webassembly/webassemblyplugin.cpp
@@ -25,8 +25,7 @@ using namespace Core;
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace WebAssembly {
-namespace Internal {
+namespace WebAssembly::Internal {
 
 class WebAssemblyPluginPrivate
 {
@@ -35,11 +34,7 @@ public:
     WebAssemblyDeviceFactory deviceFactory;
     WebAssemblyQtVersionFactory qtVersionFactory;
     EmrunRunConfigurationFactory emrunRunConfigurationFactory;
-    RunWorkerFactory emrunRunWorkerFactory{
-        makeEmrunWorker(),
-        {ProjectExplorer::Constants::NORMAL_RUN_MODE},
-        {Constants::WEBASSEMBLY_RUNCONFIGURATION_EMRUN}
-    };
+    EmrunRunWorkerFactory emrunRunWorkerFactory;
     WebAssemblyOptionsPage optionsPage;
 };
 
@@ -94,5 +89,4 @@ void WebAssemblyPlugin::askUserAboutEmSdkSetup()
     ICore::infoBar()->addInfo(info);
 }
 
-} // namespace Internal
-} // namespace WebAssembly
+} // WebAssembly::Internal
diff --git a/src/plugins/webassembly/webassemblyplugin.h b/src/plugins/webassembly/webassemblyplugin.h
index 202cdcd6ddc..40c5f8e4874 100644
--- a/src/plugins/webassembly/webassemblyplugin.h
+++ b/src/plugins/webassembly/webassemblyplugin.h
@@ -7,8 +7,7 @@
 
 #include <extensionsystem/iplugin.h>
 
-namespace WebAssembly {
-namespace Internal {
+namespace WebAssembly::Internal {
 
 class WebAssemblyPlugin : public ExtensionSystem::IPlugin
 {
@@ -32,5 +31,4 @@ private slots:
 #endif // WITH_TESTS
 };
 
-} // namespace Internal
-} // namespace WebAssembly
+} // WebAssembly::Internal
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.cpp b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
index 994f9782fd3..32f1bf581bb 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.cpp
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.cpp
@@ -11,14 +11,14 @@
 #include <projectexplorer/devicesupport/devicemanager.h>
 #include <projectexplorer/devicesupport/deviceusedportsgatherer.h>
 #include <projectexplorer/project.h>
+#include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/runcontrol.h>
 #include <projectexplorer/target.h>
 
 using namespace ProjectExplorer;
 using namespace Utils;
 
-namespace WebAssembly {
-namespace Internal {
+namespace WebAssembly::Internal {
 
 static FilePath pythonInterpreter(const Environment &env)
 {
@@ -111,11 +111,6 @@ public:
     }
 };
 
-RunWorkerFactory::WorkerCreator makeEmrunWorker()
-{
-    return RunWorkerFactory::make<EmrunRunWorker>();
-}
-
 // Factories
 
 EmrunRunConfigurationFactory::EmrunRunConfigurationFactory()
@@ -124,5 +119,11 @@ EmrunRunConfigurationFactory::EmrunRunConfigurationFactory()
     addSupportedTargetDeviceType(Constants::WEBASSEMBLY_DEVICE_TYPE);
 }
 
-} // namespace Internal
-} // namespace Webassembly
+EmrunRunWorkerFactory::EmrunRunWorkerFactory()
+{
+    setProduct<EmrunRunWorker>();
+    addSupportedRunMode(ProjectExplorer::Constants::NORMAL_RUN_MODE);
+    addSupportedRunConfig(Constants::WEBASSEMBLY_RUNCONFIGURATION_EMRUN);
+}
+
+} // Webassembly::Internal
diff --git a/src/plugins/webassembly/webassemblyrunconfiguration.h b/src/plugins/webassembly/webassemblyrunconfiguration.h
index 5dd4a7aec0b..b6ade22e847 100644
--- a/src/plugins/webassembly/webassemblyrunconfiguration.h
+++ b/src/plugins/webassembly/webassemblyrunconfiguration.h
@@ -6,8 +6,7 @@
 #include <projectexplorer/runconfiguration.h>
 #include <projectexplorer/runcontrol.h>
 
-namespace WebAssembly {
-namespace Internal {
+namespace WebAssembly::Internal {
 
 class EmrunRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
 {
@@ -15,7 +14,10 @@ public:
     EmrunRunConfigurationFactory();
 };
 
-ProjectExplorer::RunWorkerFactory::WorkerCreator makeEmrunWorker();
+class EmrunRunWorkerFactory final : public ProjectExplorer::RunWorkerFactory
+{
+public:
+    EmrunRunWorkerFactory();
+};
 
-} // namespace Internal
-} // namespace Webassembly
+} // Webassembly::Internal