Style fixes for newer cpplint.

Signed-off-by: Chris Lalancette <[email protected]>

Author: clalancette

joy/include/joy/joy.hpp

@@ -32,15 +32,15 @@
 
 #include <SDL.h>
 
-#include <rclcpp/rclcpp.hpp>
-#include <sensor_msgs/msg/joy.hpp>
-#include <sensor_msgs/msg/joy_feedback.hpp>
-
 #include <future>
 #include <memory>
 #include <string>
 #include <thread>
 
+#include <rclcpp/rclcpp.hpp>
+#include <sensor_msgs/msg/joy.hpp>
+#include <sensor_msgs/msg/joy_feedback.hpp>
+
 namespace joy
 {
 

joy/src/joy.cpp

@@ -27,13 +27,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <SDL.h>
-
-#include <rclcpp/rclcpp.hpp>
-#include <rclcpp_components/register_node_macro.hpp>
-#include <sensor_msgs/msg/joy.hpp>
-#include <sensor_msgs/msg/joy_feedback.hpp>
-
 #include <algorithm>
 #include <chrono>
 #include <functional>
@@ -43,6 +36,13 @@
 #include <string>
 #include <thread>
 
+#include <SDL.h>
+
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp_components/register_node_macro.hpp>
+#include <sensor_msgs/msg/joy.hpp>
+#include <sensor_msgs/msg/joy_feedback.hpp>
+
 #include "joy/joy.hpp"
 
 namespace joy

joy_linux/src/joy_linux_node.cpp

@@ -38,17 +38,17 @@
 #include <sys/stat.h>
 #include <unistd.h>
 
-#include <diagnostic_updater/diagnostic_updater.hpp>
-#include <rclcpp/rclcpp.hpp>
-#include <sensor_msgs/msg/joy.hpp>
-#include <sensor_msgs/msg/joy_feedback_array.hpp>
-
 #include <chrono>
 #include <functional>
 #include <future>
 #include <memory>
 #include <string>
 
+#include <diagnostic_updater/diagnostic_updater.hpp>
+#include <rclcpp/rclcpp.hpp>
+#include <sensor_msgs/msg/joy.hpp>
+#include <sensor_msgs/msg/joy_feedback_array.hpp>
+
 /// \brief Opens, reads from and publishes joystick events
 class Joystick
 {

spacenav/src/spacenav.cpp

@@ -33,15 +33,15 @@
 
 #include "spacenav/spacenav.hpp"
 
-#include <rclcpp/rclcpp.hpp>
-#include <rclcpp_components/register_node_macro.hpp>
-
 #include <chrono>
 #include <functional>
 #include <memory>
 #include <utility>
 #include <vector>
 
+#include <rclcpp/rclcpp.hpp>
+#include <rclcpp_components/register_node_macro.hpp>
+
 #include "spnav.h" // NOLINT
 
 #define SPACENAV_FULL_SCALE_PARAM_S "full_scale"

wiimote/include/wiimote/wiimote_controller.hpp

@@ -51,11 +51,10 @@
 #include <std_srvs/srv/empty.hpp>
 #include <wiimote_msgs/msg/state.hpp>
 
-// We need to link against these
-#include <bluetooth/bluetooth.h>  // libbluetooth.so
+#include "bluetooth/bluetooth.h"
 namespace wiimote_c
 {
-#include <cwiid.h>  // libcwiid.so
+#include "cwiid.h"  // NOLINT, cpplint wants us to have a directory
 }
 
 #include "wiimote/stat_vector_3d.hpp"