From 3d22629ec00b9ece13ac1a4fc07f90280012c907 Mon Sep 17 00:00:00 2001
From: hjk <hjk@qt.io>
Date: Wed, 20 Dec 2017 15:39:30 +0100
Subject: [PATCH] BareMetal: Inline two functions into their only callers

Change-Id: I86c9cb8a8e6d51e7401e8a926f65c6d0dc364b89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
---
 .../baremetal/baremetalcustomrunconfiguration.cpp      | 10 ----------
 .../baremetal/baremetalcustomrunconfiguration.h        |  3 ---
 .../baremetal/baremetalrunconfigurationfactory.cpp     |  6 ++----
 3 files changed, 2 insertions(+), 17 deletions(-)

diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
index f61e3d0df47..15e2539ba26 100644
--- a/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
+++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
@@ -145,16 +145,6 @@ Utils::OutputFormatter *BareMetalCustomRunConfiguration::createOutputFormatter()
     return new QtSupport::QtOutputFormatter(target()->project());
 }
 
-Core::Id BareMetalCustomRunConfiguration::runConfigId()
-{
-    return "BareMetal.CustomRunConfig";
-}
-
-QString BareMetalCustomRunConfiguration::runConfigDefaultDisplayName()
-{
-    return tr("Custom Executable (on GDB server or hardware debugger)");
-}
-
 static QString exeKey()
 {
     return QLatin1String("BareMetal.CustomRunConfig.Executable");
diff --git a/src/plugins/baremetal/baremetalcustomrunconfiguration.h b/src/plugins/baremetal/baremetalcustomrunconfiguration.h
index 94687ba876f..59c6ed7e449 100644
--- a/src/plugins/baremetal/baremetalcustomrunconfiguration.h
+++ b/src/plugins/baremetal/baremetalcustomrunconfiguration.h
@@ -47,9 +47,6 @@ public:
 
     void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; }
 
-    static Core::Id runConfigId();
-    static QString runConfigDefaultDisplayName();
-
     bool fromMap(const QVariantMap &map) override;
     QVariantMap toMap() const override;
 
diff --git a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
index ba89602dc3a..975c2070ec2 100644
--- a/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
+++ b/src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
@@ -32,7 +32,6 @@
 #include <projectexplorer/kitinformation.h>
 #include <projectexplorer/project.h>
 #include <projectexplorer/target.h>
-#include <utils/qtcassert.h>
 
 using namespace ProjectExplorer;
 
@@ -68,8 +67,7 @@ BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory(Q
     IRunConfigurationFactory(parent)
 {
     setObjectName("BareMetalCustomRunConfigurationFactory");
-    registerRunConfiguration<BareMetalCustomRunConfiguration>
-            (BareMetalCustomRunConfiguration::runConfigId());
+    registerRunConfiguration<BareMetalCustomRunConfiguration>("BareMetal.CustomRunConfig");
     setSupportedTargetDeviceTypes({BareMetal::Constants::BareMetalOsType});
 }
 
@@ -80,7 +78,7 @@ QList<QString> BareMetalCustomRunConfigurationFactory::availableBuildTargets(Tar
 
 QString BareMetalCustomRunConfigurationFactory::displayNameForBuildTarget(const QString &) const
 {
-    return BareMetalCustomRunConfiguration::runConfigDefaultDisplayName();
+    return BareMetalCustomRunConfiguration::tr("Custom Executable (on GDB server or hardware debugger)");
 }
 
 } // namespace Internal