From 48f4c025baed8db597b2eaf2c8249025a263d25c Mon Sep 17 00:00:00 2001 From: v4hn Date: Wed, 10 Jun 2020 00:25:55 +0200 Subject: [PATCH] clang-tidy: modernize-loop-convert --- .clang-tidy | 1 + .../motion_planning_tasks/src/remote_task_model.cpp | 8 ++++---- .../src/task_solution_visualization.cpp | 12 ++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.clang-tidy b/.clang-tidy index d117ed3d..0a0562d7 100644 --- a/.clang-tidy +++ b/.clang-tidy @@ -2,6 +2,7 @@ Checks: '-*, modernize-use-override, modernize-use-using, + modernize-loop-convert, ' HeaderFilterRegex: '.*/moveit/task_constructor/.*\.h' AnalyzeTemporaryDtors: false diff --git a/visualization/motion_planning_tasks/src/remote_task_model.cpp b/visualization/motion_planning_tasks/src/remote_task_model.cpp index dcabdbe0..9fa16b82 100644 --- a/visualization/motion_planning_tasks/src/remote_task_model.cpp +++ b/visualization/motion_planning_tasks/src/remote_task_model.cpp @@ -98,11 +98,11 @@ void RemoteTaskModel::Node::setProperties(const std::vectorgetRoot(); int index = 0; // current child index in root - for (auto it = props.begin(); it != props.end(); ++it) { + for (const auto& prop : props) { int num = root->numChildren(); // find first child with name >= it->name int next = index; - while (next < num && root->childAt(next)->getName().toStdString() < it->name) + while (next < num && root->childAt(next)->getName().toStdString() < prop.name) ++next; // and remove all children in range [index, next) at once root->removeChildren(index, next - index); @@ -110,10 +110,10 @@ void RemoteTaskModel::Node::setProperties(const std::vectorchildAt(index) : nullptr; - if (old_child && old_child->getName().toStdString() != it->name) + if (old_child && old_child->getName().toStdString() != prop.name) old_child = nullptr; - rviz::Property* new_child = createProperty(*it, old_child, scene_, display_context_); + rviz::Property* new_child = createProperty(prop, old_child, scene_, display_context_); if (new_child != old_child) root->addChild(new_child, index); ++index; diff --git a/visualization/visualization_tools/src/task_solution_visualization.cpp b/visualization/visualization_tools/src/task_solution_visualization.cpp index d775ca25..9a80c174 100644 --- a/visualization/visualization_tools/src/task_solution_visualization.cpp +++ b/visualization/visualization_tools/src/task_solution_visualization.cpp @@ -282,22 +282,22 @@ void TaskSolutionVisualization::changedTrail() { void TaskSolutionVisualization::changedRobotAlpha() { robot_render_->setAlpha(robot_alpha_property_->getFloat()); - for (std::size_t i = 0; i < trail_.size(); ++i) - trail_[i]->setAlpha(robot_alpha_property_->getFloat()); + for (auto& waypoint : trail_) + waypoint->setAlpha(robot_alpha_property_->getFloat()); } void TaskSolutionVisualization::changedRobotVisualEnabled() { robot_render_->setVisualVisible(robot_visual_enabled_property_->getBool()); renderCurrentWayPoint(); - for (std::size_t i = 0; i < trail_.size(); ++i) - trail_[i]->setVisualVisible(robot_visual_enabled_property_->getBool()); + for (auto& waypoint : trail_) + waypoint->setVisualVisible(robot_visual_enabled_property_->getBool()); } void TaskSolutionVisualization::changedRobotCollisionEnabled() { robot_render_->setCollisionVisible(robot_collision_enabled_property_->getBool()); renderCurrentWayPoint(); - for (std::size_t i = 0; i < trail_.size(); ++i) - trail_[i]->setCollisionVisible(robot_collision_enabled_property_->getBool()); + for (auto& waypoint : trail_) + waypoint->setCollisionVisible(robot_collision_enabled_property_->getBool()); } void TaskSolutionVisualization::onEnable() {