fixed comments

Signed-off-by: Nate Koenig <natekoenig@gmail.com>
gazebosim · May 26, 2023 · 5f1458a · 5f1458a
1 parent aee9f0d
commit 5f1458a
Show file tree

Hide file tree

Showing 60 changed files with 234 additions and 232 deletions.
diff --git a/include/gz/sim/Actor.hh b/include/gz/sim/Actor.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_ACTOR_HH_
-#define IGNITION_GAZEBO_ACTOR_HH_
+#ifndef GZ_GAZEBO_ACTOR_HH_
+#define GZ_GAZEBO_ACTOR_HH_
 
 #include <memory>
 #include <optional>

diff --git a/include/gz/sim/Joint.hh b/include/gz/sim/Joint.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_JOINT_HH_
-#define IGNITION_GAZEBO_JOINT_HH_
+#ifndef GZ_GAZEBO_JOINT_HH_
+#define GZ_GAZEBO_JOINT_HH_
 
 #include <memory>
 #include <optional>

diff --git a/include/gz/sim/Light.hh b/include/gz/sim/Light.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_LIGHT_HH_
-#define IGNITION_GAZEBO_LIGHT_HH_
+#ifndef GZ_GAZEBO_LIGHT_HH_
+#define GZ_GAZEBO_LIGHT_HH_
 
 #include <memory>
 #include <optional>

diff --git a/include/gz/sim/Primitives.hh b/include/gz/sim/Primitives.hh
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef IGNITION_GAZEBO_PRIMITIVES_HH_
-#define IGNITION_GAZEBO_PRIMITIVES_HH_
+#ifndef GZ_GAZEBO_PRIMITIVES_HH_
+#define GZ_GAZEBO_PRIMITIVES_HH_
 
 #include <gz/sim/config.hh>
 #include <gz/sim/Export.hh>

diff --git a/include/gz/sim/Sensor.hh b/include/gz/sim/Sensor.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_SENSOR_HH_
-#define IGNITION_GAZEBO_SENSOR_HH_
+#ifndef GZ_GAZEBO_SENSOR_HH_
+#define GZ_GAZEBO_SENSOR_HH_
 
 #include <memory>
 #include <optional>

diff --git a/include/gz/sim/comms/Broker.hh b/include/gz/sim/comms/Broker.hh
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef IGNITION_GAZEBO_BROKER_HH_
-#define IGNITION_GAZEBO_BROKER_HH_
+#ifndef GZ_GAZEBO_BROKER_HH_
+#define GZ_GAZEBO_BROKER_HH_
 
 #include <memory>
 

diff --git a/include/gz/sim/comms/ICommsModel.hh b/include/gz/sim/comms/ICommsModel.hh
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef IGNITION_GAZEBO_ICOMMSMODEL_HH_
-#define IGNITION_GAZEBO_ICOMMSMODEL_HH_
+#ifndef GZ_GAZEBO_ICOMMSMODEL_HH_
+#define GZ_GAZEBO_ICOMMSMODEL_HH_
 
 #include <memory>
 

diff --git a/include/gz/sim/comms/MsgManager.hh b/include/gz/sim/comms/MsgManager.hh
@@ -15,8 +15,8 @@
  *
  */
 
-#ifndef IGNITION_GAZEBO_MSGMANAGER_HH_
-#define IGNITION_GAZEBO_MSGMANAGER_HH_
+#ifndef GZ_GAZEBO_MSGMANAGER_HH_
+#define GZ_GAZEBO_MSGMANAGER_HH_
 
 #include <deque>
 #include <memory>

diff --git a/include/gz/sim/components/BatteryPowerLoad.hh b/include/gz/sim/components/BatteryPowerLoad.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_BATTERYPOWERLOAD_HH_
-#define IGNITION_GAZEBO_COMPONENTS_BATTERYPOWERLOAD_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_BATTERYPOWERLOAD_HH_
+#define GZ_GAZEBO_COMPONENTS_BATTERYPOWERLOAD_HH_
 
 #include <gz/sim/components/Factory.hh>
 #include <gz/sim/components/Component.hh>

diff --git a/include/gz/sim/components/BoundingBoxCamera.hh b/include/gz/sim/components/BoundingBoxCamera.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_BOUNDINGBOXCAMERA_HH_
-#define IGNITION_GAZEBO_COMPONENTS_BOUNDINGBOXCAMERA_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_BOUNDINGBOXCAMERA_HH_
+#define GZ_GAZEBO_COMPONENTS_BOUNDINGBOXCAMERA_HH_
 
 #include <sdf/Sensor.hh>
 

diff --git a/include/gz/sim/components/CustomSensor.hh b/include/gz/sim/components/CustomSensor.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_CUSTOMSENSOR_HH_
-#define IGNITION_GAZEBO_COMPONENTS_CUSTOMSENSOR_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_CUSTOMSENSOR_HH_
+#define GZ_GAZEBO_COMPONENTS_CUSTOMSENSOR_HH_
 
 #include <sdf/Sensor.hh>
 #include <gz/sim/components/Factory.hh>

diff --git a/include/gz/sim/components/Factory.hh b/include/gz/sim/components/Factory.hh
@@ -512,9 +512,10 @@ namespace components
     public: IgnGazeboComponents##_classname() \
     { \
       using namespace ignition; \
-      using Desc = gazebo::components::ComponentDescriptor<_classname>; \
-      gazebo::components::Factory::Instance()->Register<_classname>(\
-        _compType, new Desc(), gazebo::components::RegistrationObjectId(this));\
+      using Desc = gz::sim::components::ComponentDescriptor<_classname>; \
+      gz::sim::components::Factory::Instance()->Register<_classname>(\
+        _compType, new Desc(), \
+        gz::sim::components::RegistrationObjectId(this));\
     } \
     public: IgnGazeboComponents##_classname( \
                 const IgnGazeboComponents##_classname&) = delete; \

diff --git a/include/gz/sim/components/ForceTorque.hh b/include/gz/sim/components/ForceTorque.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_FORCETORQUE_HH_
-#define IGNITION_GAZEBO_COMPONENTS_FORCETORQUE_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_FORCETORQUE_HH_
+#define GZ_GAZEBO_COMPONENTS_FORCETORQUE_HH_
 
 #include <sdf/Sensor.hh>
 

diff --git a/include/gz/sim/components/HaltMotion.hh b/include/gz/sim/components/HaltMotion.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_HALT_MOTION_HH_
-#define IGNITION_GAZEBO_COMPONENTS_HALT_MOTION_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_HALT_MOTION_HH_
+#define GZ_GAZEBO_COMPONENTS_HALT_MOTION_HH_
 
 #include <gz/sim/components/Factory.hh>
 #include <gz/sim/components/Component.hh>

diff --git a/include/gz/sim/components/JointTransmittedWrench.hh b/include/gz/sim/components/JointTransmittedWrench.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_JOINTTRANSMITTEDWRENCH_HH_
-#define IGNITION_GAZEBO_COMPONENTS_JOINTTRANSMITTEDWRENCH_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_JOINTTRANSMITTEDWRENCH_HH_
+#define GZ_GAZEBO_COMPONENTS_JOINTTRANSMITTEDWRENCH_HH_
 
 #include <gz/msgs/wrench.pb.h>
 

diff --git a/include/gz/sim/components/LightCmd.hh b/include/gz/sim/components/LightCmd.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_LIGHTCMD_HH_
-#define IGNITION_GAZEBO_COMPONENTS_LIGHTCMD_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_LIGHTCMD_HH_
+#define GZ_GAZEBO_COMPONENTS_LIGHTCMD_HH_
 
 #include <sdf/Light.hh>
 

diff --git a/include/gz/sim/components/LightType.hh b/include/gz/sim/components/LightType.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_LIGHTTYPE_HH_
-#define IGNITION_GAZEBO_COMPONENTS_LIGHTTYPE_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_LIGHTTYPE_HH_
+#define GZ_GAZEBO_COMPONENTS_LIGHTTYPE_HH_
 
 #include <string>
 #include <memory>

diff --git a/include/gz/sim/components/NavSat.hh b/include/gz/sim/components/NavSat.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_NAVSAT_HH_
-#define IGNITION_GAZEBO_COMPONENTS_NAVSAT_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_NAVSAT_HH_
+#define GZ_GAZEBO_COMPONENTS_NAVSAT_HH_
 
 #include <sdf/Sensor.hh>
 

diff --git a/include/gz/sim/components/ParticleEmitter.hh b/include/gz/sim/components/ParticleEmitter.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_PARTICLEEMITTER_HH_
-#define IGNITION_GAZEBO_COMPONENTS_PARTICLEEMITTER_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_PARTICLEEMITTER_HH_
+#define GZ_GAZEBO_COMPONENTS_PARTICLEEMITTER_HH_
 
 #include <gz/msgs/particle_emitter.pb.h>
 #include <gz/sim/components/Component.hh>

diff --git a/include/gz/sim/components/Recreate.hh b/include/gz/sim/components/Recreate.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_RECREATE_HH_
-#define IGNITION_GAZEBO_COMPONENTS_RECREATE_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_RECREATE_HH_
+#define GZ_GAZEBO_COMPONENTS_RECREATE_HH_
 
 #include <gz/sim/components/Factory.hh>
 #include <gz/sim/components/Component.hh>

diff --git a/include/gz/sim/components/RenderEngineServerHeadless.hh b/include/gz/sim/components/RenderEngineServerHeadless.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_RENDERENGINESERVERHEADLESS_HH_
-#define IGNITION_GAZEBO_COMPONENTS_RENDERENGINESERVERHEADLESS_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_RENDERENGINESERVERHEADLESS_HH_
+#define GZ_GAZEBO_COMPONENTS_RENDERENGINESERVERHEADLESS_HH_
 
 #include <string>
 #include <gz/sim/components/Factory.hh>

diff --git a/include/gz/sim/components/SegmentationCamera.hh b/include/gz/sim/components/SegmentationCamera.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_SEGMENTATIONCAMERA_HH_
-#define IGNITION_GAZEBO_COMPONENTS_SEGMENTATIONCAMERA_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_SEGMENTATIONCAMERA_HH_
+#define GZ_GAZEBO_COMPONENTS_SEGMENTATIONCAMERA_HH_
 
 #include <sdf/Sensor.hh>
 

diff --git a/include/gz/sim/components/SemanticLabel.hh b/include/gz/sim/components/SemanticLabel.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_LABEL_HH_
-#define IGNITION_GAZEBO_COMPONENTS_LABEL_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_LABEL_HH_
+#define GZ_GAZEBO_COMPONENTS_LABEL_HH_
 
 #include "gz/sim/Export.hh"
 #include "gz/sim/components/Component.hh"

diff --git a/include/gz/sim/components/SphericalCoordinates.hh b/include/gz/sim/components/SphericalCoordinates.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_SPHERICALCOORDINATES_HH_
-#define IGNITION_GAZEBO_COMPONENTS_SPHERICALCOORDINATES_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_SPHERICALCOORDINATES_HH_
+#define GZ_GAZEBO_COMPONENTS_SPHERICALCOORDINATES_HH_
 
 #include <gz/math/SphericalCoordinates.hh>
 #include <gz/sim/components/Factory.hh>

diff --git a/include/gz/sim/components/SystemPluginInfo.hh b/include/gz/sim/components/SystemPluginInfo.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_SYSTEMINFO_HH_
-#define IGNITION_GAZEBO_COMPONENTS_SYSTEMINFO_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_SYSTEMINFO_HH_
+#define GZ_GAZEBO_COMPONENTS_SYSTEMINFO_HH_
 
 #include <gz/msgs/plugin_v.pb.h>
 #include <gz/sim/components/Factory.hh>

diff --git a/include/gz/sim/components/TemperatureRange.hh b/include/gz/sim/components/TemperatureRange.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_TEMPERATURERANGE_HH_
-#define IGNITION_GAZEBO_COMPONENTS_TEMPERATURERANGE_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_TEMPERATURERANGE_HH_
+#define GZ_GAZEBO_COMPONENTS_TEMPERATURERANGE_HH_
 
 #include <istream>
 #include <ostream>

diff --git a/include/gz/sim/components/Visibility.hh b/include/gz/sim/components/Visibility.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_COMPONENTS_VISIBILITY_HH_
-#define IGNITION_GAZEBO_COMPONENTS_VISIBILITY_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_VISIBILITY_HH_
+#define GZ_GAZEBO_COMPONENTS_VISIBILITY_HH_
 
 #include <string>
 #include <gz/sim/components/Factory.hh>

diff --git a/include/gz/sim/components/VisualCmd.hh b/include/gz/sim/components/VisualCmd.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_VISUALCMD_HH_
-#define IGNITION_GAZEBO_COMPONENTS_VISUALCMD_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_VISUALCMD_HH_
+#define GZ_GAZEBO_COMPONENTS_VISUALCMD_HH_
 
 #include <gz/sim/config.hh>
 #include <gz/sim/Export.hh>

diff --git a/include/gz/sim/components/WheelSlipCmd.hh b/include/gz/sim/components/WheelSlipCmd.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
  */
-#ifndef IGNITION_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
-#define IGNITION_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
+#ifndef GZ_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
+#define GZ_GAZEBO_COMPONENTS_WHEELSLIPCMD_HH_
 
 #include <gz/sim/config.hh>
 #include <gz/sim/Export.hh>

diff --git a/include/gz/sim/detail/BaseView.hh b/include/gz/sim/detail/BaseView.hh
@@ -14,8 +14,8 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GAZEBO_DETAIL_BASEVIEW_HH_
-#define IGNITION_GAZEBO_DETAIL_BASEVIEW_HH_
+#ifndef GZ_GAZEBO_DETAIL_BASEVIEW_HH_
+#define GZ_GAZEBO_DETAIL_BASEVIEW_HH_
 
 #include <cstddef>
 #include <set>

diff --git a/include/gz/sim/rendering/MarkerManager.hh b/include/gz/sim/rendering/MarkerManager.hh
@@ -20,6 +20,7 @@
 #include <memory>
 #include <string>
 
+#include <gz/sim/config.hh>
 #include <gz/sim/rendering/Export.hh>
 
 #include "gz/rendering/RenderTypes.hh"

diff --git a/src/Server_TEST.cc b/src/Server_TEST.cc
@@ -170,7 +170,7 @@ TEST_P(ServerFixture, ServerConfigSdfPluginInfo)
   plugin.SetName("interface");
   pluginInfo.SetPlugin(plugin);
 
-  ignition::gazebo::ServerConfig serverConfig;
+  gz::sim::ServerConfig serverConfig;
   serverConfig.AddPlugin(pluginInfo);
 
   const std::list<ServerConfig::PluginInfo> &plugins = serverConfig.Plugins();
@@ -364,7 +364,7 @@ TEST_P(ServerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(SdfServerConfig))
 /////////////////////////////////////////////////
 TEST_P(ServerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(SdfRootServerConfig))
 {
-  ignition::gazebo::ServerConfig serverConfig;
+  gz::sim::ServerConfig serverConfig;
 
   serverConfig.SetSdfString(TestWorldSansPhysics::World());
   EXPECT_TRUE(serverConfig.SdfFile().empty());
@@ -386,7 +386,7 @@ TEST_P(ServerFixture, IGN_UTILS_TEST_DISABLED_ON_WIN32(SdfRootServerConfig))
   EXPECT_TRUE(serverConfig.SdfFile().empty());
   EXPECT_TRUE(serverConfig.SdfString().empty());
 
-  gazebo::Server server(serverConfig);
+  gz::sim::Server server(serverConfig);
   EXPECT_FALSE(server.Running());
   EXPECT_FALSE(*server.Running(0));
   EXPECT_TRUE(*server.Paused());
@@ -693,7 +693,7 @@ TEST_P(ServerFixture, RunNonBlockingMultiple)
 {
   ServerConfig serverConfig;
   serverConfig.SetSdfString(TestWorldSansPhysics::World());
-  gazebo::Server server(serverConfig);
+  gz::sim::Server server(serverConfig);
 
   EXPECT_FALSE(server.Running());
   EXPECT_FALSE(*server.Running(0));
@@ -1113,7 +1113,7 @@ TEST_P(ServerFixture, ResolveResourcePaths)
   common::setenv("IGN_FILE_PATH", "");
 
   ServerConfig serverConfig;
-  gazebo::Server server(serverConfig);
+  gz::sim::Server server(serverConfig);
 
   EXPECT_FALSE(*server.Running(0));
 
@@ -1186,7 +1186,7 @@ TEST_P(ServerFixture, Stop)
   serverConfig.SetSdfFile(common::joinPaths((PROJECT_SOURCE_PATH),
       "test", "worlds", "shapes.sdf"));
 
-  gazebo::Server server(serverConfig);
+  gz::sim::Server server(serverConfig);
 
   // The simulation runner should not be running.
   EXPECT_FALSE(*server.Running(0));