RemoteLinux/Qnx: Disentangle deploy step factories further

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

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.cpp

@@ -4,6 +4,7 @@
 #include "devicecheckbuildstep.h"
 
 #include "../kitinformation.h"
+#include "../projectexplorerconstants.h"
 #include "../projectexplorertr.h"
 
 #include "devicemanager.h"
@@ -12,16 +13,19 @@
 
 #include <QMessageBox>
 
-using namespace ProjectExplorer;
+namespace ProjectExplorer {
 
-DeviceCheckBuildStep::DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id)
+class DeviceCheckBuildStep : public BuildStep
+{
+public:
+    DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id)
         : BuildStep(bsl, id)
-{
+    {
         setWidgetExpandedByDefault(false);
-}
+    }
 
-bool DeviceCheckBuildStep::init()
+    bool init() override
-{
+    {
         IDevice::ConstPtr device = DeviceKitAspect::device(kit());
         if (!device) {
             Utils::Id deviceTypeId = DeviceTypeKitAspect::deviceTypeId(kit());
@@ -53,19 +57,17 @@ bool DeviceCheckBuildStep::init()
         }
 
         return true;
+    }
+
+    void doRun() override { emit finished(true); }
+};
+
+// Factory
+
+DeviceCheckBuildStepFactory::DeviceCheckBuildStepFactory()
+{
+    registerStep<DeviceCheckBuildStep>(Constants::DEVICE_CHECK_STEP);
+    setDisplayName(Tr::tr("Check for a configured device"));
 }
 
-void DeviceCheckBuildStep::doRun()
+} // ProjectExplorer
-{
-    emit finished(true);
-}
-
-Utils::Id DeviceCheckBuildStep::stepId()
-{
-    return "ProjectExplorer.DeviceCheckBuildStep";
-}
-
-QString DeviceCheckBuildStep::displayName()
-{
-    return Tr::tr("Check for a configured device");
-}

src/plugins/projectexplorer/devicesupport/devicecheckbuildstep.h

@@ -8,18 +8,10 @@
 
 namespace ProjectExplorer {
 
-class PROJECTEXPLORER_EXPORT DeviceCheckBuildStep : public BuildStep
+class PROJECTEXPLORER_EXPORT DeviceCheckBuildStepFactory : public BuildStepFactory
 {
-    Q_OBJECT
-
 public:
-    DeviceCheckBuildStep(BuildStepList *bsl, Utils::Id id);
+    DeviceCheckBuildStepFactory();
-
-    bool init() override;
-    void doRun() override;
-
-    static Utils::Id stepId();
-    static QString displayName();
 };
 
-} // namespace ProjectExplorer
+} // ProjectExplorer

src/plugins/projectexplorer/projectexplorerconstants.h

@@ -134,6 +134,7 @@ const char BUILDSTEPS_DEPLOY[] = "ProjectExplorer.BuildSteps.Deploy";
 
 const char COPY_FILE_STEP[] = "ProjectExplorer.CopyFileStep";
 const char COPY_DIRECTORY_STEP[] = "ProjectExplorer.CopyDirectoryStep";
+const char DEVICE_CHECK_STEP[] =  "ProjectExplorer.DeviceCheckBuildStep";
 
 // Language
 

src/plugins/qnx/qnxconstants.h

@@ -15,5 +15,6 @@ const char QNX_QNX_OS_TYPE[] = "QnxOsType"; // Also used for device type.
 const char QNX_TOOLCHAIN_ID[] = "Qnx.QccToolChain";
 
 const char QNX_TMP_DIR[] = "/tmp"; // /var/run is root:root drwxr-xr-x
+const char QNX_DIRECT_UPLOAD_STEP_ID[] ="Qnx.DirectUploadStep";
 
 } // Qnx::Constants

src/plugins/qnx/qnxplugin.cpp

@@ -43,21 +43,22 @@ using namespace ProjectExplorer;
 
 namespace Qnx::Internal {
 
-class QnxUploadStep : public RemoteLinux::GenericDirectUploadStep
+// FIXME: Remove...
+class QnxUploadStepFactory : public RemoteLinux::GenericDirectUploadStepFactory
 {
 public:
-    QnxUploadStep(BuildStepList *bsl, Utils::Id id) : GenericDirectUploadStep(bsl, id) {}
+    QnxUploadStepFactory()
-    static Utils::Id stepId() { return "Qnx.DirectUploadStep"; }
+    {
+        registerStep<RemoteLinux::GenericDirectUploadStep>(Constants::QNX_DIRECT_UPLOAD_STEP_ID);
+    }
 };
 
-template <class Step>
+template <class Factory>
-class GenericQnxDeployStepFactory : public BuildStepFactory
+class QnxDeployStepFactory : public RemoteLinux::MakeInstallStepFactory
 {
 public:
-    GenericQnxDeployStepFactory()
+    QnxDeployStepFactory()
     {
-        registerStep<Step>(Step::stepId());
-        setDisplayName(Step::displayName());
         setSupportedConfiguration(Constants::QNX_QNX_DEPLOYCONFIGURATION_ID);
         setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
     }
@@ -78,8 +79,8 @@ public:
             return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
                     && prj->hasMakeInstallEquivalent();
         });
-        addInitialStep(DeviceCheckBuildStep::stepId());
+        addInitialStep(ProjectExplorer::Constants::DEVICE_CHECK_STEP);
-        addInitialStep(QnxUploadStep::stepId());
+        addInitialStep(Constants::QNX_DIRECT_UPLOAD_STEP_ID);
     }
 };
 
@@ -95,9 +96,9 @@ public:
     QnxQtVersionFactory qtVersionFactory;
     QnxDeviceFactory deviceFactory;
     QnxDeployConfigurationFactory deployConfigFactory;
-    GenericQnxDeployStepFactory<QnxUploadStep> directUploadDeployFactory;
+    QnxDeployStepFactory<QnxUploadStepFactory> directUploadDeployFactory;
-    GenericQnxDeployStepFactory<RemoteLinux::MakeInstallStep> makeInstallDeployFactory;
+    QnxDeployStepFactory<RemoteLinux::MakeInstallStepFactory> makeInstallDeployFactory;
-    GenericQnxDeployStepFactory<DeviceCheckBuildStep> checkBuildDeployFactory;
+    QnxDeployStepFactory<DeviceCheckBuildStepFactory> checkBuildDeployFactory;
     QnxRunConfigurationFactory runConfigFactory;
     QnxSettingsPage settingsPage;
     QnxToolChainFactory toolChainFactory;

src/plugins/remotelinux/genericdirectuploadstep.cpp

@@ -322,16 +322,6 @@ GenericDirectUploadStep::~GenericDirectUploadStep()
     delete d;
 }
 
-Utils::Id GenericDirectUploadStep::stepId()
-{
-    return Constants::DirectUploadStepId;
-}
-
-QString GenericDirectUploadStep::displayName()
-{
-    return Tr::tr("Upload files via SFTP");
-}
-
 // Factory
 
 GenericDirectUploadStepFactory::GenericDirectUploadStepFactory()
@@ -340,4 +330,4 @@ GenericDirectUploadStepFactory::GenericDirectUploadStepFactory()
     setDisplayName(Tr::tr("Upload files via SFTP"));
 }
 
-} //namespace RemoteLinux
+} // RemoteLinux

src/plugins/remotelinux/genericdirectuploadstep.h

@@ -20,9 +20,6 @@ public:
     bool isDeploymentNecessary() const final;
     Utils::Tasking::Group deployRecipe() final;
 
-    static Utils::Id stepId();
-    static QString displayName();
-
 private:
     friend class GenericDirectUploadStepPrivate;
     class GenericDirectUploadStepPrivate *d;

src/plugins/remotelinux/remotelinuxplugin.cpp

@@ -34,16 +34,14 @@ using namespace Utils;
 namespace RemoteLinux {
 namespace Internal {
 
-template <class Step>
+template <class Factory>
-class GenericDeployStepFactory : public ProjectExplorer::BuildStepFactory
+class RemoteLinuxDeployStepFactory : public Factory
 {
 public:
-    GenericDeployStepFactory()
+    RemoteLinuxDeployStepFactory()
     {
-        registerStep<Step>(Step::stepId());
+        Factory::setSupportedConfiguration(RemoteLinux::Constants::DeployToGenericLinux);
-        setDisplayName(Step::displayName());
+        Factory::setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
-        setSupportedConfiguration(RemoteLinux::Constants::DeployToGenericLinux);
-        setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY);
     }
 };
 
@@ -56,11 +54,11 @@ public:
     RemoteLinuxDeployConfigurationFactory deployConfigurationFactory;
     TarPackageCreationStepFactory tarPackageCreationStepFactory;
     TarPackageDeployStepFactory tarPackageDeployStepFactory;
-    GenericDeployStepFactory<GenericDirectUploadStep> genericDirectUploadStepFactory;
+    RemoteLinuxDeployStepFactory<GenericDirectUploadStepFactory> genericDirectUploadStepFactory;
-    GenericDeployStepFactory<RsyncDeployStep> rsyncDeployStepFactory;
+    RemoteLinuxDeployStepFactory<RsyncDeployStepFactory> rsyncDeployStepFactory;
     CustomCommandDeployStepFactory customCommandDeployStepFactory;
     KillAppStepFactory killAppStepFactory;
-    GenericDeployStepFactory<MakeInstallStep> makeInstallStepFactory;
+    RemoteLinuxDeployStepFactory<MakeInstallStepFactory> makeInstallStepFactory;
     RemoteLinuxRunWorkerFactory runWorkerFactory;
     RemoteLinuxDebugWorkerFactory debugWorkerFactory;
     RemoteLinuxQmlToolingWorkerFactory qmlToolingWorkerFactory;