feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BareMetal: Inline two functions into their only callers

Browse Source 
Change-Id: I86c9cb8a8e6d51e7401e8a926f65c6d0dc364b89
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2017-12-20 15:39:30 +01:00
parent 23296e0084
commit 3d22629ec0
3 changed files with 2 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/baremetal/baremetalcustomrunconfiguration.cpp
View File

@@ -145,16 +145,6 @@ Utils::OutputFormatter *BareMetalCustomRunConfiguration::createOutputFormatter()
return new QtSupport::QtOutputFormatter(target()->project()); 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() static QString exeKey()
{ {
return QLatin1String("BareMetal.CustomRunConfig.Executable"); return QLatin1String("BareMetal.CustomRunConfig.Executable");

3
src/plugins/baremetal/baremetalcustomrunconfiguration.h
View File

@@ -47,9 +47,6 @@ public:
void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; } void setLocalExecutableFilePath(const QString &executable) { m_localExecutable = executable; }
static Core::Id runConfigId();
static QString runConfigDefaultDisplayName();
bool fromMap(const QVariantMap &map) override; bool fromMap(const QVariantMap &map) override;
QVariantMap toMap() const override; QVariantMap toMap() const override;

6
src/plugins/baremetal/baremetalrunconfigurationfactory.cpp
View File

@@ -32,7 +32,6 @@
#include <projectexplorer/kitinformation.h> #include <projectexplorer/kitinformation.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <utils/qtcassert.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -68,8 +67,7 @@ BareMetalCustomRunConfigurationFactory::BareMetalCustomRunConfigurationFactory(Q
IRunConfigurationFactory(parent) IRunConfigurationFactory(parent)
{ {
setObjectName("BareMetalCustomRunConfigurationFactory"); setObjectName("BareMetalCustomRunConfigurationFactory");
registerRunConfiguration<BareMetalCustomRunConfiguration> registerRunConfiguration<BareMetalCustomRunConfiguration>("BareMetal.CustomRunConfig");
(BareMetalCustomRunConfiguration::runConfigId());
setSupportedTargetDeviceTypes({BareMetal::Constants::BareMetalOsType}); setSupportedTargetDeviceTypes({BareMetal::Constants::BareMetalOsType});
} }
@@ -80,7 +78,7 @@ QList<QString> BareMetalCustomRunConfigurationFactory::availableBuildTargets(Tar
QString BareMetalCustomRunConfigurationFactory::displayNameForBuildTarget(const QString &) const QString BareMetalCustomRunConfigurationFactory::displayNameForBuildTarget(const QString &) const
{ {
return BareMetalCustomRunConfiguration::runConfigDefaultDisplayName(); return BareMetalCustomRunConfiguration::tr("Custom Executable (on GDB server or hardware debugger)");
} }
} // namespace Internal } // namespace Internal