Use ignition::gazebo:: in class instantiation (#1967)

Fixes macOS build.

Signed-off-by: Steve Peters <[email protected]>

src/EntityComponentManager.cc

@@ -32,7 +32,7 @@
 using namespace gz;
 using namespace gz::sim;
 
-class gz::sim::EntityComponentManagerPrivate
+class ignition::gazebo::EntityComponentManagerPrivate
 {
   /// \brief Implementation of the CreateEntity function, which takes a specific
   /// entity as input.

src/Link.cc

@@ -36,7 +36,7 @@
 
 #include "gz/sim/Link.hh"
 
-class gz::sim::LinkPrivate
+class ignition::gazebo::LinkPrivate
 {
   /// \brief Id of link entity.
   public: Entity id{kNullEntity};

src/Model.cc

@@ -28,7 +28,7 @@
 #include "gz/sim/components/WindMode.hh"
 #include "gz/sim/Model.hh"
 
-class gz::sim::ModelPrivate
+class ignition::gazebo::ModelPrivate
 {
   /// \brief Id of model entity.
   public: Entity id{kNullEntity};

src/SdfEntityCreator.cc

@@ -70,7 +70,7 @@
 #include "gz/sim/components/WindMode.hh"
 #include "gz/sim/components/World.hh"
 
-class gz::sim::SdfEntityCreatorPrivate
+class ignition::gazebo::SdfEntityCreatorPrivate
 {
   /// \brief Pointer to entity component manager. We don't assume ownership.
   public: EntityComponentManager *ecm{nullptr};

src/ServerConfig.cc

@@ -31,7 +31,7 @@ using namespace gz;
 using namespace gz::sim;
 
 /// \brief Private data for PluginInfoConfig.
-class gz::sim::ServerConfig::PluginInfoPrivate
+class ignition::gazebo::ServerConfig::PluginInfoPrivate
 {
   /// \brief Default constructor.
   public: PluginInfoPrivate() = default;
@@ -192,7 +192,7 @@ void ServerConfig::PluginInfo::SetSdf(const sdf::ElementPtr &_sdf)
 }
 
 /// \brief Private data for ServerConfig.
-class gz::sim::ServerConfigPrivate
+class ignition::gazebo::ServerConfigPrivate
 {
   /// \brief Default constructor.
   public: ServerConfigPrivate()

src/SystemLoader.cc

@@ -35,7 +35,7 @@
 
 using namespace gz::sim;
 
-class gz::sim::SystemLoaderPrivate
+class ignition::gazebo::SystemLoaderPrivate
 {
   //////////////////////////////////////////////////
   public: explicit SystemLoaderPrivate() = default;

src/TestFixture.cc

@@ -106,7 +106,7 @@ void HelperSystem::PostUpdate(const UpdateInfo &_info,
 }
 
 //////////////////////////////////////////////////
-class gz::sim::TestFixturePrivate
+class ignition::gazebo::TestFixturePrivate
 {
   /// \brief Initialize fixture
   /// \param[in] _config Server config

src/World.cc

@@ -28,7 +28,7 @@
 #include "gz/sim/components/World.hh"
 #include "gz/sim/World.hh"
 
-class gz::sim::WorldPrivate
+class ignition::gazebo::WorldPrivate
 {
   /// \brief Id of world entity.
   public: Entity id{kNullEntity};

src/rendering/MarkerManager.cc

@@ -37,7 +37,7 @@ using namespace gz;
 using namespace gz::sim;
 
 /// Private data for the MarkerManager class
-class gz::sim::MarkerManagerPrivate
+class ignition::gazebo::MarkerManagerPrivate
 {
   /// \brief Processes a marker message.
   /// \param[in] _msg The message data.

src/rendering/RenderUtil.cc

@@ -75,7 +75,7 @@ using namespace gz;
 using namespace gz::sim;
 
 // Private data class.
-class gz::sim::RenderUtilPrivate
+class ignition::gazebo::RenderUtilPrivate
 {
   /// True if the rendering component is initialized
   public: bool initialized = false;

src/rendering/SceneManager.cc

@@ -50,7 +50,7 @@ using namespace gz::sim;
 using namespace std::chrono_literals;
 
 /// \brief Private data class.
-class gz::sim::SceneManagerPrivate
+class ignition::gazebo::SceneManagerPrivate
 {
   /// \brief Keep track of world ID, which is equivalent to the scene's
   /// root visual.

src/systems/ackermann_steering/AckermannSteering.cc

@@ -54,7 +54,7 @@ struct Commands
   Commands() : lin(0.0), ang(0.0) {}
 };
 
-class gz::sim::systems::AckermannSteeringPrivate
+class ignition::gazebo::systems::AckermannSteeringPrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message

src/systems/air_pressure/AirPressure.cc

@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private AirPressure data class.
-class gz::sim::systems::AirPressurePrivate
+class ignition::gazebo::systems::AirPressurePrivate
 {
   /// \brief A map of air pressure entity to its sensor
   public: std::unordered_map<Entity,

src/systems/altimeter/Altimeter.cc

@@ -50,7 +50,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Altimeter data class.
-class gz::sim::systems::AltimeterPrivate
+class ignition::gazebo::systems::AltimeterPrivate
 {
   /// \brief A map of altimeter entity to its sensor
   public: std::unordered_map<Entity,

src/systems/apply_joint_force/ApplyJointForce.cc

@@ -30,7 +30,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::ApplyJointForcePrivate
+class ignition::gazebo::systems::ApplyJointForcePrivate
 {
   /// \brief Callback for joint force subscription
   /// \param[in] _msg Joint force message

src/systems/apply_link_wrench/ApplyLinkWrench.cc

@@ -41,7 +41,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::ApplyLinkWrenchPrivate
+class ignition::gazebo::systems::ApplyLinkWrenchPrivate
 {
   /// \brief Callback for wrench subscription
   /// \param[in] _msg Wrench message

src/systems/battery_plugin/LinearBatteryPlugin.cc

@@ -52,7 +52,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LinearBatteryPluginPrivate
+class ignition::gazebo::systems::LinearBatteryPluginPrivate
 {
   /// \brief Reset the plugin
   public: void Reset();

src/systems/buoyancy/Buoyancy.cc

@@ -52,7 +52,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::BuoyancyPrivate
+class ignition::gazebo::systems::BuoyancyPrivate
 {
   /// \brief Get the fluid density based on a pose. This function can be
   /// used to adjust the fluid density based on the pose of an object in the

src/systems/camera_video_recorder/CameraVideoRecorder.cc

@@ -51,7 +51,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::CameraVideoRecorderPrivate
+class ignition::gazebo::systems::CameraVideoRecorderPrivate
 {
   /// \brief Callback for the video recorder service
   public: bool OnRecordVideo(const msgs::VideoRecord &_msg,

src/systems/collada_world_exporter/ColladaWorldExporter.cc

@@ -53,7 +53,7 @@ using namespace gz::sim;
 using namespace systems;
 
 
-class gz::sim::systems::ColladaWorldExporterPrivate
+class ignition::gazebo::systems::ColladaWorldExporterPrivate
 {
   // Default constructor
   public: ColladaWorldExporterPrivate() = default;

src/systems/contact/Contact.cc

@@ -81,7 +81,7 @@ class ContactSensor
   public: std::vector<Entity> collisionEntities;
 };
 
-class gz::sim::systems::ContactPrivate
+class ignition::gazebo::systems::ContactPrivate
 {
   /// \brief Create sensors that correspond to entities in the simulation
   /// \param[in] _ecm Mutable reference to ECM.

src/systems/diff_drive/DiffDrive.cc

@@ -53,7 +53,7 @@ struct Commands
   Commands() : lin(0.0), ang(0.0) {}
 };
 
-class gz::sim::systems::DiffDrivePrivate
+class ignition::gazebo::systems::DiffDrivePrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message

src/systems/imu/Imu.cc

@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Imu data class.
-class gz::sim::systems::ImuPrivate
+class ignition::gazebo::systems::ImuPrivate
 {
   /// \brief A map of IMU entity to its IMU sensor.
   public: std::unordered_map<Entity,

src/systems/joint_controller/JointController.cc

@@ -35,7 +35,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::JointControllerPrivate
+class ignition::gazebo::systems::JointControllerPrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message

src/systems/joint_position_controller/JointPositionController.cc

@@ -35,7 +35,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::JointPositionControllerPrivate
+class ignition::gazebo::systems::JointPositionControllerPrivate
 {
   /// \brief Callback for position subscription
   /// \param[in] _msg Position message

src/systems/kinetic_energy_monitor/KineticEnergyMonitor.cc

@@ -43,7 +43,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private data class
-class gz::sim::systems::KineticEnergyMonitorPrivate
+class ignition::gazebo::systems::KineticEnergyMonitorPrivate
 {
   /// \brief Link of the model.
   public: Entity linkEntity;

src/systems/lift_drag/LiftDrag.cc

@@ -44,7 +44,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LiftDragPrivate
+class ignition::gazebo::systems::LiftDragPrivate
 {
   // Initialize the system
   public: void Load(const EntityComponentManager &_ecm,

src/systems/log/LogPlayback.cc

@@ -53,7 +53,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private LogPlayback data class.
-class gz::sim::systems::LogPlaybackPrivate
+class ignition::gazebo::systems::LogPlaybackPrivate
 {
   /// \brief Extract model resource files and state file from compression.
   /// \return True if extraction was successful.

src/systems/log/LogRecord.cc

@@ -65,7 +65,7 @@ using namespace gz;
 using namespace ignition::gazebo::systems;
 
 // Private data class.
-class gz::sim::systems::LogRecordPrivate
+class ignition::gazebo::systems::LogRecordPrivate
 {
   /// \brief Start recording
   /// \param[in] _logPath Path to record to.

src/systems/log_video_recorder/LogVideoRecorder.cc

@@ -45,7 +45,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::LogVideoRecorderPrivate
+class ignition::gazebo::systems::LogVideoRecorderPrivate
 {
   /// \brief Rewind the log
   public: void Rewind();

src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.cc

@@ -43,7 +43,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::LogicalAudioSensorPluginPrivate
+class ignition::gazebo::systems::LogicalAudioSensorPluginPrivate
 {
   /// \brief Creates an audio source with attributes specified in an SDF file.
   /// \param[in] _elem A pointer to the source element in the SDF file.

src/systems/logical_camera/LogicalCamera.cc

@@ -51,7 +51,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private LogicalCamera data class.
-class gz::sim::systems::LogicalCameraPrivate
+class ignition::gazebo::systems::LogicalCameraPrivate
 {
   /// \brief A map of logicalCamera entities
   public: std::unordered_map<Entity,

src/systems/magnetometer/Magnetometer.cc

@@ -48,7 +48,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Magnetometer data class.
-class gz::sim::systems::MagnetometerPrivate
+class ignition::gazebo::systems::MagnetometerPrivate
 {
   /// \brief A map of magnetometer entity to its sensor.
   public: std::unordered_map<Entity,

src/systems/multicopter_motor_model/MulticopterMotorModel.cc

@@ -115,7 +115,7 @@ enum class MotorType {
   kForce
 };
 
-class gz::sim::systems::MulticopterMotorModelPrivate
+class ignition::gazebo::systems::MulticopterMotorModelPrivate
 {
   /// \brief Callback for actuator commands.
   public: void OnActuatorMsg(const msgs::Actuators &_msg);

src/systems/physics/Physics.cc

@@ -137,7 +137,7 @@ namespace components = gz::sim::components;
 
 
 // Private data class.
-class gz::sim::systems::PhysicsPrivate
+class ignition::gazebo::systems::PhysicsPrivate
 {
   /// \brief This is the minimum set of features that any physics engine must
   /// implement to be supported by this system.

src/systems/pose_publisher/PosePublisher.cc

@@ -56,7 +56,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private data class for PosePublisher
-class gz::sim::systems::PosePublisherPrivate
+class ignition::gazebo::systems::PosePublisherPrivate
 {
   /// \brief Initializes internal caches for entities whose poses are to be
   /// published and their names

src/systems/scene_broadcaster/SceneBroadcaster.cc

@@ -70,7 +70,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::SceneBroadcasterPrivate
+class ignition::gazebo::systems::SceneBroadcasterPrivate
 {
   /// \brief Type alias for the graph used to represent the scene graph.
   public: using SceneGraphType = math::graph::DirectedGraph<

src/systems/sensors/Sensors.cc

@@ -55,7 +55,7 @@ using namespace gz::sim;
 using namespace systems;
 
 // Private data class.
-class gz::sim::systems::SensorsPrivate
+class ignition::gazebo::systems::SensorsPrivate
 {
   /// \brief Sensor manager object. This manages the lifecycle of the
   /// instantiated sensors.

src/systems/thermal/Thermal.cc

@@ -30,7 +30,7 @@ using namespace gz::sim;
 using namespace systems;
 
 /// \brief Private Thermal data class.
-class gz::sim::systems::ThermalPrivate
+class ignition::gazebo::systems::ThermalPrivate
 {
 };
 

src/systems/touch_plugin/TouchPlugin.cc

@@ -42,7 +42,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::TouchPluginPrivate
+class ignition::gazebo::systems::TouchPluginPrivate
 {
   // Initialize the plugin
   public: void Load(const EntityComponentManager &_ecm,

src/systems/track_controller/TrackController.cc

@@ -44,7 +44,7 @@ using namespace gz;
 using namespace gz::sim;
 using namespace systems;
 
-class gz::sim::systems::TrackControllerPrivate
+class ignition::gazebo::systems::TrackControllerPrivate
 {
   public : ~TrackControllerPrivate() {}
   /// \brief Register a collision entity to work with this system (e.g. enable

src/systems/tracked_vehicle/TrackedVehicle.cc

@@ -56,7 +56,7 @@ struct Commands
   Commands() {}
 };
 
-class gz::sim::systems::TrackedVehiclePrivate
+class ignition::gazebo::systems::TrackedVehiclePrivate
 {
   /// \brief Callback for velocity subscription
   /// \param[in] _msg Velocity message

src/systems/user_commands/UserCommands.cc

@@ -173,7 +173,7 @@ class PhysicsCommand : public UserCommandBase
 }
 
 /// \brief Private UserCommands data class.
-class gz::sim::systems::UserCommandsPrivate
+class ignition::gazebo::systems::UserCommandsPrivate
 {
   /// \brief Callback for create service
   /// \param[in] _req Request containing entity description.