Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <[email protected]>
gazebosim · Aug 26, 2022 · 9283a2c · 9283a2c
1 parent cdd8c00
commit 9283a2c
Show file tree

Hide file tree

Showing 174 changed files with 244 additions and 234 deletions.
diff --git a/av/include/gz/common/AudioDecoder.hh b/av/include/gz/common/AudioDecoder.hh
@@ -24,7 +24,7 @@
 #include <gz/common/av/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/av/include/gz/common/HWEncoder.hh b/av/include/gz/common/HWEncoder.hh
@@ -28,7 +28,7 @@
 
 /// This is an internal-use only class encapsulating HW video encoding. All
 /// symbols defined here are hidden from the public API.
-namespace gz::common
+namespace ignition::common
 {
   // Forward declare private data class
   class HWVideoPrivate;

diff --git a/av/include/gz/common/HWVideo.hh b/av/include/gz/common/HWVideo.hh
@@ -18,7 +18,7 @@
 
 #include <gz/common/EnumIface.hh>
 
-namespace gz::common
+namespace ignition::common
 {
   enum class IGNITION_COMMON_AV_VISIBLE HWEncoderType
   {

diff --git a/av/include/gz/common/Video.hh b/av/include/gz/common/Video.hh
@@ -29,7 +29,7 @@ struct AVFrame;
 struct AVPicture;
 struct SwsContext;
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/av/include/gz/common/VideoEncoder.hh b/av/include/gz/common/VideoEncoder.hh
@@ -35,7 +35,7 @@
 #define VIDEO_ENCODER_FPS_DEFAULT 25
 #define VIDEO_ENCODER_FORMAT_DEFAULT "mp4"
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/av/include/gz/common/av/Util.hh b/av/include/gz/common/av/Util.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_COMMON_AV_UTIL_HH_
 #define GZ_COMMON_AV_UTIL_HH_
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/av/include/gz/common/ffmpeg_inc.hh b/av/include/gz/common/ffmpeg_inc.hh
@@ -51,7 +51,7 @@ extern "C" {
 
 #include <gz/common/av/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc
@@ -23,7 +23,7 @@
 #define AUDIO_INBUF_SIZE (20480 * 2)
 #define AUDIO_REFILL_THRESH 4096
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 class gz::common::AudioDecoderPrivate

diff --git a/av/src/AudioDecoder_TEST.cc b/av/src/AudioDecoder_TEST.cc
@@ -21,7 +21,7 @@
 
 #include "test_config.h"
 
-using namespace gz;
+using namespace ignition;
 
 /////////////////////////////////////////////////
 TEST(AudioDecoder, FileNotSet)

diff --git a/av/src/HWEncoder.cc b/av/src/HWEncoder.cc
@@ -25,7 +25,7 @@
 #include "gz/common/StringUtils.hh"
 #include "gz/common/Console.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 using namespace std;
 

diff --git a/av/src/Video.cc b/av/src/Video.cc
@@ -20,7 +20,7 @@
 #include "gz/common/Video.hh"
 #include "gz/common/av/Util.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 // Private data structure for the Video class

diff --git a/av/src/VideoEncoder.cc b/av/src/VideoEncoder.cc
@@ -28,7 +28,7 @@
 #include "gz/common/HWEncoder.hh"
 #endif
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 using namespace std;
 

diff --git a/av/src/VideoEncoder_TEST.cc b/av/src/VideoEncoder_TEST.cc
@@ -19,7 +19,7 @@
 #include "gz/common/VideoEncoder.hh"
 #include "test_config.h"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 class VideoEncoderTest : public common::testing::AutoLogFixture

diff --git a/av/src/ffmpeg_inc.cc b/av/src/ffmpeg_inc.cc
@@ -16,7 +16,7 @@
 */
 #include "gz/common/ffmpeg_inc.hh"
 
-using namespace gz;
+using namespace ignition;
 
 //////////////////////////////////////////////////
 AVFrame *common::AVFrameAlloc(void)

diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh
@@ -29,7 +29,7 @@
 #include <gz/common/events/Export.hh>
 #include <gz/common/events/Types.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/events/include/gz/common/KeyEvent.hh b/events/include/gz/common/KeyEvent.hh
@@ -23,7 +23,7 @@
 #include <gz/common/events/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/events/include/gz/common/MouseEvent.hh b/events/include/gz/common/MouseEvent.hh
@@ -23,7 +23,7 @@
 #include <gz/common/events/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/events/include/gz/common/events/Types.hh b/events/include/gz/common/events/Types.hh
@@ -21,7 +21,7 @@
 #include <memory>
 
 // This header contains forward declarations for some event types
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/events/src/Event.cc b/events/src/Event.cc
@@ -18,7 +18,7 @@
 #include "gz/common/Console.hh"
 #include "gz/common/Event.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 //////////////////////////////////////////////////

diff --git a/events/src/Event_TEST.cc b/events/src/Event_TEST.cc
@@ -22,7 +22,7 @@
 #include <functional>
 #include <gz/common/Event.hh>
 
-using namespace gz;
+using namespace ignition;
 
 class EventTest : public common::testing::AutoLogFixture { };
 

diff --git a/events/src/KeyEvent.cc b/events/src/KeyEvent.cc
@@ -16,7 +16,7 @@
 */
 #include "gz/common/KeyEvent.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 class gz::common::KeyEventPrivate

diff --git a/events/src/KeyEvent_TEST.cc b/events/src/KeyEvent_TEST.cc
@@ -18,7 +18,7 @@
 #include <gtest/gtest.h>
 #include "gz/common/KeyEvent.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 /////////////////////////////////////////////////

diff --git a/events/src/MouseEvent.cc b/events/src/MouseEvent.cc
@@ -18,7 +18,7 @@
 #include <gz/math/Vector2.hh>
 #include "gz/common/MouseEvent.hh"
 
-using namespace gz;
+using namespace ignition;
 using namespace common;
 
 /// \brief Mouse event private data

diff --git a/events/src/MouseEvent_TEST.cc b/events/src/MouseEvent_TEST.cc
@@ -21,7 +21,7 @@
 #include "gz/common/MouseEvent.hh"
 #include "gz/common/config.hh"
 
-using namespace gz;
+using namespace ignition;
 
 class MouseEvent : public common::testing::AutoLogFixture { };
 

diff --git a/examples/events.cc b/examples/events.cc
@@ -19,7 +19,7 @@
 #include <iostream>
 #include <gz/common/Event.hh>
 
-using namespace gz;
+using namespace ignition;
 
 int g_callback = 0;
 common::EventT<void ()> g_event;

diff --git a/graphics/include/gz/common/Animation.hh b/graphics/include/gz/common/Animation.hh
@@ -27,7 +27,7 @@
 
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/BVHLoader.hh b/graphics/include/gz/common/BVHLoader.hh
@@ -23,7 +23,7 @@
 #include <gz/math/Pose3.hh>
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/ColladaExporter.hh b/graphics/include/gz/common/ColladaExporter.hh
@@ -27,7 +27,7 @@
 
 #include <gz/math/Matrix4.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/ColladaLoader.hh b/graphics/include/gz/common/ColladaLoader.hh
@@ -21,7 +21,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/MeshLoader.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/Dem.hh b/graphics/include/gz/common/Dem.hh
@@ -30,7 +30,7 @@
 
 # include <ignition/common/HeightmapData.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/GTSMeshUtils.hh b/graphics/include/gz/common/GTSMeshUtils.hh
@@ -27,7 +27,7 @@
 struct _GtsSurface;
 typedef _GtsSurface GtsSurface;
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/HeightmapData.hh b/graphics/include/gz/common/HeightmapData.hh
@@ -21,7 +21,7 @@
 #include <gz/math/Vector3.hh>
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/Image.hh b/graphics/include/gz/common/Image.hh
@@ -25,7 +25,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/ImageHeightmap.hh b/graphics/include/gz/common/ImageHeightmap.hh
@@ -25,7 +25,7 @@
 #include <gz/common/HeightmapData.hh>
 #include <gz/common/Image.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/KeyFrame.hh b/graphics/include/gz/common/KeyFrame.hh
@@ -21,7 +21,7 @@
 #include <gz/math/Quaternion.hh>
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/Material.hh b/graphics/include/gz/common/Material.hh
@@ -27,7 +27,7 @@
 #include <gz/common/Pbr.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/Mesh.hh b/graphics/include/gz/common/Mesh.hh
@@ -28,7 +28,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/MeshCSG.hh b/graphics/include/gz/common/MeshCSG.hh
@@ -26,7 +26,7 @@ typedef _GtsSurface GtsSurface;
 struct _GPtrArray;
 typedef _GPtrArray GPtrArray;
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/MeshExporter.hh b/graphics/include/gz/common/MeshExporter.hh
@@ -20,7 +20,7 @@
 #include <string>
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/MeshLoader.hh b/graphics/include/gz/common/MeshLoader.hh
@@ -21,7 +21,7 @@
 
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/MeshManager.hh b/graphics/include/gz/common/MeshManager.hh
@@ -35,7 +35,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/NodeAnimation.hh b/graphics/include/gz/common/NodeAnimation.hh
@@ -25,7 +25,7 @@
 
 #include <gz/common/graphics/Export.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/NodeTransform.hh b/graphics/include/gz/common/NodeTransform.hh
@@ -24,7 +24,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/Util.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {

diff --git a/graphics/include/gz/common/OBJLoader.hh b/graphics/include/gz/common/OBJLoader.hh
@@ -25,7 +25,7 @@
 #include <gz/common/graphics/Export.hh>
 #include <gz/common/SuppressWarning.hh>
 
-namespace gz
+namespace ignition
 {
   namespace common
   {