Standardize RunConfiguration id specification

Use the cheapest of all patterns used so far, they are only used exactly
once.

Normalizing the id values to a common patters is not as simple as they are
stored in .user files.

Change-Id: Ib4d037a88a7a5ca2ea94dfb3933d17122c89240f
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

4 files changed, 2 insertions, 12 deletions

diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
index 32db508f8a..8a87b97c8d 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.cpp
@@ -68,11 +68,6 @@ RemoteLinuxCustomRunConfiguration::RemoteLinuxCustomRunConfiguration(Target *tar
     setDefaultDisplayName(runConfigDefaultDisplayName());
 }
 
-Core::Id RemoteLinuxCustomRunConfiguration::runConfigId()
-{
-    return "RemoteLinux.CustomRunConfig";
-}
-
 QString RemoteLinuxCustomRunConfiguration::runConfigDefaultDisplayName()
 {
     QString remoteExecutable = aspect<ExecutableAspect>()->executable().toString();
@@ -104,8 +99,7 @@ Tasks RemoteLinuxCustomRunConfiguration::checkForIssues() const
 RemoteLinuxCustomRunConfigurationFactory::RemoteLinuxCustomRunConfigurationFactory()
     : FixedRunConfigurationFactory(RemoteLinuxCustomRunConfiguration::tr("Custom Executable"), true)
 {
-    registerRunConfiguration<RemoteLinuxCustomRunConfiguration>
-            (RemoteLinuxCustomRunConfiguration::runConfigId());
+    registerRunConfiguration<RemoteLinuxCustomRunConfiguration>("RemoteLinux.CustomRunConfig");
     addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
 }
 
diff --git a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
index 186412fe3c..6eeb7b44f0 100644
--- a/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxcustomrunconfiguration.h
@@ -37,7 +37,6 @@ class RemoteLinuxCustomRunConfiguration : public ProjectExplorer::RunConfigurati
 public:
     RemoteLinuxCustomRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
-    static Core::Id runConfigId();
     QString runConfigDefaultDisplayName();
 
 private:
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
index 4d3a4eb5d1..81a855d030 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
@@ -93,14 +93,12 @@ Runnable RemoteLinuxRunConfiguration::runnable() const
     return r;
 }
 
-const char *RemoteLinuxRunConfiguration::IdPrefix = "RemoteLinuxRunConfiguration:";
-
 
 // RemoteLinuxRunConfigurationFactory
 
 RemoteLinuxRunConfigurationFactory::RemoteLinuxRunConfigurationFactory()
 {
-    registerRunConfiguration<RemoteLinuxRunConfiguration>(RemoteLinuxRunConfiguration::IdPrefix);
+    registerRunConfiguration<RemoteLinuxRunConfiguration>("RemoteLinuxRunConfiguration:");
     setDecorateDisplayNames(true);
     addSupportedTargetDeviceType(RemoteLinux::Constants::GenericLinuxOsType);
 }
diff --git a/src/plugins/remotelinux/remotelinuxrunconfiguration.h b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
index 94b0d6a03f..ec08bf6963 100644
--- a/src/plugins/remotelinux/remotelinuxrunconfiguration.h
+++ b/src/plugins/remotelinux/remotelinuxrunconfiguration.h
@@ -38,7 +38,6 @@ class RemoteLinuxRunConfiguration final : public ProjectExplorer::RunConfigurati
 
 public:
     RemoteLinuxRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
-    static const char *IdPrefix;
 
 protected:
     ProjectExplorer::Runnable runnable() const override;