Migrate include statements

Signed-off-by: methylDragon <[email protected]>
gazebosim · Aug 19, 2022 · 49d45d2 · 49d45d2
1 parent 5283831
commit 49d45d2
Show file tree

Hide file tree

Showing 190 changed files with 487 additions and 487 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,7 +15,7 @@ find_package(ignition-cmake2 2.14.0 REQUIRED)
 #============================================================================
 ign_configure_project(
   REPLACE_IGNITION_INCLUDE_PATH gz/physics
-  VERSION_SUFFIX pre1
+  VERSION_SUFFIX
 )
 
 #============================================================================

diff --git a/dartsim/include/gz/physics/dartsim/World.hh b/dartsim/include/gz/physics/dartsim/World.hh
@@ -20,7 +20,7 @@
 
 #include <dart/simulation/World.hpp>
 
-#include <ignition/physics/FeatureList.hh>
+#include <gz/physics/FeatureList.hh>
 
 namespace gz {
 namespace physics {

diff --git a/dartsim/src/Base.hh b/dartsim/src/Base.hh
@@ -30,8 +30,8 @@
 #include <utility>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/physics/Implements.hh>
+#include <gz/common/Console.hh>
+#include <gz/physics/Implements.hh>
 
 namespace gz {
 namespace physics {

diff --git a/dartsim/src/Base_TEST.cc b/dartsim/src/Base_TEST.cc
@@ -17,14 +17,14 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/physics/Implements.hh>
-
-#include <ignition/physics/sdf/ConstructCollision.hh>
-#include <ignition/physics/sdf/ConstructJoint.hh>
-#include <ignition/physics/sdf/ConstructLink.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructVisual.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
+#include <gz/physics/Implements.hh>
+
+#include <gz/physics/sdf/ConstructCollision.hh>
+#include <gz/physics/sdf/ConstructJoint.hh>
+#include <gz/physics/sdf/ConstructLink.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructVisual.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
 
 #include "dart/dynamics/BoxShape.hpp"
 #include "dart/dynamics/FreeJoint.hpp"

diff --git a/dartsim/src/Collisions_TEST.cc b/dartsim/src/Collisions_TEST.cc
@@ -19,21 +19,21 @@
 
 #include <test/PhysicsPluginsList.hh>
 
-#include <ignition/physics/FindFeatures.hh>
-#include <ignition/physics/RequestEngine.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/physics/FindFeatures.hh>
+#include <gz/physics/RequestEngine.hh>
+#include <gz/plugin/Loader.hh>
 
 // Features
-#include <ignition/physics/ConstructEmpty.hh>
-#include <ignition/physics/ForwardStep.hh>
-#include <ignition/physics/FrameSemantics.hh>
-#include <ignition/physics/FreeJoint.hh>
-#include <ignition/physics/GetEntities.hh>
-#include <ignition/physics/mesh/MeshShape.hh>
-#include <ignition/physics/PlaneShape.hh>
-#include <ignition/physics/FixedJoint.hh>
-
-#include <ignition/common/MeshManager.hh>
+#include <gz/physics/ConstructEmpty.hh>
+#include <gz/physics/ForwardStep.hh>
+#include <gz/physics/FrameSemantics.hh>
+#include <gz/physics/FreeJoint.hh>
+#include <gz/physics/GetEntities.hh>
+#include <gz/physics/mesh/MeshShape.hh>
+#include <gz/physics/PlaneShape.hh>
+#include <gz/physics/FixedJoint.hh>
+
+#include <gz/common/MeshManager.hh>
 
 using TestFeatureList = gz::physics::FeatureList<
   gz::physics::LinkFrameSemantics,

diff --git a/dartsim/src/CustomFeatures.hh b/dartsim/src/CustomFeatures.hh
@@ -18,9 +18,9 @@
 #ifndef IGNITION_PHYSICS_SRC_CUSTOMFEATURES_HH
 #define IGNITION_PHYSICS_SRC_CUSTOMFEATURES_HH
 
-#include <ignition/physics/Implements.hh>
+#include <gz/physics/Implements.hh>
 
-#include <ignition/physics/dartsim/World.hh>
+#include <gz/physics/dartsim/World.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/CustomMeshShape.cc b/dartsim/src/CustomMeshShape.cc
@@ -20,8 +20,8 @@
 #include <memory>
 #include <string>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/SubMesh.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/SubMesh.hh>
 
 namespace gz {
 namespace physics {

diff --git a/dartsim/src/CustomMeshShape.hh b/dartsim/src/CustomMeshShape.hh
@@ -19,7 +19,7 @@
 #define GZ_PHYSICS_DARTSIM_SRC_CUSTOMMESHSHAPE_HH_
 
 #include <dart/dynamics/MeshShape.hpp>
-#include <ignition/common/Mesh.hh>
+#include <gz/common/Mesh.hh>
 
 namespace gz {
 namespace physics {

diff --git a/dartsim/src/EntityManagementFeatures.hh b/dartsim/src/EntityManagementFeatures.hh
@@ -20,11 +20,11 @@
 
 #include <string>
 
-#include <ignition/physics/ConstructEmpty.hh>
-#include <ignition/physics/Shape.hh>
-#include <ignition/physics/GetEntities.hh>
-#include <ignition/physics/RemoveEntities.hh>
-#include <ignition/physics/Implements.hh>
+#include <gz/physics/ConstructEmpty.hh>
+#include <gz/physics/Shape.hh>
+#include <gz/physics/GetEntities.hh>
+#include <gz/physics/RemoveEntities.hh>
+#include <gz/physics/Implements.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/EntityManagement_TEST.cc b/dartsim/src/EntityManagement_TEST.cc
@@ -17,15 +17,15 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/Loader.hh>
 
-#include <ignition/common/MeshManager.hh>
+#include <gz/common/MeshManager.hh>
 
-#include <ignition/math/eigen3/Conversions.hh>
+#include <gz/math/eigen3/Conversions.hh>
 
-#include <ignition/physics/Joint.hh>
-#include <ignition/physics/RequestEngine.hh>
-#include <ignition/physics/RevoluteJoint.hh>
+#include <gz/physics/Joint.hh>
+#include <gz/physics/RequestEngine.hh>
+#include <gz/physics/RevoluteJoint.hh>
 
 #include "EntityManagementFeatures.hh"
 #include "JointFeatures.hh"

diff --git a/dartsim/src/FreeGroupFeatures.hh b/dartsim/src/FreeGroupFeatures.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_PHYSICS_DARTSIM_SRC_FREEGROUPFEATURES_HH_
 #define GZ_PHYSICS_DARTSIM_SRC_FREEGROUPFEATURES_HH_
 
-#include <ignition/physics/FreeGroup.hh>
+#include <gz/physics/FreeGroup.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/JointFeatures.hh b/dartsim/src/JointFeatures.hh
@@ -20,11 +20,11 @@
 
 #include <string>
 
-#include <ignition/physics/Joint.hh>
-#include <ignition/physics/FixedJoint.hh>
-#include <ignition/physics/FreeJoint.hh>
-#include <ignition/physics/PrismaticJoint.hh>
-#include <ignition/physics/RevoluteJoint.hh>
+#include <gz/physics/Joint.hh>
+#include <gz/physics/FixedJoint.hh>
+#include <gz/physics/FreeJoint.hh>
+#include <gz/physics/PrismaticJoint.hh>
+#include <gz/physics/RevoluteJoint.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/JointFeatures_TEST.cc b/dartsim/src/JointFeatures_TEST.cc
@@ -23,22 +23,22 @@
 
 #include <iostream>
 
-#include <ignition/physics/FindFeatures.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/physics/RequestEngine.hh>
+#include <gz/physics/FindFeatures.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/physics/RequestEngine.hh>
 
-#include <ignition/math/eigen3/Conversions.hh>
+#include <gz/math/eigen3/Conversions.hh>
 
 // Features
-#include <ignition/physics/ForwardStep.hh>
-#include <ignition/physics/FreeJoint.hh>
-#include <ignition/physics/FixedJoint.hh>
-#include <ignition/physics/GetEntities.hh>
-#include <ignition/physics/Joint.hh>
-#include <ignition/physics/RevoluteJoint.hh>
-#include <ignition/physics/dartsim/World.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
+#include <gz/physics/ForwardStep.hh>
+#include <gz/physics/FreeJoint.hh>
+#include <gz/physics/FixedJoint.hh>
+#include <gz/physics/GetEntities.hh>
+#include <gz/physics/Joint.hh>
+#include <gz/physics/RevoluteJoint.hh>
+#include <gz/physics/dartsim/World.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
 
 #include <limits>
 #include <sdf/Model.hh>

diff --git a/dartsim/src/KinematicsFeatures.cc b/dartsim/src/KinematicsFeatures.cc
@@ -17,7 +17,7 @@
 
 #include <dart/dynamics/Frame.hpp>
 
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include "KinematicsFeatures.hh"
 
 namespace gz {

diff --git a/dartsim/src/KinematicsFeatures.hh b/dartsim/src/KinematicsFeatures.hh
@@ -18,8 +18,8 @@
 #ifndef GZ_PHYSICS_DARTSIM_SRC_KINEMATICSFEATURES_HH_
 #define GZ_PHYSICS_DARTSIM_SRC_KINEMATICSFEATURES_HH_
 
-#include <ignition/physics/FrameSemantics.hh>
-#include <ignition/physics/FreeGroup.hh>
+#include <gz/physics/FrameSemantics.hh>
+#include <gz/physics/FreeGroup.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/KinematicsFeatures_TEST.cc b/dartsim/src/KinematicsFeatures_TEST.cc
@@ -19,19 +19,19 @@
 
 #include <iostream>
 
-#include <ignition/physics/FindFeatures.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/physics/RequestEngine.hh>
+#include <gz/physics/FindFeatures.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/physics/RequestEngine.hh>
 
-#include <ignition/math/eigen3/Conversions.hh>
+#include <gz/math/eigen3/Conversions.hh>
 
 // Features
-#include <ignition/physics/FrameSemantics.hh>
-#include <ignition/physics/ForwardStep.hh>
-#include <ignition/physics/GetEntities.hh>
-#include <ignition/physics/Joint.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
+#include <gz/physics/FrameSemantics.hh>
+#include <gz/physics/ForwardStep.hh>
+#include <gz/physics/GetEntities.hh>
+#include <gz/physics/Joint.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
 
 #include <limits>
 #include <sdf/Model.hh>

diff --git a/dartsim/src/LinkFeatures.hh b/dartsim/src/LinkFeatures.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_PHYSICS_DARTSIM_SRC_LINKFEATURES_HH_
 #define GZ_PHYSICS_DARTSIM_SRC_LINKFEATURES_HH_
 
-#include <ignition/physics/Link.hh>
+#include <gz/physics/Link.hh>
 
 #include "Base.hh"
 

diff --git a/dartsim/src/LinkFeatures_TEST.cc b/dartsim/src/LinkFeatures_TEST.cc
@@ -19,20 +19,20 @@
 
 #include <iostream>
 
-#include <ignition/physics/FindFeatures.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/physics/RequestEngine.hh>
+#include <gz/physics/FindFeatures.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/physics/RequestEngine.hh>
 
-#include <ignition/math/eigen3/Conversions.hh>
+#include <gz/math/eigen3/Conversions.hh>
 
 // Features
-#include <ignition/physics/ForwardStep.hh>
-#include <ignition/physics/FrameSemantics.hh>
-#include <ignition/physics/GetBoundingBox.hh>
-#include <ignition/physics/Link.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructLink.hh>
+#include <gz/physics/ForwardStep.hh>
+#include <gz/physics/FrameSemantics.hh>
+#include <gz/physics/GetBoundingBox.hh>
+#include <gz/physics/Link.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructLink.hh>
 
 #include <sdf/Root.hh>
 #include <sdf/World.hh>

diff --git a/dartsim/src/SDFFeatures.cc b/dartsim/src/SDFFeatures.cc
@@ -36,9 +36,9 @@
 #include <dart/constraint/WeldJointConstraint.hpp>
 #include <dart/dynamics/WeldJoint.hpp>
 
-#include <ignition/common/Console.hh>
-#include <ignition/math/eigen3/Conversions.hh>
-#include <ignition/math/Helpers.hh>
+#include <gz/common/Console.hh>
+#include <gz/math/eigen3/Conversions.hh>
+#include <gz/math/Helpers.hh>
 
 #include <sdf/Box.hh>
 #include <sdf/Collision.hh>

diff --git a/dartsim/src/SDFFeatures.hh b/dartsim/src/SDFFeatures.hh
@@ -20,14 +20,14 @@
 
 #include <string>
 
-#include <ignition/physics/sdf/ConstructCollision.hh>
-#include <ignition/physics/sdf/ConstructJoint.hh>
-#include <ignition/physics/sdf/ConstructLink.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructVisual.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
-
-#include <ignition/physics/Implements.hh>
+#include <gz/physics/sdf/ConstructCollision.hh>
+#include <gz/physics/sdf/ConstructJoint.hh>
+#include <gz/physics/sdf/ConstructLink.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructVisual.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
+
+#include <gz/physics/Implements.hh>
 
 #include "Base.hh"
 #include "EntityManagementFeatures.hh"

diff --git a/dartsim/src/SDFFeatures_TEST.cc b/dartsim/src/SDFFeatures_TEST.cc
@@ -26,18 +26,18 @@
 
 #include <tuple>
 
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/Loader.hh>
 
-#include <ignition/physics/GetEntities.hh>
-#include <ignition/physics/Joint.hh>
-#include <ignition/physics/RequestEngine.hh>
+#include <gz/physics/GetEntities.hh>
+#include <gz/physics/Joint.hh>
+#include <gz/physics/RequestEngine.hh>
 
-#include <ignition/physics/sdf/ConstructJoint.hh>
-#include <ignition/physics/sdf/ConstructLink.hh>
-#include <ignition/physics/sdf/ConstructModel.hh>
-#include <ignition/physics/sdf/ConstructWorld.hh>
+#include <gz/physics/sdf/ConstructJoint.hh>
+#include <gz/physics/sdf/ConstructLink.hh>
+#include <gz/physics/sdf/ConstructModel.hh>
+#include <gz/physics/sdf/ConstructWorld.hh>
 
-#include <ignition/physics/dartsim/World.hh>
+#include <gz/physics/dartsim/World.hh>
 
 #include <sdf/Root.hh>
 #include <sdf/World.hh>

diff --git a/dartsim/src/ShapeFeatures.hh b/dartsim/src/ShapeFeatures.hh
@@ -20,12 +20,12 @@
 
 #include <string>
 
-#include <ignition/physics/Shape.hh>
-#include <ignition/physics/BoxShape.hh>
-#include <ignition/physics/CylinderShape.hh>
-#include <ignition/physics/mesh/MeshShape.hh>
-#include <ignition/physics/PlaneShape.hh>
-#include <ignition/physics/SphereShape.hh>
+#include <gz/physics/Shape.hh>
+#include <gz/physics/BoxShape.hh>
+#include <gz/physics/CylinderShape.hh>
+#include <gz/physics/mesh/MeshShape.hh>
+#include <gz/physics/PlaneShape.hh>
+#include <gz/physics/SphereShape.hh>
 
 #include "Base.hh"