Package wide linting fixes

CPP, CMake, python, etc. Mostly updated using tools, some manual edits.
locusrobotics · Jul 30, 2024 · 796bd88 · 796bd88
1 parent fb65a17
commit 796bd88
Show file tree

Hide file tree

Showing 8 changed files with 734 additions and 486 deletions.
diff --git a/cmake/find_ignore_include_lists.cmake b/cmake/find_ignore_include_lists.cmake
@@ -1,3 +1,17 @@
+# Copyright (C) 2024, Locus Robotics. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 function(filter_packages)
   set(options "")
   set(oneValueArgs PKG_LIST)
@@ -11,15 +25,15 @@ function(filter_packages)
     foreach(pkg ${ros2_packages})
       if(NOT ${pkg} IN_LIST BRIDGE_INCLUDE_PKGS)
         list(REMOVE_ITEM ros2_packages ${pkg})
-      endif(NOT ${pkg} IN_LIST BRIDGE_INCLUDE_PKGS)
+      endif()
     endforeach()
   elseif(BRIDGE_IGNORE_PKGS)
     foreach(pkg ${ros2_packages})
       if(${pkg} IN_LIST BRIDGE_IGNORE_PKGS)
         list(REMOVE_ITEM ros2_packages ${pkg})
-      endif(${pkg} IN_LIST BRIDGE_IGNORE_PKGS)
+      endif()
     endforeach()
-  endif(BRIDGE_INCLUDE_PKGS)
+  endif()
 
   set(${BRIDGE_PKG_LIST} "${ros2_packages}" PARENT_SCOPE)
-endfunction(filter_packages ros2_packages)
+endfunction()
diff --git a/include/ros1_bridge/action_factory.hpp b/include/ros1_bridge/action_factory.hpp
@@ -121,7 +121,7 @@ class ActionFactory_1_2 : public ActionFactoryInterface
 private:
   class GoalHandler
   {
-  public:
+public:
     void cancel()
     {
       std::lock_guard<std::mutex> lock(mutex_gh_);
@@ -193,7 +193,7 @@ class ActionFactory_1_2 : public ActionFactoryInterface
     GoalHandler(ROS1GoalHandle & gh1, ROS2ClientSharedPtr & client, rclcpp::Logger logger)
     : gh1_(gh1), gh2_(nullptr), client_(client), logger_(logger), canceled_(false) {}
 
-  private:
+private:
     ROS1GoalHandle gh1_;
     ROS2ClientGoalHandle gh2_;
     ROS2ClientSharedPtr client_;
@@ -312,7 +312,7 @@ class ActionFactory_2_1 : public ActionFactoryInterface
 private:
   class GoalHandler
   {
-  public:
+public:
     void cancel()
     {
       std::lock_guard<std::mutex> lock(mutex_);
@@ -382,7 +382,7 @@ class ActionFactory_2_1 : public ActionFactoryInterface
     GoalHandler(std::shared_ptr<ROS2ServerGoalHandle> & gh2, std::shared_ptr<ROS1Client> & client)
     : gh2_(gh2), client_(client), canceled_(false) {}
 
-  private:
+private:
     std::shared_ptr<ROS1ClientGoalHandle> gh1_;
     std::shared_ptr<ROS2ServerGoalHandle> gh2_;
     std::shared_ptr<ROS1Client> client_;

diff --git a/include/ros1_bridge/command_parser_utils.hpp b/include/ros1_bridge/command_parser_utils.hpp
@@ -22,24 +22,24 @@ namespace ros1_bridge
 {
 
 bool find_command_option(
-    const std::vector<const char *> & args,
-    const std::string & option);
+  const std::vector<const char *> & args,
+  const std::string & option);
 
 bool get_option_value(
-    std::vector<const char *> & args,
-    const std::string & option,
-    const char * & value,
-    bool remove = false);
+  std::vector<const char *> & args,
+  const std::string & option,
+  const char * & value,
+  bool remove = false);
 
 bool get_option_values(
   std::vector<const char *> & args, const std::string & option,
   std::vector<const char *> & available_options,
   std::vector<const char *> & values, bool remove = false);
 
 bool get_option_flag(
-    std::vector<const char *> & args,
-    const std::string & option,
-    bool remove = false);
+  std::vector<const char *> & args,
+  const std::string & option,
+  bool remove = false);
 
 void split_ros1_ros2_args(
   const std::vector<const char *> & args,

diff --git a/package.xml b/package.xml
@@ -60,6 +60,13 @@
   <test_depend>launch_testing_ros</test_depend>
   <test_depend>ros2run</test_depend>
   <test_depend>sensor_msgs</test_depend>
+  <test_depend>python3-ament-pep257</test_depend>
+  <test_depend>python3-ament-cmake-test</test_depend>
+  <test_depend>python3-ament-xmllint</test_depend>
+  <test_depend>python3-ament-lint-cmake</test_depend>
+  <test_depend>python3-ament-uncrustify</test_depend>
+  <test_depend>python3-ament-flake8</test_depend>
+  <test_depend>python3-ament-copyright</test_depend>
 
   <export>
     <build_type>ament_cmake</build_type>