From b556f32b5f31997a03fc56269ae6b82862d318c7 Mon Sep 17 00:00:00 2001
From: methylDragon <methylDragon@gmail.com>
Date: Thu, 18 Aug 2022 20:42:02 -0700
Subject: [PATCH] Migrate include statements

Signed-off-by: methylDragon <methylDragon@gmail.com>
---
 include/gz/launch/Plugin.hh                 |  4 ++--
 plugins/gazebo_factory/GazeboFactory.cc     |  8 ++++----
 plugins/gazebo_factory/GazeboFactory.hh     |  6 +++---
 plugins/gazebo_gui/GazeboGui.cc             | 14 +++++++-------
 plugins/gazebo_gui/GazeboGui.hh             |  6 +++---
 plugins/gazebo_server/GazeboServer.cc       |  2 +-
 plugins/gazebo_server/GazeboServer.hh       |  6 +++---
 plugins/joy_to_twist/JoyToTwist.cc          |  8 ++++----
 plugins/joy_to_twist/JoyToTwist.hh          | 10 +++++-----
 plugins/joystick/Joystick.cc                | 10 +++++-----
 plugins/joystick/Joystick.hh                |  6 +++---
 plugins/websocket_server/WebsocketServer.cc |  6 +++---
 plugins/websocket_server/WebsocketServer.hh | 10 +++++-----
 src/Manager.cc                              | 16 ++++++++--------
 src/Manager.hh                              |  2 +-
 src/Manager_TEST.cc                         |  6 +++---
 src/gz.cc                                   |  4 ++--
 src/gz.hh                                   |  2 +-
 src/gz_TEST.cc                              |  4 ++--
 test/integration/deprecated_TEST.cc         |  2 +-
 test/integration/plugins/bad_plugins.cc     |  2 +-
 test/integration/plugins/bad_plugins.hh     |  4 ++--
 22 files changed, 69 insertions(+), 69 deletions(-)

diff --git a/include/gz/launch/Plugin.hh b/include/gz/launch/Plugin.hh
index a4435690..b7df4826 100644
--- a/include/gz/launch/Plugin.hh
+++ b/include/gz/launch/Plugin.hh
@@ -18,8 +18,8 @@
 #define GZ_LAUNCH_PLUGIN_HH_
 
 #include <tinyxml2.h>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
-#include <ignition/launch/Export.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
+#include <gz/launch/Export.hh>
 
 namespace gz
 {
diff --git a/plugins/gazebo_factory/GazeboFactory.cc b/plugins/gazebo_factory/GazeboFactory.cc
index bf0f2d46..7293a21a 100644
--- a/plugins/gazebo_factory/GazeboFactory.cc
+++ b/plugins/gazebo_factory/GazeboFactory.cc
@@ -15,11 +15,11 @@
  *
 */
 
-#include <ignition/msgs/entity_factory.pb.h>
-#include <ignition/msgs/boolean.pb.h>
+#include <gz/msgs/entity_factory.pb.h>
+#include <gz/msgs/boolean.pb.h>
 
-#include <ignition/common/Util.hh>
-#include <ignition/common/Console.hh>
+#include <gz/common/Util.hh>
+#include <gz/common/Console.hh>
 #include "GazeboFactory.hh"
 
 using namespace gz;
diff --git a/plugins/gazebo_factory/GazeboFactory.hh b/plugins/gazebo_factory/GazeboFactory.hh
index b8fed89e..ae47d480 100644
--- a/plugins/gazebo_factory/GazeboFactory.hh
+++ b/plugins/gazebo_factory/GazeboFactory.hh
@@ -18,9 +18,9 @@
 #define GZ_LAUNCH_GAZEBOFACTORY_HH_
 
 #include <memory>
-#include <ignition/plugin/Register.hh>
-#include <ignition/transport/Node.hh>
-#include "ignition/launch/Plugin.hh"
+#include <gz/plugin/Register.hh>
+#include <gz/transport/Node.hh>
+#include "gz/launch/Plugin.hh"
 
 namespace gz
 {
diff --git a/plugins/gazebo_gui/GazeboGui.cc b/plugins/gazebo_gui/GazeboGui.cc
index fe5c8c3e..3279a5ac 100644
--- a/plugins/gazebo_gui/GazeboGui.cc
+++ b/plugins/gazebo_gui/GazeboGui.cc
@@ -17,13 +17,13 @@
 
 #include <fstream>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/Filesystem.hh>
-#include <ignition/gazebo/config.hh>
-#include <ignition/gazebo/gui/GuiRunner.hh>
-#include <ignition/gui/MainWindow.hh>
-#include "ignition/gazebo/gui/Gui.hh"
-#include "ignition/gazebo/gui/TmpIface.hh"
+#include <gz/common/Console.hh>
+#include <gz/common/Filesystem.hh>
+#include <gz/sim/config.hh>
+#include <gz/sim/gui/GuiRunner.hh>
+#include <gz/gui/MainWindow.hh>
+#include "gz/sim/gui/Gui.hh"
+#include "gz/sim/gui/TmpIface.hh"
 
 #include "GazeboGui.hh"
 
diff --git a/plugins/gazebo_gui/GazeboGui.hh b/plugins/gazebo_gui/GazeboGui.hh
index d7558429..bbbc94d0 100644
--- a/plugins/gazebo_gui/GazeboGui.hh
+++ b/plugins/gazebo_gui/GazeboGui.hh
@@ -18,9 +18,9 @@
 #define GZ_LAUNCH_GAZEBOGUI_HH_
 
 #include <memory>
-#include <ignition/gui/Application.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/launch/Plugin.hh>
+#include <gz/gui/Application.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/launch/Plugin.hh>
 
 namespace gz
 {
diff --git a/plugins/gazebo_server/GazeboServer.cc b/plugins/gazebo_server/GazeboServer.cc
index ca21e3e0..954eca3b 100644
--- a/plugins/gazebo_server/GazeboServer.cc
+++ b/plugins/gazebo_server/GazeboServer.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include <sdf/sdf.hh>
 #include "GazeboServer.hh"
 
diff --git a/plugins/gazebo_server/GazeboServer.hh b/plugins/gazebo_server/GazeboServer.hh
index f65a405f..09b78568 100644
--- a/plugins/gazebo_server/GazeboServer.hh
+++ b/plugins/gazebo_server/GazeboServer.hh
@@ -18,9 +18,9 @@
 #define GZ_LAUNCH_GAZEBOSERVER_HH_
 
 #include <memory>
-#include <ignition/plugin/Register.hh>
-#include <ignition/gazebo/Server.hh>
-#include "ignition/launch/Plugin.hh"
+#include <gz/plugin/Register.hh>
+#include <gz/sim/Server.hh>
+#include "gz/launch/Plugin.hh"
 
 namespace gz
 {
diff --git a/plugins/joy_to_twist/JoyToTwist.cc b/plugins/joy_to_twist/JoyToTwist.cc
index b255a3f1..8f205978 100644
--- a/plugins/joy_to_twist/JoyToTwist.cc
+++ b/plugins/joy_to_twist/JoyToTwist.cc
@@ -18,10 +18,10 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Util.hh>
-#include <ignition/math/Helpers.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Util.hh>
+#include <gz/math/Helpers.hh>
+#include <gz/transport/Node.hh>
 
 #include "JoyToTwist.hh"
 
diff --git a/plugins/joy_to_twist/JoyToTwist.hh b/plugins/joy_to_twist/JoyToTwist.hh
index 8853dbdd..4af2d6bb 100644
--- a/plugins/joy_to_twist/JoyToTwist.hh
+++ b/plugins/joy_to_twist/JoyToTwist.hh
@@ -19,11 +19,11 @@
 
 #include <string>
 #include <thread>
-#include <ignition/launch/Plugin.hh>
-#include <ignition/math/Vector3.hh>
-#include <ignition/msgs.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/launch/Plugin.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/msgs.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/transport/Node.hh>
 
 namespace gz
 {
diff --git a/plugins/joystick/Joystick.cc b/plugins/joystick/Joystick.cc
index 595c6cbe..27bfab19 100644
--- a/plugins/joystick/Joystick.cc
+++ b/plugins/joystick/Joystick.cc
@@ -19,11 +19,11 @@
 #include <linux/joystick.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Util.hh>
-#include <ignition/math/Helpers.hh>
-#include <ignition/msgs.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Util.hh>
+#include <gz/math/Helpers.hh>
+#include <gz/msgs.hh>
+#include <gz/transport/Node.hh>
 
 #include "Joystick.hh"
 
diff --git a/plugins/joystick/Joystick.hh b/plugins/joystick/Joystick.hh
index 4ffef3a9..4fdc69bc 100644
--- a/plugins/joystick/Joystick.hh
+++ b/plugins/joystick/Joystick.hh
@@ -18,9 +18,9 @@
 #define GZ_LAUNCH_JOYSTICK_HH_
 
 #include <thread>
-#include <ignition/launch/Plugin.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/launch/Plugin.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/transport/Node.hh>
 
 namespace gz
 {
diff --git a/plugins/websocket_server/WebsocketServer.cc b/plugins/websocket_server/WebsocketServer.cc
index 01222951..54d42aac 100644
--- a/plugins/websocket_server/WebsocketServer.cc
+++ b/plugins/websocket_server/WebsocketServer.cc
@@ -16,9 +16,9 @@
 */
 
 #include <algorithm>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Util.hh>
-#include <ignition/msgs.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Util.hh>
+#include <gz/msgs.hh>
 
 #include "MessageDefinitions.hh"
 #include "WebsocketServer.hh"
diff --git a/plugins/websocket_server/WebsocketServer.hh b/plugins/websocket_server/WebsocketServer.hh
index 1d68d9da..dd8a9aea 100644
--- a/plugins/websocket_server/WebsocketServer.hh
+++ b/plugins/websocket_server/WebsocketServer.hh
@@ -21,11 +21,11 @@
 #include <map>
 #include <memory>
 #include <thread>
-#include <ignition/launch/Plugin.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/transport/MessageInfo.hh>
-#include <ignition/transport/Node.hh>
-#include <ignition/common/Util.hh>
+#include <gz/launch/Plugin.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/transport/MessageInfo.hh>
+#include <gz/transport/Node.hh>
+#include <gz/common/Util.hh>
 #include <libwebsockets.h>
 
 namespace gz
diff --git a/src/Manager.cc b/src/Manager.cc
index e7fdbcc8..d2bb7a36 100644
--- a/src/Manager.cc
+++ b/src/Manager.cc
@@ -39,14 +39,14 @@
 #include <utility>
 #include <vector>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/SignalHandler.hh>
-#include <ignition/common/SystemPaths.hh>
-#include <ignition/math/Rand.hh>
-#include <ignition/plugin/Loader.hh>
-
-#include "ignition/launch/config.hh"
-#include "ignition/launch/Plugin.hh"
+#include <gz/common/Console.hh>
+#include <gz/common/SignalHandler.hh>
+#include <gz/common/SystemPaths.hh>
+#include <gz/math/Rand.hh>
+#include <gz/plugin/Loader.hh>
+
+#include "gz/launch/config.hh"
+#include "gz/launch/Plugin.hh"
 
 #include "vendor/backward.hpp"
 
diff --git a/src/Manager.hh b/src/Manager.hh
index 7f2aceaf..02f2325d 100644
--- a/src/Manager.hh
+++ b/src/Manager.hh
@@ -19,7 +19,7 @@
 
 #include <memory>
 #include <string>
-#include <ignition/launch/Export.hh>
+#include <gz/launch/Export.hh>
 
 namespace gz
 {
diff --git a/src/Manager_TEST.cc b/src/Manager_TEST.cc
index 22b6ac8d..b9dc5b80 100644
--- a/src/Manager_TEST.cc
+++ b/src/Manager_TEST.cc
@@ -16,10 +16,10 @@
 */
 
 #include <gtest/gtest.h>
-#include <ignition/common/Console.hh>
-#include <ignition/common/Filesystem.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/Filesystem.hh>
 
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <gz/utilities/ExtraTestMacros.hh>
 
 #include <sys/stat.h>
 
diff --git a/src/gz.cc b/src/gz.cc
index 5fe17c55..b57ac111 100644
--- a/src/gz.cc
+++ b/src/gz.cc
@@ -15,9 +15,9 @@
  *
 */
 #include <cstring>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 
-#include "ignition/launch/config.hh"
+#include "gz/launch/config.hh"
 #include "gz.hh"
 #include "Manager.hh"
 
diff --git a/src/gz.hh b/src/gz.hh
index 63094821..b884b00e 100644
--- a/src/gz.hh
+++ b/src/gz.hh
@@ -17,7 +17,7 @@
 #ifndef GZ_LAUNCH_IGN_HH_
 #define GZ_LAUNCH_IGN_HH_
 
-#include "ignition/launch/Export.hh"
+#include "gz/launch/Export.hh"
 
 /// \brief External hook to read the library version.
 /// \return C-string representing the version. Ex.: 0.1.2
diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc
index 96653cb9..cb8edb7d 100644
--- a/src/gz_TEST.cc
+++ b/src/gz_TEST.cc
@@ -21,8 +21,8 @@
 
 #include <string>
 
-#include <ignition/common/Filesystem.hh>
-#include "ignition/launch/test_config.hh"  // NOLINT(build/include)
+#include <gz/common/Filesystem.hh>
+#include "gz/launch/test_config.hh"  // NOLINT(build/include)
 
 static const std::string kIgnCommand(
     std::string("IGN_CONFIG_PATH=") + IGN_CONFIG_PATH + " " +
diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc
index 0bb00342..3879780f 100644
--- a/test/integration/deprecated_TEST.cc
+++ b/test/integration/deprecated_TEST.cc
@@ -16,7 +16,7 @@
 */
 
 #include <gtest/gtest.h>
-#include <ignition/launch/Plugin.hh>
+#include <gz/launch/Plugin.hh>
 
 /////////////////////////////////////////////////
 // Make sure the ignition namespace still works
diff --git a/test/integration/plugins/bad_plugins.cc b/test/integration/plugins/bad_plugins.cc
index 6c5d57a3..c18c88f4 100644
--- a/test/integration/plugins/bad_plugins.cc
+++ b/test/integration/plugins/bad_plugins.cc
@@ -16,7 +16,7 @@
  */
 
 #include "bad_plugins.hh"
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include <iostream>
 
diff --git a/test/integration/plugins/bad_plugins.hh b/test/integration/plugins/bad_plugins.hh
index 4ed74213..f803e36c 100644
--- a/test/integration/plugins/bad_plugins.hh
+++ b/test/integration/plugins/bad_plugins.hh
@@ -15,8 +15,8 @@
  *
  */
 
-#include <ignition/plugin/Register.hh>
-#include "ignition/launch/Plugin.hh"
+#include <gz/plugin/Register.hh>
+#include "gz/launch/Plugin.hh"
 
 class SegfaultOnLoad : public gz::launch::Plugin
 {