Update headers for missing transitive includes (gazebosim#1566)

Signed-off-by: Michael Carroll <[email protected]> Signed-off-by: Louise Poubel <[email protected]> Co-authored-by: Louise Poubel <[email protected]>
srmainwaring · Aug 31, 2022 · 0942c2e · 0942c2e
1 parent 6184b54
commit 0942c2e
Show file tree

Hide file tree

Showing 47 changed files with 140 additions and 28 deletions.
diff --git a/examples/standalone/comms/publisher.cc b/examples/standalone/comms/publisher.cc
@@ -24,8 +24,9 @@
 #include <string>
 #include <thread>
 
-#include <gz/msgs.hh>
-#include <gz/transport.hh>
+#include <gz/msgs/dataframe.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/transport/Node.hh>
 
 /// \brief Flag used to break the publisher loop and terminate the program.
 static std::atomic<bool> g_terminatePub(false);

diff --git a/examples/standalone/entity_creation/entity_creation.cc b/examples/standalone/entity_creation/entity_creation.cc
@@ -19,6 +19,10 @@
 
 #include <iostream>
 
+#include <gz/math/Color.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/msgs/Utility.hh>
 #include <gz/transport/Node.hh>
 
 // Create a transport node.

diff --git a/examples/standalone/joy_to_twist/joy_to_twist.cc b/examples/standalone/joy_to_twist/joy_to_twist.cc
@@ -19,6 +19,9 @@
  * Adapted from https://github.com/ros-teleop/teleop_twist_joy
  */
 
+#include <gz/msgs/joy.pb.h>
+#include <gz/msgs/twist.pb.h>
+
 #include <gz/transport/Node.hh>
 #include <sdf/sdf.hh>
 

diff --git a/examples/standalone/joystick/joystick.cc b/examples/standalone/joystick/joystick.cc
@@ -19,6 +19,7 @@
 #include <linux/joystick.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <gz/msgs/joy.pb.h>
 #include <gz/math/Helpers.hh>
 #include <gz/transport/Node.hh>
 #include <sdf/sdf.hh>

diff --git a/examples/standalone/light_control/light_control.cc b/examples/standalone/light_control/light_control.cc
@@ -19,10 +19,14 @@
 #include <iostream>
 #include <random>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/entity_factory.pb.h>
+#include <gz/msgs/light.pb.h>
+
 #include <gz/sim/components/Light.hh>
 #include <gz/sim/components/LightCmd.hh>
-#include <gz/msgs.hh>
-#include <gz/transport.hh>
+#include <gz/msgs/Utility.hh>
+#include <gz/transport/Node.hh>
 
 using namespace std::chrono_literals;
 

diff --git a/examples/standalone/multi_lrauv_race/multi_lrauv_race.cc b/examples/standalone/multi_lrauv_race/multi_lrauv_race.cc
@@ -26,8 +26,9 @@
 #include <chrono>
 #include <thread>
 
-#include <gz/msgs.hh>
-#include <gz/transport.hh>
+#include <gz/msgs/double.pb.h>
+
+#include <gz/transport/Node.hh>
 
 // Fin joint limits from tethys model.sdf
 double random_angle_within_limits(double min=-0.261799, double max=0.261799)
@@ -84,7 +85,7 @@ int main(int argc, char** argv)
   propellerCmds.resize(ns.size(), 0.0);
 
   float artificial_speedup = 1;
-  
+
   while (true)
   {
     for (int i = 0; i < ns.size(); i++)

diff --git a/include/gz/sim/comms/MsgManager.hh b/include/gz/sim/comms/MsgManager.hh
@@ -23,6 +23,8 @@
 #include <string>
 #include <unordered_map>
 
+#include <gz/msgs/dataframe.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
 #include <gz/transport/Node.hh>
 #include <gz/utils/ImplPtr.hh>
 #include "gz/sim/config.hh"

diff --git a/include/gz/sim/rendering/SceneManager.hh b/include/gz/sim/rendering/SceneManager.hh
@@ -41,6 +41,7 @@
 #include <gz/math/Inertial.hh>
 #include <gz/math/Matrix4.hh>
 #include <gz/math/Pose3.hh>
+#include <gz/math/SphericalCoordinates.hh>
 #include <gz/math/Vector3.hh>
 
 #include <gz/msgs/particle_emitter.pb.h>

diff --git a/src/ServerPrivate.cc b/src/ServerPrivate.cc
@@ -18,6 +18,11 @@
 
 #include <tinyxml2.h>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/server_control.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
+
 #include <sdf/Root.hh>
 #include <sdf/World.hh>
 

diff --git a/src/ServerPrivate.hh b/src/ServerPrivate.hh
@@ -40,6 +40,8 @@
 
 #include <gz/transport/Node.hh>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
 #include <gz/msgs/server_control.pb.h>
 
 #include "gz/sim/config.hh"

diff --git a/src/SimulationRunner.cc b/src/SimulationRunner.cc
@@ -19,6 +19,16 @@
 
 #include <algorithm>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/clock.pb.h>
+#include <gz/msgs/gui.pb.h>
+#include <gz/msgs/log_playback_control.pb.h>
+#include <gz/msgs/sdf_generator_config.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/world_control.pb.h>
+#include <gz/msgs/world_control_state.pb.h>
+#include <gz/msgs/world_stats.pb.h>
+
 #include <sdf/Root.hh>
 
 #include "gz/common/Profiler.hh"

diff --git a/src/SimulationRunner.hh b/src/SimulationRunner.hh
@@ -17,9 +17,13 @@
 #ifndef GZ_SIM_SIMULATIONRUNNER_HH_
 #define GZ_SIM_SIMULATIONRUNNER_HH_
 
+#include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/gui.pb.h>
 #include <gz/msgs/log_playback_control.pb.h>
 #include <gz/msgs/sdf_generator_config.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/world_control.pb.h>
+#include <gz/msgs/world_control_state.pb.h>
 
 #include <atomic>
 #include <chrono>
@@ -39,7 +43,6 @@
 #include <gz/common/Event.hh>
 #include <gz/common/WorkerPool.hh>
 #include <gz/math/Stopwatch.hh>
-#include <gz/msgs.hh>
 #include <gz/transport/Node.hh>
 
 #include "gz/sim/config.hh"

diff --git a/src/gui/Gui.cc b/src/gui/Gui.cc
@@ -16,6 +16,10 @@
  */
 #include <QScreen>
 
+#include <gz/msgs/gui.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/SignalHandler.hh>
 #include <gz/common/Filesystem.hh>

diff --git a/src/gui/GuiFileHandler.cc b/src/gui/GuiFileHandler.cc
@@ -23,6 +23,10 @@
 #include <gz/common/Profiler.hh>
 #include <gz/gui/Application.hh>
 
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
+#include <gz/msgs/Utility.hh>
+
 #include "GuiFileHandler.hh"
 
 using namespace gz;

diff --git a/src/gui/GuiRunner.cc b/src/gui/GuiRunner.cc
@@ -19,13 +19,17 @@
 #include <utility>
 #include <vector>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/serialized_map.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/world_control_state.pb.h>
+
 #include <gz/common/Console.hh>
 #include <gz/common/Profiler.hh>
 #include <gz/fuel_tools/Interface.hh>
 #include <gz/gui/Application.hh>
 #include <gz/gui/GuiEvents.hh>
 #include <gz/gui/MainWindow.hh>
-#include <gz/msgs.hh>
 #include <gz/transport/Node.hh>
 
 // Include all components so they have first-class support

diff --git a/src/gui/Gui_TEST.cc b/src/gui/Gui_TEST.cc
@@ -17,7 +17,9 @@
 
 #include <gtest/gtest.h>
 
+#include <gz/msgs/gui.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
 
 #include <gz/common/Console.hh>
 #include <gz/common/StringUtils.hh>

diff --git a/src/gui/PathManager.cc b/src/gui/PathManager.cc
@@ -18,6 +18,7 @@
 #include "PathManager.hh"
 
 #include <gz/msgs/sdf_generator_config.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
 
 #include <string>
 #include <vector>

diff --git a/src/gui/plugins/component_inspector/Pose3d.cc b/src/gui/plugins/component_inspector/Pose3d.cc
@@ -19,6 +19,7 @@
 
 #include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/pose.pb.h>
+#include <gz/msgs/Utility.hh>
 
 #include "Pose3d.hh"
 

diff --git a/src/gui/plugins/copy_paste/CopyPaste.cc b/src/gui/plugins/copy_paste/CopyPaste.cc
@@ -24,7 +24,7 @@
 #include <gz/gui/GuiEvents.hh>
 #include <gz/gui/MainWindow.hh>
 #include <gz/plugin/Register.hh>
-#include <gz/transport.hh>
+#include <gz/transport/Node.hh>
 
 #include "gz/sim/components/Name.hh"
 #include "gz/sim/gui/GuiEvents.hh"

diff --git a/src/gui/plugins/copy_paste/CopyPaste.hh b/src/gui/plugins/copy_paste/CopyPaste.hh
@@ -20,7 +20,9 @@
 
 #include <memory>
 
-#include <gz/msgs.hh>
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/empty.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
 
 #include "gz/sim/gui/GuiSystem.hh"
 

diff --git a/src/gui/plugins/resource_spawner/ResourceSpawner.cc b/src/gui/plugins/resource_spawner/ResourceSpawner.cc
@@ -19,6 +19,7 @@
 
 #include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
 
 #include <algorithm>
 #include <set>

diff --git a/src/gui/plugins/transform_control/TransformControl.cc b/src/gui/plugins/transform_control/TransformControl.cc
@@ -18,7 +18,9 @@
 #include "TransformControl.hh"
 
 #include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/pose.pb.h>
 #include <gz/msgs/stringmsg.pb.h>
+#include <gz/msgs/Utility.hh>
 
 #include <algorithm>
 #include <iostream>

diff --git a/src/gui/plugins/view_angle/ViewAngle.cc b/src/gui/plugins/view_angle/ViewAngle.cc
@@ -19,7 +19,9 @@
 
 #include <gz/msgs/boolean.pb.h>
 #include <gz/msgs/gui_camera.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
 #include <gz/msgs/vector3d.pb.h>
+#include <gz/msgs/Utility.hh>
 
 #include <iostream>
 #include <string>

diff --git a/src/network/NetworkManagerPrimary.hh b/src/network/NetworkManagerPrimary.hh
@@ -29,6 +29,7 @@
 #include <gz/sim/Entity.hh>
 #include <gz/transport/Node.hh>
 
+#include <gz/msgs/serialized_map.pb.h>
 #include "msgs/simulation_step.pb.h"
 
 #include "NetworkManager.hh"

diff --git a/src/rendering/MarkerManager.cc b/src/rendering/MarkerManager.cc
@@ -21,12 +21,15 @@
 #include <mutex>
 #include <string>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/marker.pb.h>
+#include <gz/msgs/marker_v.pb.h>
+
 #include <gz/math/Color.hh>
 #include <gz/math/Helpers.hh>
 #include <gz/math/Pose3.hh>
 #include <gz/math/Rand.hh>
 #include <gz/math/Vector3.hh>
-#include <gz/msgs.hh>
 #include <gz/transport/Node.hh>
 
 #include "gz/sim/Events.hh"

diff --git a/src/systems/apply_joint_force/ApplyJointForce.cc b/src/systems/apply_joint_force/ApplyJointForce.cc
@@ -20,6 +20,7 @@
 #include <string>
 
 #include <gz/common/Profiler.hh>
+#include <gz/msgs/double.pb.h>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 

diff --git a/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh b/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
@@ -25,6 +25,8 @@
 #include <sstream>
 #include <utility>
 
+#include <gz/msgs/double.pb.h>
+
 #include <gz/common/Console.hh>
 
 #include "../ElevatorStateMachine.hh"

diff --git a/src/systems/hydrodynamics/Hydrodynamics.cc b/src/systems/hydrodynamics/Hydrodynamics.cc
@@ -18,9 +18,10 @@
 
 #include <Eigen/Eigen>
 
-#include <gz/plugin/Register.hh>
+#include <gz/msgs/vector3d.pb.h>
+#include <gz/msgs/Utility.hh>
 
-#include "gz/msgs/vector3d.pb.h"
+#include <gz/plugin/Register.hh>
 
 #include "gz/sim/components/AngularVelocity.hh"
 #include "gz/sim/components/LinearVelocity.hh"

diff --git a/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc b/src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc
@@ -25,14 +25,16 @@
 #include <unordered_set>
 #include <utility>
 
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/double.pb.h>
+
 #include <gz/sim/components/LogicalAudio.hh>
 #include <gz/sim/components/Model.hh>
 #include <gz/sim/components/Name.hh>
 #include <gz/sim/components/Pose.hh>
 #include <gz/sim/components/Sensor.hh>
 #include <gz/sim/components/World.hh>
-#include <gz/msgs.hh>
-#include <gz/transport.hh>
+#include <gz/transport/Node.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/sim/SdfEntityCreator.hh>
 #include <gz/sim/Util.hh>

diff --git a/src/systems/multicopter_motor_model/MulticopterMotorModel.cc b/src/systems/multicopter_motor_model/MulticopterMotorModel.cc
@@ -26,6 +26,8 @@
 #include <mutex>
 #include <string>
 
+#include <gz/msgs/actuators.pb.h>
+
 #include <gz/common/Profiler.hh>
 
 #include <gz/plugin/Register.hh>
@@ -34,7 +36,7 @@
 #include <gz/math/Helpers.hh>
 #include <gz/math/Pose3.hh>
 #include <gz/math/Vector3.hh>
-#include <gz/msgs.hh>
+#include <gz/msgs/Utility.hh>
 
 #include <sdf/sdf.hh>
 

diff --git a/src/systems/velocity_control/VelocityControl.cc b/src/systems/velocity_control/VelocityControl.cc
@@ -21,8 +21,11 @@
 #include <vector>
 #include <unordered_map>
 
+#include <gz/msgs/twist.pb.h>
+
 #include <gz/common/Profiler.hh>
 #include <gz/math/Vector3.hh>
+#include <gz/msgs/Utility.hh>
 #include <gz/plugin/Register.hh>
 #include <gz/transport/Node.hh>
 

diff --git a/test/integration/camera_sensor_background.cc b/test/integration/camera_sensor_background.cc
@@ -19,6 +19,8 @@
 
 #include <string>
 
+#include <gz/msgs/image.pb.h>
+
 #include <gz/transport/Node.hh>
 #include <gz/utils/ExtraTestMacros.hh>
 

diff --git a/test/integration/camera_sensor_background_from_scene.cc b/test/integration/camera_sensor_background_from_scene.cc
@@ -17,6 +17,8 @@
 
 #include <gtest/gtest.h>
 
+#include <gz/msgs/image.pb.h>
+
 #include <string>
 
 #include <gz/transport/Node.hh>