Migrate include statements

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

Hide file tree

Showing 181 changed files with 480 additions and 480 deletions.
diff --git a/av/include/gz/common/AudioDecoder.hh b/av/include/gz/common/AudioDecoder.hh
@@ -21,8 +21,8 @@
 #include <string>
 #include <memory>
 
-#include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <gz/common/av/Export.hh>
+#include <gz/common/SuppressWarning.hh>
 
 namespace gz
 {

diff --git a/av/include/gz/common/HWEncoder.hh b/av/include/gz/common/HWEncoder.hh
@@ -20,11 +20,11 @@
 #include <string>
 #include <optional>
 
-#include <ignition/common/FlagSet.hh>
-#include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
-#include <ignition/common/HWVideo.hh>
-#include <ignition/common/ffmpeg_inc.hh>
+#include <gz/common/FlagSet.hh>
+#include <gz/common/av/Export.hh>
+#include <gz/common/SuppressWarning.hh>
+#include <gz/common/HWVideo.hh>
+#include <gz/common/ffmpeg_inc.hh>
 
 /// This is an internal-use only class encapsulating HW video encoding. All
 /// symbols defined here are hidden from the public API.

diff --git a/av/include/gz/common/HWVideo.hh b/av/include/gz/common/HWVideo.hh
@@ -16,7 +16,7 @@
 #ifndef IGNITION_COMMON_HWVIDEO_HH
 #define IGNITION_COMMON_HWVIDEO_HH
 
-#include <ignition/common/EnumIface.hh>
+#include <gz/common/EnumIface.hh>
 
 namespace gz::common
 {

diff --git a/av/include/gz/common/Video.hh b/av/include/gz/common/Video.hh
@@ -20,8 +20,8 @@
 #include <string>
 #include <memory>
 
-#include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <gz/common/av/Export.hh>
+#include <gz/common/SuppressWarning.hh>
 
 struct AVFormatContext;
 struct AVCodecContext;

diff --git a/av/include/gz/common/VideoEncoder.hh b/av/include/gz/common/VideoEncoder.hh
@@ -22,10 +22,10 @@
 #include <memory>
 #include <optional>
 
-#include <ignition/common/FlagSet.hh>
-#include <ignition/common/av/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
-#include <ignition/common/HWVideo.hh>
+#include <gz/common/FlagSet.hh>
+#include <gz/common/av/Export.hh>
+#include <gz/common/SuppressWarning.hh>
+#include <gz/common/HWVideo.hh>
 
 // Default bitrate (0) indicates that a bitrate should be calculated when
 // Start is called.

diff --git a/av/include/gz/common/ffmpeg_inc.hh b/av/include/gz/common/ffmpeg_inc.hh
@@ -19,7 +19,7 @@
 
 #include <string>
 
-#include <ignition/common/config.hh>
+#include <gz/common/config.hh>
 
 #ifndef _WIN32
 #pragma GCC system_header
@@ -49,7 +49,7 @@ extern "C" {
 #endif
 }
 
-#include <ignition/common/av/Export.hh>
+#include <gz/common/av/Export.hh>
 
 namespace gz
 {

diff --git a/av/src/AudioDecoder.cc b/av/src/AudioDecoder.cc
@@ -15,10 +15,10 @@
 *
 */
 
-#include <ignition/common/av/Util.hh>
-#include <ignition/common/ffmpeg_inc.hh>
-#include <ignition/common/AudioDecoder.hh>
-#include <ignition/common/Console.hh>
+#include <gz/common/av/Util.hh>
+#include <gz/common/ffmpeg_inc.hh>
+#include <gz/common/AudioDecoder.hh>
+#include <gz/common/Console.hh>
 
 #define AUDIO_INBUF_SIZE (20480 * 2)
 #define AUDIO_REFILL_THRESH 4096

diff --git a/av/src/AudioDecoder_TEST.cc b/av/src/AudioDecoder_TEST.cc
@@ -16,8 +16,8 @@
 */
 #include <gtest/gtest.h>
 
-#include <ignition/common/AudioDecoder.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <gz/common/AudioDecoder.hh>
+#include <gz/utilities/ExtraTestMacros.hh>
 
 #include "test_config.h"
 

diff --git a/av/src/HWEncoder.cc b/av/src/HWEncoder.cc
@@ -20,10 +20,10 @@
 #include <map>
 #include <utility>
 
-#include "ignition/common/ffmpeg_inc.hh"
+#include "gz/common/ffmpeg_inc.hh"
 #include "gz/common/HWEncoder.hh"
-#include "ignition/common/StringUtils.hh"
-#include "ignition/common/Console.hh"
+#include "gz/common/StringUtils.hh"
+#include "gz/common/Console.hh"
 
 using namespace gz;
 using namespace common;

diff --git a/av/src/Util.cc b/av/src/Util.cc
@@ -17,9 +17,9 @@
 
 #include <string>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/av/Util.hh>
-#include <ignition/common/ffmpeg_inc.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/av/Util.hh>
+#include <gz/common/ffmpeg_inc.hh>
 
 /////////////////////////////////////////////////
 // avcodec log callback. We use this to redirect message to gazebo's console

diff --git a/av/src/Video.cc b/av/src/Video.cc
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
 */
-#include "ignition/common/config.hh"
-#include "ignition/common/Console.hh"
-#include "ignition/common/ffmpeg_inc.hh"
-#include "ignition/common/Video.hh"
-#include "ignition/common/av/Util.hh"
+#include "gz/common/config.hh"
+#include "gz/common/Console.hh"
+#include "gz/common/ffmpeg_inc.hh"
+#include "gz/common/Video.hh"
+#include "gz/common/av/Util.hh"
 
 using namespace gz;
 using namespace common;

diff --git a/av/src/VideoEncoder.cc b/av/src/VideoEncoder.cc
@@ -18,11 +18,11 @@
 
 #include <mutex>
 
-#include <ignition/common/av/Util.hh>
-#include "ignition/common/ffmpeg_inc.hh"
-#include "ignition/common/Console.hh"
-#include "ignition/common/VideoEncoder.hh"
-#include "ignition/common/StringUtils.hh"
+#include <gz/common/av/Util.hh>
+#include "gz/common/ffmpeg_inc.hh"
+#include "gz/common/Console.hh"
+#include "gz/common/VideoEncoder.hh"
+#include "gz/common/StringUtils.hh"
 
 #ifdef IGN_COMMON_BUILD_HW_VIDEO
 #include "gz/common/HWEncoder.hh"

diff --git a/av/src/VideoEncoder_TEST.cc b/av/src/VideoEncoder_TEST.cc
@@ -15,8 +15,8 @@
 */
 #include <gtest/gtest.h>
 
-#include "ignition/common/Console.hh"
-#include "ignition/common/VideoEncoder.hh"
+#include "gz/common/Console.hh"
+#include "gz/common/VideoEncoder.hh"
 #include "test_config.h"
 
 using namespace gz;

diff --git a/av/src/ffmpeg_inc.cc b/av/src/ffmpeg_inc.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
 */
-#include "ignition/common/ffmpeg_inc.hh"
+#include "gz/common/ffmpeg_inc.hh"
 
 using namespace gz;
 

diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh
@@ -25,9 +25,9 @@
 #include <mutex>
 #include <utility>
 
-#include <ignition/common/config.hh>
-#include <ignition/common/events/Export.hh>
-#include <ignition/common/events/Types.hh>
+#include <gz/common/config.hh>
+#include <gz/common/events/Export.hh>
+#include <gz/common/events/Types.hh>
 
 namespace gz
 {

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

diff --git a/events/include/gz/common/MouseEvent.hh b/events/include/gz/common/MouseEvent.hh
@@ -18,10 +18,10 @@
 #define GZ_COMMON_MOUSEEVENT_HH_
 
 #include <memory>
-#include <ignition/math/Vector2.hh>
+#include <gz/math/Vector2.hh>
 
-#include <ignition/common/events/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <gz/common/events/Export.hh>
+#include <gz/common/SuppressWarning.hh>
 
 namespace gz
 {

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

diff --git a/events/src/Event_TEST.cc b/events/src/Event_TEST.cc
@@ -20,7 +20,7 @@
 #include "test_config.h"
 
 #include <functional>
-#include <ignition/common/Event.hh>
+#include <gz/common/Event.hh>
 
 using namespace gz;
 

diff --git a/events/src/KeyEvent.cc b/events/src/KeyEvent.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
 */
-#include "ignition/common/KeyEvent.hh"
+#include "gz/common/KeyEvent.hh"
 
 using namespace gz;
 using namespace common;

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

diff --git a/events/src/MouseEvent.cc b/events/src/MouseEvent.cc
@@ -15,8 +15,8 @@
  *
 */
 
-#include <ignition/math/Vector2.hh>
-#include "ignition/common/MouseEvent.hh"
+#include <gz/math/Vector2.hh>
+#include "gz/common/MouseEvent.hh"
 
 using namespace gz;
 using namespace common;

diff --git a/events/src/MouseEvent_TEST.cc b/events/src/MouseEvent_TEST.cc
@@ -18,8 +18,8 @@
 #include <gtest/gtest.h>
 
 #include "test_config.h"
-#include "ignition/common/MouseEvent.hh"
-#include "ignition/common/config.hh"
+#include "gz/common/MouseEvent.hh"
+#include "gz/common/config.hh"
 
 using namespace gz;
 

diff --git a/examples/assert_example.cc b/examples/assert_example.cc
@@ -1,4 +1,4 @@
-#include <ignition/common.hh>
+#include <gz/common.hh>
 
 int main(int argc, char **argv)
 {

diff --git a/examples/console.cc b/examples/console.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  *
 */
-#include <ignition/common.hh>
+#include <gz/common.hh>
 
 int main(int argc, char **argv)
 {

diff --git a/examples/events.cc b/examples/events.cc
@@ -17,7 +17,7 @@
 
 #include <functional>
 #include <iostream>
-#include <ignition/common/Event.hh>
+#include <gz/common/Event.hh>
 
 using namespace gz;
 

diff --git a/examples/profiler.cc b/examples/profiler.cc
@@ -18,10 +18,10 @@
 #include <atomic>
 #include <thread>
 
-#include "ignition/common/Console.hh"
-#include "ignition/common/Profiler.hh"
-#include "ignition/common/SignalHandler.hh"
-#include "ignition/common/Time.hh"
+#include "gz/common/Console.hh"
+#include "gz/common/Profiler.hh"
+#include "gz/common/SignalHandler.hh"
+#include "gz/common/Time.hh"
 
 std::atomic<bool> running;
 

diff --git a/graphics/include/gz/common/Animation.hh b/graphics/include/gz/common/Animation.hh
@@ -21,11 +21,11 @@
 #include <string>
 #include <vector>
 
-#include <ignition/math/Pose3.hh>
-#include <ignition/math/Spline.hh>
-#include <ignition/math/RotationSpline.hh>
+#include <gz/math/Pose3.hh>
+#include <gz/math/Spline.hh>
+#include <gz/math/RotationSpline.hh>
 
-#include <ignition/common/graphics/Export.hh>
+#include <gz/common/graphics/Export.hh>
 
 namespace gz
 {

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

diff --git a/graphics/include/gz/common/ColladaExporter.hh b/graphics/include/gz/common/ColladaExporter.hh
@@ -21,11 +21,11 @@
 #include <string>
 #include <vector>
 
-#include <ignition/common/MeshExporter.hh>
-#include <ignition/common/graphics/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <gz/common/MeshExporter.hh>
+#include <gz/common/graphics/Export.hh>
+#include <gz/common/SuppressWarning.hh>
 
-#include <ignition/math/Matrix4.hh>
+#include <gz/math/Matrix4.hh>
 
 namespace gz
 {

diff --git a/graphics/include/gz/common/ColladaLoader.hh b/graphics/include/gz/common/ColladaLoader.hh
@@ -18,8 +18,8 @@
 #define GZ_COMMON_COLLADALOADER_HH_
 
 #include <string>
-#include <ignition/common/graphics/Export.hh>
-#include <ignition/common/MeshLoader.hh>
+#include <gz/common/graphics/Export.hh>
+#include <gz/common/MeshLoader.hh>
 
 namespace gz
 {

diff --git a/graphics/include/gz/common/Dem.hh b/graphics/include/gz/common/Dem.hh
@@ -18,11 +18,11 @@
 #define GZ_COMMON_DEM_HH_
 
 #include <memory>
-#include <ignition/math/Vector3.hh>
-#include <ignition/math/Angle.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/math/Angle.hh>
 
-#include <ignition/common/graphics/Export.hh>
-#include <ignition/common/SuppressWarning.hh>
+#include <gz/common/graphics/Export.hh>
+#include <gz/common/SuppressWarning.hh>
 
 #ifdef HAVE_GDAL
 # include <string>