ign -> gz Migrate Ignition Headers : gz-gui (#466)

* Migrate headers Signed-off-by: methylDragon <methylDragon@gmail.com> * Add redirection headers Signed-off-by: methylDragon <methylDragon@gmail.com> * Migrate include statements Signed-off-by: methylDragon <methylDragon@gmail.com> * Leave ignition as primary in headers to fix ABI Signed-off-by: methylDragon <methylDragon@gmail.com> * Changed more Ignition names Signed-off-by: Nate Koenig <nate@openrobotics.org> * Update ignitionrobotics to gazebosim Signed-off-by: Nate Koenig <nate@openrobotics.org> * Update renaming Signed-off-by: Nate Koenig <nate@openrobotics.org> Signed-off-by: methylDragon <methylDragon@gmail.com> Signed-off-by: Nate Koenig <nate@openrobotics.org> Co-authored-by: Nate Koenig <nate@openrobotics.org>
gazebosim · Nov 30, 2022 · b016183 · b016183
1 parent 721eca0
commit b016183
Show file tree

Hide file tree

Showing 170 changed files with 2,899 additions and 2,533 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -13,7 +13,9 @@ find_package(ignition-cmake2 2.14 REQUIRED)
 #============================================================================
 # Configure the project
 #============================================================================
-ign_configure_project()
+ign_configure_project(
+  REPLACE_IGNITION_INCLUDE_PATH gz/gui
+)
 
 #============================================================================
 # Set project-specific options

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1 +1 @@
-See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing).
+See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing).
diff --git a/Changelog.md b/Changelog.md
diff --git a/Migration.md b/Migration.md
@@ -5,26 +5,26 @@ Deprecated code produces compile-time warnings. These warning serve as
 notification to users that their code should be upgraded. The next major
 release will remove the deprecated code.
 
-## Ignition GUI 3.10 to 3.11
+## Gazebo GUI 3.10 to 3.11
 
 * `Dialog::ReadConfigAttribute` doesn't create a missing file anymore.
 
-## Ignition GUI 3.6 to 3.7
+## Gazebo GUI 3.6 to 3.7
 
 * The `Application::PluginAdded` signal used to send empty strings. Now it
   sends the plugin's unique name.
 
-## Ignition GUI 2.x to 3.x
+## Gazebo GUI 2.x to 3.x
 
 * Use rendering3, transport8 and msgs5.
 
-## Ignition GUI 1.x to 2.x
+## Gazebo GUI 1.x to 2.x
 
 * Plugin headers are no longer installed.
 
 * Use ignition msgs4, rendering2, and transport7.
 
-## Ignition GUI 0.1.0 to 1.0.0
+## Gazebo GUI 0.1.0 to 1.0.0
 
-* Ignition GUI v1 uses QtQuick and it is not compatible with v0, which uses QWidgets.
+* Gazebo GUI v1 uses QtQuick and it is not compatible with v0, which uses QWidgets.
 
diff --git a/NEWS b/NEWS
@@ -1 +1 @@
-http://ignitionrobotics.org
+http://gazebosim.org
diff --git a/api.md.in b/api.md.in
@@ -1,6 +1,6 @@
-## Ignition @GZ_DESIGNATION_CAP@
+## Gazebo @GZ_DESIGNATION_CAP@
 
-Ignition @GZ_DESIGNATION_CAP@ is a component in Ignition Robotics, a set of libraries
+Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo, a set of libraries
 designed to rapidly develop robot and simulation applications. 
 
 ## License

diff --git a/examples/README.md b/examples/README.md
@@ -1,4 +1,4 @@
-This directory contains examples which are not shipped with Ignition GUI
+This directory contains examples which are not shipped with Gazebo GUI
 
 # Standalone
 
@@ -7,11 +7,11 @@ Ignition-GUI as a library
 
 # Plugin
 
-Examples of how to build plugins which can then be used with Ignition GUI's
+Examples of how to build plugins which can then be used with Gazebo GUI's
 command line tool, or used by standalone applications.
 
 # Config
 
-Example configuration files which can be used with Ignition GUI's command
+Example configuration files which can be used with Gazebo GUI's command
 line tool or with standalone applications
 
diff --git a/examples/config/plugin_params.config b/examples/config/plugin_params.config
@@ -6,7 +6,7 @@
 
 <plugin filename="Publisher">
   <!--
-    All elements within <ignition-gui> are parsed by Ignition GUI and common to
+    All elements within <ignition-gui> are parsed by Gazebo GUI and common to
     all plugins.
   -->
   <ignition-gui>

diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 find_package(ignition-common3 REQUIRED)
 

diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc
@@ -16,11 +16,11 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "CustomContext.hh"
 
-using namespace ignition;
+using namespace gz;
 using namespace gui;
 
 /////////////////////////////////////////////////

diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh
@@ -15,12 +15,12 @@
  *
 */
 
-#ifndef IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_
-#define IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_
+#ifndef GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_
+#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 ignition

diff --git a/examples/plugin/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 find_package(ignition-common3 REQUIRED)
 

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

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
@@ -15,12 +15,12 @@
  *
 */
 
-#ifndef IGNITION_GUI_DIALOGFROMPLUGIN_HH_
-#define IGNITION_GUI_DIALOGFROMPLUGIN_HH_
+#ifndef GZ_GUI_DIALOGFROMPLUGIN_HH_
+#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 ignition

diff --git a/examples/plugin/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 find_package(ignition-common3 REQUIRED)
 

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

diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh
@@ -15,13 +15,13 @@
  *
 */
 
-#ifndef IGNITION_GUI_HELLOPLUGIN_HH_
-#define IGNITION_GUI_HELLOPLUGIN_HH_
+#ifndef GZ_GUI_HELLOPLUGIN_HH_
+#define GZ_GUI_HELLOPLUGIN_HH_
 
 #include <string>
 
-#include <ignition/gui/qt.h>
-#include <ignition/gui/Plugin.hh>
+#include <gz/gui/qt.h>
+#include <gz/gui/Plugin.hh>
 
 namespace ignition
 {
@@ -37,7 +37,7 @@ namespace ignition
       /// \brief Destructor
       public: virtual ~HelloPlugin();
 
-      /// \brief Called by Ignition GUI when plugin is instantiated.
+      /// \brief Called by Gazebo GUI when plugin is instantiated.
       /// \param[in] _pluginElem XML configuration for this plugin.
       public: virtual void LoadConfig(const tinyxml2::XMLElement *_pluginElem)
           override;

diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc
@@ -15,9 +15,9 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 #include "IgnComponents.hh"
 
 // Register this plugin
-IGNITION_ADD_PLUGIN(ignition::gui::IgnComponents,
-                    ignition::gui::Plugin);
+IGNITION_ADD_PLUGIN(gz::gui::IgnComponents,
+                    gz::gui::Plugin);
diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh
@@ -15,10 +15,10 @@
  *
 */
 
-#ifndef IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
-#define IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
+#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 ignition
 {

diff --git a/examples/plugin/ign_components/README.md b/examples/plugin/ign_components/README.md
@@ -1,4 +1,4 @@
-Demo of QML components provided by Ignition GUI which can be
+Demo of QML components provided by Gazebo GUI which can be
 useful for downstream developers.
 
 ## Build

diff --git a/examples/plugin/multiple_qml/CMakeLists.txt b/examples/plugin/multiple_qml/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 find_package(ignition-common3 REQUIRED)
 

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

diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh
@@ -15,12 +15,12 @@
  *
 */
 
-#ifndef IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
-#define IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
+#ifndef GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
+#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 ignition

diff --git a/examples/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 
 QT5_ADD_RESOURCES(resources_RCC custom_drawer.qrc)

diff --git a/examples/standalone/custom_drawer/CustomDrawer.qml b/examples/standalone/custom_drawer/CustomDrawer.qml
@@ -50,7 +50,7 @@ Rectangle {
       actionElement: "cppActionFromQml"
     }
 
-    // Actions provided by Ignition GUI, with custom titles
+    // Actions provided by Gazebo GUI, with custom titles
     ListElement {
       title: "Call default action (Style)"
       actionElement: "styleSettings"

diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc
@@ -15,29 +15,29 @@
  *
 */
 
-#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
 
 //////////////////////////////////////////////////
 int main(int _argc, char **_argv)
 {
   // Increase verboosity so we see all messages
-  ignition::common::Console::SetVerbosity(4);
+  gz::common::Console::SetVerbosity(4);
 
   // Initialize app
-  ignition::gui::Application app(_argc, _argv);
+  gz::gui::Application app(_argc, _argv);
 
   // Hide original panel
   app.LoadConfig("../custom_drawer.config");
 
   // Let QML files use CustomActions' functions and properties
-  ignition::gui::CustomActions actions;
+  gz::gui::CustomActions actions;
   auto context = new QQmlContext(app.Engine()->rootContext());
   context->setContextProperty("CustomActions", &actions);
 
@@ -54,7 +54,7 @@ int main(int _argc, char **_argv)
   QQmlEngine::setObjectOwnership(item, QQmlEngine::CppOwnership);
 
   // Add to main window
-  auto win = app.findChild<ignition::gui::MainWindow *>()->QuickWindow();
+  auto win = app.findChild<gz::gui::MainWindow *>()->QuickWindow();
   auto drawerItem = win->findChild<QQuickItem *>("sideDrawer");
 
   item->setParentItem(drawerItem);

diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh
@@ -15,13 +15,13 @@
  *
 */
 
-#ifndef IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
-#define IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
+#ifndef GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
+#define GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
 
 #include <iostream>
 
 #ifndef Q_MOC_RUN
-  #include <ignition/gui/qt.h>
+  #include <gz/gui/qt.h>
 #endif
 
 namespace ignition

diff --git a/examples/standalone/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt
@@ -17,7 +17,7 @@ find_package (Qt5
   REQUIRED
 )
 
-# Find the Ignition gui library
+# Find the Gazebo gui library
 find_package(ignition-gui3 REQUIRED)
 
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IGNITION-GUI_CXX_FLAGS}")