fixing local code checker

adlarkin · adlarkin · commit 1e400bd907fb · 2020-11-03T22:31:36.000-05:00
Signed-off-by: Ashton Larkin &lt;ashton@openrobotics.org&gt;
diff --git a/src/gui/PathManager.cc b/src/gui/PathManager.cc
@@ -17,11 +17,11 @@
 
 #include "PathManager.hh"
 
+#include <ignition/msgs/sdf_generator_config.pb.h>
+
 #include <string>
 #include <vector>
 
-#include <ignition/msgs/sdf_generator_config.pb.h>
-
 #include <ignition/common/Console.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/gui/Application.hh>
diff --git a/src/gui/PathManager.hh b/src/gui/PathManager.hh
@@ -22,6 +22,7 @@
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/config.hh"
 
 namespace ignition
 {
diff --git a/src/gui/plugins/modules/EntityContextMenu.cc b/src/gui/plugins/modules/EntityContextMenu.cc
@@ -17,13 +17,13 @@
 
 #include "EntityContextMenu.hh"
 
-#include <iostream>
-#include <string>
-
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 #include <ignition/msgs/entity.pb.h>
 
+#include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gazebo/gui/GuiRunner.hh>
 #include <ignition/gazebo/Conversions.hh>
diff --git a/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc b/src/gui/plugins/playback_scrubber/PlaybackScrubber.cc
@@ -17,15 +17,16 @@
 
 #include "PlaybackScrubber.hh"
 
+#include <ignition/msgs/boolean.pb.h>
+#include <ignition/msgs/stringmsg.pb.h>
+
 #include <chrono>
 #include <ctime>
 #include <iostream>
 #include <regex>
 #include <string>
 #include <utility>
 
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/stringmsg.pb.h>
 #include <ignition/math/Helpers.hh>
 
 #include <ignition/common/Console.hh>
diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
@@ -17,14 +17,15 @@
 
 #include "ResourceSpawner.hh"
 
+#include <ignition/msgs/boolean.pb.h>
+#include <ignition/msgs/stringmsg.pb.h>
+
 #include <set>
 #include <unordered_map>
 
 #include <sdf/Root.hh>
 #include <sdf/parser.hh>
 
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/stringmsg.pb.h>
 #include <ignition/common/Console.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/common/Filesystem.hh>
diff --git a/src/gui/plugins/shapes/Shapes.cc b/src/gui/plugins/shapes/Shapes.cc
@@ -17,13 +17,13 @@
 
 #include "Shapes.hh"
 
+#include <ignition/msgs/boolean.pb.h>
+#include <ignition/msgs/stringmsg.pb.h>
+
 #include <algorithm>
 #include <iostream>
 #include <string>
 
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/stringmsg.pb.h>
-
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
diff --git a/src/gui/plugins/transform_control/TransformControl.cc b/src/gui/plugins/transform_control/TransformControl.cc
@@ -17,12 +17,12 @@
 
 #include "TransformControl.hh"
 
-#include <iostream>
-#include <string>
-
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/stringmsg.pb.h>
 
+#include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/gui/Application.hh>
 #include <ignition/gui/MainWindow.hh>
diff --git a/src/gui/plugins/video_recorder/VideoRecorder.cc b/src/gui/plugins/video_recorder/VideoRecorder.cc
@@ -17,12 +17,12 @@
 
 #include "VideoRecorder.hh"
 
-#include <iostream>
-#include <string>
-
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/video_record.pb.h>
 
+#include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/common/Filesystem.hh>
 #include <ignition/gui/Application.hh>
diff --git a/src/gui/plugins/view_angle/ViewAngle.cc b/src/gui/plugins/view_angle/ViewAngle.cc
@@ -17,12 +17,12 @@
 
 #include "ViewAngle.hh"
 
-#include <iostream>
-#include <string>
-
 #include <ignition/msgs/boolean.pb.h>
 #include <ignition/msgs/vector3d.pb.h>
 
+#include <iostream>
+#include <string>
+
 #include <ignition/common/Console.hh>
 #include <ignition/plugin/Register.hh>
 #include <ignition/transport/Node.hh>
diff --git a/src/systems/air_pressure/AirPressure.cc b/src/systems/air_pressure/AirPressure.cc
@@ -17,12 +17,12 @@
 
 #include "AirPressure.hh"
 
+#include <ignition/msgs/air_pressure_sensor.pb.h>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include <ignition/msgs/air_pressure_sensor.pb.h>
-
 #include <ignition/plugin/Register.hh>
 
 #include <ignition/common/Profiler.hh>
diff --git a/src/systems/altimeter/Altimeter.cc b/src/systems/altimeter/Altimeter.cc
@@ -17,12 +17,12 @@
 
 #include "Altimeter.hh"
 
+#include <ignition/msgs/altimeter.pb.h>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include <ignition/msgs/altimeter.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/plugin/Register.hh>
 
diff --git a/src/systems/battery_plugin/LinearBatteryPlugin.cc b/src/systems/battery_plugin/LinearBatteryPlugin.cc
@@ -17,16 +17,16 @@
 
 #include "LinearBatteryPlugin.hh"
 
+#include <ignition/msgs/battery_state.pb.h>
+#include <ignition/msgs/boolean.pb.h>
+
 #include <algorithm>
 #include <atomic>
 #include <deque>
 #include <functional>
 #include <string>
 #include <vector>
 
-#include <ignition/msgs/battery_state.pb.h>
-#include <ignition/msgs/boolean.pb.h>
-
 #include <ignition/common/Battery.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/common/Util.hh>
diff --git a/src/systems/breadcrumbs/Breadcrumbs.cc b/src/systems/breadcrumbs/Breadcrumbs.cc
@@ -17,13 +17,13 @@
 
 #include "Breadcrumbs.hh"
 
+#include <ignition/msgs/empty.pb.h>
+
 #include <algorithm>
 #include <iterator>
 #include <string>
 #include <utility>
 
-#include <ignition/msgs/empty.pb.h>
-
 #include <ignition/common/Profiler.hh>
 
 #include <ignition/math/Quaternion.hh>
diff --git a/src/systems/breadcrumbs/Breadcrumbs.hh b/src/systems/breadcrumbs/Breadcrumbs.hh
@@ -23,6 +23,7 @@
 #include <vector>
 
 #include <sdf/Element.hh>
+#include <sdf/Geometry.hh>
 #include <sdf/Root.hh>
 
 #include <ignition/transport/Node.hh>
diff --git a/src/systems/contact/Contact.cc b/src/systems/contact/Contact.cc
@@ -17,14 +17,14 @@
 
 #include "Contact.hh"
 
+#include <ignition/msgs/contact.pb.h>
+#include <ignition/msgs/contacts.pb.h>
+
 #include <string>
 #include <unordered_map>
 #include <utility>
 #include <vector>
 
-#include <ignition/msgs/contact.pb.h>
-#include <ignition/msgs/contacts.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/plugin/Register.hh>
 
diff --git a/src/systems/diff_drive/DiffDrive.cc b/src/systems/diff_drive/DiffDrive.cc
@@ -17,13 +17,13 @@
 
 #include "DiffDrive.hh"
 
+#include <ignition/msgs/odometry.pb.h>
+
 #include <limits>
 #include <mutex>
 #include <string>
 #include <vector>
 
-#include <ignition/msgs/odometry.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/math/DiffDriveOdometry.hh>
 #include <ignition/math/Quaternion.hh>
diff --git a/src/systems/joint_controller/JointController.cc b/src/systems/joint_controller/JointController.cc
@@ -17,9 +17,10 @@
 
 #include "JointController.hh"
 
+#include <ignition/msgs/double.pb.h>
+
 #include <string>
 
-#include <ignition/msgs/double.pb.h>
 #include <ignition/common/Profiler.hh>
 #include <ignition/math/PID.hh>
 #include <ignition/plugin/Register.hh>
diff --git a/src/systems/joint_position_controller/JointPositionController.cc b/src/systems/joint_position_controller/JointPositionController.cc
@@ -17,9 +17,10 @@
 
 #include "JointPositionController.hh"
 
+#include <ignition/msgs/double.pb.h>
+
 #include <string>
 
-#include <ignition/msgs/double.pb.h>
 #include <ignition/common/Profiler.hh>
 #include <ignition/math/PID.hh>
 #include <ignition/plugin/Register.hh>
diff --git a/src/systems/joint_state_publisher/JointStatePublisher.cc b/src/systems/joint_state_publisher/JointStatePublisher.cc
@@ -17,10 +17,11 @@
 
 #include "JointStatePublisher.hh"
 
+#include <ignition/msgs/model.pb.h>
+
 #include <string>
 #include <vector>
 
-#include <ignition/msgs/model.pb.h>
 #include <ignition/plugin/Register.hh>
 
 #include "ignition/gazebo/components/Name.hh"
diff --git a/src/systems/log/LogPlayback.cc b/src/systems/log/LogPlayback.cc
@@ -17,13 +17,13 @@
 
 #include "LogPlayback.hh"
 
+#include <ignition/msgs/pose_v.pb.h>
+#include <ignition/msgs/log_playback_stats.pb.h>
+
 #include <set>
 #include <string>
 #include <unordered_map>
 
-#include <ignition/msgs/pose_v.pb.h>
-#include <ignition/msgs/log_playback_stats.pb.h>
-
 #include <ignition/common/Filesystem.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/common/Time.hh>
diff --git a/src/systems/log_video_recorder/LogVideoRecorder.cc b/src/systems/log_video_recorder/LogVideoRecorder.cc
@@ -17,13 +17,13 @@
 
 #include "LogVideoRecorder.hh"
 
+#include <ignition/msgs/scene.pb.h>
+#include <ignition/msgs/stringmsg.pb.h>
+
 #include <chrono>
 #include <set>
 #include <string>
 
-#include <ignition/msgs/scene.pb.h>
-#include <ignition/msgs/stringmsg.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/math/AxisAlignedBox.hh>
 #include <ignition/plugin/Register.hh>
diff --git a/src/systems/logical_camera/LogicalCamera.cc b/src/systems/logical_camera/LogicalCamera.cc
@@ -17,13 +17,13 @@
 
 #include "LogicalCamera.hh"
 
+#include <ignition/msgs/logical_camera_image.pb.h>
+
 #include <map>
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include <ignition/msgs/logical_camera_image.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/plugin/Register.hh>
 
diff --git a/src/systems/physics/Physics.cc b/src/systems/physics/Physics.cc
@@ -17,18 +17,18 @@
 
 #include "Physics.hh"
 
+#include <ignition/msgs/contact.pb.h>
+#include <ignition/msgs/contacts.pb.h>
+#include <ignition/msgs/entity.pb.h>
+#include <ignition/msgs/Utility.hh>
+
 #include <algorithm>
 #include <iostream>
 #include <deque>
 #include <string>
 #include <unordered_map>
 #include <vector>
 
-#include <ignition/msgs/contact.pb.h>
-#include <ignition/msgs/contacts.pb.h>
-#include <ignition/msgs/entity.pb.h>
-#include <ignition/msgs/Utility.hh>
-
 #include <ignition/common/MeshManager.hh>
 #include <ignition/common/Profiler.hh>
 #include <ignition/common/SystemPaths.hh>
diff --git a/src/systems/pose_publisher/PosePublisher.cc b/src/systems/pose_publisher/PosePublisher.cc
@@ -17,15 +17,15 @@
 
 #include "PosePublisher.hh"
 
+#include <ignition/msgs/pose.pb.h>
+
 #include <stack>
 #include <string>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 #include <vector>
 
-#include <ignition/msgs/pose.pb.h>
-
 #include <sdf/Joint.hh>
 
 #include <ignition/common/Profiler.hh>
diff --git a/src/systems/scene_broadcaster/SceneBroadcaster.cc b/src/systems/scene_broadcaster/SceneBroadcaster.cc
@@ -17,12 +17,12 @@
 
 #include "SceneBroadcaster.hh"
 
+#include <ignition/msgs/scene.pb.h>
+
 #include <chrono>
 #include <condition_variable>
 #include <string>
 
-#include <ignition/msgs/scene.pb.h>
-
 #include <ignition/common/Profiler.hh>
 #include <ignition/math/graph/Graph.hh>
 #include <ignition/plugin/Register.hh>
diff --git a/src/systems/sensors/Sensors.hh b/src/systems/sensors/Sensors.hh
diff --git a/src/systems/triggered_publisher/TriggeredPublisher.cc b/src/systems/triggered_publisher/TriggeredPublisher.cc
diff --git a/src/systems/user_commands/UserCommands.cc b/src/systems/user_commands/UserCommands.cc
diff --git a/src/systems/wind_effects/WindEffects.cc b/src/systems/wind_effects/WindEffects.cc

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@`
`22`	`22`	`#include <ignition/transport/Node.hh>`
`23`	`23`
`24`	`24`	`#include "ignition/gazebo/Export.hh"`
	`25`	`+#include "ignition/gazebo/config.hh"`
`25`	`26`
`26`	`27`	`namespace ignition`
`27`	`28`	`{`