From 13146fb0bd122cd2031f3a7b8d2193c362046762 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Thu, 2 Jun 2022 18:40:09 +0200
Subject: [PATCH] RemoteLinux: Remove indirection in
 RemoteLinuxDeployConfigurationFactory

Change-Id: Iec5fc2cc8e31c5a6e2181b62e9b00c46aca94d0b
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
---
 .../remotelinuxdeployconfiguration.cpp            | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
index 78bccaa4c1b..db5ecfc5280 100644
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
@@ -25,14 +25,9 @@
 
 #include "remotelinuxdeployconfiguration.h"
 
-#include "checkforfreediskspacestep.h"
-#include "genericdirectuploadstep.h"
 #include "makeinstallstep.h"
-#include "killappstep.h"
 #include "remotelinux_constants.h"
-#include "rsyncdeploystep.h"
 
-#include <projectexplorer/abi.h>
 #include <projectexplorer/devicesupport/idevice.h>
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
@@ -67,14 +62,14 @@ RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
         }
     });
 
-    addInitialStep(MakeInstallStep::stepId(), needsMakeInstall);
-    addInitialStep(CheckForFreeDiskSpaceStep::stepId());
-    addInitialStep(KillAppStep::stepId());
-    addInitialStep(RsyncDeployStep::stepId(), [](Target *target) {
+    addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
+    addInitialStep(Constants::CheckForFreeDiskSpaceId);
+    addInitialStep(Constants::KillAppStepId);
+    addInitialStep(Constants::RsyncDeployStepId, [](Target *target) {
         auto device = DeviceKitAspect::device(target->kit());
         return device && device->extraData(Constants::SupportsRSync).toBool();
     });
-    addInitialStep(GenericDirectUploadStep::stepId(), [](Target *target) {
+    addInitialStep(Constants::DirectUploadStepId, [](Target *target) {
         auto device = DeviceKitAspect::device(target->kit());
         return device && !device->extraData(Constants::SupportsRSync).toBool();
     });