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>

12 files changed, 6 insertions, 26 deletions

diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
index 362fc3ebb1..b4734d4651 100644
--- a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
@@ -55,8 +55,6 @@ BareMetalCustomRunConfiguration::BareMetalCustomRunConfiguration(Target *target,
     setDefaultDisplayName(RunConfigurationFactory::decoratedTargetName(tr("Custom Executable"), target));
 }
 
-const char *BareMetalCustomRunConfiguration::Id = "BareMetal";
-
 Tasks BareMetalCustomRunConfiguration::checkForIssues() const
 {
     Tasks tasks;
@@ -72,7 +70,7 @@ Tasks BareMetalCustomRunConfiguration::checkForIssues() const
 BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory()
     : FixedRunConfigurationFactory(BareMetalCustomRunConfiguration::tr("Custom Executable"), true)
 {
-    registerRunConfiguration<BareMetalCustomRunConfiguration>(BareMetalCustomRunConfiguration::Id);
+    registerRunConfiguration<BareMetalCustomRunConfiguration>("BareMetal");
     addSupportedTargetDeviceType(BareMetal::Constants::BareMetalOsType);
 }
 
diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.h b/src/plugins/baremetal/baremetalcustomrunconfiguration.h
index 130478b025..94b032114a 100644
--- a/src/plugins/baremetal/baremetalcustomrunconfiguration.h
+++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.h
@@ -41,7 +41,6 @@ public:
     explicit BareMetalCustomRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
 
 public:
-    static const char *Id;
     ProjectExplorer::Tasks checkForIssues() const final;
 };
 
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.cpp b/src/plugins/baremetal/baremetalrunconfiguration.cpp
index 8cff07e343..4712d7fca8 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalrunconfiguration.cpp
@@ -59,13 +59,11 @@ BareMetalRunConfiguration::BareMetalRunConfiguration(Target *target, Core::Id id
     connect(target, &Target::buildSystemUpdated, this, &RunConfiguration::update);
 }
 
-const char *BareMetalRunConfiguration::IdPrefix = "BareMetalCustom";
-
 // BareMetalRunConfigurationFactory
 
 BareMetalRunConfigurationFactory::BareMetalRunConfigurationFactory()
 {
-    registerRunConfiguration<BareMetalRunConfiguration>(BareMetalRunConfiguration::IdPrefix);
+    registerRunConfiguration<BareMetalRunConfiguration>("BareMetalCustom");
     setDecorateDisplayNames(true);
     addSupportedTargetDeviceType(BareMetal::Constants::BareMetalOsType);
 }
diff --git a/src/plugins/baremetal/baremetalrunconfiguration.h b/src/plugins/baremetal/baremetalrunconfiguration.h
index 8855add215..2132882a5b 100644
--- a/src/plugins/baremetal/baremetalrunconfiguration.h
+++ b/src/plugins/baremetal/baremetalrunconfiguration.h
@@ -38,8 +38,6 @@ class BareMetalRunConfiguration final : public ProjectExplorer::RunConfiguration
 
 public:
     explicit BareMetalRunConfiguration(ProjectExplorer::Target *target, Core::Id id);
-
-    static const char *IdPrefix;
 };
 
 // BareMetalRunConfigurationFactory
diff --git a/src/plugins/boot2qt/qdbconstants.h b/src/plugins/boot2qt/qdbconstants.h
index 9d9093f4a1..34471f43df 100644
--- a/src/plugins/boot2qt/qdbconstants.h
+++ b/src/plugins/boot2qt/qdbconstants.h
@@ -36,7 +36,6 @@ const char QdbDeployConfigurationId[] = "Qt4ProjectManager.Qdb.QdbDeployConfigur
 
 const Core::Id QdbHardwareDevicePrefix = "QdbHardwareDevice";
 const char AppcontrollerFilepath[] = "/usr/bin/appcontroller";
-const char QdbRunConfigurationPrefix[] = "QdbLinuxRunConfiguration:";
 
 } // namespace Constants
 
diff --git a/src/plugins/boot2qt/qdbrunconfiguration.cpp b/src/plugins/boot2qt/qdbrunconfiguration.cpp
index ca74afad0d..97aa4a01e5 100644
--- a/src/plugins/boot2qt/qdbrunconfiguration.cpp
+++ b/src/plugins/boot2qt/qdbrunconfiguration.cpp
@@ -119,7 +119,7 @@ QString QdbRunConfiguration::defaultDisplayName() const
 
 QdbRunConfigurationFactory::QdbRunConfigurationFactory()
 {
-    registerRunConfiguration<QdbRunConfiguration>(Qdb::Constants::QdbRunConfigurationPrefix);
+    registerRunConfiguration<QdbRunConfiguration>("QdbLinuxRunConfiguration:");
     addSupportedTargetDeviceType(Constants::QdbLinuxOsType);
 }
 
diff --git a/src/plugins/qnx/qnxconstants.h b/src/plugins/qnx/qnxconstants.h
index 05c5a17618..5daf09b06b 100644
--- a/src/plugins/qnx/qnxconstants.h
+++ b/src/plugins/qnx/qnxconstants.h
@@ -37,8 +37,6 @@ const char QNX_QNX_QT[] = "Qt4ProjectManager.QtVersion.QNX.QNX";
 
 const char QNX_QNX_FEATURE[] = "QtSupport.Wizards.FeatureQNX";
 
-const char QNX_QNX_RUNCONFIGURATION_PREFIX[] = "Qt4ProjectManager.QNX.QNXRunConfiguration.";
-
 const char QNX_QNX_DEPLOYCONFIGURATION_ID[] = "Qt4ProjectManager.QNX.QNXDeployConfiguration";
 
 const char QNX_QNX_OS_TYPE[] = "QnxOsType"; // Also used for device type.
diff --git a/src/plugins/qnx/qnxrunconfiguration.cpp b/src/plugins/qnx/qnxrunconfiguration.cpp
index e1726b42ed..9e9707cbfc 100644
--- a/src/plugins/qnx/qnxrunconfiguration.cpp
+++ b/src/plugins/qnx/qnxrunconfiguration.cpp
@@ -102,7 +102,7 @@ Runnable QnxRunConfiguration::runnable() const
 
 QnxRunConfigurationFactory::QnxRunConfigurationFactory()
 {
-    registerRunConfiguration<QnxRunConfiguration>(Constants::QNX_QNX_RUNCONFIGURATION_PREFIX);
+    registerRunConfiguration<QnxRunConfiguration>("Qt4ProjectManager.QNX.QNXRunConfiguration.");
     addSupportedTargetDeviceType(Constants::QNX_QNX_OS_TYPE);
 }
 
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;