remove redundant nullptr checks before delete

This commit is contained in:
Robert Haschke 2019-06-03 20:13:16 +02:00
parent 95455c2a26
commit 345c183d06
4 changed files with 7 additions and 13 deletions

View File

@ -297,10 +297,8 @@ void TaskDisplay::onTasksRemoved(const QModelIndex &parent, int first, int last)
{
if (parent.isValid()) return; // only handle top-level items
for (; first <= last; ++first) {
rviz::Property *child = tasks_property_->takeChildAt(first);
delete child;
}
for (; first <= last; ++first)
delete tasks_property_->takeChildAt(first);
}
void TaskDisplay::onTaskDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)

View File

@ -176,11 +176,9 @@ TaskListModel::~TaskListModel() {
// inform MetaTaskListModel that we will remove our stuff
removeRows(0, rowCount());
// free RemoteTaskModels
for (auto& pair : remote_tasks_) {
if (pair.second)
for (auto& pair : remote_tasks_)
delete pair.second;
}
}
void TaskListModel::setScene(const planning_scene::PlanningSceneConstPtr &scene)
{
@ -352,7 +350,7 @@ bool TaskListModel::dropMimeData(const QMimeData *mime, Qt::DropAction action, i
std::unique_ptr<moveit::task_constructor::ContainerBase> container
(dynamic_cast<moveit::task_constructor::ContainerBase*>(stage));
if (!container) { // only accept container at root level
if (stage) delete stage;
delete stage;
return false;
}

View File

@ -418,7 +418,7 @@ void TaskView::onCurrentStageChanged(const QModelIndex &current, const QModelInd
QAbstractItemModel *m = task ? task->getSolutionModel(task_index) : nullptr;
view->setModel(m);
view->sortByColumn(sort_column, sort_order);
if (sm) delete sm; // we don't store the selection model
delete sm; // we don't store the selection model
sm = view->selectionModel();
if (sm) {

View File

@ -166,9 +166,7 @@ TaskSolutionVisualization::~TaskSolutionVisualization()
scene_render_.reset();
robot_render_.reset();
if (slider_dock_panel_)
delete slider_dock_panel_;
delete marker_visual_;
if (main_scene_node_)