Fix visibility macro names when used by a different component (Windows)

include/ignition/gazebo/gui/Gui.hh

@@ -22,7 +22,7 @@
 #include <ignition/gui/Application.hh>
 
 #include "ignition/gazebo/config.hh"
-#include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/gui/Export.hh"
 
 namespace ignition
 {
@@ -41,7 +41,7 @@ namespace gui
   /// ign-tools. Set to the name of the application if using ign-tools)
   /// \param[in] _guiConfig The GUI configuration file. If nullptr, the default
   /// configuration from IGN_HOMEDIR/.ignition/gazebo/gui.config will be used.
-  IGNITION_GAZEBO_VISIBLE int runGui(int &_argc, char **_argv,
+  IGNITION_GAZEBO_GUI_VISIBLE int runGui(int &_argc, char **_argv,
                                      const char *_guiConfig);
 
   /// \brief Create a Gazebo GUI application
@@ -60,7 +60,8 @@ namespace gui
   /// IGN_HOMEDIR/.ignition/gazebo/gui.config will be used.
   /// \param[in] _loadPluginsFromSdf If true, plugins specified in the world
   /// SDFormat file will get loaded.
-  IGNITION_GAZEBO_VISIBLE std::unique_ptr<ignition::gui::Application> createGui(
+  IGNITION_GAZEBO_GUI_VISIBLE
+  std::unique_ptr<ignition::gui::Application> createGui(
       int &_argc, char **_argv, const char *_guiConfig,
       const char *_defaultGuiConfig = nullptr, bool _loadPluginsFromSdf = true);
 

include/ignition/gazebo/gui/GuiRunner.hh

@@ -25,7 +25,7 @@
 #include <ignition/transport/Node.hh>
 
 #include "ignition/gazebo/EntityComponentManager.hh"
-#include "ignition/gazebo/Export.hh"
+#include "ignition/gazebo/gui/Export.hh"
 
 namespace ignition
 {
@@ -35,7 +35,7 @@ namespace gazebo
 inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 /// \brief Responsible for running GUI systems as new states are received from
 /// the backend.
-class IGNITION_GAZEBO_VISIBLE GuiRunner : public QObject
+class IGNITION_GAZEBO_GUI_VISIBLE GuiRunner : public QObject
 {
   Q_OBJECT
 

include/ignition/gazebo/rendering/MarkerManager.hh

@@ -20,6 +20,8 @@
 #include <memory>
 #include <string>
 
+#include <ignition/gazebo/rendering/Export.hh>
+
 #include "ignition/rendering/RenderTypes.hh"
 
 namespace ignition
@@ -32,7 +34,7 @@ class MarkerManagerPrivate;
 
 /// \brief Creates, deletes, and maintains marker visuals. Only the
 /// Scene class should instantiate and use this class.
-class IGNITION_GAZEBO_VISIBLE MarkerManager
+class IGNITION_GAZEBO_RENDERING_VISIBLE MarkerManager
 {
   /// \brief Constructor
   public: MarkerManager();

include/ignition/gazebo/rendering/RenderUtil.hh

@@ -24,7 +24,7 @@
 #include <sdf/Sensor.hh>
 
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
+#include <ignition/gazebo/rendering/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 #include "ignition/gazebo/rendering/SceneManager.hh"
@@ -41,7 +41,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
   class RenderUtilPrivate;
 
   /// \class RenderUtil RenderUtil.hh ignition/gazebo/gui/plugins/RenderUtil.hh
-  class IGNITION_GAZEBO_VISIBLE RenderUtil
+  class IGNITION_GAZEBO_RENDERING_VISIBLE RenderUtil
   {
     /// \brief Constructor
     public: explicit RenderUtil();

include/ignition/gazebo/rendering/SceneManager.hh

@@ -38,7 +38,7 @@
 
 #include <ignition/gazebo/config.hh>
 #include <ignition/gazebo/Entity.hh>
-#include <ignition/gazebo/Export.hh>
+#include <ignition/gazebo/rendering/Export.hh>
 
 namespace ignition
 {
@@ -84,7 +84,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
   };
 
   /// \brief Scene manager class for loading and managing objects in the scene
-  class IGNITION_GAZEBO_VISIBLE SceneManager
+  class IGNITION_GAZEBO_RENDERING_VISIBLE SceneManager
   {
     /// \brief Constructor
     public: SceneManager();

src/systems/air_pressure/AirPressure.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -36,7 +35,7 @@ namespace systems
   /// \class AirPressure AirPressure.hh ignition/gazebo/systems/AirPressure.hh
   /// \brief An air pressure sensor that reports vertical position and velocity
   /// readings over ign transport
-  class IGNITION_GAZEBO_VISIBLE AirPressure:
+  class AirPressure:
     public System,
     public ISystemPreUpdate,
     public ISystemPostUpdate

src/systems/altimeter/Altimeter.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -36,7 +35,7 @@ namespace systems
   /// \class Altimeter Altimeter.hh ignition/gazebo/systems/Altimeter.hh
   /// \brief An altimeter sensor that reports vertical position and velocity
   /// readings over ign transport
-  class IGNITION_GAZEBO_VISIBLE Altimeter:
+  class Altimeter:
     public System,
     public ISystemPreUpdate,
     public ISystemPostUpdate

src/systems/apply_joint_force/ApplyJointForce.hh

@@ -32,7 +32,7 @@ namespace systems
   class ApplyJointForcePrivate;
 
   /// \brief This system applies a force to the first axis of a specified joint.
-  class IGNITION_GAZEBO_VISIBLE ApplyJointForce
+  class ApplyJointForce
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/battery_plugin/LinearBatteryPlugin.hh

@@ -58,7 +58,7 @@ namespace systems
   ///                 (Required if <enable_recharge> is set to true)
   /// <fix_issue_225> True to change the battery behavior to fix some issues
   /// described in https://github.com/ignitionrobotics/ign-gazebo/issues/225.
-  class IGNITION_GAZEBO_VISIBLE LinearBatteryPlugin
+  class LinearBatteryPlugin
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate,

src/systems/breadcrumbs/Breadcrumbs.hh

@@ -18,6 +18,7 @@
 #define IGNITION_GAZEBO_SYSTEMS_BREADCRUMBS_HH_
 
 #include <memory>
+#include <optional>
 #include <set>
 #include <unordered_map>
 #include <vector>
@@ -79,7 +80,7 @@ namespace systems
   /// Defaults to false.
   /// `<breadcrumb>`: This is the model used as a template for deploying
   /// breadcrumbs.
-  class IGNITION_GAZEBO_VISIBLE Breadcrumbs
+  class Breadcrumbs
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/buoyancy/Buoyancy.hh

@@ -57,7 +57,7 @@ namespace systems
   /// ```
   /// ign gazebo -v 4 buoyancy.sdf
   /// ```
-  class IGNITION_GAZEBO_VISIBLE Buoyancy
+  class Buoyancy
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/camera_video_recorder/CameraVideoRecorder.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -41,7 +40,8 @@ namespace systems
   ///              not specified, the topic defaults to:
   ///              /world/<world_name/model/<model_name>/link/<link_name>/
   ///                  sensor/<sensor_name>/record_video
-  class IGNITION_GAZEBO_VISIBLE CameraVideoRecorder:
+  class
+  CameraVideoRecorder:
     public System,
     public ISystemConfigure,
     public ISystemPostUpdate

src/systems/contact/Contact.hh

@@ -18,7 +18,6 @@
 #define IGNITION_GAZEBO_SYSTEMS_CONTACT_HH_
 
 #include <memory>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -37,7 +36,7 @@ namespace systems
   **/
   /// \brief Contact sensor system which manages all contact sensors in
   /// simulation
-  class IGNITION_GAZEBO_VISIBLE Contact :
+  class Contact :
     public System,
     public ISystemPreUpdate,
     public ISystemPostUpdate

src/systems/detachable_joint/DetachableJoint.hh

@@ -54,7 +54,7 @@ namespace systems
   /// will not print a warning message if a child model does not exist yet.
   /// Otherwise, a warning message is printed. Defaults to false.
 
-  class IGNITION_GAZEBO_VISIBLE DetachableJoint
+  class DetachableJoint
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/diff_drive/DiffDrive.hh

@@ -61,7 +61,7 @@ namespace systems
   /// `<odom_topic>`: Custom topic on which this system will publish odometry
   /// messages. This element if optional, and the default value is
   /// `/model/{name_of_model}/odometry`.
-  class IGNITION_GAZEBO_VISIBLE DiffDrive
+  class DiffDrive
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate,

src/systems/diff_drive/SpeedLimiter.hh

@@ -57,7 +57,7 @@ namespace systems
 
   /// \brief Class to limit velocity, acceleration and jerk.
   /// \ref https://github.com/ros-controls/ros_controllers/tree/melodic-devel/diff_drive_controller
-  class IGNITION_GAZEBO_VISIBLE SpeedLimiter
+  class SpeedLimiter
   {
     /// \brief Constructor.
     /// \param [in] _hasVelocityLimits     if true, applies velocity limits.

src/systems/follow_actor/FollowActor.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -54,7 +53,7 @@ namespace systems
   /// <animation_x_vel>: Velocity of the animation on the X axis. Used to
   ///                    coordinate translational motion with the actor's
   ///                    animation.
-  class IGNITION_GAZEBO_VISIBLE FollowActor:
+  class FollowActor:
     public System,
     public ISystemConfigure,
     public ISystemPreUpdate

src/systems/imu/Imu.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -37,7 +36,7 @@ namespace systems
   /// \brief This system manages all IMU sensors in simulation.
   /// Each IMU sensor eports vertical position, angular velocity
   /// and lienar acceleration readings over Ignition Transport.
-  class IGNITION_GAZEBO_VISIBLE Imu:
+  class Imu:
     public System,
     public ISystemPreUpdate,
     public ISystemPostUpdate

src/systems/joint_controller/JointController.hh

@@ -69,7 +69,7 @@ namespace systems
   ///
   /// `<cmd_offset>` Command offset (feed-forward) of the PID.
   /// The default value is 0.
-  class IGNITION_GAZEBO_VISIBLE JointController
+  class JointController
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/joint_position_controller/JointPositionController.hh

@@ -71,7 +71,7 @@ namespace systems
   ///
   /// `<cmd_offset>` Command offset (feed-forward) of the PID. Optional
   /// parameter. The default value is 0.
-  class IGNITION_GAZEBO_VISIBLE JointPositionController
+  class JointPositionController
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/joint_state_publisher/JointStatePublisher.hh

@@ -45,7 +45,7 @@ namespace systems
   /// `<joint_name>`: Name of a joint to publish. This parameter can be
   /// specified multiple times, and is optional. All joints in a model will
   /// be published if joint names are not specified.
-  class IGNITION_GAZEBO_VISIBLE JointStatePublisher
+  class JointStatePublisher
       : public System,
         public ISystemConfigure,
         public ISystemPostUpdate

src/systems/lift_drag/LiftDrag.hh

@@ -59,7 +59,7 @@ namespace systems
   ///               coefficient curve.
   /// cda_stall   : The ratio of coefficient of drag and alpha slope after
   ///               stall.
-  class IGNITION_GAZEBO_VISIBLE LiftDrag
+  class LiftDrag
       : public System,
         public ISystemConfigure,
         public ISystemPreUpdate

src/systems/log/LogPlayback.hh

@@ -20,7 +20,6 @@
 #include <memory>
 
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -37,7 +36,7 @@ namespace systems
   /// \class LogPlayback LogPlayback.hh
   ///   ignition/gazebo/systems/log/LogPlayback.hh
   /// \brief Log state playback
-  class IGNITION_GAZEBO_VISIBLE LogPlayback:
+  class LogPlayback:
     public System,
     public ISystemConfigure,
     public ISystemUpdate

src/systems/log/LogRecord.hh

@@ -20,7 +20,6 @@
 #include <memory>
 
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -36,7 +35,7 @@ namespace systems
 
   /// \class LogRecord LogRecord.hh ignition/gazebo/systems/log/LogRecord.hh
   /// \brief Log state recorder
-  class IGNITION_GAZEBO_VISIBLE LogRecord:
+  class LogRecord:
     public System,
     public ISystemConfigure,
     public ISystemPreUpdate,

src/systems/log_video_recorder/LogVideoRecorder.hh

@@ -20,7 +20,6 @@
 #include <memory>
 #include <vector>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -50,7 +49,7 @@ namespace systems
   /// When recording is finished. An `end` string will be published to the
   /// `/log_video_recorder/status` topic and the videos are saved to a
   /// timestamped directory
-  class IGNITION_GAZEBO_VISIBLE LogVideoRecorder:
+  class LogVideoRecorder:
     public System,
     public ISystemConfigure,
     public ISystemPostUpdate

src/systems/logical_audio_sensor_plugin/LogicalAudioSensorPlugin.hh

@@ -128,7 +128,7 @@ namespace systems
   /// <PREFIX>/mic_<id>/detection topic, where <PREFIX> is the scoped name
   /// for the microphone - see ignition::gazebo::scopedName for more details -
   /// and <id> is the value specified in the microphone's <id> tag from the SDF.
-  class IGNITION_GAZEBO_VISIBLE LogicalAudioSensorPlugin :
+  class LogicalAudioSensorPlugin :
     public System,
     public ISystemConfigure,
     public ISystemPreUpdate,

src/systems/logical_camera/LogicalCamera.hh

@@ -19,7 +19,6 @@
 
 #include <memory>
 #include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/Export.hh>
 #include <ignition/gazebo/System.hh>
 
 namespace ignition
@@ -38,7 +37,7 @@ namespace systems
   **/
   /// \brief A logical camera sensor that reports objects detected within its
   /// frustum readings over ign transport
-  class IGNITION_GAZEBO_VISIBLE LogicalCamera:
+  class LogicalCamera:
     public System,
     public ISystemPreUpdate,
     public ISystemPostUpdate