diff --git a/src/plugins/remotelinux/remotelinux_constants.h b/src/plugins/remotelinux/remotelinux_constants.h index 843a3d96f36..da6eac43d40 100644 --- a/src/plugins/remotelinux/remotelinux_constants.h +++ b/src/plugins/remotelinux/remotelinux_constants.h @@ -30,6 +30,8 @@ namespace Constants { const char GenericLinuxOsType[] = "GenericLinuxOsType"; +const char DeployToGenericLinux[] = "DeployToGenericLinux"; + const char CheckForFreeDiskSpaceId[] = "RemoteLinux.CheckForFreeDiskSpaceStep"; const char DirectUploadStepId[] = "RemoteLinux.DirectUploadStep"; const char MakeInstallStepId[] = "RemoteLinux.MakeInstall"; diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp index ed8f0d0d9bb..78bccaa4c1b 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.cpp @@ -43,19 +43,11 @@ using namespace ProjectExplorer; namespace RemoteLinux { - -using namespace Internal; - -Utils::Id genericDeployConfigurationId() -{ - return "DeployToGenericLinux"; -} - namespace Internal { RemoteLinuxDeployConfigurationFactory::RemoteLinuxDeployConfigurationFactory() { - setConfigBaseId(genericDeployConfigurationId()); + setConfigBaseId(RemoteLinux::Constants::DeployToGenericLinux); addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType); setDefaultDisplayName(QCoreApplication::translate("RemoteLinux", "Deploy to Remote Linux Host")); diff --git a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h index 264d28e1e40..3a4c803d219 100644 --- a/src/plugins/remotelinux/remotelinuxdeployconfiguration.h +++ b/src/plugins/remotelinux/remotelinuxdeployconfiguration.h @@ -28,9 +28,6 @@ #include namespace RemoteLinux { - -Utils::Id genericDeployConfigurationId(); - namespace Internal { class RemoteLinuxDeployConfigurationFactory : public ProjectExplorer::DeployConfigurationFactory diff --git a/src/plugins/remotelinux/remotelinuxplugin.cpp b/src/plugins/remotelinux/remotelinuxplugin.cpp index 4affcd2aef4..bb15ed1ee4c 100644 --- a/src/plugins/remotelinux/remotelinuxplugin.cpp +++ b/src/plugins/remotelinux/remotelinuxplugin.cpp @@ -62,7 +62,7 @@ public: { registerStep(Step::stepId()); setDisplayName(Step::displayName()); - setSupportedConfiguration(genericDeployConfigurationId()); + setSupportedConfiguration(RemoteLinux::Constants::DeployToGenericLinux); setSupportedStepList(ProjectExplorer::Constants::BUILDSTEPS_DEPLOY); } };