From 8b452b28d226c07b504679e6acf7fe9e0fbf5edf Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 3 May 2018 17:22:13 +0200 Subject: [PATCH] Inline complex RunConfigurationCreationInfo constructor Names are easier to follow than positions in long argument lists. Change-Id: Ia0ace9d864a1100e649f6725e7de338ab2653d05 Reviewed-by: Christian Stenger --- src/plugins/projectexplorer/runconfiguration.cpp | 12 ++++++++++-- src/plugins/projectexplorer/runconfiguration.h | 13 ------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/src/plugins/projectexplorer/runconfiguration.cpp b/src/plugins/projectexplorer/runconfiguration.cpp index b26bcdd64e3..8a7419992a0 100644 --- a/src/plugins/projectexplorer/runconfiguration.cpp +++ b/src/plugins/projectexplorer/runconfiguration.cpp @@ -550,7 +550,11 @@ RunConfigurationFactory::availableCreators(Target *parent) const displayName = decoratedTargetName(ti.buildKey, parent); else if (m_decorateDisplayNames) displayName = decoratedTargetName(displayName, parent); - RunConfigurationCreationInfo rci(this, m_runConfigBaseId, ti.buildKey, displayName); + RunConfigurationCreationInfo rci; + rci.factory = this; + rci.id = m_runConfigBaseId; + rci.buildKey = ti.buildKey; + rci.displayName = displayName; rci.creationMode = ti.isQtcRunnable || !hasAnyQtcRunnable ? RunConfigurationCreationInfo::AlwaysCreate : RunConfigurationCreationInfo::ManualCreationOnly; @@ -664,7 +668,11 @@ FixedRunConfigurationFactory::availableCreators(Target *parent) const { QString displayName = m_decorateTargetName ? decoratedTargetName(m_fixedBuildTarget, parent) : m_fixedBuildTarget; - return {RunConfigurationCreationInfo(this, runConfigurationBaseId(), QString(), displayName)}; + RunConfigurationCreationInfo rci; + rci.factory = this; + rci.id = runConfigurationBaseId(); + rci.displayName = displayName; + return {rci}; } using WorkerFactories = std::vector; diff --git a/src/plugins/projectexplorer/runconfiguration.h b/src/plugins/projectexplorer/runconfiguration.h index 8f64fcad56b..fa73f67b591 100644 --- a/src/plugins/projectexplorer/runconfiguration.h +++ b/src/plugins/projectexplorer/runconfiguration.h @@ -301,19 +301,6 @@ class RunConfigurationCreationInfo { public: enum CreationMode {AlwaysCreate, ManualCreationOnly}; - RunConfigurationCreationInfo() = default; - RunConfigurationCreationInfo(const RunConfigurationFactory *factory, - Core::Id id, - QString buildKey, QString displayName, - CreationMode creationMode = AlwaysCreate, - bool useTerminal = false) - : factory(factory), id(id), - buildKey(buildKey), - displayName(displayName), - creationMode(creationMode), - useTerminal(useTerminal) - {} - RunConfiguration *create(Target *target) const; const RunConfigurationFactory *factory = nullptr;