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

Project Explorer: fix possible nullptr derefs and remove dead

Browse Source 
The dead store is not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I18084c357696311b6556c7bc60832a72b3318e92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Erik Verbruggen
2014-09-11 11:05:45 +02:00
parent b3bc530cd0
commit a83bf58b88
7 changed files with 44 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/plugins/projectexplorer/runsettingspropertiespage.cpp
View File

@@ -250,14 +250,15 @@ void RunSettingsWidget::aboutToShowAddMenu()
QList<Core::Id> ids = factory->availableCreationIds(m_target);
foreach (Core::Id id, ids) {
QAction *action = new QAction(factory->displayNameForId(id), m_addRunMenu);
FactoryAndId fai;
fai.factory = factory;
fai.id = id;
QVariant v;
v.setValue(fai);
action->setData(v);
connect(action, SIGNAL(triggered()),
this, SLOT(addRunConfiguration()));
connect(action, &QAction::triggered, [factory, id, this]() {
RunConfiguration *newRC = factory->create(m_target, id);
if (!newRC)
return;
QTC_CHECK(newRC->id() == id);
m_target->addRunConfiguration(newRC);
m_target->setActiveRunConfiguration(newRC);
m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1);
});
menuActions.append(action);
}
}
@@ -269,21 +270,6 @@ void RunSettingsWidget::aboutToShowAddMenu()
m_addRunMenu->addAction(action);
}
void RunSettingsWidget::addRunConfiguration()
{
QAction *act = qobject_cast<QAction *>(sender());
if (!act)
return;
FactoryAndId fai = act->data().value<FactoryAndId>();
RunConfiguration *newRC = fai.factory->create(m_target, fai.id);
if (!newRC)
return;
QTC_CHECK(newRC->id() == fai.id);
m_target->addRunConfiguration(newRC);
m_target->setActiveRunConfiguration(newRC);
m_removeRunToolButton->setEnabled(m_target->runConfigurations().size() > 1);
}
void RunSettingsWidget::cloneRunConfiguration()
{
RunConfiguration* activeRunConfiguration = m_target->activeRunConfiguration();
@@ -397,27 +383,21 @@ void RunSettingsWidget::aboutToShowDeployMenu()
action->setData(QVariant::fromValue(data));
connect(action, SIGNAL(triggered()),
this, SLOT(addDeployConfiguration()));
connect(action, &QAction::triggered, [factory, id, this]() {
if (!factory->canCreate(m_target, id))
return;
DeployConfiguration *newDc = factory->create(m_target, id);
if (!newDc)
return;
QTC_CHECK(!newDc || newDc->id() == id);
m_target->addDeployConfiguration(newDc);
m_target->setActiveDeployConfiguration(newDc);
m_removeDeployToolButton->setEnabled(m_target->deployConfigurations().size() > 1);
});
}
}
}
void RunSettingsWidget::addDeployConfiguration()
{
QAction *act = qobject_cast<QAction *>(sender());
if (!act)
return;
DeployFactoryAndId data = act->data().value<DeployFactoryAndId>();
if (!data.factory->canCreate(m_target, data.id))
return;
DeployConfiguration *newDc = data.factory->create(m_target, data.id);
if (!newDc)
return;
QTC_CHECK(!newDc || newDc->id() == data.id);
m_target->addDeployConfiguration(newDc);
m_target->setActiveDeployConfiguration(newDc);
m_removeDeployToolButton->setEnabled(m_target->deployConfigurations().size() > 1);
}
void RunSettingsWidget::removeDeployConfiguration()
{
DeployConfiguration *dc = m_target->activeDeployConfiguration();