Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Aug 26, 2022 · c71704f · c71704f
1 parent a8b31e9
commit c71704f
Show file tree

Hide file tree

Showing 177 changed files with 188 additions and 179 deletions.
diff --git a/examples/custom_scene_viewer/ManualSceneDemo.hh b/examples/custom_scene_viewer/ManualSceneDemo.hh
@@ -21,7 +21,7 @@
 #include <gz/rendering.hh>
 #include "TestTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/custom_scene_viewer/SceneBuilder.hh b/examples/custom_scene_viewer/SceneBuilder.hh
@@ -20,7 +20,7 @@
 #include <string>
 #include "TestTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/custom_scene_viewer/TestTypes.hh b/examples/custom_scene_viewer/TestTypes.hh
@@ -20,7 +20,7 @@
 #include <vector>
 #include <gz/rendering.hh>
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/gazebo_scene_viewer/CameraWindow.hh b/examples/gazebo_scene_viewer/CameraWindow.hh
@@ -20,7 +20,7 @@
 #include <vector>
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz = gz::rendering;
+namespace ignition = gz::rendering;
 
 void GlutRun(std::vector<gz::CameraPtr> _cameras);
 

diff --git a/examples/gazebo_scene_viewer/SceneManager.hh b/examples/gazebo_scene_viewer/SceneManager.hh
@@ -30,7 +30,7 @@
 #include <gz/common/SingletonT.hh>
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/examples/gazebo_scene_viewer/SceneManagerPrivate.hh b/examples/gazebo_scene_viewer/SceneManagerPrivate.hh
@@ -30,7 +30,7 @@
 #include "gz/rendering/ShaderType.hh"
 #include "gazebo/transport/Node.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/ArrowVisual.hh b/include/gz/rendering/ArrowVisual.hh
@@ -20,7 +20,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/CompositeVisual.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/AxisVisual.hh b/include/gz/rendering/AxisVisual.hh
@@ -20,7 +20,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/CompositeVisual.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Camera.hh b/include/gz/rendering/Camera.hh
@@ -29,7 +29,7 @@
 #include "gz/rendering/Scene.hh"
 
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/CompositeVisual.hh b/include/gz/rendering/CompositeVisual.hh
@@ -20,7 +20,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Visual.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/DepthCamera.hh b/include/gz/rendering/DepthCamera.hh
@@ -22,7 +22,7 @@
 #include <gz/common/Event.hh>
 #include "gz/rendering/Camera.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/GaussianNoisePass.hh b/include/gz/rendering/GaussianNoisePass.hh
@@ -22,7 +22,7 @@
 #include "gz/rendering/Export.hh"
 #include "gz/rendering/RenderPass.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Geometry.hh b/include/gz/rendering/Geometry.hh
@@ -23,7 +23,7 @@
 #include "gz/rendering/Object.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/GizmoVisual.hh b/include/gz/rendering/GizmoVisual.hh
@@ -23,7 +23,7 @@
 #include "gz/rendering/Export.hh"
 #include "gz/rendering/TransformType.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/GpuRays.hh b/include/gz/rendering/GpuRays.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/Scene.hh"
 #include "gz/rendering/Camera.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Grid.hh b/include/gz/rendering/Grid.hh
@@ -22,7 +22,7 @@
 #include "gz/rendering/Geometry.hh"
 #include "gz/rendering/Object.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Image.hh b/include/gz/rendering/Image.hh
@@ -25,7 +25,7 @@
 #include "gz/rendering/PixelFormat.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Light.hh b/include/gz/rendering/Light.hh
@@ -21,7 +21,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Node.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Marker.hh b/include/gz/rendering/Marker.hh
@@ -25,7 +25,7 @@
 #include "gz/rendering/Object.hh"
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Material.hh b/include/gz/rendering/Material.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/ShaderType.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Mesh.hh b/include/gz/rendering/Mesh.hh
@@ -24,7 +24,7 @@
 #include "gz/rendering/Geometry.hh"
 #include "gz/rendering/Object.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/MeshDescriptor.hh b/include/gz/rendering/MeshDescriptor.hh
@@ -24,15 +24,15 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace common
   {
     class Mesh;
   }
 }
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/MoveToHelper.hh b/include/gz/rendering/MoveToHelper.hh
@@ -27,7 +27,7 @@
 
 #include "gz/rendering/Camera.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Node.hh b/include/gz/rendering/Node.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/Object.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Object.hh b/include/gz/rendering/Object.hh
@@ -22,7 +22,7 @@
 #include "gz/rendering/RenderTypes.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/OrbitViewController.hh b/include/gz/rendering/OrbitViewController.hh
@@ -27,7 +27,7 @@
 #include "gz/rendering/Camera.hh"
 #include "gz/rendering/ViewController.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/PixelFormat.hh b/include/gz/rendering/PixelFormat.hh
@@ -21,7 +21,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RayQuery.hh b/include/gz/rendering/RayQuery.hh
@@ -25,7 +25,7 @@
 #include "gz/rendering/Scene.hh"
 #include "gz/rendering/Visual.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderEngine.hh b/include/gz/rendering/RenderEngine.hh
@@ -23,7 +23,7 @@
 #include "gz/rendering/RenderTypes.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderEngineManager.hh b/include/gz/rendering/RenderEngineManager.hh
@@ -27,7 +27,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderEnginePlugin.hh b/include/gz/rendering/RenderEnginePlugin.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderPass.hh b/include/gz/rendering/RenderPass.hh
@@ -21,7 +21,7 @@
 #include "gz/rendering/Object.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderPassSystem.hh b/include/gz/rendering/RenderPassSystem.hh
@@ -29,7 +29,7 @@
 #include "gz/rendering/RenderPass.hh"
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderTarget.hh b/include/gz/rendering/RenderTarget.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/Image.hh"
 #include "gz/rendering/Object.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderTypes.hh b/include/gz/rendering/RenderTypes.hh
@@ -37,7 +37,7 @@
 /// \brief Render visuals that are selectable mask.
 #define IGN_VISIBILITY_SELECTABLE      0x00000002
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/RenderingIface.hh b/include/gz/rendering/RenderingIface.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/Export.hh"
 #include "gz/rendering/RenderTypes.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Scene.hh b/include/gz/rendering/Scene.hh
@@ -33,7 +33,7 @@
 #include "gz/rendering/Storage.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Sensor.hh b/include/gz/rendering/Sensor.hh
@@ -20,7 +20,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Node.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/ShaderParam.hh b/include/gz/rendering/ShaderParam.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/ShaderParams.hh b/include/gz/rendering/ShaderParams.hh
@@ -25,7 +25,7 @@
 #include "gz/rendering/Export.hh"
 #include "gz/rendering/ShaderParam.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/ShaderType.hh b/include/gz/rendering/ShaderType.hh
@@ -21,7 +21,7 @@
 #include "gz/rendering/config.hh"
 #include "gz/rendering/Export.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Storage.hh b/include/gz/rendering/Storage.hh
@@ -36,7 +36,7 @@
 #undef DestroyAll
 #endif
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {

diff --git a/include/gz/rendering/Text.hh b/include/gz/rendering/Text.hh
@@ -26,7 +26,7 @@
 #include "gz/rendering/Geometry.hh"
 #include "gz/rendering/Object.hh"
 
-namespace gz
+namespace ignition
 {
   namespace rendering
   {