Migrate include statements

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Aug 19, 2022 · f963ab5 · f963ab5
1 parent d7afaa8
commit f963ab5
Show file tree

Hide file tree

Showing 92 changed files with 373 additions and 373 deletions.
diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "CustomContext.hh"
 

diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh
@@ -19,8 +19,8 @@
 #define GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
-  #include <ignition/gui/Plugin.hh>
+  #include <gz/gui/qt.h>
+  #include <gz/gui/Plugin.hh>
 #endif
 
 namespace gz

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "DialogFromPlugin.hh"
 

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
@@ -19,8 +19,8 @@
 #define GZ_GUI_DIALOGFROMPLUGIN_HH_
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
-  #include <ignition/gui/Plugin.hh>
+  #include <gz/gui/qt.h>
+  #include <gz/gui/Plugin.hh>
 #endif
 
 namespace gz

diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "HelloPlugin.hh"
 

diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh
@@ -20,8 +20,8 @@
 
 #include <string>
 
-#include <ignition/gui/qt.h>
-#include <ignition/gui/Plugin.hh>
+#include <gz/gui/qt.h>
+#include <gz/gui/Plugin.hh>
 
 namespace gz
 {

diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 #include "IgnComponents.hh"
 
 // Register this plugin

diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
 #define GZ_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
 
-#include <ignition/gui/Plugin.hh>
+#include <gz/gui/Plugin.hh>
 
 namespace gz
 {

diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "MultipleQml.hh"
 

diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh
@@ -19,8 +19,8 @@
 #define GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
-  #include <ignition/gui/Plugin.hh>
+  #include <gz/gui/qt.h>
+  #include <gz/gui/Plugin.hh>
 #endif
 
 namespace gz

diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc
@@ -15,12 +15,12 @@
  *
 */
 
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/Application.hh>
-  #include <ignition/gui/MainWindow.hh>
-  #include <ignition/gui/qt.h>
+  #include <gz/gui/Application.hh>
+  #include <gz/gui/MainWindow.hh>
+  #include <gz/gui/qt.h>
   #include "custom_drawer.hh"
 #endif
 

diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh
@@ -21,7 +21,7 @@
 #include <iostream>
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
+  #include <gz/gui/qt.h>
 #endif
 
 namespace gz

diff --git a/examples/standalone/dialogs/dialogs.cc b/examples/standalone/dialogs/dialogs.cc
@@ -17,12 +17,12 @@
 
 #include <iostream>
 
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
-  #include <ignition/gui/Application.hh>
-  #include <ignition/gui/Dialog.hh>
+  #include <gz/gui/qt.h>
+  #include <gz/gui/Application.hh>
+  #include <gz/gui/Dialog.hh>
 #endif
 
 //////////////////////////////////////////////////

diff --git a/examples/standalone/start_dialog/start_dialog.cc b/examples/standalone/start_dialog/start_dialog.cc
@@ -17,10 +17,10 @@
 
 #include <iostream>
 
-#include <ignition/gui/qt.h>
-#include <ignition/gui/Application.hh>
-#include <ignition/gui/Dialog.hh>
-#include <ignition/gui/MainWindow.hh>
+#include <gz/gui/qt.h>
+#include <gz/gui/Application.hh>
+#include <gz/gui/Dialog.hh>
+#include <gz/gui/MainWindow.hh>
 
 //////////////////////////////////////////////////
 int main(int _argc, char **_argv)

diff --git a/examples/standalone/window/window.cc b/examples/standalone/window/window.cc
@@ -18,9 +18,9 @@
 #include <iostream>
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
-  #include <ignition/gui/Application.hh>
-  #include <ignition/gui/MainWindow.hh>
+  #include <gz/gui/qt.h>
+  #include <gz/gui/Application.hh>
+  #include <gz/gui/MainWindow.hh>
 #endif
 
 //////////////////////////////////////////////////

diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh
@@ -22,8 +22,8 @@
 #include <utility>
 #include <vector>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by

diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh
@@ -21,17 +21,17 @@
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <ignition/msgs/time.pb.h>
+#include <gz/msgs/time.pb.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#include <ignition/common/Time.hh>
-#include <ignition/math/Color.hh>
-#include <ignition/math/Vector2.hh>
-#include <ignition/math/Vector3.hh>
+#include <gz/common/Time.hh>
+#include <gz/math/Color.hh>
+#include <gz/math/Vector2.hh>
+#include <gz/math/Vector3.hh>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 namespace gz
 {

diff --git a/include/gz/gui/Dialog.hh b/include/gz/gui/Dialog.hh
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by

diff --git a/include/gz/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh
@@ -17,8 +17,8 @@
 #ifndef GZ_GUI_DRAGDROPMODEL_HH_
 #define GZ_GUI_DRAGDROPMODEL_HH_
 
-#include "ignition/gui/Export.hh"
-#include "ignition/gui/qt.h"
+#include "gz/gui/Export.hh"
+#include "gz/gui/qt.h"
 
 namespace gz
 {

diff --git a/include/gz/gui/Enums.hh b/include/gz/gui/Enums.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_GUI_ENUMS_HH_
 #define GZ_GUI_ENUMS_HH_
 
-#include "ignition/gui/qt.h"
+#include "gz/gui/qt.h"
 
 namespace gz
 {

diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh
@@ -21,7 +21,7 @@
 #include <string>
 #include <utility>
 #include <vector>
-#include <ignition/math/Vector3.hh>
+#include <gz/math/Vector3.hh>
 
 namespace gz
 {

diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh
@@ -19,8 +19,8 @@
 
 #include <string>
 
-#include "ignition/gui/Enums.hh"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/Enums.hh"
+#include "gz/gui/Export.hh"
 
 namespace gz
 {

diff --git a/include/gz/gui/MainWindow.hh b/include/gz/gui/MainWindow.hh
@@ -23,10 +23,10 @@
 #include <string>
 #include <vector>
 
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by

diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh
@@ -21,8 +21,8 @@
 #include <memory>
 #include <string>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by

diff --git a/include/gz/gui/SearchModel.hh b/include/gz/gui/SearchModel.hh
@@ -17,8 +17,8 @@
 #ifndef GZ_GUI_SEARCHMODEL_HH_
 #define GZ_GUI_SEARCHMODEL_HH_
 
-#include "ignition/gui/Export.hh"
-#include "ignition/gui/qt.h"
+#include "gz/gui/Export.hh"
+#include "gz/gui/qt.h"
 
 namespace gz
 {

diff --git a/include/gz/gui/gz.hh b/include/gz/gui/gz.hh
@@ -18,7 +18,7 @@
 #ifndef GZ_GUI_IGN_HH_
 #define GZ_GUI_IGN_HH_
 
-#include "ignition/gui/Export.hh"
+#include "gz/gui/Export.hh"
 
 /// \brief External hook to read the library version.
 /// \return C-string representing the version. Ex.: 0.1.2

diff --git a/include/gz/gui/ign_auto_headers.hh.in b/include/gz/gui/ign_auto_headers.hh.in
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <ignition/${GZ_DESIGNATION}/config.hh>
+#include <gz/${GZ_DESIGNATION}/config.hh>
 ${ign_headers}
diff --git a/src/Application.cc b/src/Application.cc
@@ -18,23 +18,23 @@
 #include <tinyxml2.h>
 #include <queue>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/Filesystem.hh>
-#include <ignition/common/SignalHandler.hh>
-#include <ignition/common/StringUtils.hh>
-#include <ignition/common/SystemPaths.hh>
-#include <ignition/common/Util.hh>
-
-#include <ignition/plugin/Loader.hh>
-
-#include "ignition/gui/Application.hh"
-#include "ignition/gui/config.hh"
-#include "ignition/gui/Dialog.hh"
-#include "ignition/gui/Helpers.hh"
-#include "ignition/gui/MainWindow.hh"
-#include "ignition/gui/Plugin.hh"
-
-#include "ignition/transport/TopicUtils.hh"
+#include <gz/common/Console.hh>
+#include <gz/common/Filesystem.hh>
+#include <gz/common/SignalHandler.hh>
+#include <gz/common/StringUtils.hh>
+#include <gz/common/SystemPaths.hh>
+#include <gz/common/Util.hh>
+
+#include <gz/plugin/Loader.hh>
+
+#include "gz/gui/Application.hh"
+#include "gz/gui/config.hh"
+#include "gz/gui/Dialog.hh"
+#include "gz/gui/Helpers.hh"
+#include "gz/gui/MainWindow.hh"
+#include "gz/gui/Plugin.hh"
+
+#include "gz/transport/TopicUtils.hh"
 
 namespace gz
 {

diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc
@@ -17,14 +17,14 @@
 
 #include <stdlib.h>
 #include <gtest/gtest.h>
-#include <ignition/common/Console.hh>
-#include <ignition/utilities/ExtraTestMacros.hh>
+#include <gz/common/Console.hh>
+#include <gz/utilities/ExtraTestMacros.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
-#include "ignition/gui/Application.hh"
-#include "ignition/gui/Dialog.hh"
-#include "ignition/gui/MainWindow.hh"
-#include "ignition/gui/Plugin.hh"
+#include "gz/gui/Application.hh"
+#include "gz/gui/Dialog.hh"
+#include "gz/gui/MainWindow.hh"
+#include "gz/gui/Plugin.hh"
 
 int g_argc = 1;
 char* g_argv[] =

diff --git a/src/Conversions.cc b/src/Conversions.cc
@@ -15,10 +15,10 @@
  *
 */
 
-#include <ignition/common/MouseEvent.hh>
-#include <ignition/math/Color.hh>
+#include <gz/common/MouseEvent.hh>
+#include <gz/math/Color.hh>
 
-#include "ignition/gui/Conversions.hh"
+#include "gz/gui/Conversions.hh"
 
 //////////////////////////////////////////////////
 QColor gz::gui::convert(const gz::math::Color &_color)

diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc
@@ -17,12 +17,12 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/common/Console.hh>
-#include <ignition/common/MouseEvent.hh>
-#include <ignition/math/Color.hh>
+#include <gz/common/Console.hh>
+#include <gz/common/MouseEvent.hh>
+#include <gz/math/Color.hh>
 
 #include "test_config.h"  // NOLINT(build/include)
-#include "ignition/gui/Conversions.hh"
+#include "gz/gui/Conversions.hh"
 
 using namespace gz;
 using namespace gui;