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

ProjectExplorer: Remove DeployConfigurationFactory::m_creator

Browse Source 
Behavior is uniquely determined by m_deployConfigBaseId, so
a normal member functions does the trick, too.

Change-Id: I04f9a5dbba6874743b56ef32cc67ad1de13169d0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-01-22 16:59:14 +01:00
parent 260c41156c
commit 63ae7eeb1b
2 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/projectexplorer/deployconfiguration.cpp
View File

@@ -181,27 +181,26 @@ void DeployConfigurationFactory::setUseDeploymentDataView()
void DeployConfigurationFactory::setConfigBaseId(Core::Id deployConfigBaseId) void DeployConfigurationFactory::setConfigBaseId(Core::Id deployConfigBaseId)
{ {
m_creator = [this, deployConfigBaseId](Target *t) {
auto dc = new DeployConfiguration(t, deployConfigBaseId);
dc->setDefaultDisplayName(m_defaultDisplayName);
dc->m_configWidgetCreator = m_configWidgetCreator;
return dc;
};
m_deployConfigBaseId = deployConfigBaseId; m_deployConfigBaseId = deployConfigBaseId;
} }
DeployConfiguration *DeployConfigurationFactory::createDeployConfiguration(Target *t)
{
auto dc = new DeployConfiguration(t, m_deployConfigBaseId);
dc->setDefaultDisplayName(m_defaultDisplayName);
dc->m_configWidgetCreator = m_configWidgetCreator;
return dc;
}
DeployConfiguration *DeployConfigurationFactory::create(Target *parent) DeployConfiguration *DeployConfigurationFactory::create(Target *parent)
{ {
QTC_ASSERT(canHandle(parent), return nullptr); QTC_ASSERT(canHandle(parent), return nullptr);
QTC_ASSERT(m_creator, return nullptr); DeployConfiguration *dc = createDeployConfiguration(parent);
DeployConfiguration *dc = m_creator(parent); QTC_ASSERT(dc, return nullptr);
if (!dc)
return nullptr;
for (const DeployStepCreationInfo &info : qAsConst(m_initialSteps)) { for (const DeployStepCreationInfo &info : qAsConst(m_initialSteps)) {
if (!info.condition || info.condition(parent)) if (!info.condition || info.condition(parent))
dc->stepList()->appendStep(info.deployStepId); dc->stepList()->appendStep(info.deployStepId);
} }
dc->m_configWidgetCreator = m_configWidgetCreator;
return dc; return dc;
} }
@@ -222,8 +221,7 @@ DeployConfiguration *DeployConfigurationFactory::restore(Target *parent, const Q
}); });
if (!factory) if (!factory)
return nullptr; return nullptr;
QTC_ASSERT(factory->m_creator, return nullptr); DeployConfiguration *dc = factory->createDeployConfiguration(parent);
DeployConfiguration *dc = factory->m_creator(parent);
QTC_ASSERT(dc, return nullptr); QTC_ASSERT(dc, return nullptr);
if (!dc->fromMap(map)) { if (!dc->fromMap(map)) {
delete dc; delete dc;

2
src/plugins/projectexplorer/deployconfiguration.h
View File

@@ -106,7 +106,7 @@ private:
Core::Id deployStepId; Core::Id deployStepId;
std::function<bool(Target *)> condition; // unset counts as unrestricted std::function<bool(Target *)> condition; // unset counts as unrestricted
}; };
DeployConfigurationCreator m_creator; DeployConfiguration *createDeployConfiguration(Target *t);
Core::Id m_deployConfigBaseId; Core::Id m_deployConfigBaseId;
Core::Id m_supportedProjectType; Core::Id m_supportedProjectType;
QList<Core::Id> m_supportedTargetDeviceTypes; QList<Core::Id> m_supportedTargetDeviceTypes;