diff --git a/visualization/motion_planning_tasks/src/task_display.cpp b/visualization/motion_planning_tasks/src/task_display.cpp index 8c0bb2a2..5bc19a63 100644 --- a/visualization/motion_planning_tasks/src/task_display.cpp +++ b/visualization/motion_planning_tasks/src/task_display.cpp @@ -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) diff --git a/visualization/motion_planning_tasks/src/task_list_model.cpp b/visualization/motion_planning_tasks/src/task_list_model.cpp index 8cfa1eea..3b0d2f1f 100644 --- a/visualization/motion_planning_tasks/src/task_list_model.cpp +++ b/visualization/motion_planning_tasks/src/task_list_model.cpp @@ -176,10 +176,8 @@ TaskListModel::~TaskListModel() { // inform MetaTaskListModel that we will remove our stuff removeRows(0, rowCount()); // free RemoteTaskModels - for (auto& pair : remote_tasks_) { - if (pair.second) - delete 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 container (dynamic_cast(stage)); if (!container) { // only accept container at root level - if (stage) delete stage; + delete stage; return false; } diff --git a/visualization/motion_planning_tasks/src/task_panel.cpp b/visualization/motion_planning_tasks/src/task_panel.cpp index 19271bbc..213e12da 100644 --- a/visualization/motion_planning_tasks/src/task_panel.cpp +++ b/visualization/motion_planning_tasks/src/task_panel.cpp @@ -418,7 +418,7 @@ void TaskView::onCurrentStageChanged(const QModelIndex ¤t, 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) { diff --git a/visualization/visualization_tools/src/task_solution_visualization.cpp b/visualization/visualization_tools/src/task_solution_visualization.cpp index e96c83f7..e7dd6051 100644 --- a/visualization/visualization_tools/src/task_solution_visualization.cpp +++ b/visualization/visualization_tools/src/task_solution_visualization.cpp @@ -166,9 +166,7 @@ TaskSolutionVisualization::~TaskSolutionVisualization() scene_render_.reset(); robot_render_.reset(); - if (slider_dock_panel_) - delete slider_dock_panel_; - + delete slider_dock_panel_; delete marker_visual_; if (main_scene_node_)