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

Inline complex RunConfigurationCreationInfo constructor

Browse Source 
Names are easier to follow than positions in long argument lists.

Change-Id: Ia0ace9d864a1100e649f6725e7de338ab2653d05
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2018-05-03 17:22:13 +02:00
parent 6d3275212b
commit 8b452b28d2
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/projectexplorer/runconfiguration.cpp
View File

@@ -550,7 +550,11 @@ RunConfigurationFactory::availableCreators(Target *parent) const
displayName = decoratedTargetName(ti.buildKey, parent); displayName = decoratedTargetName(ti.buildKey, parent);
else if (m_decorateDisplayNames) else if (m_decorateDisplayNames)
displayName = decoratedTargetName(displayName, parent); 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 rci.creationMode = ti.isQtcRunnable || !hasAnyQtcRunnable
? RunConfigurationCreationInfo::AlwaysCreate ? RunConfigurationCreationInfo::AlwaysCreate
: RunConfigurationCreationInfo::ManualCreationOnly; : RunConfigurationCreationInfo::ManualCreationOnly;
@@ -664,7 +668,11 @@ FixedRunConfigurationFactory::availableCreators(Target *parent) const
{ {
QString displayName = m_decorateTargetName ? decoratedTargetName(m_fixedBuildTarget, parent) QString displayName = m_decorateTargetName ? decoratedTargetName(m_fixedBuildTarget, parent)
: m_fixedBuildTarget; : 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<RunControl::WorkerFactory>; using WorkerFactories = std::vector<RunControl::WorkerFactory>;

13
src/plugins/projectexplorer/runconfiguration.h
View File

@@ -301,19 +301,6 @@ class RunConfigurationCreationInfo
{ {
public: public:
enum CreationMode {AlwaysCreate, ManualCreationOnly}; 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; RunConfiguration *create(Target *target) const;
const RunConfigurationFactory *factory = nullptr; const RunConfigurationFactory *factory = nullptr;