RemoteLinux: Inline RemoteLinuxDeployConfigurationFactory

Change-Id: I0459981d46561c63b0c4895c37e82b3bc5363777
Reviewed-by: hjk <[email protected]>

5 files changed, 34 insertions, 68 deletions

diff --git a/src/plugins/remotelinux/CMakeLists.txt b/src/plugins/remotelinux/CMakeLists.txt
index 3b2133b85a5..b13dac3f7ed 100644
--- a/src/plugins/remotelinux/CMakeLists.txt
+++ b/src/plugins/remotelinux/CMakeLists.txt
@@ -18,7 +18,6 @@ add_qtc_plugin(RemoteLinux
     remotelinux_export.h
     remotelinuxcustomrunconfiguration.cpp remotelinuxcustomrunconfiguration.h
     remotelinuxdebugsupport.cpp remotelinuxdebugsupport.h
-    remotelinuxdeployconfiguration.cpp remotelinuxdeployconfiguration.h
     remotelinuxenvironmentaspect.cpp remotelinuxenvironmentaspect.h
     remotelinuxplugin.cpp remotelinuxplugin.h
     remotelinuxrunconfiguration.cpp remotelinuxrunconfiguration.h
diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs
index 3bf972697b2..519020b3f79 100644
--- a/src/plugins/remotelinux/remotelinux.qbs
+++ b/src/plugins/remotelinux/remotelinux.qbs
@@ -41,8 +41,6 @@ Project {
             "remotelinuxcustomrunconfiguration.h",
             "remotelinuxdebugsupport.cpp",
             "remotelinuxdebugsupport.h",
-            "remotelinuxdeployconfiguration.cpp",
-            "remotelinuxdeployconfiguration.h",
             "remotelinuxenvironmentaspect.cpp",
             "remotelinuxenvironmentaspect.h",
             "remotelinuxplugin.cpp",
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
deleted file mode 100644
index 537ca8ebe44..00000000000
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#include "remotelinuxdeployconfiguration.h"
-
-#include "remotelinux_constants.h"
-#include "remotelinuxtr.h"
-
-#include <projectexplorer/devicesupport/filetransferinterface.h>
-#include <projectexplorer/devicesupport/idevice.h>
-#include <projectexplorer/kitaspects.h>
-#include <projectexplorer/project.h>
-#include <projectexplorer/projectexplorerconstants.h>
-#include <projectexplorer/target.h>
-
-using namespace ProjectExplorer;
-
-namespace RemoteLinux::Internal {
-
-RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory()
-{
-    setConfigBaseId(RemoteLinux::Constants::DeployToGenericLinux);
-    addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
-    setDefaultDisplayName(Tr::tr("Deploy to Remote Linux Host"));
-    setUseDeploymentDataView();
-
-    const auto needsMakeInstall = [](Target *target)
-    {
-        const Project * const prj = target->project();
-        return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
-                && prj->hasMakeInstallEquivalent();
-    };
-    setPostRestore([needsMakeInstall](DeployConfiguration *dc, const QVariantMap &map) {
-        // 4.9 -> 4.10. See QTCREATORBUG-22689.
-        if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) {
-            dc->stepList()->insertStep(0, Constants::MakeInstallStepId);
-        }
-    });
-
-    addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
-    addInitialStep(Constants::KillAppStepId);
-
-    // TODO: Rename RsyncDeployStep to something more generic.
-    addInitialStep(Constants::RsyncDeployStepId);
-}
-
-} // RemoteLinux::Internal
diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
deleted file mode 100644
index 61959122b2c..00000000000
--- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (C) 2016 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
-
-#pragma once
-
-#include <projectexplorer/deployconfiguration.h>
-
-namespace RemoteLinux::Internal {
-
-class RemoteLinuxDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory
-{
-public:
-    RemoteLinuxDeployConfigurationFactory();
-};
-
-} // RemoteLinux::Internal
diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp
index 2cb96de7405..734c17408e9 100644
--- a/src/plugins/remotelinux/remotelinuxplugin.cpp
+++ b/src/plugins/remotelinux/remotelinuxplugin.cpp
@@ -9,11 +9,10 @@
 #include "linuxdevice.h"
 #include "makeinstallstep.h"
 #include "remotelinux_constants.h"
-#include "remotelinuxdeployconfiguration.h"
 #include "remotelinuxcustomrunconfiguration.h"
 #include "remotelinuxdebugsupport.h"
-#include "remotelinuxdeployconfiguration.h"
 #include "remotelinuxrunconfiguration.h"
+#include "remotelinuxtr.h"
 #include "rsyncdeploystep.h"
 #include "tarpackagecreationstep.h"
 #include "tarpackagedeploystep.h"
@@ -22,7 +21,9 @@
 #include "filesystemaccess_test.h"
 #endif
 
+#include <projectexplorer/deployconfiguration.h>
 #include <projectexplorer/kitaspects.h>
+#include <projectexplorer/project.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <projectexplorer/target.h>
 
@@ -45,6 +46,37 @@ public:
     }
 };
 
+class RemoteLinuxDeployConfigurationFactory : public DeployConfigurationFactory
+{
+public:
+    RemoteLinuxDeployConfigurationFactory()
+    {
+        setConfigBaseId(RemoteLinux::Constants::DeployToGenericLinux);
+        addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
+        setDefaultDisplayName(Tr::tr("Deploy to Remote Linux Host"));
+        setUseDeploymentDataView();
+
+        const auto needsMakeInstall = [](Target *target)
+        {
+            const Project * const prj = target->project();
+            return prj->deploymentKnowledge() == DeploymentKnowledge::Bad
+                   && prj->hasMakeInstallEquivalent();
+        };
+        setPostRestore([needsMakeInstall](DeployConfiguration *dc, const QVariantMap &map) {
+            // 4.9 -> 4.10. See QTCREATORBUG-22689.
+            if (map.value("_checkMakeInstall").toBool() && needsMakeInstall(dc->target())) {
+                dc->stepList()->insertStep(0, Constants::MakeInstallStepId);
+            }
+        });
+
+        addInitialStep(Constants::MakeInstallStepId, needsMakeInstall);
+        addInitialStep(Constants::KillAppStepId);
+
+        // TODO: Rename RsyncDeployStep to something more generic.
+        addInitialStep(Constants::RsyncDeployStepId);
+    }
+};
+
 class RemoteLinuxPluginPrivate
 {
 public: