Fix Windows and Doxygen (#1643)

Signed-off-by: Louise Poubel <[email protected]>
gazebosim · Aug 17, 2022 · 4f93cde · 4f93cde
1 parent 594955d
commit 4f93cde
Show file tree

Hide file tree

Showing 16 changed files with 27 additions and 36 deletions.
diff --git a/src/LevelManager.cc b/src/LevelManager.cc
@@ -36,14 +36,14 @@
 #include "ignition/gazebo/components/Geometry.hh"
 #include "ignition/gazebo/components/Gravity.hh"
 #include "ignition/gazebo/components/Level.hh"
-#include "ignition/gazebo/components/Model.hh"
-#include "ignition/gazebo/components/Light.hh"
-#include "ignition/gazebo/components/Name.hh"
 #include "ignition/gazebo/components/LevelBuffer.hh"
 #include "ignition/gazebo/components/LevelEntityNames.hh"
+#include "ignition/gazebo/components/Light.hh"
 #include "ignition/gazebo/components/LinearVelocity.hh"
 #include "ignition/gazebo/components/LinearVelocitySeed.hh"
 #include "ignition/gazebo/components/MagneticField.hh"
+#include "ignition/gazebo/components/Model.hh"
+#include "ignition/gazebo/components/Name.hh"
 #include "ignition/gazebo/components/ParentEntity.hh"
 #include "ignition/gazebo/components/Performer.hh"
 #include "ignition/gazebo/components/PerformerLevels.hh"

diff --git a/src/gui/QuickStartHandler.hh b/src/gui/QuickStartHandler.hh
@@ -20,8 +20,8 @@
 #include <QtCore>
 #include <string>
 
-#include "ignition/gazebo/Export.hh"
 #include "ignition/gazebo/config.hh"
+#include "ignition/gazebo/gui/Export.hh"
 
 namespace ignition
 {
@@ -32,7 +32,7 @@ inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace gui
 {
 /// \brief Class for handling quick start dialog
-class QuickStartHandler : public QObject
+class IGNITION_GAZEBO_GUI_VISIBLE QuickStartHandler : public QObject
 {
   Q_OBJECT
 
@@ -44,8 +44,8 @@ class QuickStartHandler : public QObject
   /// \return Distribution name, such as 'Citadel'
   public: Q_INVOKABLE QString Distribution() const;
 
-  /// \brief Get Gazebo version
-  /// \return gazebo version
+  /// \brief Get Gazebo Sim version
+  /// \return Version
   public: Q_INVOKABLE QString SimVersion() const;
 
   /// \brief Set starting world

diff --git a/src/systems/elevator/Elevator.hh b/src/systems/elevator/Elevator.hh
@@ -32,8 +32,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration

diff --git a/src/systems/elevator/ElevatorCommonPrivate.hh b/src/systems/elevator/ElevatorCommonPrivate.hh
@@ -34,8 +34,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 class ElevatorCommonPrivate

diff --git a/src/systems/elevator/ElevatorStateMachine.hh b/src/systems/elevator/ElevatorStateMachine.hh
@@ -35,8 +35,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declarations

diff --git a/src/systems/elevator/state_machine/ActionsImpl.hh b/src/systems/elevator/state_machine/ActionsImpl.hh
@@ -27,8 +27,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 namespace actions

diff --git a/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh b/src/systems/elevator/state_machine/ElevatorStateMachineImpl.hh
@@ -36,8 +36,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 class ElevatorStateMachinePrivate

diff --git a/src/systems/elevator/state_machine/EventsImpl.hh b/src/systems/elevator/state_machine/EventsImpl.hh
@@ -25,8 +25,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 namespace events

diff --git a/src/systems/elevator/state_machine/GuardsImpl.hh b/src/systems/elevator/state_machine/GuardsImpl.hh
@@ -27,8 +27,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 namespace guards

diff --git a/src/systems/elevator/state_machine/StatesImpl.hh b/src/systems/elevator/state_machine/StatesImpl.hh
@@ -32,8 +32,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 /// \brief State at which the elevator is idling.

diff --git a/src/systems/elevator/utils/DoorTimer.hh b/src/systems/elevator/utils/DoorTimer.hh
@@ -34,8 +34,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration

diff --git a/src/systems/elevator/utils/JointMonitor.hh b/src/systems/elevator/utils/JointMonitor.hh
@@ -33,8 +33,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 // Data forward declaration

diff --git a/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh b/src/systems/optical_tactile_plugin/OpticalTactilePlugin.hh
@@ -27,8 +27,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering.
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
   // Forward declaration

diff --git a/src/systems/optical_tactile_plugin/Visualization.hh b/src/systems/optical_tactile_plugin/Visualization.hh
@@ -32,8 +32,7 @@ namespace ignition
 namespace gazebo
 {
 // Inline bracket to help doxygen filtering.
-inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE
-{
+inline namespace IGNITION_GAZEBO_VERSION_NAMESPACE {
 namespace systems
 {
 namespace optical_tactile_sensor

diff --git a/src/systems/particle_emitter2/ParticleEmitter2.cc b/src/systems/particle_emitter2/ParticleEmitter2.cc
@@ -158,7 +158,7 @@ void ParticleEmitter2::PreUpdate(const ignition::gazebo::UpdateInfo &_info,
           // hack to avoid breaking the particle_emitter.proto message.
           if (_emitter->Data().has_header())
           {
-            for (const auto data : _emitter->Data().header().data())
+            for (const auto &data : _emitter->Data().header().data())
             {
               if (data.key() == "topic" && !data.value().empty())
               {
@@ -218,7 +218,7 @@ void ParticleEmitter2::PreUpdate(const ignition::gazebo::UpdateInfo &_info,
     return;
 
   // Process each command
-  for (const auto cmd : this->dataPtr->userCmd)
+  for (const auto &cmd : this->dataPtr->userCmd)
   {
     // Create component.
     auto emitterComp = _ecm.Component<components::ParticleEmitterCmd>(

diff --git a/test/integration/apply_link_wrench_system.cc b/test/integration/apply_link_wrench_system.cc
@@ -23,6 +23,7 @@
 #include <ignition/common/Console.hh>
 #include <ignition/common/Util.hh>
 #include <ignition/transport/Node.hh>
+#include <ignition/utils/ExtraTestMacros.hh>
 
 #include "ignition/gazebo/components/Model.hh"
 #include "ignition/gazebo/components/Name.hh"
@@ -48,7 +49,7 @@ class ApplyLinkWrenchTestFixture : public InternalFixture<::testing::Test>
 };
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
+TEST_F(ApplyLinkWrenchTestFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(FromSdf))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));
@@ -106,7 +107,8 @@ TEST_F(ApplyLinkWrenchTestFixture, FromSdf)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
+TEST_F(ApplyLinkWrenchTestFixture,
+    IGN_UTILS_TEST_DISABLED_ON_WIN32(PersistentFromTopic))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));
@@ -240,7 +242,8 @@ TEST_F(ApplyLinkWrenchTestFixture, PersistentFromTopic)
 }
 
 /////////////////////////////////////////////////
-TEST_F(ApplyLinkWrenchTestFixture, InstantaneousFromTopic)
+TEST_F(ApplyLinkWrenchTestFixture,
+    IGN_UTILS_TEST_DISABLED_ON_WIN32(InstantaneousFromTopic))
 {
   TestFixture fixture(common::joinPaths(std::string(PROJECT_SOURCE_PATH),
     "test", "worlds", "apply_link_wrench.sdf"));