Nim: Move RunConfigurations to .cpp, drop Q_OBJECT

Also remove NimbleRunConfigurationFactory::availableCreators
reimplementation that was the same as the base.

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

src/plugins/nim/project/nimblerunconfiguration.cpp

@@ -37,10 +37,18 @@
 
 #include <QStandardPaths>
 
-using namespace Nim;
 using namespace ProjectExplorer;
 
-NimbleRunConfiguration::NimbleRunConfiguration(ProjectExplorer::Target *target, Core::Id id)
+namespace Nim {
+
+// NimbleRunConfiguration
+
+class NimbleRunConfiguration : public RunConfiguration
+{
+    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleRunConfiguration)
+
+public:
+    NimbleRunConfiguration(Target *target, Core::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<LocalEnvironmentAspect>(target);
@@ -60,6 +68,7 @@ NimbleRunConfiguration::NimbleRunConfiguration(ProjectExplorer::Target *target,
         connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
         update();
     }
+};
 
 NimbleRunConfigurationFactory::NimbleRunConfigurationFactory()
     : RunConfigurationFactory()
@@ -69,12 +78,15 @@ NimbleRunConfigurationFactory::NimbleRunConfigurationFactory()
     addSupportedTargetDeviceType(ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE);
 }
 
-QList<RunConfigurationCreationInfo> NimbleRunConfigurationFactory::availableCreators(Target *parent) const
-{
-    return RunConfigurationFactory::availableCreators(parent);
-}
 
-NimbleTestConfiguration::NimbleTestConfiguration(Target *target, Core::Id id)
+// NimbleTestConfiguration
+
+class NimbleTestConfiguration : public RunConfiguration
+{
+    Q_DECLARE_TR_FUNCTIONS(Nim::NimbleTestConfiguration)
+
+public:
+    NimbleTestConfiguration(ProjectExplorer::Target *target, Core::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<ExecutableAspect>()->setExecutable(Utils::FilePath::fromString(QStandardPaths::findExecutable("nimble")));
@@ -85,6 +97,7 @@ NimbleTestConfiguration::NimbleTestConfiguration(Target *target, Core::Id id)
         setDisplayName(tr("Nimble Test"));
         setDefaultDisplayName(tr("Nimble Test"));
     }
+};
 
 NimbleTestConfigurationFactory::NimbleTestConfigurationFactory()
     : FixedRunConfigurationFactory(QString())
@@ -92,3 +105,5 @@ NimbleTestConfigurationFactory::NimbleTestConfigurationFactory()
     registerRunConfiguration<NimbleTestConfiguration>("Nim.NimbleTestConfiguration");
     addSupportedProjectType(Constants::C_NIMBLEPROJECT_ID);
 }
+
+} // Nim

src/plugins/nim/project/nimblerunconfiguration.h

@@ -29,35 +29,16 @@
 
 namespace Nim {
 
-class NimbleRunConfiguration : public ProjectExplorer::RunConfiguration
+class NimbleRunConfigurationFactory final : public ProjectExplorer::RunConfigurationFactory
-{
-    Q_OBJECT
-
-public:
-    NimbleRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
-};
-
-class NimbleRunConfigurationFactory : public ProjectExplorer::RunConfigurationFactory
 {
 public:
     NimbleRunConfigurationFactory();
-
-protected:
-    QList<ProjectExplorer::RunConfigurationCreationInfo> availableCreators(ProjectExplorer::Target *parent) const override;
 };
 
-class NimbleTestConfiguration : public ProjectExplorer::RunConfiguration
+class NimbleTestConfigurationFactory final : public ProjectExplorer::FixedRunConfigurationFactory
-{
-    Q_OBJECT
-
-public:
-    NimbleTestConfiguration(ProjectExplorer::Target *target, Core::Id id);
-};
-
-class NimbleTestConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory
 {
 public:
     NimbleTestConfigurationFactory();
 };
 
-}
+} // Nim

src/plugins/nim/project/nimrunconfiguration.cpp

@@ -41,7 +41,12 @@ using namespace Utils;
 
 namespace Nim {
 
-NimRunConfiguration::NimRunConfiguration(Target *target, Core::Id id)
+class NimRunConfiguration final : public RunConfiguration
+{
+    Q_DECLARE_TR_FUNCTIONS(Nim::NimRunConfiguration)
+
+public:
+    NimRunConfiguration(Target *target, Core::Id id)
         : RunConfiguration(target, id)
     {
         addAspect<LocalEnvironmentAspect>(target);
@@ -66,6 +71,7 @@ NimRunConfiguration::NimRunConfiguration(Target *target, Core::Id id)
         connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
         update();
     }
+};
 
 // NimRunConfigurationFactory
 

src/plugins/nim/project/nimrunconfiguration.h

@@ -29,15 +29,7 @@
 
 namespace Nim {
 
-class NimRunConfiguration : public ProjectExplorer::RunConfiguration
+class NimRunConfigurationFactory final : public ProjectExplorer::FixedRunConfigurationFactory
-{
-    Q_OBJECT
-
-public:
-    NimRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
-};
-
-class NimRunConfigurationFactory : public ProjectExplorer::FixedRunConfigurationFactory
 {
 public:
     NimRunConfigurationFactory();