Update headers

Signed-off-by: Addisu Z. Taddese <addisu@openrobotics.org>
gazebosim · Nov 14, 2023 · 3853cf2 · 3853cf2
1 parent 682dd66
commit 3853cf2
Show file tree

Hide file tree

Showing 31 changed files with 140 additions and 140 deletions.
diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/actuator_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/actuator_msgs.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__ACTUATOR_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/actuators.pb.h>
+#include <gz/msgs/actuators.pb.h>
 
 // ROS 2 messages
 #include <actuator_msgs/msg/actuators.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/builtin_interfaces.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/builtin_interfaces.hpp
@@ -15,7 +15,7 @@
 #ifndef ROS_GZ_BRIDGE__CONVERT__BUILTIN_INTERFACES_HPP_
 #define ROS_GZ_BRIDGE__CONVERT__BUILTIN_INTERFACES_HPP_
 
-#include <ignition/msgs/time.pb.h>
+#include <gz/msgs/time.pb.h>
 
 #include <builtin_interfaces/msg/time.hpp>
 

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/geometry_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/geometry_msgs.hpp
@@ -16,14 +16,14 @@
 #define ROS_GZ_BRIDGE__CONVERT__GEOMETRY_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/quaternion.pb.h>
-#include <ignition/msgs/vector3d.pb.h>
-#include <ignition/msgs/pose.pb.h>
-#include <ignition/msgs/pose_with_covariance.pb.h>
-#include <ignition/msgs/pose_v.pb.h>
-#include <ignition/msgs/twist.pb.h>
-#include <ignition/msgs/twist_with_covariance.pb.h>
-#include <ignition/msgs/wrench.pb.h>
+#include <gz/msgs/quaternion.pb.h>
+#include <gz/msgs/vector3d.pb.h>
+#include <gz/msgs/pose.pb.h>
+#include <gz/msgs/pose_with_covariance.pb.h>
+#include <gz/msgs/pose_v.pb.h>
+#include <gz/msgs/twist.pb.h>
+#include <gz/msgs/twist_with_covariance.pb.h>
+#include <gz/msgs/wrench.pb.h>
 
 // ROS 2 messages
 #include <geometry_msgs/msg/point.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/nav_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/nav_msgs.hpp
@@ -16,8 +16,8 @@
 #define ROS_GZ_BRIDGE__CONVERT__NAV_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/odometry.pb.h>
-#include <ignition/msgs/odometry_with_covariance.pb.h>
+#include <gz/msgs/odometry.pb.h>
+#include <gz/msgs/odometry_with_covariance.pb.h>
 
 // ROS 2 messages
 #include <nav_msgs/msg/odometry.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/rcl_interfaces.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/rcl_interfaces.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__RCL_INTERFACES_HPP_
 
 // Ignition messages
-#include <ignition/msgs/any.pb.h>
+#include <gz/msgs/any.pb.h>
 
 // ROS 2 messages
 #include <rcl_interfaces/msg/parameter.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/ros_gz_interfaces.hpp
@@ -16,21 +16,21 @@
 #define ROS_GZ_BRIDGE__CONVERT__ROS_GZ_INTERFACES_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/altimeter.pb.h>
-#include <ignition/msgs/entity.pb.h>
-#include <ignition/msgs/joint_wrench.pb.h>
-#include <ignition/msgs/contact.pb.h>
-#include <ignition/msgs/contacts.pb.h>
-#include <ignition/msgs/float_v.pb.h>
-#include <ignition/msgs/gui_camera.pb.h>
-#include <ignition/msgs/light.pb.h>
-#include <ignition/msgs/param.pb.h>
-#include <ignition/msgs/param_v.pb.h>
-#include <ignition/msgs/sensor_noise.pb.h>
-#include <ignition/msgs/stringmsg_v.pb.h>
-#include <ignition/msgs/track_visual.pb.h>
-#include <ignition/msgs/video_record.pb.h>
-#include <ignition/msgs/world_control.pb.h>
+#include <gz/msgs/altimeter.pb.h>
+#include <gz/msgs/entity.pb.h>
+#include <gz/msgs/joint_wrench.pb.h>
+#include <gz/msgs/contact.pb.h>
+#include <gz/msgs/contacts.pb.h>
+#include <gz/msgs/float_v.pb.h>
+#include <gz/msgs/gui_camera.pb.h>
+#include <gz/msgs/light.pb.h>
+#include <gz/msgs/param.pb.h>
+#include <gz/msgs/param_v.pb.h>
+#include <gz/msgs/sensor_noise.pb.h>
+#include <gz/msgs/stringmsg_v.pb.h>
+#include <gz/msgs/track_visual.pb.h>
+#include <gz/msgs/video_record.pb.h>
+#include <gz/msgs/world_control.pb.h>
 
 // ROS 2 messages
 #include <ros_gz_interfaces/msg/altimeter.hpp>
@@ -52,7 +52,7 @@
 #include <ros_gz_bridge/ros_gz_bridge.hpp>
 
 #if HAVE_DATAFRAME
-#include <ignition/msgs/dataframe.pb.h>
+#include <gz/msgs/dataframe.pb.h>
 #include <ros_gz_interfaces/msg/dataframe.hpp>
 #endif  // HAVE_DATAFRAME
 

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/rosgraph_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/rosgraph_msgs.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__ROSGRAPH_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs.hh>
+#include <gz/msgs.hh>
 
 // ROS 2 messages
 #include <rosgraph_msgs/msg/clock.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/sensor_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/sensor_msgs.hpp
@@ -16,17 +16,17 @@
 #define ROS_GZ_BRIDGE__CONVERT__SENSOR_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/battery_state.pb.h>
-#include <ignition/msgs/camera_info.pb.h>
-#include <ignition/msgs/fluid_pressure.pb.h>
-#include <ignition/msgs/image.pb.h>
-#include <ignition/msgs/imu.pb.h>
-#include <ignition/msgs/joy.pb.h>
-#include <ignition/msgs/laserscan.pb.h>
-#include <ignition/msgs/magnetometer.pb.h>
-#include <ignition/msgs/model.pb.h>
-#include <ignition/msgs/navsat.pb.h>
-#include <ignition/msgs/pointcloud_packed.pb.h>
+#include <gz/msgs/battery_state.pb.h>
+#include <gz/msgs/camera_info.pb.h>
+#include <gz/msgs/fluid_pressure.pb.h>
+#include <gz/msgs/image.pb.h>
+#include <gz/msgs/imu.pb.h>
+#include <gz/msgs/joy.pb.h>
+#include <gz/msgs/laserscan.pb.h>
+#include <gz/msgs/magnetometer.pb.h>
+#include <gz/msgs/model.pb.h>
+#include <gz/msgs/navsat.pb.h>
+#include <gz/msgs/pointcloud_packed.pb.h>
 
 // ROS 2 messages
 #include <sensor_msgs/msg/battery_state.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/std_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/std_msgs.hpp
@@ -16,15 +16,15 @@
 #define ROS_GZ_BRIDGE__CONVERT__STD_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/color.pb.h>
-#include <ignition/msgs/empty.pb.h>
-#include <ignition/msgs/float.pb.h>
-#include <ignition/msgs/double.pb.h>
-#include <ignition/msgs/header.pb.h>
-#include <ignition/msgs/int32.pb.h>
-#include <ignition/msgs/uint32.pb.h>
-#include <ignition/msgs/stringmsg.pb.h>
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/color.pb.h>
+#include <gz/msgs/empty.pb.h>
+#include <gz/msgs/float.pb.h>
+#include <gz/msgs/double.pb.h>
+#include <gz/msgs/header.pb.h>
+#include <gz/msgs/int32.pb.h>
+#include <gz/msgs/uint32.pb.h>
+#include <gz/msgs/stringmsg.pb.h>
 
 // ROS 2 messages
 #include <std_msgs/msg/bool.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/tf2_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/tf2_msgs.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__TF2_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/pose_v.pb.h>
+#include <gz/msgs/pose_v.pb.h>
 
 // ROS 2 messages
 #include <tf2_msgs/msg/tf_message.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/trajectory_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/trajectory_msgs.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__TRAJECTORY_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/joint_trajectory.pb.h>
+#include <gz/msgs/joint_trajectory.pb.h>
 
 // ROS 2 messages
 #include <trajectory_msgs/msg/joint_trajectory.hpp>

diff --git a/ros_gz_bridge/include/ros_gz_bridge/convert/vision_msgs.hpp b/ros_gz_bridge/include/ros_gz_bridge/convert/vision_msgs.hpp
@@ -16,7 +16,7 @@
 #define ROS_GZ_BRIDGE__CONVERT__VISION_MSGS_HPP_
 
 // Gazebo Msgs
-#include <ignition/msgs/annotated_axis_aligned_2d_box_v.pb.h>
+#include <gz/msgs/annotated_axis_aligned_2d_box_v.pb.h>
 
 // ROS 2 messages
 #include "vision_msgs/msg/detection2_d_array.hpp"

diff --git a/ros_gz_bridge/include/ros_gz_bridge/ros_gz_bridge.hpp b/ros_gz_bridge/include/ros_gz_bridge/ros_gz_bridge.hpp
@@ -19,8 +19,8 @@
 #include <string>
 #include <vector>
 
-#include <ignition/msgs/config.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/msgs/config.hh>
+#include <gz/transport/Node.hh>
 #include <rclcpp/node.hpp>
 #include "ros_gz_bridge/bridge_config.hpp"
 

diff --git a/ros_gz_bridge/src/bridge_handle.hpp b/ros_gz_bridge/src/bridge_handle.hpp
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 #include <rclcpp/node.hpp>
 
 #include "get_factory.hpp"

diff --git a/ros_gz_bridge/src/bridge_handle_gz_to_ros.hpp b/ros_gz_bridge/src/bridge_handle_gz_to_ros.hpp
@@ -17,7 +17,7 @@
 
 #include <memory>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 #include <rclcpp/subscription_base.hpp>
 
 #include "bridge_handle.hpp"

diff --git a/ros_gz_bridge/src/bridge_handle_ros_to_gz.cpp b/ros_gz_bridge/src/bridge_handle_ros_to_gz.cpp
@@ -14,7 +14,7 @@
 
 #include "bridge_handle_ros_to_gz.hpp"
 
-#include <ignition/transport/TopicUtils.hh>
+#include <gz/transport/TopicUtils.hh>
 
 namespace ros_gz_bridge
 {

diff --git a/ros_gz_bridge/src/bridge_handle_ros_to_gz.hpp b/ros_gz_bridge/src/bridge_handle_ros_to_gz.hpp
@@ -15,7 +15,7 @@
 #ifndef BRIDGE_HANDLE_ROS_TO_GZ_HPP_
 #define BRIDGE_HANDLE_ROS_TO_GZ_HPP_
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 #include <rclcpp/subscription_base.hpp>
 
 #include "bridge_handle.hpp"

diff --git a/ros_gz_bridge/src/factory.hpp b/ros_gz_bridge/src/factory.hpp
@@ -19,7 +19,7 @@
 #include <memory>
 #include <string>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 
 // include ROS 2
 #include <rclcpp/rclcpp.hpp>

diff --git a/ros_gz_bridge/src/factory_interface.hpp b/ros_gz_bridge/src/factory_interface.hpp
@@ -19,7 +19,7 @@
 #include <string>
 
 // include Gazebo Transport
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 
 // include ROS 2
 #include <rclcpp/rclcpp.hpp>

diff --git a/ros_gz_bridge/src/service_factories/ros_gz_interfaces.cpp b/ros_gz_bridge/src/service_factories/ros_gz_interfaces.cpp
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/world_control.pb.h>
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/world_control.pb.h>
 
 #include <memory>
 #include <string>

diff --git a/ros_gz_bridge/src/service_factory.hpp b/ros_gz_bridge/src/service_factory.hpp
@@ -20,7 +20,7 @@
 #include <string>
 #include <utility>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 
 #include <rclcpp/rclcpp.hpp>
 

diff --git a/ros_gz_bridge/src/service_factory_interface.hpp b/ros_gz_bridge/src/service_factory_interface.hpp
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 
 #include <rclcpp/service.hpp>
 #include <rclcpp/node.hpp>

diff --git a/ros_gz_bridge/test/resource/gz_publisher.cpp.em b/ros_gz_bridge/test/resource/gz_publisher.cpp.em
@@ -14,8 +14,8 @@
 
 // This file is generated from test/resource/gz_publisher.cpp.em
 
-#include <ignition/msgs.hh>
-#include <ignition/transport.hh>
+#include <gz/msgs.hh>
+#include <gz/transport.hh>
 
 #include <atomic>
 #include <chrono>

diff --git a/ros_gz_bridge/test/resource/gz_subscriber.cpp.em b/ros_gz_bridge/test/resource/gz_subscriber.cpp.em
@@ -14,7 +14,7 @@
 
 
 #include <gtest/gtest.h>
-#include <ignition/transport.hh>
+#include <gz/transport.hh>
 
 #include <chrono>
 #include <memory>

diff --git a/ros_gz_bridge/test/serverclient/gz_server.cpp b/ros_gz_bridge/test/serverclient/gz_server.cpp
@@ -12,16 +12,16 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <ignition/msgs/boolean.pb.h>
-#include <ignition/msgs/world_control.pb.h>
+#include <gz/msgs/boolean.pb.h>
+#include <gz/msgs/world_control.pb.h>
 
 #include <atomic>
 #include <chrono>
 #include <csignal>
 #include <iostream>
 #include <thread>
 
-#include <ignition/transport.hh>
+#include <gz/transport.hh>
 
 #include "utils/test_utils.hpp"
 #include "utils/gz_test_msg.hpp"