From c0c52f09376e6dc04edd442ece1719f72b2d7b82 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 18 Aug 2022 16:57:41 -0700 Subject: [PATCH 1/7] Migrate headers Signed-off-by: methylDragon --- include/{ignition => gz}/CMakeLists.txt | 0 include/{ignition => gz}/gui/Application.hh | 0 include/{ignition => gz}/gui/CMakeLists.txt | 3 +-- include/{ignition => gz}/gui/Conversions.hh | 0 include/{ignition => gz}/gui/Dialog.hh | 0 include/{ignition => gz}/gui/DragDropModel.hh | 0 include/{ignition => gz}/gui/Enums.hh | 0 include/{ignition => gz}/gui/GuiEvents.hh | 0 include/{ignition => gz}/gui/Helpers.hh | 0 include/{ignition => gz}/gui/MainWindow.hh | 0 include/{ignition => gz}/gui/Plugin.hh | 0 include/{ignition => gz}/gui/SearchModel.hh | 0 include/{ignition => gz}/gui/config.hh.in | 0 include/{ignition/gui/ign.hh => gz/gui/gz.hh} | 0 include/{ignition => gz}/gui/ign_auto_headers.hh.in | 0 include/{ignition => gz}/gui/qml/GzColor.qml | 0 include/{ignition => gz}/gui/qml/GzPose.qml | 0 include/{ignition => gz}/gui/qml/GzVector3.qml | 0 include/{ignition => gz}/gui/qml/IgnCard.qml | 0 .../{ignition => gz}/gui/qml/IgnCardSettings.qml | 0 include/{ignition => gz}/gui/qml/IgnHelpers.qml | 0 include/{ignition => gz}/gui/qml/IgnRulers.qml | 0 include/{ignition => gz}/gui/qml/IgnSnackBar.qml | 0 .../{ignition => gz}/gui/qml/IgnSortFilterModel.qml | 0 include/{ignition => gz}/gui/qml/IgnSpinBox.qml | 0 include/{ignition => gz}/gui/qml/IgnSplit.qml | 0 include/{ignition => gz}/gui/qml/Main.qml | 0 include/{ignition => gz}/gui/qml/PluginMenu.qml | 0 include/{ignition => gz}/gui/qml/SideDrawer.qml | 0 .../{ignition => gz}/gui/qml/StandaloneDialog.qml | 0 include/{ignition => gz}/gui/qml/StyleDialog.qml | 0 include/{ignition => gz}/gui/qml/images/drawer.png | Bin .../gui/qml/images/ignition_logo_50x50.png | Bin include/{ignition => gz}/gui/qml/images/menu.png | Bin include/{ignition => gz}/gui/qml/images/search.svg | 0 include/{ignition => gz}/gui/qml/qmldir | 0 include/{ignition => gz}/gui/qt.h | 0 include/{ignition => gz}/gui/qtquickcontrols2.conf | 0 include/{ignition => gz}/gui/resources.qrc | 0 src/{ign.cc => gz.cc} | 0 src/{ign_TEST.cc => gz_TEST.cc} | 0 41 files changed, 1 insertion(+), 2 deletions(-) rename include/{ignition => gz}/CMakeLists.txt (100%) rename include/{ignition => gz}/gui/Application.hh (100%) rename include/{ignition => gz}/gui/CMakeLists.txt (99%) rename include/{ignition => gz}/gui/Conversions.hh (100%) rename include/{ignition => gz}/gui/Dialog.hh (100%) rename include/{ignition => gz}/gui/DragDropModel.hh (100%) rename include/{ignition => gz}/gui/Enums.hh (100%) rename include/{ignition => gz}/gui/GuiEvents.hh (100%) rename include/{ignition => gz}/gui/Helpers.hh (100%) rename include/{ignition => gz}/gui/MainWindow.hh (100%) rename include/{ignition => gz}/gui/Plugin.hh (100%) rename include/{ignition => gz}/gui/SearchModel.hh (100%) rename include/{ignition => gz}/gui/config.hh.in (100%) rename include/{ignition/gui/ign.hh => gz/gui/gz.hh} (100%) rename include/{ignition => gz}/gui/ign_auto_headers.hh.in (100%) rename include/{ignition => gz}/gui/qml/GzColor.qml (100%) rename include/{ignition => gz}/gui/qml/GzPose.qml (100%) rename include/{ignition => gz}/gui/qml/GzVector3.qml (100%) rename include/{ignition => gz}/gui/qml/IgnCard.qml (100%) rename include/{ignition => gz}/gui/qml/IgnCardSettings.qml (100%) rename include/{ignition => gz}/gui/qml/IgnHelpers.qml (100%) rename include/{ignition => gz}/gui/qml/IgnRulers.qml (100%) rename include/{ignition => gz}/gui/qml/IgnSnackBar.qml (100%) rename include/{ignition => gz}/gui/qml/IgnSortFilterModel.qml (100%) rename include/{ignition => gz}/gui/qml/IgnSpinBox.qml (100%) rename include/{ignition => gz}/gui/qml/IgnSplit.qml (100%) rename include/{ignition => gz}/gui/qml/Main.qml (100%) rename include/{ignition => gz}/gui/qml/PluginMenu.qml (100%) rename include/{ignition => gz}/gui/qml/SideDrawer.qml (100%) rename include/{ignition => gz}/gui/qml/StandaloneDialog.qml (100%) rename include/{ignition => gz}/gui/qml/StyleDialog.qml (100%) rename include/{ignition => gz}/gui/qml/images/drawer.png (100%) rename include/{ignition => gz}/gui/qml/images/ignition_logo_50x50.png (100%) rename include/{ignition => gz}/gui/qml/images/menu.png (100%) rename include/{ignition => gz}/gui/qml/images/search.svg (100%) rename include/{ignition => gz}/gui/qml/qmldir (100%) rename include/{ignition => gz}/gui/qt.h (100%) rename include/{ignition => gz}/gui/qtquickcontrols2.conf (100%) rename include/{ignition => gz}/gui/resources.qrc (100%) rename src/{ign.cc => gz.cc} (100%) rename src/{ign_TEST.cc => gz_TEST.cc} (100%) diff --git a/include/ignition/CMakeLists.txt b/include/gz/CMakeLists.txt similarity index 100% rename from include/ignition/CMakeLists.txt rename to include/gz/CMakeLists.txt diff --git a/include/ignition/gui/Application.hh b/include/gz/gui/Application.hh similarity index 100% rename from include/ignition/gui/Application.hh rename to include/gz/gui/Application.hh diff --git a/include/ignition/gui/CMakeLists.txt b/include/gz/gui/CMakeLists.txt similarity index 99% rename from include/ignition/gui/CMakeLists.txt rename to include/gz/gui/CMakeLists.txt index aae3170bb..3c6871a60 100644 --- a/include/ignition/gui/CMakeLists.txt +++ b/include/gz/gui/CMakeLists.txt @@ -31,7 +31,7 @@ set (headers DragDropModel.hh Enums.hh Helpers.hh - ign.hh + gz.hh qt.h SearchModel.hh System.hh @@ -64,4 +64,3 @@ target_link_libraries(${PROJECT_LIBRARY_TARGET_NAME} ) ign_install_all_headers() - diff --git a/include/ignition/gui/Conversions.hh b/include/gz/gui/Conversions.hh similarity index 100% rename from include/ignition/gui/Conversions.hh rename to include/gz/gui/Conversions.hh diff --git a/include/ignition/gui/Dialog.hh b/include/gz/gui/Dialog.hh similarity index 100% rename from include/ignition/gui/Dialog.hh rename to include/gz/gui/Dialog.hh diff --git a/include/ignition/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh similarity index 100% rename from include/ignition/gui/DragDropModel.hh rename to include/gz/gui/DragDropModel.hh diff --git a/include/ignition/gui/Enums.hh b/include/gz/gui/Enums.hh similarity index 100% rename from include/ignition/gui/Enums.hh rename to include/gz/gui/Enums.hh diff --git a/include/ignition/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh similarity index 100% rename from include/ignition/gui/GuiEvents.hh rename to include/gz/gui/GuiEvents.hh diff --git a/include/ignition/gui/Helpers.hh b/include/gz/gui/Helpers.hh similarity index 100% rename from include/ignition/gui/Helpers.hh rename to include/gz/gui/Helpers.hh diff --git a/include/ignition/gui/MainWindow.hh b/include/gz/gui/MainWindow.hh similarity index 100% rename from include/ignition/gui/MainWindow.hh rename to include/gz/gui/MainWindow.hh diff --git a/include/ignition/gui/Plugin.hh b/include/gz/gui/Plugin.hh similarity index 100% rename from include/ignition/gui/Plugin.hh rename to include/gz/gui/Plugin.hh diff --git a/include/ignition/gui/SearchModel.hh b/include/gz/gui/SearchModel.hh similarity index 100% rename from include/ignition/gui/SearchModel.hh rename to include/gz/gui/SearchModel.hh diff --git a/include/ignition/gui/config.hh.in b/include/gz/gui/config.hh.in similarity index 100% rename from include/ignition/gui/config.hh.in rename to include/gz/gui/config.hh.in diff --git a/include/ignition/gui/ign.hh b/include/gz/gui/gz.hh similarity index 100% rename from include/ignition/gui/ign.hh rename to include/gz/gui/gz.hh diff --git a/include/ignition/gui/ign_auto_headers.hh.in b/include/gz/gui/ign_auto_headers.hh.in similarity index 100% rename from include/ignition/gui/ign_auto_headers.hh.in rename to include/gz/gui/ign_auto_headers.hh.in diff --git a/include/ignition/gui/qml/GzColor.qml b/include/gz/gui/qml/GzColor.qml similarity index 100% rename from include/ignition/gui/qml/GzColor.qml rename to include/gz/gui/qml/GzColor.qml diff --git a/include/ignition/gui/qml/GzPose.qml b/include/gz/gui/qml/GzPose.qml similarity index 100% rename from include/ignition/gui/qml/GzPose.qml rename to include/gz/gui/qml/GzPose.qml diff --git a/include/ignition/gui/qml/GzVector3.qml b/include/gz/gui/qml/GzVector3.qml similarity index 100% rename from include/ignition/gui/qml/GzVector3.qml rename to include/gz/gui/qml/GzVector3.qml diff --git a/include/ignition/gui/qml/IgnCard.qml b/include/gz/gui/qml/IgnCard.qml similarity index 100% rename from include/ignition/gui/qml/IgnCard.qml rename to include/gz/gui/qml/IgnCard.qml diff --git a/include/ignition/gui/qml/IgnCardSettings.qml b/include/gz/gui/qml/IgnCardSettings.qml similarity index 100% rename from include/ignition/gui/qml/IgnCardSettings.qml rename to include/gz/gui/qml/IgnCardSettings.qml diff --git a/include/ignition/gui/qml/IgnHelpers.qml b/include/gz/gui/qml/IgnHelpers.qml similarity index 100% rename from include/ignition/gui/qml/IgnHelpers.qml rename to include/gz/gui/qml/IgnHelpers.qml diff --git a/include/ignition/gui/qml/IgnRulers.qml b/include/gz/gui/qml/IgnRulers.qml similarity index 100% rename from include/ignition/gui/qml/IgnRulers.qml rename to include/gz/gui/qml/IgnRulers.qml diff --git a/include/ignition/gui/qml/IgnSnackBar.qml b/include/gz/gui/qml/IgnSnackBar.qml similarity index 100% rename from include/ignition/gui/qml/IgnSnackBar.qml rename to include/gz/gui/qml/IgnSnackBar.qml diff --git a/include/ignition/gui/qml/IgnSortFilterModel.qml b/include/gz/gui/qml/IgnSortFilterModel.qml similarity index 100% rename from include/ignition/gui/qml/IgnSortFilterModel.qml rename to include/gz/gui/qml/IgnSortFilterModel.qml diff --git a/include/ignition/gui/qml/IgnSpinBox.qml b/include/gz/gui/qml/IgnSpinBox.qml similarity index 100% rename from include/ignition/gui/qml/IgnSpinBox.qml rename to include/gz/gui/qml/IgnSpinBox.qml diff --git a/include/ignition/gui/qml/IgnSplit.qml b/include/gz/gui/qml/IgnSplit.qml similarity index 100% rename from include/ignition/gui/qml/IgnSplit.qml rename to include/gz/gui/qml/IgnSplit.qml diff --git a/include/ignition/gui/qml/Main.qml b/include/gz/gui/qml/Main.qml similarity index 100% rename from include/ignition/gui/qml/Main.qml rename to include/gz/gui/qml/Main.qml diff --git a/include/ignition/gui/qml/PluginMenu.qml b/include/gz/gui/qml/PluginMenu.qml similarity index 100% rename from include/ignition/gui/qml/PluginMenu.qml rename to include/gz/gui/qml/PluginMenu.qml diff --git a/include/ignition/gui/qml/SideDrawer.qml b/include/gz/gui/qml/SideDrawer.qml similarity index 100% rename from include/ignition/gui/qml/SideDrawer.qml rename to include/gz/gui/qml/SideDrawer.qml diff --git a/include/ignition/gui/qml/StandaloneDialog.qml b/include/gz/gui/qml/StandaloneDialog.qml similarity index 100% rename from include/ignition/gui/qml/StandaloneDialog.qml rename to include/gz/gui/qml/StandaloneDialog.qml diff --git a/include/ignition/gui/qml/StyleDialog.qml b/include/gz/gui/qml/StyleDialog.qml similarity index 100% rename from include/ignition/gui/qml/StyleDialog.qml rename to include/gz/gui/qml/StyleDialog.qml diff --git a/include/ignition/gui/qml/images/drawer.png b/include/gz/gui/qml/images/drawer.png similarity index 100% rename from include/ignition/gui/qml/images/drawer.png rename to include/gz/gui/qml/images/drawer.png diff --git a/include/ignition/gui/qml/images/ignition_logo_50x50.png b/include/gz/gui/qml/images/ignition_logo_50x50.png similarity index 100% rename from include/ignition/gui/qml/images/ignition_logo_50x50.png rename to include/gz/gui/qml/images/ignition_logo_50x50.png diff --git a/include/ignition/gui/qml/images/menu.png b/include/gz/gui/qml/images/menu.png similarity index 100% rename from include/ignition/gui/qml/images/menu.png rename to include/gz/gui/qml/images/menu.png diff --git a/include/ignition/gui/qml/images/search.svg b/include/gz/gui/qml/images/search.svg similarity index 100% rename from include/ignition/gui/qml/images/search.svg rename to include/gz/gui/qml/images/search.svg diff --git a/include/ignition/gui/qml/qmldir b/include/gz/gui/qml/qmldir similarity index 100% rename from include/ignition/gui/qml/qmldir rename to include/gz/gui/qml/qmldir diff --git a/include/ignition/gui/qt.h b/include/gz/gui/qt.h similarity index 100% rename from include/ignition/gui/qt.h rename to include/gz/gui/qt.h diff --git a/include/ignition/gui/qtquickcontrols2.conf b/include/gz/gui/qtquickcontrols2.conf similarity index 100% rename from include/ignition/gui/qtquickcontrols2.conf rename to include/gz/gui/qtquickcontrols2.conf diff --git a/include/ignition/gui/resources.qrc b/include/gz/gui/resources.qrc similarity index 100% rename from include/ignition/gui/resources.qrc rename to include/gz/gui/resources.qrc diff --git a/src/ign.cc b/src/gz.cc similarity index 100% rename from src/ign.cc rename to src/gz.cc diff --git a/src/ign_TEST.cc b/src/gz_TEST.cc similarity index 100% rename from src/ign_TEST.cc rename to src/gz_TEST.cc From 63271c6fe4a958519f63982e13af73850933c8ae Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 18 Aug 2022 17:09:56 -0700 Subject: [PATCH 2/7] Add redirection headers Signed-off-by: methylDragon --- CMakeLists.txt | 4 +- Changelog.md | 2 +- .../custom_context_menu/CustomContext.cc | 2 +- .../custom_context_menu/CustomContext.hh | 6 +-- .../dialog_from_plugin/DialogFromPlugin.cc | 2 +- .../dialog_from_plugin/DialogFromPlugin.hh | 6 +-- examples/plugin/hello_plugin/HelloPlugin.cc | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 6 +-- .../plugin/ign_components/IgnComponents.cc | 4 +- .../plugin/ign_components/IgnComponents.hh | 6 +-- examples/plugin/multiple_qml/MultipleQml.cc | 2 +- examples/plugin/multiple_qml/MultipleQml.hh | 6 +-- .../standalone/custom_drawer/custom_drawer.cc | 8 +-- .../standalone/custom_drawer/custom_drawer.hh | 6 +-- examples/standalone/dialogs/dialogs.cc | 6 +-- .../standalone/start_dialog/start_dialog.cc | 8 +-- examples/standalone/window/window.cc | 6 +-- include/CMakeLists.txt | 3 +- include/gz/gui/Application.hh | 6 +-- include/gz/gui/Conversions.hh | 14 +++--- include/gz/gui/Dialog.hh | 6 +-- include/gz/gui/DragDropModel.hh | 6 +-- include/gz/gui/Enums.hh | 6 +-- include/gz/gui/GuiEvents.hh | 8 +-- include/gz/gui/Helpers.hh | 6 +-- include/gz/gui/MainWindow.hh | 6 +-- include/gz/gui/Plugin.hh | 6 +-- include/gz/gui/SearchModel.hh | 6 +-- include/gz/gui/gz.hh | 4 +- include/gz/gui/qt.h | 6 +-- include/ignition/gui.hh | 19 +++++++ include/ignition/gui/Application.hh | 19 +++++++ include/ignition/gui/Conversions.hh | 19 +++++++ include/ignition/gui/Dialog.hh | 19 +++++++ include/ignition/gui/DragDropModel.hh | 19 +++++++ include/ignition/gui/Enums.hh | 19 +++++++ include/ignition/gui/Export.hh | 19 +++++++ include/ignition/gui/GuiEvents.hh | 19 +++++++ include/ignition/gui/Helpers.hh | 19 +++++++ include/ignition/gui/MainWindow.hh | 19 +++++++ include/ignition/gui/Plugin.hh | 19 +++++++ include/ignition/gui/SearchModel.hh | 19 +++++++ include/ignition/gui/config.hh | 49 +++++++++++++++++++ include/ignition/gui/gz.hh | 19 +++++++ include/ignition/gui/ign.hh | 19 +++++++ include/ignition/gui/qt.h | 19 +++++++ src/Application.cc | 4 +- src/Application_TEST.cc | 2 +- src/CMakeLists.txt | 14 +++--- src/Conversions.cc | 28 +++++------ src/Conversions_TEST.cc | 2 +- src/Dialog.cc | 4 +- src/Dialog_TEST.cc | 2 +- src/DragDropModel.cc | 2 +- src/DragDropModel_TEST.cc | 2 +- src/GuiEvents_TEST.cc | 2 +- src/Helpers.cc | 16 +++--- src/Helpers_TEST.cc | 2 +- src/MainWindow.cc | 6 +-- src/MainWindow_TEST.cc | 2 +- src/Plugin.cc | 4 +- src/Plugin_TEST.cc | 2 +- src/SearchModel.cc | 2 +- src/SearchModel_TEST.cc | 2 +- src/gz.cc | 26 +++++----- src/gz_TEST.cc | 2 +- src/plugins/grid_3d/Grid3D.cc | 4 +- src/plugins/grid_3d/Grid3D.hh | 6 +-- src/plugins/grid_3d/Grid3D_TEST.cc | 2 +- src/plugins/image_display/ImageDisplay.cc | 6 +-- src/plugins/image_display/ImageDisplay.hh | 12 ++--- .../image_display/ImageDisplay_TEST.cc | 2 +- src/plugins/key_publisher/KeyPublisher.cc | 10 ++-- src/plugins/key_publisher/KeyPublisher.hh | 8 +-- src/plugins/publisher/Publisher.cc | 10 ++-- src/plugins/publisher/Publisher.hh | 10 ++-- src/plugins/publisher/Publisher_TEST.cc | 10 ++-- src/plugins/scene3d/Scene3D.cc | 6 +-- src/plugins/scene3d/Scene3D.hh | 8 +-- src/plugins/screenshot/Screenshot.cc | 8 +-- src/plugins/screenshot/Screenshot.hh | 6 +-- src/plugins/screenshot/Screenshot_TEST.cc | 2 +- src/plugins/shutdown_button/ShutdownButton.cc | 2 +- src/plugins/shutdown_button/ShutdownButton.hh | 8 +-- .../shutdown_button/ShutdownButton_TEST.cc | 2 +- src/plugins/teleop/Teleop.cc | 10 ++-- src/plugins/teleop/Teleop.hh | 6 +-- src/plugins/teleop/Teleop_TEST.cc | 2 +- src/plugins/topic_echo/TopicEcho.cc | 6 +-- src/plugins/topic_echo/TopicEcho.hh | 6 +-- src/plugins/topic_echo/TopicEcho_TEST.cc | 2 +- src/plugins/topic_viewer/TopicViewer.cc | 6 +-- src/plugins/topic_viewer/TopicViewer.hh | 2 +- src/plugins/topic_viewer/TopicViewer_TEST.cc | 6 +-- src/plugins/world_control/WorldControl.cc | 8 +-- src/plugins/world_control/WorldControl.hh | 10 ++-- .../world_control/WorldControl_TEST.cc | 2 +- src/plugins/world_stats/WorldStats.cc | 8 +-- src/plugins/world_stats/WorldStats.hh | 10 ++-- src/plugins/world_stats/WorldStats_TEST.cc | 2 +- test/helpers/TestHelper.cc | 2 +- test/helpers/TestHelper.hh | 6 +-- test/integration/ExamplesBuild_TEST.cc | 2 +- test/integration/Examples_TEST.cc | 2 +- test/integration/deprecated_TEST.cc | 26 ++++++++++ test/integration/scene3d.cc | 2 +- test/plugins/TestBadInheritancePlugin.cc | 2 +- test/plugins/TestBadInheritancePlugin.hh | 6 +-- test/plugins/TestInvalidQmlPlugin.cc | 2 +- test/plugins/TestInvalidQmlPlugin.hh | 6 +-- test/plugins/TestNotRegisteredPlugin.cc | 2 +- test/plugins/TestNotRegisteredPlugin.hh | 6 +-- test/plugins/TestPlugin.cc | 2 +- test/plugins/TestPlugin.hh | 6 +-- tutorials/03_plugins.md | 6 +-- 115 files changed, 637 insertions(+), 274 deletions(-) create mode 100644 include/ignition/gui.hh create mode 100644 include/ignition/gui/Application.hh create mode 100644 include/ignition/gui/Conversions.hh create mode 100644 include/ignition/gui/Dialog.hh create mode 100644 include/ignition/gui/DragDropModel.hh create mode 100644 include/ignition/gui/Enums.hh create mode 100644 include/ignition/gui/Export.hh create mode 100644 include/ignition/gui/GuiEvents.hh create mode 100644 include/ignition/gui/Helpers.hh create mode 100644 include/ignition/gui/MainWindow.hh create mode 100644 include/ignition/gui/Plugin.hh create mode 100644 include/ignition/gui/SearchModel.hh create mode 100644 include/ignition/gui/config.hh create mode 100644 include/ignition/gui/gz.hh create mode 100644 include/ignition/gui/ign.hh create mode 100644 include/ignition/gui/qt.h create mode 100644 test/integration/deprecated_TEST.cc diff --git a/CMakeLists.txt b/CMakeLists.txt index 3dd418888..0b89b4e41 100644 --- 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/Changelog.md b/Changelog.md index c1069f0a2..73459be91 100644 --- a/Changelog.md +++ b/Changelog.md @@ -61,7 +61,7 @@ 1. Common widget GzColor * [Pull request #410](https://github.com/gazebosim/gz-gui/pull/410) -1. Fix ign_TEST +1. Fix gz_TEST * [Pull request #420](https://github.com/gazebosim/gz-gui/pull/420) 1. Make display tests more robust diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc index 78419be8d..2c255f912 100644 --- a/examples/plugin/custom_context_menu/CustomContext.cc +++ b/examples/plugin/custom_context_menu/CustomContext.cc @@ -20,7 +20,7 @@ #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 index 88ff67541..a373498cb 100644 --- a/examples/plugin/custom_context_menu/CustomContext.hh +++ b/examples/plugin/custom_context_menu/CustomContext.hh @@ -15,15 +15,15 @@ * */ -#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 #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc index 20f260ed1..aa59e1bcc 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc @@ -20,7 +20,7 @@ #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 index 35d048094..51ba359b8 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh @@ -15,15 +15,15 @@ * */ -#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 #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc index bdd7e21b8..f37716500 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.cc +++ b/examples/plugin/hello_plugin/HelloPlugin.cc @@ -20,7 +20,7 @@ #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 index 588ec4fa5..b326214a3 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_GUI_HELLOPLUGIN_HH_ -#define IGNITION_GUI_HELLOPLUGIN_HH_ +#ifndef GZ_GUI_HELLOPLUGIN_HH_ +#define GZ_GUI_HELLOPLUGIN_HH_ #include #include #include -namespace ignition +namespace gz { namespace gui { diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc index ea2a010ae..cd8272d7b 100644 --- a/examples/plugin/ign_components/IgnComponents.cc +++ b/examples/plugin/ign_components/IgnComponents.cc @@ -19,5 +19,5 @@ #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 index 9130a936e..c1f4ed521 100644 --- a/examples/plugin/ign_components/IgnComponents.hh +++ b/examples/plugin/ign_components/IgnComponents.hh @@ -15,12 +15,12 @@ * */ -#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 -namespace ignition +namespace gz { namespace gui { diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc index 6651f9773..92cecdf49 100644 --- a/examples/plugin/multiple_qml/MultipleQml.cc +++ b/examples/plugin/multiple_qml/MultipleQml.cc @@ -20,7 +20,7 @@ #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 index dad17e517..6d4960ee3 100644 --- a/examples/plugin/multiple_qml/MultipleQml.hh +++ b/examples/plugin/multiple_qml/MultipleQml.hh @@ -15,15 +15,15 @@ * */ -#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 #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc index 0ac1f02fb..c9e0560de 100644 --- a/examples/standalone/custom_drawer/custom_drawer.cc +++ b/examples/standalone/custom_drawer/custom_drawer.cc @@ -28,16 +28,16 @@ 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()->QuickWindow(); + auto win = app.findChild()->QuickWindow(); auto drawerItem = win->findChild("sideDrawer"); item->setParentItem(drawerItem); diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh index 5f4d678a7..0f3f2c4eb 100644 --- a/examples/standalone/custom_drawer/custom_drawer.hh +++ b/examples/standalone/custom_drawer/custom_drawer.hh @@ -15,8 +15,8 @@ * */ -#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 @@ -24,7 +24,7 @@ #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/examples/standalone/dialogs/dialogs.cc b/examples/standalone/dialogs/dialogs.cc index 1d7c665c3..38a78b111 100644 --- a/examples/standalone/dialogs/dialogs.cc +++ b/examples/standalone/dialogs/dialogs.cc @@ -31,11 +31,11 @@ int main(int _argc, char **_argv) std::cout << "Hello, GUI!" << std::endl; // 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, - ignition::gui::WindowType::kDialog); + gz::gui::Application app(_argc, _argv, + gz::gui::WindowType::kDialog); // Load plugins / config app.LoadPlugin("Publisher"); diff --git a/examples/standalone/start_dialog/start_dialog.cc b/examples/standalone/start_dialog/start_dialog.cc index 3ef1b7d43..8222274cd 100644 --- a/examples/standalone/start_dialog/start_dialog.cc +++ b/examples/standalone/start_dialog/start_dialog.cc @@ -26,15 +26,15 @@ int main(int _argc, char **_argv) { // Increase verboosity so we see all messages - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); // Create app - ignition::gui::Application app(_argc, _argv, ignition::gui::WindowType::kDialog); + gz::gui::Application app(_argc, _argv, gz::gui::WindowType::kDialog); igndbg << "Open dialog" << std::endl; // Add and display a dialog - auto dialog = new ignition::gui::Dialog(); + auto dialog = new gz::gui::Dialog(); dialog->QuickWindow(); std::string qmlFile(":start_dialog/start_dialog.qml"); @@ -45,7 +45,7 @@ int main(int _argc, char **_argv) return -1; } - QQmlComponent dialogComponent(ignition::gui::App()->Engine(), + QQmlComponent dialogComponent(gz::gui::App()->Engine(), QString(QString::fromStdString(qmlFile))); if (dialogComponent.isError()) { diff --git a/examples/standalone/window/window.cc b/examples/standalone/window/window.cc index 8986216a1..25f68a21e 100644 --- a/examples/standalone/window/window.cc +++ b/examples/standalone/window/window.cc @@ -29,10 +29,10 @@ int main(int _argc, char **_argv) std::cout << "Hello, GUI!" << std::endl; // Increase verboosity so we see all messages - ignition::common::Console::SetVerbosity(4); + gz::common::Console::SetVerbosity(4); // Create app - ignition::gui::Application app(_argc, _argv); + gz::gui::Application app(_argc, _argv); // Load plugins / config if (!app.LoadPlugin("Publisher")) @@ -41,7 +41,7 @@ int main(int _argc, char **_argv) } // Customize main window - auto win = app.findChild()->QuickWindow(); + auto win = app.findChild()->QuickWindow(); win->setProperty("title", "Hello Window!"); // Run window diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 25ec89762..4b2bdd7bb 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1 +1,2 @@ -add_subdirectory(ignition) +add_subdirectory(gz) +install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL}) diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index 0a104848b..25712838e 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_APPLICATION_HH_ -#define IGNITION_GUI_APPLICATION_HH_ +#ifndef GZ_GUI_APPLICATION_HH_ +#define GZ_GUI_APPLICATION_HH_ #include #include @@ -37,7 +37,7 @@ namespace tinyxml2 class XMLElement; } -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index 2730f9fbd..0154b651b 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_CONVERSIONS_HH_ -#define IGNITION_GUI_CONVERSIONS_HH_ +#ifndef GZ_GUI_CONVERSIONS_HH_ +#define GZ_GUI_CONVERSIONS_HH_ #ifdef _MSC_VER #pragma warning(push, 0) @@ -33,7 +33,7 @@ #include "ignition/gui/qt.h" #include "ignition/gui/Export.hh" -namespace ignition +namespace gz { namespace common { @@ -87,15 +87,15 @@ namespace ignition IGNITION_GUI_VISIBLE common::MouseEvent convert(const QMouseEvent &_e); - /// \brief Convert an ignition::msgs::Time to an ignition::common::Time + /// \brief Convert an gz::msgs::Time to an gz::common::Time /// \param[in] _t The time to convert - /// \return An ignition::common::Time object + /// \return An gz::common::Time object IGNITION_GUI_VISIBLE common::Time convert(const msgs::Time &_t); - /// \brief Convert an ignition::common::Time to an ignition::msgs::Time + /// \brief Convert an gz::common::Time to an gz::msgs::Time /// \param[in] _t The time to convert - /// \return An ignition::msgs::Time object + /// \return An gz::msgs::Time object IGNITION_GUI_VISIBLE msgs::Time convert(const common::Time &_t); } diff --git a/include/gz/gui/Dialog.hh b/include/gz/gui/Dialog.hh index 4c7a51daa..476d36093 100644 --- a/include/gz/gui/Dialog.hh +++ b/include/gz/gui/Dialog.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_DIALOG_HH_ -#define IGNITION_GUI_DIALOG_HH_ +#ifndef GZ_GUI_DIALOG_HH_ +#define GZ_GUI_DIALOG_HH_ #include #include @@ -31,7 +31,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh index 397a0e6f5..a1e07b699 100644 --- a/include/gz/gui/DragDropModel.hh +++ b/include/gz/gui/DragDropModel.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_DRAGDROPMODEL_HH_ -#define IGNITION_GUI_DRAGDROPMODEL_HH_ +#ifndef GZ_GUI_DRAGDROPMODEL_HH_ +#define GZ_GUI_DRAGDROPMODEL_HH_ #include "ignition/gui/Export.hh" #include "ignition/gui/qt.h" -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/Enums.hh b/include/gz/gui/Enums.hh index 911b929e1..886a10d5d 100644 --- a/include/gz/gui/Enums.hh +++ b/include/gz/gui/Enums.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_GUI_ENUMS_HH_ -#define IGNITION_GUI_ENUMS_HH_ +#ifndef GZ_GUI_ENUMS_HH_ +#define GZ_GUI_ENUMS_HH_ #include "ignition/gui/qt.h" -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh index 78f8a0cbf..6189d9224 100644 --- a/include/gz/gui/GuiEvents.hh +++ b/include/gz/gui/GuiEvents.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_GUIEVENTS_HH_ -#define IGNITION_GUI_GUIEVENTS_HH_ +#ifndef GZ_GUI_GUIEVENTS_HH_ +#define GZ_GUI_GUIEVENTS_HH_ #include #include @@ -23,7 +23,7 @@ #include #include -namespace ignition +namespace gz { namespace gui { @@ -259,4 +259,4 @@ namespace ignition } } -#endif // IGNITION_GUI_GUIEVENTS_HH_ +#endif // GZ_GUI_GUIEVENTS_HH_ diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index bb88ec828..b20b50da6 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_HELPERS_HH_ -#define IGNITION_GUI_HELPERS_HH_ +#ifndef GZ_GUI_HELPERS_HH_ +#define GZ_GUI_HELPERS_HH_ #include #include "ignition/gui/Enums.hh" #include "ignition/gui/Export.hh" -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/MainWindow.hh b/include/gz/gui/MainWindow.hh index 9f3cd5e33..b1872007a 100644 --- a/include/gz/gui/MainWindow.hh +++ b/include/gz/gui/MainWindow.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_MAINWINDOW_HH_ -#define IGNITION_GUI_MAINWINDOW_HH_ +#ifndef GZ_GUI_MAINWINDOW_HH_ +#define GZ_GUI_MAINWINDOW_HH_ #include #include @@ -35,7 +35,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh index b943b1e0d..d911f009f 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_PLUGIN_HH_ -#define IGNITION_GUI_PLUGIN_HH_ +#ifndef GZ_GUI_PLUGIN_HH_ +#define GZ_GUI_PLUGIN_HH_ #include #include @@ -31,7 +31,7 @@ #pragma warning(disable: 4251) #endif -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/SearchModel.hh b/include/gz/gui/SearchModel.hh index 563063f10..8d40963cc 100644 --- a/include/gz/gui/SearchModel.hh +++ b/include/gz/gui/SearchModel.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_SEARCHMODEL_HH_ -#define IGNITION_GUI_SEARCHMODEL_HH_ +#ifndef GZ_GUI_SEARCHMODEL_HH_ +#define GZ_GUI_SEARCHMODEL_HH_ #include "ignition/gui/Export.hh" #include "ignition/gui/qt.h" -namespace ignition +namespace gz { namespace gui { diff --git a/include/gz/gui/gz.hh b/include/gz/gui/gz.hh index f5541359c..099043313 100644 --- a/include/gz/gui/gz.hh +++ b/include/gz/gui/gz.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_IGN_HH_ -#define IGNITION_GUI_IGN_HH_ +#ifndef GZ_GUI_IGN_HH_ +#define GZ_GUI_IGN_HH_ #include "ignition/gui/Export.hh" diff --git a/include/gz/gui/qt.h b/include/gz/gui/qt.h index 0f8a83abe..81b842915 100644 --- a/include/gz/gui/qt.h +++ b/include/gz/gui/qt.h @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_QT_H_ -#define IGNITION_GUI_QT_H_ +#ifndef GZ_GUI_QT_H_ +#define GZ_GUI_QT_H_ #ifndef _MSC_VER #pragma GCC system_header @@ -42,4 +42,4 @@ #include -#endif // IGNITION_GUI_QT_H_ +#endif // GZ_GUI_QT_H_ diff --git a/include/ignition/gui.hh b/include/ignition/gui.hh new file mode 100644 index 000000000..432d7aabc --- /dev/null +++ b/include/ignition/gui.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Application.hh b/include/ignition/gui/Application.hh new file mode 100644 index 000000000..7b3377be8 --- /dev/null +++ b/include/ignition/gui/Application.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Conversions.hh b/include/ignition/gui/Conversions.hh new file mode 100644 index 000000000..63f926f5f --- /dev/null +++ b/include/ignition/gui/Conversions.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Dialog.hh b/include/ignition/gui/Dialog.hh new file mode 100644 index 000000000..c2b3b862e --- /dev/null +++ b/include/ignition/gui/Dialog.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/DragDropModel.hh b/include/ignition/gui/DragDropModel.hh new file mode 100644 index 000000000..fcd5b1412 --- /dev/null +++ b/include/ignition/gui/DragDropModel.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Enums.hh b/include/ignition/gui/Enums.hh new file mode 100644 index 000000000..e87d512bc --- /dev/null +++ b/include/ignition/gui/Enums.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Export.hh b/include/ignition/gui/Export.hh new file mode 100644 index 000000000..145530e06 --- /dev/null +++ b/include/ignition/gui/Export.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/GuiEvents.hh b/include/ignition/gui/GuiEvents.hh new file mode 100644 index 000000000..e8961662d --- /dev/null +++ b/include/ignition/gui/GuiEvents.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Helpers.hh b/include/ignition/gui/Helpers.hh new file mode 100644 index 000000000..b123adb8b --- /dev/null +++ b/include/ignition/gui/Helpers.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/MainWindow.hh b/include/ignition/gui/MainWindow.hh new file mode 100644 index 000000000..5df5762da --- /dev/null +++ b/include/ignition/gui/MainWindow.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/Plugin.hh b/include/ignition/gui/Plugin.hh new file mode 100644 index 000000000..fd5a6338c --- /dev/null +++ b/include/ignition/gui/Plugin.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/SearchModel.hh b/include/ignition/gui/SearchModel.hh new file mode 100644 index 000000000..b168d1034 --- /dev/null +++ b/include/ignition/gui/SearchModel.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/config.hh b/include/ignition/gui/config.hh new file mode 100644 index 000000000..f7bbf8f3f --- /dev/null +++ b/include/ignition/gui/config.hh @@ -0,0 +1,49 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#ifndef IGNITION_GUI__CONFIG_HH_ +#define IGNITION_GUI__CONFIG_HH_ + +#include + +/* Version number */ +// #define IGNITION_GUI_MAJOR_VERSION GZ_GUI_MAJOR_VERSION +// #define IGNITION_GUI_MINOR_VERSION GZ_GUI_MINOR_VERSION +// #define IGNITION_GUI_PATCH_VERSION GZ_GUI_PATCH_VERSION + +// #define IGNITION_GUI_VERSION GZ_GUI_VERSION +// #define IGNITION_GUI_VERSION_FULL GZ_GUI_VERSION_FULL + +// #define IGNITION_GUI_VERSION_HEADER GZ_GUI_VERSION_HEADER + +/* #undef BUILD_TYPE_PROFILE */ +/* #undef BUILD_TYPE_DEBUG */ +/* #undef BUILD_TYPE_RELEASE */ + +// #define IGN_GUI_PLUGIN_INSTALL_DIR GZ_GUI_PLUGIN_INSTALL_DIR + +namespace gz +{ +} + +namespace ignition +{ + using namespace gz; +} + + +#endif diff --git a/include/ignition/gui/gz.hh b/include/ignition/gui/gz.hh new file mode 100644 index 000000000..52c6f06ef --- /dev/null +++ b/include/ignition/gui/gz.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/ign.hh b/include/ignition/gui/ign.hh new file mode 100644 index 000000000..52c6f06ef --- /dev/null +++ b/include/ignition/gui/ign.hh @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/include/ignition/gui/qt.h b/include/ignition/gui/qt.h new file mode 100644 index 000000000..bc538a3e2 --- /dev/null +++ b/include/ignition/gui/qt.h @@ -0,0 +1,19 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + +#include +#include diff --git a/src/Application.cc b/src/Application.cc index 77073ffdd..503006aad 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -36,7 +36,7 @@ #include "ignition/transport/TopicUtils.hh" -namespace ignition +namespace gz { namespace gui { @@ -82,7 +82,7 @@ namespace ignition } } -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc index 1e234e591..e933b319a 100644 --- a/src/Application_TEST.cc +++ b/src/Application_TEST.cc @@ -32,7 +32,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Application_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 2c3a3beeb..6b681043a 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,7 +6,7 @@ set (sources ${CMAKE_CURRENT_SOURCE_DIR}/Dialog.cc ${CMAKE_CURRENT_SOURCE_DIR}/DragDropModel.cc ${CMAKE_CURRENT_SOURCE_DIR}/Helpers.cc - ${CMAKE_CURRENT_SOURCE_DIR}/ign.cc + ${CMAKE_CURRENT_SOURCE_DIR}/gz.cc ${CMAKE_CURRENT_SOURCE_DIR}/MainWindow.cc ${CMAKE_CURRENT_SOURCE_DIR}/Plugin.cc ${CMAKE_CURRENT_SOURCE_DIR}/SearchModel.cc @@ -20,7 +20,7 @@ set (gtest_sources DragDropModel_TEST Helpers_TEST GuiEvents_TEST - ign_TEST + gz_TEST MainWindow_TEST Plugin_TEST SearchModel_TEST @@ -38,7 +38,7 @@ endif() # this test currently fails on brew (issue #27) # so disable it for now if (NOT HAVE_IGN_TOOLS OR APPLE) - list(REMOVE_ITEM gtest_sources ign_TEST.cc) + list(REMOVE_ITEM gtest_sources gz_TEST.cc) endif() ign_build_tests(TYPE UNIT @@ -56,7 +56,7 @@ foreach(test ${gtest_targets}) "PROJECT_SOURCE_DIR=\"${PROJECT_SOURCE_DIR}\"") endforeach() -if(TARGET UNIT_ign_TEST) +if(TARGET UNIT_gz_TEST) # Running `ign gazebo` on macOS has problems when run with /usr/bin/ruby # due to System Integrity Protection (SIP). Try to find ruby from # homebrew as a workaround. @@ -64,16 +64,16 @@ if(TARGET UNIT_ign_TEST) find_program(BREW_RUBY ruby HINTS /usr/local/opt/ruby/bin) endif() - target_compile_definitions(UNIT_ign_TEST PRIVATE + target_compile_definitions(UNIT_gz_TEST PRIVATE "BREW_RUBY=\"${BREW_RUBY} \"") - target_compile_definitions(UNIT_ign_TEST PRIVATE + target_compile_definitions(UNIT_gz_TEST PRIVATE "IGN_PATH=\"${HAVE_IGN_TOOLS}\"") set(_env_vars) list(APPEND _env_vars "IGN_CONFIG_PATH=${CMAKE_BINARY_DIR}/test/conf") - set_tests_properties(UNIT_ign_TEST PROPERTIES + set_tests_properties(UNIT_gz_TEST PROPERTIES ENVIRONMENT "${_env_vars}") endif() diff --git a/src/Conversions.cc b/src/Conversions.cc index 77b1eee68..1b4ee059f 100644 --- a/src/Conversions.cc +++ b/src/Conversions.cc @@ -21,7 +21,7 @@ #include "ignition/gui/Conversions.hh" ////////////////////////////////////////////////// -QColor ignition::gui::convert(const ignition::math::Color &_color) +QColor gz::gui::convert(const gz::math::Color &_color) { return QColor(_color.R()*255.0, _color.G()*255.0, @@ -30,40 +30,40 @@ QColor ignition::gui::convert(const ignition::math::Color &_color) } ////////////////////////////////////////////////// -ignition::math::Color ignition::gui::convert(const QColor &_color) +gz::math::Color gz::gui::convert(const QColor &_color) { - return ignition::math::Color(_color.red() / 255.0, + return gz::math::Color(_color.red() / 255.0, _color.green() / 255.0, _color.blue() / 255.0, _color.alpha() / 255.0); } ////////////////////////////////////////////////// -QPointF ignition::gui::convert(const ignition::math::Vector2d &_pt) +QPointF gz::gui::convert(const gz::math::Vector2d &_pt) { return QPointF(_pt.X(), _pt.Y()); } ////////////////////////////////////////////////// -ignition::math::Vector2d ignition::gui::convert(const QPointF &_pt) +gz::math::Vector2d gz::gui::convert(const QPointF &_pt) { - return ignition::math::Vector2d(_pt.x(), _pt.y()); + return gz::math::Vector2d(_pt.x(), _pt.y()); } ////////////////////////////////////////////////// -QVector3D ignition::gui::convert(const ignition::math::Vector3d &_vec) +QVector3D gz::gui::convert(const gz::math::Vector3d &_vec) { return QVector3D(_vec.X(), _vec.Y(), _vec.Z()); } ////////////////////////////////////////////////// -ignition::math::Vector3d ignition::gui::convert(const QVector3D &_vec) +gz::math::Vector3d gz::gui::convert(const QVector3D &_vec) { - return ignition::math::Vector3d(_vec.x(), _vec.y(), _vec.z()); + return gz::math::Vector3d(_vec.x(), _vec.y(), _vec.z()); } ////////////////////////////////////////////////// -ignition::common::MouseEvent ignition::gui::convert(const QMouseEvent &_e) +gz::common::MouseEvent gz::gui::convert(const QMouseEvent &_e) { common::MouseEvent event; event.SetPos(_e.pos().x(), _e.pos().y()); @@ -114,16 +114,16 @@ ignition::common::MouseEvent ignition::gui::convert(const QMouseEvent &_e) } ///////////////////////////////////////////////// -ignition::common::Time ignition::gui::convert(const ignition::msgs::Time &_t) +gz::common::Time gz::gui::convert(const gz::msgs::Time &_t) { - ignition::common::Time result(_t.sec(), _t.nsec()); + gz::common::Time result(_t.sec(), _t.nsec()); return result; } ///////////////////////////////////////////////// -ignition::msgs::Time ignition::gui::convert(const ignition::common::Time &_t) +gz::msgs::Time gz::gui::convert(const gz::common::Time &_t) { - ignition::msgs::Time result; + gz::msgs::Time result; result.set_sec(_t.sec); result.set_nsec(_t.nsec); return result; diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index 7ab42ba39..30d5bfb5b 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -24,7 +24,7 @@ #include "test_config.h" // NOLINT(build/include) #include "ignition/gui/Conversions.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/Dialog.cc b/src/Dialog.cc index 3b8da900e..3285ce472 100644 --- a/src/Dialog.cc +++ b/src/Dialog.cc @@ -21,7 +21,7 @@ #include "ignition/gui/Application.hh" #include "ignition/gui/Dialog.hh" -namespace ignition +namespace gz { namespace gui { @@ -33,7 +33,7 @@ namespace ignition } } -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/Dialog_TEST.cc b/src/Dialog_TEST.cc index 33a3e7fb8..55b913aea 100644 --- a/src/Dialog_TEST.cc +++ b/src/Dialog_TEST.cc @@ -31,7 +31,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Dialog_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/DragDropModel.cc b/src/DragDropModel.cc index 5e1708c25..a05f60b20 100644 --- a/src/DragDropModel.cc +++ b/src/DragDropModel.cc @@ -18,7 +18,7 @@ #include "ignition/gui/Enums.hh" #include "ignition/gui/DragDropModel.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/DragDropModel_TEST.cc b/src/DragDropModel_TEST.cc index d5fbb45ee..86a284a4b 100644 --- a/src/DragDropModel_TEST.cc +++ b/src/DragDropModel_TEST.cc @@ -24,7 +24,7 @@ #include "ignition/gui/Enums.hh" #include "ignition/gui/DragDropModel.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/GuiEvents_TEST.cc b/src/GuiEvents_TEST.cc index 72c4ee740..19df0972f 100644 --- a/src/GuiEvents_TEST.cc +++ b/src/GuiEvents_TEST.cc @@ -20,7 +20,7 @@ #include "test_config.h" // NOLINT(build/include) #include "ignition/gui/GuiEvents.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/Helpers.cc b/src/Helpers.cc index 0fc89d7cc..50ceb7c63 100644 --- a/src/Helpers.cc +++ b/src/Helpers.cc @@ -26,7 +26,7 @@ #include "ignition/gui/MainWindow.hh" ///////////////////////////////////////////////// -std::string ignition::gui::humanReadable(const std::string &_key) +std::string gz::gui::humanReadable(const std::string &_key) { std::string humanKey = _key; humanKey[0] = toupper(humanKey[0]); @@ -35,7 +35,7 @@ std::string ignition::gui::humanReadable(const std::string &_key) } ///////////////////////////////////////////////// -std::string ignition::gui::unitFromKey(const std::string &_key, +std::string gz::gui::unitFromKey(const std::string &_key, const std::string &_type) { if (_key == "pos" || _key == "length" || _key == "min_depth") @@ -110,7 +110,7 @@ std::string ignition::gui::unitFromKey(const std::string &_key, } ///////////////////////////////////////////////// -void ignition::gui::rangeFromKey(const std::string &_key, double &_min, +void gz::gui::rangeFromKey(const std::string &_key, double &_min, double &_max) { // Maximum range by default @@ -139,19 +139,19 @@ void ignition::gui::rangeFromKey(const std::string &_key, double &_min, } ///////////////////////////////////////////////// -ignition::gui::StringType ignition::gui::stringTypeFromKey( +gz::gui::StringType gz::gui::stringTypeFromKey( const std::string &_key) { if (_key == "innerxml") { - return ignition::gui::StringType::PLAIN_TEXT; + return gz::gui::StringType::PLAIN_TEXT; } return StringType::LINE; } ///////////////////////////////////////////////// -std::string ignition::gui::uniqueFilePath(const std::string &_pathAndName, +std::string gz::gui::uniqueFilePath(const std::string &_pathAndName, const std::string &_extension) { std::string result = _pathAndName + "." + _extension; @@ -168,7 +168,7 @@ std::string ignition::gui::uniqueFilePath(const std::string &_pathAndName, } ///////////////////////////////////////////////// -QStringList ignition::gui::worldNames() +QStringList gz::gui::worldNames() { auto win = App()->findChild(); if (nullptr == win) @@ -182,7 +182,7 @@ QStringList ignition::gui::worldNames() } ///////////////////////////////////////////////// -const QString ignition::gui::qmlQrcImportPath() +const QString gz::gui::qmlQrcImportPath() { return "qrc:/ign-gui-qml/"; } diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index e0fc28ab4..8608d7a9f 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -29,7 +29,7 @@ int gg_argc = 1; char **gg_argv = new char *[gg_argc]; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/MainWindow.cc b/src/MainWindow.cc index e4015dd32..62c25da20 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -29,7 +29,7 @@ #include "ignition/msgs/server_control.pb.h" #include "ignition/transport/Node.hh" -namespace ignition +namespace gz { namespace gui { @@ -76,12 +76,12 @@ namespace ignition public: std::string controlService{"/server_control"}; /// \brief Communication node - public: ignition::transport::Node node; + public: gz::transport::Node node; }; } } -using namespace ignition; +using namespace gz; using namespace gui; /// \brief Strip last component from a path. diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index 2b7c27fe2..7098f6945 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -39,7 +39,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./MainWindow_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; using namespace std::chrono_literals; diff --git a/src/Plugin.cc b/src/Plugin.cc index d95c87229..ae767fd21 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -51,7 +51,7 @@ static const std::unordered_set kIgnoredProps{ "pluginName", "anchored"}; -class ignition::gui::PluginPrivate +class gz::gui::PluginPrivate { /// \brief Set this to true if the plugin should be deleted as soon as it has /// a parent. @@ -80,7 +80,7 @@ class ignition::gui::PluginPrivate public: Anchors anchors; }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc index 93f6960eb..2b698c9ec 100644 --- a/src/Plugin_TEST.cc +++ b/src/Plugin_TEST.cc @@ -32,7 +32,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Plugin_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/src/SearchModel.cc b/src/SearchModel.cc index 720eee80c..7c3def983 100644 --- a/src/SearchModel.cc +++ b/src/SearchModel.cc @@ -20,7 +20,7 @@ #include "ignition/gui/Enums.hh" #include "ignition/gui/SearchModel.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/SearchModel_TEST.cc b/src/SearchModel_TEST.cc index da1061e73..0c81cbc31 100644 --- a/src/SearchModel_TEST.cc +++ b/src/SearchModel_TEST.cc @@ -24,7 +24,7 @@ #include "ignition/gui/Enums.hh" #include "ignition/gui/SearchModel.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/gz.cc b/src/gz.cc index faba5dcc3..53060c492 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -24,7 +24,7 @@ #include "ignition/gui/Application.hh" #include "ignition/gui/config.hh" #include "ignition/gui/Export.hh" -#include "ignition/gui/ign.hh" +#include "gz/gui/gz.hh" #include "ignition/gui/MainWindow.hh" int g_argc = 1; @@ -37,11 +37,11 @@ char* g_argv[] = void startConsoleLog() { std::string home; - ignition::common::env(IGN_HOMEDIR, home); + gz::common::env(IGN_HOMEDIR, home); - std::string logPathMod = ignition::common::joinPaths(home, + std::string logPathMod = gz::common::joinPaths(home, ".ignition", "gui", "log", - ignition::common::timeToIso(IGN_SYSTEM_TIME())); + gz::common::timeToIso(IGN_SYSTEM_TIME())); ignLogInit(logPathMod, "console.log"); } @@ -56,7 +56,7 @@ extern "C" IGNITION_GUI_VISIBLE void cmdPluginList() { startConsoleLog(); - ignition::gui::Application app(g_argc, g_argv); + gz::gui::Application app(g_argc, g_argv); auto pluginsList = app.PluginList(); for (auto const &path : pluginsList) @@ -81,8 +81,8 @@ extern "C" IGNITION_GUI_VISIBLE void cmdStandalone(const char *_filename) { startConsoleLog(); - ignition::gui::Application app(g_argc, g_argv, - ignition::gui::WindowType::kDialog); + gz::gui::Application app(g_argc, g_argv, + gz::gui::WindowType::kDialog); if (!app.LoadPlugin(_filename)) { @@ -97,9 +97,9 @@ extern "C" IGNITION_GUI_VISIBLE void cmdConfig(const char *_config) { startConsoleLog(); - ignition::gui::Application app(g_argc, g_argv); + gz::gui::Application app(g_argc, g_argv); - if (!app.findChild()) + if (!app.findChild()) { return; } @@ -115,7 +115,7 @@ extern "C" IGNITION_GUI_VISIBLE void cmdConfig(const char *_config) ////////////////////////////////////////////////// extern "C" IGNITION_GUI_VISIBLE void cmdVerbose(const char *_verbosity) { - ignition::common::Console::SetVerbosity(std::atoi(_verbosity)); + gz::common::Console::SetVerbosity(std::atoi(_verbosity)); } ////////////////////////////////////////////////// @@ -123,9 +123,9 @@ extern "C" IGNITION_GUI_VISIBLE void cmdEmptyWindow() { startConsoleLog(); - ignition::gui::Application app(g_argc, g_argv); + gz::gui::Application app(g_argc, g_argv); - if (!app.findChild()) + if (!app.findChild()) { return; } @@ -139,5 +139,5 @@ extern "C" IGNITION_GUI_VISIBLE void cmdEmptyWindow() extern "C" IGNITION_GUI_VISIBLE void cmdSetStyleFromFile( const char * /*_filename*/) { -// ignition::gui::setStyleFromFile(std::string(_filename)); +// gz::gui::setStyleFromFile(std::string(_filename)); } diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc index f1e03ee82..34d6a0650 100644 --- a/src/gz_TEST.cc +++ b/src/gz_TEST.cc @@ -58,7 +58,7 @@ std::string custom_exec_str(std::string _cmd) return result; } -using namespace ignition; +using namespace gz; class CmdLine : public ::testing::Test { diff --git a/src/plugins/grid_3d/Grid3D.cc b/src/plugins/grid_3d/Grid3D.cc index f8e7127fd..717c51b9d 100644 --- a/src/plugins/grid_3d/Grid3D.cc +++ b/src/plugins/grid_3d/Grid3D.cc @@ -32,7 +32,7 @@ #include "Grid3D.hh" -namespace ignition +namespace gz { namespace gui { @@ -89,7 +89,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/grid_3d/Grid3D.hh b/src/plugins/grid_3d/Grid3D.hh index 1d26a3740..8f9d27011 100644 --- a/src/plugins/grid_3d/Grid3D.hh +++ b/src/plugins/grid_3d/Grid3D.hh @@ -15,14 +15,14 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_GRID3D_HH_ -#define IGNITION_GUI_PLUGINS_GRID3D_HH_ +#ifndef GZ_GUI_PLUGINS_GRID3D_HH_ +#define GZ_GUI_PLUGINS_GRID3D_HH_ #include #include "ignition/gui/Plugin.hh" -namespace ignition +namespace gz { namespace gui { diff --git a/src/plugins/grid_3d/Grid3D_TEST.cc b/src/plugins/grid_3d/Grid3D_TEST.cc index 4b816a120..908cfbea4 100644 --- a/src/plugins/grid_3d/Grid3D_TEST.cc +++ b/src/plugins/grid_3d/Grid3D_TEST.cc @@ -29,7 +29,7 @@ #include "ignition/gui/Plugin.hh" #include "ignition/gui/QtMetatypes.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc index 2959d66ef..e39c31801 100644 --- a/src/plugins/image_display/ImageDisplay.cc +++ b/src/plugins/image_display/ImageDisplay.cc @@ -30,7 +30,7 @@ #include "ignition/gui/Application.hh" #include "ignition/gui/MainWindow.hh" -namespace ignition +namespace gz { namespace gui { @@ -57,7 +57,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; @@ -189,7 +189,7 @@ void ImageDisplay::OnRefresh() this->dataPtr->node.TopicInfo(topic, publishers); for (auto pub : publishers) { - if (pub.MsgTypeName() == "ignition.msgs.Image") + if (pub.MsgTypeName() == "gz.msgs.Image") { this->dataPtr->topicList.push_back(QString::fromStdString(topic)); break; diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh index 8aaf62a70..32a7bb038 100644 --- a/src/plugins/image_display/ImageDisplay.hh +++ b/src/plugins/image_display/ImageDisplay.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_IMAGEDISPLAY_HH_ -#define IGNITION_GUI_PLUGINS_IMAGEDISPLAY_HH_ +#ifndef GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_ +#define GZ_GUI_PLUGINS_IMAGEDISPLAY_HH_ #include #include @@ -42,7 +42,7 @@ #include "ignition/gui/Plugin.hh" -namespace ignition +namespace gz { namespace gui { @@ -116,12 +116,12 @@ namespace plugins public slots: void OnTopic(const QString _topic); /// \brief Get the topic list as a string, for example - /// 'ignition.msgs.StringMsg' + /// 'gz.msgs.StringMsg' /// \return Message type public: Q_INVOKABLE QStringList TopicList() const; /// \brief Set the topic list from a string, for example - /// 'ignition.msgs.StringMsg' + /// 'gz.msgs.StringMsg' /// \param[in] _topicList Message type public: Q_INVOKABLE void SetTopicList(const QStringList &_topicList); @@ -145,7 +145,7 @@ namespace plugins /// \brief Subscriber callback when new image is received /// \param[in] _msg New image - private: void OnImageMsg(const ignition::msgs::Image &_msg); + private: void OnImageMsg(const gz::msgs::Image &_msg); /// \internal /// \brief Pointer to private data. diff --git a/src/plugins/image_display/ImageDisplay_TEST.cc b/src/plugins/image_display/ImageDisplay_TEST.cc index bbd7fd3bc..5752b04dc 100644 --- a/src/plugins/image_display/ImageDisplay_TEST.cc +++ b/src/plugins/image_display/ImageDisplay_TEST.cc @@ -42,7 +42,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./ImageDisplay_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc index 7fe9fc4e5..c2cd9ecf9 100644 --- a/src/plugins/key_publisher/KeyPublisher.cc +++ b/src/plugins/key_publisher/KeyPublisher.cc @@ -31,17 +31,17 @@ #include "KeyPublisher.hh" -namespace ignition +namespace gz { namespace gui { class KeyPublisherPrivate { /// \brief Node for communication - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Publisher - public: ignition::transport::Node::Publisher pub; + public: gz::transport::Node::Publisher pub; /// \brief Topic public: std::string topic = "keyboard/keypress"; @@ -50,7 +50,7 @@ namespace gui /// \param[in] key_press Pointer to the keyevent public: void KeyPub(QKeyEvent *_keyPress) { - ignition::msgs::Int32 Msg; + gz::msgs::Int32 Msg; Msg.set_data(_keyPress->key()); pub.Publish(Msg); } @@ -58,7 +58,7 @@ namespace gui } } -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/plugins/key_publisher/KeyPublisher.hh b/src/plugins/key_publisher/KeyPublisher.hh index 38ecdd2e5..36ffaacc3 100644 --- a/src/plugins/key_publisher/KeyPublisher.hh +++ b/src/plugins/key_publisher/KeyPublisher.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_KEYPUBLISHER_HH_ -#define IGNITION_GUI_PLUGINS_KEYPUBLISHER_HH_ +#ifndef GZ_GUI_PLUGINS_KEYPUBLISHER_HH_ +#define GZ_GUI_PLUGINS_KEYPUBLISHER_HH_ #include @@ -25,7 +25,7 @@ #include #include -namespace ignition +namespace gz { namespace gui { @@ -35,7 +35,7 @@ namespace gui /// /// ## Configuration /// This plugin doesn't accept any custom configuration. - class KeyPublisher : public ignition::gui::Plugin + class KeyPublisher : public gz::gui::Plugin { Q_OBJECT diff --git a/src/plugins/publisher/Publisher.cc b/src/plugins/publisher/Publisher.cc index 4a6519af3..862d71a4d 100644 --- a/src/plugins/publisher/Publisher.cc +++ b/src/plugins/publisher/Publisher.cc @@ -29,7 +29,7 @@ #include "Publisher.hh" -namespace ignition +namespace gz { namespace gui { @@ -38,7 +38,7 @@ namespace plugins class PublisherPrivate { /// \brief Message type - public: QString msgType = "ignition.msgs.StringMsg"; + public: QString msgType = "gz.msgs.StringMsg"; /// \brief Message contents public: QString msgData = "data: \"Hello\""; @@ -53,16 +53,16 @@ namespace plugins public: QTimer *timer; /// \brief Node for communication - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Publisher - public: ignition::transport::Node::Publisher pub; + public: gz::transport::Node::Publisher pub; }; } } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/publisher/Publisher.hh b/src/plugins/publisher/Publisher.hh index f5ec11cdc..e33b8df81 100644 --- a/src/plugins/publisher/Publisher.hh +++ b/src/plugins/publisher/Publisher.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_PUBLISHER_HH_ -#define IGNITION_GUI_PLUGINS_PUBLISHER_HH_ +#ifndef GZ_GUI_PLUGINS_PUBLISHER_HH_ +#define GZ_GUI_PLUGINS_PUBLISHER_HH_ #include @@ -32,7 +32,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { @@ -94,12 +94,12 @@ namespace plugins public slots: void OnPublish(const bool _checked); /// \brief Get the message type as a string, for example - /// 'ignition.msgs.StringMsg' + /// 'gz.msgs.StringMsg' /// \return Message type public: Q_INVOKABLE QString MsgType() const; /// \brief Set the message type from a string, for example - /// 'ignition.msgs.StringMsg' + /// 'gz.msgs.StringMsg' /// \param[in] _msgType Message type public: Q_INVOKABLE void SetMsgType(const QString &_msgType); diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc index a7ecde9ec..f9c05b6e8 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -39,7 +39,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Publisher_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// @@ -104,7 +104,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) EXPECT_EQ(plugin->Title(), "Publisher!"); // Message type - EXPECT_EQ(plugin->MsgType(), "ignition.msgs.StringMsg"); + EXPECT_EQ(plugin->MsgType(), "gz.msgs.StringMsg"); // Message EXPECT_EQ(plugin->MsgData(), "data: \"Hello\""); @@ -190,7 +190,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) plugin->OnPublish(false); // Bad message type - msg combination - plugin->SetMsgType("ignition.msgs.StringMsg"); + plugin->SetMsgType("gz.msgs.StringMsg"); plugin->SetMsgData("banana: apple"); plugin->OnPublish(true); @@ -221,7 +221,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) "" "/fruit" "number: 1 fruit {name:\"banana\"}" - "ignition.msgs.Fruits" + "gz.msgs.Fruits" "0.1" ""; @@ -245,7 +245,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) EXPECT_EQ(plugin->Title(), "Publisher"); // Message type - EXPECT_EQ(plugin->MsgType(), "ignition.msgs.Fruits"); + EXPECT_EQ(plugin->MsgType(), "gz.msgs.Fruits"); // Message EXPECT_EQ(plugin->MsgData(), "number: 1 fruit {name:\"banana\"}"); diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc index af9572d67..bd51f7e73 100644 --- a/src/plugins/scene3d/Scene3D.cc +++ b/src/plugins/scene3d/Scene3D.cc @@ -58,7 +58,7 @@ #include "ignition/gui/GuiEvents.hh" #include "ignition/gui/MainWindow.hh" -namespace ignition +namespace gz { namespace gui { @@ -199,7 +199,7 @@ namespace plugins /// \brief Transport node for making service request and subscribing to /// pose topic - private: ignition::transport::Node node; + private: gz::transport::Node node; }; /// \brief Private data class for IgnRenderer @@ -263,7 +263,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index dae21ed3c..3c31fad62 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_SCENE3D_HH_ -#define IGNITION_GUI_PLUGINS_SCENE3D_HH_ +#ifndef GZ_GUI_PLUGINS_SCENE3D_HH_ +#define GZ_GUI_PLUGINS_SCENE3D_HH_ #include #include @@ -32,7 +32,7 @@ #include "ignition/gui/qt.h" #include "ignition/gui/Plugin.hh" -namespace ignition +namespace gz { namespace gui { @@ -329,7 +329,7 @@ namespace plugins /// \brief Called when the mouse hovers to a new position. /// \param[in] _hoverPos 2D coordinates of the hovered mouse position on /// the render window. - public: void OnHovered(const ignition::math::Vector2i &_hoverPos); + public: void OnHovered(const gz::math::Vector2i &_hoverPos); /// \brief Slot called when thread is ready to be started public Q_SLOTS: void Ready(); diff --git a/src/plugins/screenshot/Screenshot.cc b/src/plugins/screenshot/Screenshot.cc index e990f2b47..314a9950a 100644 --- a/src/plugins/screenshot/Screenshot.cc +++ b/src/plugins/screenshot/Screenshot.cc @@ -40,7 +40,7 @@ #include "ignition/gui/GuiEvents.hh" #include "ignition/gui/MainWindow.hh" -namespace ignition +namespace gz { namespace gui { @@ -49,7 +49,7 @@ namespace plugins class ScreenshotPrivate { /// \brief Node for communication - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Screenshot service name public: std::string screenshotService; @@ -61,7 +61,7 @@ namespace plugins public: bool dirty{false}; /// \brief Pointer to the user camera. - public: ignition::rendering::CameraPtr userCamera{nullptr}; + public: gz::rendering::CameraPtr userCamera{nullptr}; /// \brief Saved screenshot filepath public: QString savedScreenshotPath = ""; @@ -70,7 +70,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/screenshot/Screenshot.hh b/src/plugins/screenshot/Screenshot.hh index cb56a383c..1821d406e 100644 --- a/src/plugins/screenshot/Screenshot.hh +++ b/src/plugins/screenshot/Screenshot.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_PLUGINS_SCREENSHOT_HH_ -#define IGNITION_GUI_PLUGINS_SCREENSHOT_HH_ +#ifndef GZ_GUI_PLUGINS_SCREENSHOT_HH_ +#define GZ_GUI_PLUGINS_SCREENSHOT_HH_ #ifdef _MSC_VER #pragma warning(push, 0) @@ -31,7 +31,7 @@ #include "ignition/gui/qt.h" #include "ignition/gui/Plugin.hh" -namespace ignition +namespace gz { namespace gui { diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc index f78c0273f..704df59a6 100644 --- a/src/plugins/screenshot/Screenshot_TEST.cc +++ b/src/plugins/screenshot/Screenshot_TEST.cc @@ -45,7 +45,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Screenshot_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/plugins/shutdown_button/ShutdownButton.cc b/src/plugins/shutdown_button/ShutdownButton.cc index f8ab9ba3c..0c1417106 100644 --- a/src/plugins/shutdown_button/ShutdownButton.cc +++ b/src/plugins/shutdown_button/ShutdownButton.cc @@ -22,7 +22,7 @@ #include "ignition/gui/Application.hh" #include "ignition/gui/MainWindow.hh" -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/shutdown_button/ShutdownButton.hh b/src/plugins/shutdown_button/ShutdownButton.hh index f4489cb43..5c1fb991e 100644 --- a/src/plugins/shutdown_button/ShutdownButton.hh +++ b/src/plugins/shutdown_button/ShutdownButton.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ -#define IGNITION_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ +#ifndef GZ_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ +#define GZ_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ #include "ignition/gui/Plugin.hh" @@ -30,14 +30,14 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { namespace plugins { /// \brief This plugin provides a shutdown button. - class ShutdownButton_EXPORTS_API ShutdownButton: public ignition::gui::Plugin + class ShutdownButton_EXPORTS_API ShutdownButton: public gz::gui::Plugin { Q_OBJECT diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc index 07d6a7470..9ef7cbef5 100644 --- a/src/plugins/shutdown_button/ShutdownButton_TEST.cc +++ b/src/plugins/shutdown_button/ShutdownButton_TEST.cc @@ -33,7 +33,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./ShutdownButton_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/src/plugins/teleop/Teleop.cc b/src/plugins/teleop/Teleop.cc index 34a6f35a0..6f3ac31f5 100644 --- a/src/plugins/teleop/Teleop.cc +++ b/src/plugins/teleop/Teleop.cc @@ -33,7 +33,7 @@ #include #include -namespace ignition +namespace gz { namespace gui { @@ -60,13 +60,13 @@ namespace plugins class TeleopPrivate { /// \brief Node for communication. - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Topic. Set '/cmd_vel' as default. public: std::string topic = "/cmd_vel"; /// \brief Publisher. - public: ignition::transport::Node::Publisher cmdVelPub; + public: gz::transport::Node::Publisher cmdVelPub; /// \brief Maximum forward velocity in m/s. GUI buttons and key presses /// will use this velocity. Sliders will scale up to this value. @@ -111,7 +111,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; @@ -157,7 +157,7 @@ void Teleop::OnTeleopTwist(double _forwardVel, double _verticalVel, if (!this->dataPtr->cmdVelPub.Publish(cmdVelMsg)) { - ignerr << "ignition::msgs::Twist message couldn't be published at topic: " + ignerr << "gz::msgs::Twist message couldn't be published at topic: " << this->dataPtr->topic << std::endl; } } diff --git a/src/plugins/teleop/Teleop.hh b/src/plugins/teleop/Teleop.hh index 1406f88d7..7c45b9100 100644 --- a/src/plugins/teleop/Teleop.hh +++ b/src/plugins/teleop/Teleop.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_TELEOP_HH_ -#define IGNITION_GUI_PLUGINS_TELEOP_HH_ +#ifndef GZ_GUI_PLUGINS_TELEOP_HH_ +#define GZ_GUI_PLUGINS_TELEOP_HH_ #include @@ -35,7 +35,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc index c2ac9d6ad..ef7abe406 100644 --- a/src/plugins/teleop/Teleop_TEST.cc +++ b/src/plugins/teleop/Teleop_TEST.cc @@ -40,7 +40,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Teleop_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; class TeleopTest : public ::testing::Test diff --git a/src/plugins/topic_echo/TopicEcho.cc b/src/plugins/topic_echo/TopicEcho.cc index 0bd374e7d..9e5d60c85 100644 --- a/src/plugins/topic_echo/TopicEcho.cc +++ b/src/plugins/topic_echo/TopicEcho.cc @@ -23,7 +23,7 @@ #include "ignition/gui/Application.hh" #include "TopicEcho.hh" -namespace ignition +namespace gz { namespace gui { @@ -48,13 +48,13 @@ namespace plugins public: std::mutex mutex; /// \brief Node for communication - public: ignition::transport::Node node; + public: gz::transport::Node node; }; } } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh index e9fd62252..ff47c0d7a 100644 --- a/src/plugins/topic_echo/TopicEcho.hh +++ b/src/plugins/topic_echo/TopicEcho.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_TOPICECHO_HH_ -#define IGNITION_GUI_PLUGINS_TOPICECHO_HH_ +#ifndef GZ_GUI_PLUGINS_TOPICECHO_HH_ +#define GZ_GUI_PLUGINS_TOPICECHO_HH_ #ifdef _MSC_VER #pragma warning(push, 0) @@ -40,7 +40,7 @@ #include "ignition/gui/Plugin.hh" -namespace ignition +namespace gz { namespace gui { diff --git a/src/plugins/topic_echo/TopicEcho_TEST.cc b/src/plugins/topic_echo/TopicEcho_TEST.cc index c3cbbc8ff..c1876b63d 100644 --- a/src/plugins/topic_echo/TopicEcho_TEST.cc +++ b/src/plugins/topic_echo/TopicEcho_TEST.cc @@ -43,7 +43,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./TopicEcho_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/src/plugins/topic_viewer/TopicViewer.cc b/src/plugins/topic_viewer/TopicViewer.cc index a01ca883c..e404b8f84 100644 --- a/src/plugins/topic_viewer/TopicViewer.cc +++ b/src/plugins/topic_viewer/TopicViewer.cc @@ -46,7 +46,7 @@ #define PATH_ROLE 54 #define PLOT_ROLE 55 -namespace ignition +namespace gz { namespace gui { @@ -73,7 +73,7 @@ namespace plugins class TopicViewerPrivate { /// \brief Node for Commincation - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Model to create it from the available topics and messages public: TopicsModel *model; @@ -146,7 +146,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/topic_viewer/TopicViewer.hh b/src/plugins/topic_viewer/TopicViewer.hh index ec4e73185..815024e14 100644 --- a/src/plugins/topic_viewer/TopicViewer.hh +++ b/src/plugins/topic_viewer/TopicViewer.hh @@ -28,7 +28,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc index 27ee57c68..48d969a36 100644 --- a/src/plugins/topic_viewer/TopicViewer_TEST.cc +++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc @@ -39,7 +39,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./TopicViewer_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; @@ -145,7 +145,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { foundCollision = true; - EXPECT_EQ(child->data(TYPE_ROLE), "ignition.msgs.Collision"); + EXPECT_EQ(child->data(TYPE_ROLE), "gz.msgs.Collision"); EXPECT_EQ(child->rowCount(), 8); auto pose = child->child(5); @@ -162,7 +162,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { foundInt = true; - EXPECT_EQ(child->data(TYPE_ROLE), "ignition.msgs.Int32"); + EXPECT_EQ(child->data(TYPE_ROLE), "gz.msgs.Int32"); EXPECT_EQ(child->rowCount(), 2); auto data = child->child(1); diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc index dd68be194..39d9b008b 100644 --- a/src/plugins/world_control/WorldControl.cc +++ b/src/plugins/world_control/WorldControl.cc @@ -26,7 +26,7 @@ #include "ignition/gui/Helpers.hh" -namespace ignition +namespace gz { namespace gui { @@ -35,7 +35,7 @@ namespace plugins class WorldControlPrivate { /// \brief Message holding latest world statistics - public: ignition::msgs::WorldStatistics msg; + public: gz::msgs::WorldStatistics msg; /// \brief Service to send world control requests public: std::string controlService; @@ -44,7 +44,7 @@ namespace plugins public: std::recursive_mutex mutex; /// \brief Communication node - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief The multi step value public: unsigned int multiStep = 1u; @@ -56,7 +56,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/world_control/WorldControl.hh b/src/plugins/world_control/WorldControl.hh index a434228a7..cd0fdddc0 100644 --- a/src/plugins/world_control/WorldControl.hh +++ b/src/plugins/world_control/WorldControl.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_WORLDCONTROL_HH_ -#define IGNITION_GUI_PLUGINS_WORLDCONTROL_HH_ +#ifndef GZ_GUI_PLUGINS_WORLDCONTROL_HH_ +#define GZ_GUI_PLUGINS_WORLDCONTROL_HH_ #include @@ -41,7 +41,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { @@ -67,7 +67,7 @@ namespace plugins /// /// If no elements are filled for the plugin, both the play/pause and the /// step buttons will be displayed. - class WorldControl_EXPORTS_API WorldControl: public ignition::gui::Plugin + class WorldControl_EXPORTS_API WorldControl: public gz::gui::Plugin { Q_OBJECT @@ -103,7 +103,7 @@ namespace plugins signals: void paused(); /// \brief Subscriber callback when new world statistics are received - private: void OnWorldStatsMsg(const ignition::msgs::WorldStatistics &_msg); + private: void OnWorldStatsMsg(const gz::msgs::WorldStatistics &_msg); // Private data private: std::unique_ptr dataPtr; diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc index a84602505..f74d3cd64 100644 --- a/src/plugins/world_control/WorldControl_TEST.cc +++ b/src/plugins/world_control/WorldControl_TEST.cc @@ -33,7 +33,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./WorldControl_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index 321f8197c..b8a817e56 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -26,7 +26,7 @@ #include "ignition/gui/Helpers.hh" -namespace ignition +namespace gz { namespace gui { @@ -35,13 +35,13 @@ namespace plugins class WorldStatsPrivate { /// \brief Message holding latest world statistics - public: ignition::msgs::WorldStatistics msg; + public: gz::msgs::WorldStatistics msg; /// \brief Mutex to protect msg public: std::recursive_mutex mutex; /// \brief Communication node - public: ignition::transport::Node node; + public: gz::transport::Node node; /// \brief Holds real time factor public: QString realTimeFactor; @@ -59,7 +59,7 @@ namespace plugins } } -using namespace ignition; +using namespace gz; using namespace gui; using namespace plugins; diff --git a/src/plugins/world_stats/WorldStats.hh b/src/plugins/world_stats/WorldStats.hh index 472d1c096..46d0cf3ee 100644 --- a/src/plugins/world_stats/WorldStats.hh +++ b/src/plugins/world_stats/WorldStats.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_GUI_PLUGINS_WORLDSTATS_HH_ -#define IGNITION_GUI_PLUGINS_WORLDSTATS_HH_ +#ifndef GZ_GUI_PLUGINS_WORLDSTATS_HH_ +#define GZ_GUI_PLUGINS_WORLDSTATS_HH_ #include @@ -42,7 +42,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { @@ -70,7 +70,7 @@ namespace plugins /// /// If no elements are filled for the plugin, all properties will be /// displayed. - class WorldStats_EXPORTS_API WorldStats: public ignition::gui::Plugin + class WorldStats_EXPORTS_API WorldStats: public gz::gui::Plugin { Q_OBJECT @@ -163,7 +163,7 @@ namespace plugins signals: void IterationsChanged(); /// \brief Subscriber callback when new world statistics are received - private: void OnWorldStatsMsg(const ignition::msgs::WorldStatistics &_msg); + private: void OnWorldStatsMsg(const gz::msgs::WorldStatistics &_msg); // Private data private: std::unique_ptr dataPtr; diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc index b628f13d8..14e807c44 100644 --- a/src/plugins/world_stats/WorldStats_TEST.cc +++ b/src/plugins/world_stats/WorldStats_TEST.cc @@ -33,7 +33,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./WorldStats_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/test/helpers/TestHelper.cc b/test/helpers/TestHelper.cc index e7d70984d..7316f5e24 100644 --- a/test/helpers/TestHelper.cc +++ b/test/helpers/TestHelper.cc @@ -17,7 +17,7 @@ #include "TestHelper.hh" -namespace ignition +namespace gz { namespace gui { diff --git a/test/helpers/TestHelper.hh b/test/helpers/TestHelper.hh index 8c2fee0f9..73a9ee201 100644 --- a/test/helpers/TestHelper.hh +++ b/test/helpers/TestHelper.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_GUI_TESTHELPER_HH_ -#define IGNITION_GUI_TESTHELPER_HH_ +#ifndef GZ_GUI_TESTHELPER_HH_ +#define GZ_GUI_TESTHELPER_HH_ #include #include @@ -31,7 +31,7 @@ # endif #endif -namespace ignition +namespace gz { namespace gui { diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc index 7c87b77c3..9b8c1b5af 100644 --- a/test/integration/ExamplesBuild_TEST.cc +++ b/test/integration/ExamplesBuild_TEST.cc @@ -24,7 +24,7 @@ #include "test_config.h" // NOLINT(build/include) -using namespace ignition; +using namespace gz; // Helper functions copied from // https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc index 346931086..cd8b4b219 100644 --- a/test/integration/Examples_TEST.cc +++ b/test/integration/Examples_TEST.cc @@ -30,7 +30,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Examples_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; // See https://github.com/ignitionrobotics/ign-gui/issues/75 diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc new file mode 100644 index 000000000..66709f54c --- /dev/null +++ b/test/integration/deprecated_TEST.cc @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2022 Open Source Robotics Foundation + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * +*/ + +#include +#include + +///////////////////////////////////////////////// +// Make sure the ignition namespace still works +TEST(Deprecated, IgnitionNamespace) +{ + ignition::gui::Plugin plugin; +} diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc index 817b82ca5..2ddd4d117 100644 --- a/test/integration/scene3d.cc +++ b/test/integration/scene3d.cc @@ -39,7 +39,7 @@ char* g_argv[] = reinterpret_cast(const_cast("./Scene3d_TEST")), }; -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/test/plugins/TestBadInheritancePlugin.cc b/test/plugins/TestBadInheritancePlugin.cc index b98fdbc79..532e972cc 100644 --- a/test/plugins/TestBadInheritancePlugin.cc +++ b/test/plugins/TestBadInheritancePlugin.cc @@ -20,7 +20,7 @@ #include "TestBadInheritancePlugin.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/test/plugins/TestBadInheritancePlugin.hh b/test/plugins/TestBadInheritancePlugin.hh index c5c5bc753..35ef0c2f2 100644 --- a/test/plugins/TestBadInheritancePlugin.hh +++ b/test/plugins/TestBadInheritancePlugin.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_GUI_TEST_TESTBADINHERITANCEPLUGIN_HH_ -#define IGNITION_GUI_TEST_TESTBADINHERITANCEPLUGIN_HH_ +#ifndef GZ_GUI_TEST_TESTBADINHERITANCEPLUGIN_HH_ +#define GZ_GUI_TEST_TESTBADINHERITANCEPLUGIN_HH_ #ifndef Q_MOC_RUN #include #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/test/plugins/TestInvalidQmlPlugin.cc b/test/plugins/TestInvalidQmlPlugin.cc index 2f58cb41f..feb0b15ff 100644 --- a/test/plugins/TestInvalidQmlPlugin.cc +++ b/test/plugins/TestInvalidQmlPlugin.cc @@ -19,7 +19,7 @@ #include "TestInvalidQmlPlugin.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/test/plugins/TestInvalidQmlPlugin.hh b/test/plugins/TestInvalidQmlPlugin.hh index 412dbd1e6..4793433f4 100644 --- a/test/plugins/TestInvalidQmlPlugin.hh +++ b/test/plugins/TestInvalidQmlPlugin.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_GUI_TEST_MALFORMEDPLUGIN_HH_ -#define IGNITION_GUI_TEST_MALFORMEDPLUGIN_HH_ +#ifndef GZ_GUI_TEST_MALFORMEDPLUGIN_HH_ +#define GZ_GUI_TEST_MALFORMEDPLUGIN_HH_ #include -namespace ignition +namespace gz { namespace gui { diff --git a/test/plugins/TestNotRegisteredPlugin.cc b/test/plugins/TestNotRegisteredPlugin.cc index c9471d8b4..02caed094 100644 --- a/test/plugins/TestNotRegisteredPlugin.cc +++ b/test/plugins/TestNotRegisteredPlugin.cc @@ -20,7 +20,7 @@ #include "TestNotRegisteredPlugin.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/test/plugins/TestNotRegisteredPlugin.hh b/test/plugins/TestNotRegisteredPlugin.hh index 41726a08a..f9aad7d0c 100644 --- a/test/plugins/TestNotRegisteredPlugin.hh +++ b/test/plugins/TestNotRegisteredPlugin.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_GUI_TEST_TESTNOTREGISTEREDPLUGIN_HH_ -#define IGNITION_GUI_TEST_TESTNOTREGISTEREDPLUGIN_HH_ +#ifndef GZ_GUI_TEST_TESTNOTREGISTEREDPLUGIN_HH_ +#define GZ_GUI_TEST_TESTNOTREGISTEREDPLUGIN_HH_ #ifndef Q_MOC_RUN #include #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/test/plugins/TestPlugin.cc b/test/plugins/TestPlugin.cc index 03559ae3f..828bcfd58 100644 --- a/test/plugins/TestPlugin.cc +++ b/test/plugins/TestPlugin.cc @@ -20,7 +20,7 @@ #include "TestPlugin.hh" -using namespace ignition; +using namespace gz; using namespace gui; ///////////////////////////////////////////////// diff --git a/test/plugins/TestPlugin.hh b/test/plugins/TestPlugin.hh index d0a03bac6..a72d3f039 100644 --- a/test/plugins/TestPlugin.hh +++ b/test/plugins/TestPlugin.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_GUI_TEST_TESTPLUGIN_HH_ -#define IGNITION_GUI_TEST_TESTPLUGIN_HH_ +#ifndef GZ_GUI_TEST_TESTPLUGIN_HH_ +#define GZ_GUI_TEST_TESTPLUGIN_HH_ #ifndef Q_MOC_RUN #include #include #endif -namespace ignition +namespace gz { namespace gui { diff --git a/tutorials/03_plugins.md b/tutorials/03_plugins.md index 53ced108c..7d9ca74a8 100644 --- a/tutorials/03_plugins.md +++ b/tutorials/03_plugins.md @@ -18,9 +18,9 @@ for an example. Ignition GUI will look for plugins on the following paths, in this order: 1. All paths set on the `IGN_GUI_PLUGIN_PATH` environment variable -2. All paths added by calling `ignition::gui::addPluginPath` +2. All paths added by calling `gz::gui::addPluginPath` 3. `~/.ignition/gui/plugins` -4. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/3.3/namespaceignition_1_1gui_1_1plugins.html) +4. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/3.3/namespace gz_1_1gui_1_1plugins.html) ## Configuring plugins @@ -120,4 +120,4 @@ order: 1. All paths set on the `IGN_GUI_DISPLAY_PLUGIN_PATH` environment variable 2. `~/.ignition/gui/display_plugins` -3. [Display plugins that are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/0.1/namespaceignition_1_1gui_1_1display_plugins.html) +3. [Display plugins that are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/0.1/namespace gz_1_1gui_1_1display_plugins.html) From b804f638156def55b5bdd552cfdf2830a5fc3b3f Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 18 Aug 2022 20:42:01 -0700 Subject: [PATCH 3/7] Migrate include statements Signed-off-by: methylDragon --- .../custom_context_menu/CustomContext.cc | 2 +- .../custom_context_menu/CustomContext.hh | 4 +- .../dialog_from_plugin/DialogFromPlugin.cc | 2 +- .../dialog_from_plugin/DialogFromPlugin.hh | 4 +- examples/plugin/hello_plugin/HelloPlugin.cc | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 4 +- .../plugin/ign_components/IgnComponents.cc | 2 +- .../plugin/ign_components/IgnComponents.hh | 2 +- examples/plugin/multiple_qml/MultipleQml.cc | 2 +- examples/plugin/multiple_qml/MultipleQml.hh | 4 +- .../standalone/custom_drawer/custom_drawer.cc | 8 ++-- .../standalone/custom_drawer/custom_drawer.hh | 2 +- examples/standalone/dialogs/dialogs.cc | 8 ++-- .../standalone/start_dialog/start_dialog.cc | 8 ++-- examples/standalone/window/window.cc | 6 +-- include/gz/gui/Application.hh | 4 +- include/gz/gui/Conversions.hh | 14 +++---- include/gz/gui/Dialog.hh | 4 +- include/gz/gui/DragDropModel.hh | 4 +- include/gz/gui/Enums.hh | 2 +- include/gz/gui/GuiEvents.hh | 2 +- include/gz/gui/Helpers.hh | 4 +- include/gz/gui/MainWindow.hh | 6 +-- include/gz/gui/Plugin.hh | 4 +- include/gz/gui/SearchModel.hh | 4 +- include/gz/gui/gz.hh | 2 +- include/gz/gui/ign_auto_headers.hh.in | 2 +- src/Application.cc | 34 ++++++++--------- src/Application_TEST.cc | 12 +++--- src/Conversions.cc | 6 +-- src/Conversions_TEST.cc | 8 ++-- src/Dialog.cc | 6 +-- src/Dialog_TEST.cc | 8 ++-- src/DragDropModel.cc | 4 +- src/DragDropModel_TEST.cc | 6 +-- src/GuiEvents_TEST.cc | 2 +- src/Helpers.cc | 10 ++--- src/Helpers_TEST.cc | 10 ++--- src/MainWindow.cc | 18 ++++----- src/MainWindow_TEST.cc | 16 ++++---- src/Plugin.cc | 10 ++--- src/Plugin_TEST.cc | 10 ++--- src/SearchModel.cc | 6 +-- src/SearchModel_TEST.cc | 6 +-- src/gz.cc | 10 ++--- src/gz_TEST.cc | 6 +-- src/plugins/grid_3d/Grid3D.cc | 22 +++++------ src/plugins/grid_3d/Grid3D.hh | 2 +- src/plugins/grid_3d/Grid3D_TEST.cc | 24 ++++++------ src/plugins/image_display/ImageDisplay.cc | 12 +++--- src/plugins/image_display/ImageDisplay.hh | 4 +- .../image_display/ImageDisplay_TEST.cc | 16 ++++---- src/plugins/key_publisher/KeyPublisher.cc | 8 ++-- src/plugins/key_publisher/KeyPublisher.hh | 6 +-- src/plugins/publisher/Publisher.cc | 8 ++-- src/plugins/publisher/Publisher.hh | 2 +- src/plugins/publisher/Publisher_TEST.cc | 12 +++--- src/plugins/scene3d/Scene3D.cc | 38 +++++++++---------- src/plugins/scene3d/Scene3D.hh | 14 +++---- src/plugins/screenshot/Screenshot.cc | 24 ++++++------ src/plugins/screenshot/Screenshot.hh | 8 ++-- src/plugins/screenshot/Screenshot_TEST.cc | 22 +++++------ src/plugins/shutdown_button/ShutdownButton.cc | 6 +-- src/plugins/shutdown_button/ShutdownButton.hh | 2 +- .../shutdown_button/ShutdownButton_TEST.cc | 12 +++--- src/plugins/teleop/Teleop.cc | 8 ++-- src/plugins/teleop/Teleop.hh | 6 +-- src/plugins/teleop/Teleop_TEST.cc | 12 +++--- src/plugins/topic_echo/TopicEcho.cc | 8 ++-- src/plugins/topic_echo/TopicEcho.hh | 2 +- src/plugins/topic_echo/TopicEcho_TEST.cc | 16 ++++---- src/plugins/topic_viewer/TopicViewer.cc | 12 +++--- src/plugins/topic_viewer/TopicViewer.hh | 2 +- src/plugins/topic_viewer/TopicViewer_TEST.cc | 12 +++--- src/plugins/world_control/WorldControl.cc | 10 ++--- src/plugins/world_control/WorldControl.hh | 6 +-- .../world_control/WorldControl_TEST.cc | 12 +++--- src/plugins/world_stats/WorldStats.cc | 10 ++--- src/plugins/world_stats/WorldStats.hh | 8 ++-- src/plugins/world_stats/WorldStats_TEST.cc | 12 +++--- test/helpers/TestHelper.hh | 6 +-- test/integration/ExamplesBuild_TEST.cc | 6 +-- test/integration/Examples_TEST.cc | 8 ++-- test/integration/scene3d.cc | 24 ++++++------ test/plugins/TestBadInheritancePlugin.cc | 4 +- test/plugins/TestBadInheritancePlugin.hh | 4 +- test/plugins/TestInvalidQmlPlugin.cc | 2 +- test/plugins/TestInvalidQmlPlugin.hh | 2 +- test/plugins/TestNotRegisteredPlugin.cc | 4 +- test/plugins/TestNotRegisteredPlugin.hh | 4 +- test/plugins/TestPlugin.cc | 4 +- test/plugins/TestPlugin.hh | 4 +- 92 files changed, 375 insertions(+), 375 deletions(-) diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc index 2c255f912..564ea5efd 100644 --- a/examples/plugin/custom_context_menu/CustomContext.cc +++ b/examples/plugin/custom_context_menu/CustomContext.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "CustomContext.hh" diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh index a373498cb..e87989f5b 100644 --- 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 - #include + #include + #include #endif namespace gz diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc index aa59e1bcc..e94266063 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "DialogFromPlugin.hh" diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh index 51ba359b8..e800d7732 100644 --- 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 - #include + #include + #include #endif namespace gz diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc index f37716500..b5c5ef93e 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.cc +++ b/examples/plugin/hello_plugin/HelloPlugin.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "HelloPlugin.hh" diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh index b326214a3..0e555c76d 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -20,8 +20,8 @@ #include -#include -#include +#include +#include namespace gz { diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc index cd8272d7b..2de4e42e7 100644 --- a/examples/plugin/ign_components/IgnComponents.cc +++ b/examples/plugin/ign_components/IgnComponents.cc @@ -15,7 +15,7 @@ * */ -#include +#include #include "IgnComponents.hh" // Register this plugin diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh index c1f4ed521..1922e54ac 100644 --- 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 +#include namespace gz { diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc index 92cecdf49..460b6d7c1 100644 --- a/examples/plugin/multiple_qml/MultipleQml.cc +++ b/examples/plugin/multiple_qml/MultipleQml.cc @@ -16,7 +16,7 @@ */ #include -#include +#include #include "MultipleQml.hh" diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh index 6d4960ee3..ae0d9114f 100644 --- 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 - #include + #include + #include #endif namespace gz diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc index c9e0560de..057b5d2b2 100644 --- a/examples/standalone/custom_drawer/custom_drawer.cc +++ b/examples/standalone/custom_drawer/custom_drawer.cc @@ -15,12 +15,12 @@ * */ -#include +#include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #include "custom_drawer.hh" #endif diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh index 0f3f2c4eb..e062afa69 100644 --- a/examples/standalone/custom_drawer/custom_drawer.hh +++ b/examples/standalone/custom_drawer/custom_drawer.hh @@ -21,7 +21,7 @@ #include #ifndef Q_MOC_RUN - #include + #include #endif namespace gz diff --git a/examples/standalone/dialogs/dialogs.cc b/examples/standalone/dialogs/dialogs.cc index 38a78b111..fbe091d76 100644 --- a/examples/standalone/dialogs/dialogs.cc +++ b/examples/standalone/dialogs/dialogs.cc @@ -17,12 +17,12 @@ #include -#include +#include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #endif ////////////////////////////////////////////////// diff --git a/examples/standalone/start_dialog/start_dialog.cc b/examples/standalone/start_dialog/start_dialog.cc index 8222274cd..625eb885d 100644 --- a/examples/standalone/start_dialog/start_dialog.cc +++ b/examples/standalone/start_dialog/start_dialog.cc @@ -17,10 +17,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include ////////////////////////////////////////////////// int main(int _argc, char **_argv) diff --git a/examples/standalone/window/window.cc b/examples/standalone/window/window.cc index 25f68a21e..031dcbcbb 100644 --- a/examples/standalone/window/window.cc +++ b/examples/standalone/window/window.cc @@ -18,9 +18,9 @@ #include #ifndef Q_MOC_RUN - #include - #include - #include + #include + #include + #include #endif ////////////////////////////////////////////////// diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index 25712838e..cdb703dcd 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -22,8 +22,8 @@ #include #include -#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 index 0154b651b..b0e88595a 100644 --- 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 +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include -#include -#include +#include +#include +#include +#include -#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 index 476d36093..df1f3a055 100644 --- a/include/gz/gui/Dialog.hh +++ b/include/gz/gui/Dialog.hh @@ -21,8 +21,8 @@ #include #include -#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 index a1e07b699..eb384567a 100644 --- 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 index 886a10d5d..b612fe6ea 100644 --- 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 index 6189d9224..5c1cca09f 100644 --- a/include/gz/gui/GuiEvents.hh +++ b/include/gz/gui/GuiEvents.hh @@ -21,7 +21,7 @@ #include #include #include -#include +#include namespace gz { diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index b20b50da6..490aaa372 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -19,8 +19,8 @@ #include -#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 index b1872007a..bd275b817 100644 --- a/include/gz/gui/MainWindow.hh +++ b/include/gz/gui/MainWindow.hh @@ -23,10 +23,10 @@ #include #include -#include +#include -#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 index d911f009f..6519c0e4c 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -21,8 +21,8 @@ #include #include -#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 index 8d40963cc..7ef58d0f3 100644 --- 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 index 099043313..c9a66b64c 100644 --- 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 index a92282ee3..78322db29 100644 --- 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 +#include ${ign_headers} diff --git a/src/Application.cc b/src/Application.cc index 503006aad..d9f2b6ccb 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -18,23 +18,23 @@ #include #include -#include -#include -#include -#include -#include -#include - -#include - -#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 +#include +#include +#include +#include +#include + +#include + +#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 index e933b319a..83b4ca5a4 100644 --- a/src/Application_TEST.cc +++ b/src/Application_TEST.cc @@ -17,14 +17,14 @@ #include #include -#include -#include +#include +#include #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 index 1b4ee059f..76569010a 100644 --- a/src/Conversions.cc +++ b/src/Conversions.cc @@ -15,10 +15,10 @@ * */ -#include -#include +#include +#include -#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 index 30d5bfb5b..a46ad39a3 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -17,12 +17,12 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Conversions.hh" +#include "gz/gui/Conversions.hh" using namespace gz; using namespace gui; diff --git a/src/Dialog.cc b/src/Dialog.cc index 3285ce472..19aba6f94 100644 --- a/src/Dialog.cc +++ b/src/Dialog.cc @@ -17,9 +17,9 @@ #include -#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/Dialog.hh" +#include +#include "gz/gui/Application.hh" +#include "gz/gui/Dialog.hh" namespace gz { diff --git a/src/Dialog_TEST.cc b/src/Dialog_TEST.cc index 55b913aea..74197eacd 100644 --- a/src/Dialog_TEST.cc +++ b/src/Dialog_TEST.cc @@ -17,12 +17,12 @@ #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Dialog.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Dialog.hh" std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*) int g_argc = 1; diff --git a/src/DragDropModel.cc b/src/DragDropModel.cc index a05f60b20..73a645c0d 100644 --- a/src/DragDropModel.cc +++ b/src/DragDropModel.cc @@ -15,8 +15,8 @@ * */ -#include "ignition/gui/Enums.hh" -#include "ignition/gui/DragDropModel.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/DragDropModel.hh" using namespace gz; using namespace gui; diff --git a/src/DragDropModel_TEST.cc b/src/DragDropModel_TEST.cc index 86a284a4b..2ff05e331 100644 --- a/src/DragDropModel_TEST.cc +++ b/src/DragDropModel_TEST.cc @@ -17,12 +17,12 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Enums.hh" -#include "ignition/gui/DragDropModel.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/DragDropModel.hh" using namespace gz; using namespace gui; diff --git a/src/GuiEvents_TEST.cc b/src/GuiEvents_TEST.cc index 19df0972f..a0563954f 100644 --- a/src/GuiEvents_TEST.cc +++ b/src/GuiEvents_TEST.cc @@ -18,7 +18,7 @@ #include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/GuiEvents.hh" +#include "gz/gui/GuiEvents.hh" using namespace gz; using namespace gui; diff --git a/src/Helpers.cc b/src/Helpers.cc index 50ceb7c63..a413bdc47 100644 --- a/src/Helpers.cc +++ b/src/Helpers.cc @@ -18,12 +18,12 @@ #include #include #include -#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/Enums.hh" -#include "ignition/gui/Helpers.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/Helpers.hh" +#include "gz/gui/MainWindow.hh" ///////////////////////////////////////////////// std::string gz::gui::humanReadable(const std::string &_key) diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index 8608d7a9f..359ed480c 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -18,13 +18,13 @@ #include #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Helpers.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Helpers.hh" int gg_argc = 1; char **gg_argv = new char *[gg_argc]; diff --git a/src/MainWindow.cc b/src/MainWindow.cc index 62c25da20..45049d08d 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -19,15 +19,15 @@ #include #include -#include -#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/qt.h" -#include "ignition/msgs/boolean.pb.h" -#include "ignition/msgs/server_control.pb.h" -#include "ignition/transport/Node.hh" +#include +#include +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/qt.h" +#include "gz/msgs/boolean.pb.h" +#include "gz/msgs/server_control.pb.h" +#include "gz/transport/Node.hh" namespace gz { diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index 7098f6945..3c49e76b8 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -21,16 +21,16 @@ #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*) int g_argc = 1; diff --git a/src/Plugin.cc b/src/Plugin.cc index ae767fd21..be704f6e9 100644 --- a/src/Plugin.cc +++ b/src/Plugin.cc @@ -17,11 +17,11 @@ #include -#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/Helpers.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include +#include "gz/gui/Application.hh" +#include "gz/gui/Helpers.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" /// \brief Used to store information about anchors set by the user. struct Anchors diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc index 2b698c9ec..6955f91c6 100644 --- a/src/Plugin_TEST.cc +++ b/src/Plugin_TEST.cc @@ -18,13 +18,13 @@ #include #include -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" int g_argc = 1; char* g_argv[] = diff --git a/src/SearchModel.cc b/src/SearchModel.cc index 7c3def983..3ccf2bbe3 100644 --- a/src/SearchModel.cc +++ b/src/SearchModel.cc @@ -15,10 +15,10 @@ * */ -#include +#include -#include "ignition/gui/Enums.hh" -#include "ignition/gui/SearchModel.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/SearchModel.hh" using namespace gz; using namespace gui; diff --git a/src/SearchModel_TEST.cc b/src/SearchModel_TEST.cc index 0c81cbc31..1b3a0f8f6 100644 --- a/src/SearchModel_TEST.cc +++ b/src/SearchModel_TEST.cc @@ -17,12 +17,12 @@ #include -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Enums.hh" -#include "ignition/gui/SearchModel.hh" +#include "gz/gui/Enums.hh" +#include "gz/gui/SearchModel.hh" using namespace gz; using namespace gui; diff --git a/src/gz.cc b/src/gz.cc index 53060c492..b077c597e 100644 --- a/src/gz.cc +++ b/src/gz.cc @@ -19,13 +19,13 @@ #include -#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/config.hh" -#include "ignition/gui/Export.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/config.hh" +#include "gz/gui/Export.hh" #include "gz/gui/gz.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/MainWindow.hh" int g_argc = 1; char* g_argv[] = diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc index 34d6a0650..d923bd421 100644 --- a/src/gz_TEST.cc +++ b/src/gz_TEST.cc @@ -22,9 +22,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) diff --git a/src/plugins/grid_3d/Grid3D.cc b/src/plugins/grid_3d/Grid3D.cc index 717c51b9d..4bcbba836 100644 --- a/src/plugins/grid_3d/Grid3D.cc +++ b/src/plugins/grid_3d/Grid3D.cc @@ -18,17 +18,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include "Grid3D.hh" diff --git a/src/plugins/grid_3d/Grid3D.hh b/src/plugins/grid_3d/Grid3D.hh index 8f9d27011..59fb3096b 100644 --- a/src/plugins/grid_3d/Grid3D.hh +++ b/src/plugins/grid_3d/Grid3D.hh @@ -20,7 +20,7 @@ #include -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" namespace gz { diff --git a/src/plugins/grid_3d/Grid3D_TEST.cc b/src/plugins/grid_3d/Grid3D_TEST.cc index 908cfbea4..4e7931dfd 100644 --- a/src/plugins/grid_3d/Grid3D_TEST.cc +++ b/src/plugins/grid_3d/Grid3D_TEST.cc @@ -16,18 +16,18 @@ */ #include -#include -#include - -#include "ignition/gui/CollapsibleWidget.hh" -#include "ignition/gui/ColorWidget.hh" -#include "ignition/gui/Helpers.hh" -#include "ignition/gui/Iface.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/NumberWidget.hh" -#include "ignition/gui/Pose3dWidget.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/QtMetatypes.hh" +#include +#include + +#include "gz/gui/CollapsibleWidget.hh" +#include "gz/gui/ColorWidget.hh" +#include "gz/gui/Helpers.hh" +#include "gz/gui/Iface.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/NumberWidget.hh" +#include "gz/gui/Pose3dWidget.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/QtMetatypes.hh" using namespace gz; using namespace gui; diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc index e39c31801..801a65e49 100644 --- a/src/plugins/image_display/ImageDisplay.cc +++ b/src/plugins/image_display/ImageDisplay.cc @@ -22,13 +22,13 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" namespace gz { diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh index 32a7bb038..edaa06f07 100644 --- a/src/plugins/image_display/ImageDisplay.hh +++ b/src/plugins/image_display/ImageDisplay.hh @@ -25,7 +25,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -40,7 +40,7 @@ # endif #endif -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" namespace gz { diff --git a/src/plugins/image_display/ImageDisplay_TEST.cc b/src/plugins/image_display/ImageDisplay_TEST.cc index 5752b04dc..4c3a7bc2d 100644 --- a/src/plugins/image_display/ImageDisplay_TEST.cc +++ b/src/plugins/image_display/ImageDisplay_TEST.cc @@ -20,19 +20,19 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" #include "test_config.h" // NOLINT(build/include) #include "ImageDisplay.hh" diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc index c2cd9ecf9..bdafd5d67 100644 --- a/src/plugins/key_publisher/KeyPublisher.cc +++ b/src/plugins/key_publisher/KeyPublisher.cc @@ -18,16 +18,16 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif #include -#include -#include -#include +#include +#include +#include #include "KeyPublisher.hh" diff --git a/src/plugins/key_publisher/KeyPublisher.hh b/src/plugins/key_publisher/KeyPublisher.hh index 36ffaacc3..67106ab21 100644 --- a/src/plugins/key_publisher/KeyPublisher.hh +++ b/src/plugins/key_publisher/KeyPublisher.hh @@ -18,12 +18,12 @@ #ifndef GZ_GUI_PLUGINS_KEYPUBLISHER_HH_ #define GZ_GUI_PLUGINS_KEYPUBLISHER_HH_ -#include +#include #include -#include -#include +#include +#include namespace gz { diff --git a/src/plugins/publisher/Publisher.cc b/src/plugins/publisher/Publisher.cc index 862d71a4d..21655516c 100644 --- a/src/plugins/publisher/Publisher.cc +++ b/src/plugins/publisher/Publisher.cc @@ -19,13 +19,13 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include -#include +#include +#include +#include #include "Publisher.hh" diff --git a/src/plugins/publisher/Publisher.hh b/src/plugins/publisher/Publisher.hh index e33b8df81..cf7a5f2b7 100644 --- a/src/plugins/publisher/Publisher.hh +++ b/src/plugins/publisher/Publisher.hh @@ -20,7 +20,7 @@ #include -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" #ifndef _WIN32 # define Publisher_EXPORTS_API diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc index f9c05b6e8..b192c0a63 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -19,17 +19,17 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" #include "Publisher.hh" diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc index bd51f7e73..2a0386014 100644 --- a/src/plugins/scene3d/Scene3D.cc +++ b/src/plugins/scene3d/Scene3D.cc @@ -24,39 +24,39 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include // TODO(louise) Remove these pragmas once ign-rendering and ign-msgs // are disabling the warnings #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/Conversions.hh" -#include "ignition/gui/GuiEvents.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Conversions.hh" +#include "gz/gui/GuiEvents.hh" +#include "gz/gui/MainWindow.hh" namespace gz { diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index 3c31fad62..b27ed2ec3 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -22,15 +22,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#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/src/plugins/screenshot/Screenshot.cc b/src/plugins/screenshot/Screenshot.cc index 314a9950a..317bac40b 100644 --- a/src/plugins/screenshot/Screenshot.cc +++ b/src/plugins/screenshot/Screenshot.cc @@ -18,27 +18,27 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include -#include -#include -#include +#include +#include +#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/GuiEvents.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/GuiEvents.hh" +#include "gz/gui/MainWindow.hh" namespace gz { diff --git a/src/plugins/screenshot/Screenshot.hh b/src/plugins/screenshot/Screenshot.hh index 1821d406e..9921b3944 100644 --- a/src/plugins/screenshot/Screenshot.hh +++ b/src/plugins/screenshot/Screenshot.hh @@ -20,16 +20,16 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include -#include +#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif #include -#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/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc index 704df59a6..3918a0803 100644 --- a/src/plugins/screenshot/Screenshot_TEST.cc +++ b/src/plugins/screenshot/Screenshot_TEST.cc @@ -17,9 +17,9 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include -#include -#include +#include +#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -27,16 +27,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/GuiEvents.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/GuiEvents.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" #include "Screenshot.hh" int g_argc = 1; diff --git a/src/plugins/shutdown_button/ShutdownButton.cc b/src/plugins/shutdown_button/ShutdownButton.cc index 0c1417106..2b000928e 100644 --- a/src/plugins/shutdown_button/ShutdownButton.cc +++ b/src/plugins/shutdown_button/ShutdownButton.cc @@ -17,10 +17,10 @@ #include "ShutdownButton.hh" -#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" using namespace gz; using namespace gui; diff --git a/src/plugins/shutdown_button/ShutdownButton.hh b/src/plugins/shutdown_button/ShutdownButton.hh index 5c1fb991e..7af124b2f 100644 --- a/src/plugins/shutdown_button/ShutdownButton.hh +++ b/src/plugins/shutdown_button/ShutdownButton.hh @@ -18,7 +18,7 @@ #ifndef GZ_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ #define GZ_GUI_PLUGINS_SHUTDOWNBUTTON_HH_ -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" #ifndef _WIN32 # define ShutdownButton_EXPORTS_API diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc index 9ef7cbef5..97fdac6a1 100644 --- a/src/plugins/shutdown_button/ShutdownButton_TEST.cc +++ b/src/plugins/shutdown_button/ShutdownButton_TEST.cc @@ -17,14 +17,14 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" #include "ShutdownButton.hh" int g_argc = 1; diff --git a/src/plugins/teleop/Teleop.cc b/src/plugins/teleop/Teleop.cc index 6f3ac31f5..7574d226f 100644 --- a/src/plugins/teleop/Teleop.cc +++ b/src/plugins/teleop/Teleop.cc @@ -19,7 +19,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -28,10 +28,10 @@ #include -#include +#include -#include -#include +#include +#include namespace gz { diff --git a/src/plugins/teleop/Teleop.hh b/src/plugins/teleop/Teleop.hh index 7c45b9100..fd3ecaeb2 100644 --- a/src/plugins/teleop/Teleop.hh +++ b/src/plugins/teleop/Teleop.hh @@ -20,10 +20,10 @@ #include -#include +#include -#include -#include +#include +#include #ifndef _WIN32 # define Teleop_EXPORTS_API diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc index ef7abe406..0ea98e609 100644 --- a/src/plugins/teleop/Teleop_TEST.cc +++ b/src/plugins/teleop/Teleop_TEST.cc @@ -19,18 +19,18 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/qt.h" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/qt.h" #include "Teleop.hh" diff --git a/src/plugins/topic_echo/TopicEcho.cc b/src/plugins/topic_echo/TopicEcho.cc index 9e5d60c85..eb01400db 100644 --- a/src/plugins/topic_echo/TopicEcho.cc +++ b/src/plugins/topic_echo/TopicEcho.cc @@ -16,11 +16,11 @@ */ #include -#include -#include -#include +#include +#include +#include -#include "ignition/gui/Application.hh" +#include "gz/gui/Application.hh" #include "TopicEcho.hh" namespace gz diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh index ff47c0d7a..977a2dc74 100644 --- a/src/plugins/topic_echo/TopicEcho.hh +++ b/src/plugins/topic_echo/TopicEcho.hh @@ -38,7 +38,7 @@ #include -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" namespace gz { diff --git a/src/plugins/topic_echo/TopicEcho_TEST.cc b/src/plugins/topic_echo/TopicEcho_TEST.cc index c1876b63d..d848eca92 100644 --- a/src/plugins/topic_echo/TopicEcho_TEST.cc +++ b/src/plugins/topic_echo/TopicEcho_TEST.cc @@ -21,19 +21,19 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/gui/Application.hh" -#include "ignition/gui/MainWindow.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/MainWindow.hh" +#include "gz/gui/Plugin.hh" #include "test_config.h" // NOLINT(build/include) #include "TopicEcho.hh" diff --git a/src/plugins/topic_viewer/TopicViewer.cc b/src/plugins/topic_viewer/TopicViewer.cc index e404b8f84..9f2f3edd7 100644 --- a/src/plugins/topic_viewer/TopicViewer.cc +++ b/src/plugins/topic_viewer/TopicViewer.cc @@ -24,14 +24,14 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #include "TopicViewer.hh" #define NAME_KEY "name" diff --git a/src/plugins/topic_viewer/TopicViewer.hh b/src/plugins/topic_viewer/TopicViewer.hh index 815024e14..a8839bbbf 100644 --- a/src/plugins/topic_viewer/TopicViewer.hh +++ b/src/plugins/topic_viewer/TopicViewer.hh @@ -16,7 +16,7 @@ */ #include -#include +#include #ifndef _WIN32 # define TopicViewer_EXPORTS_API diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc index 48d969a36..1f2f984f8 100644 --- a/src/plugins/topic_viewer/TopicViewer_TEST.cc +++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc @@ -16,14 +16,14 @@ */ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" #include "TopicViewer.hh" #define NAME_ROLE 51 diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc index 39d9b008b..dc33149a9 100644 --- a/src/plugins/world_control/WorldControl.cc +++ b/src/plugins/world_control/WorldControl.cc @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/gui/Helpers.hh" +#include "gz/gui/Helpers.hh" namespace gz { diff --git a/src/plugins/world_control/WorldControl.hh b/src/plugins/world_control/WorldControl.hh index cd0fdddc0..22dab4567 100644 --- a/src/plugins/world_control/WorldControl.hh +++ b/src/plugins/world_control/WorldControl.hh @@ -23,13 +23,13 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include +#include -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Plugin.hh" #ifndef _WIN32 # define WorldControl_EXPORTS_API diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc index f74d3cd64..3fd396b9b 100644 --- a/src/plugins/world_control/WorldControl_TEST.cc +++ b/src/plugins/world_control/WorldControl_TEST.cc @@ -17,14 +17,14 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" #include "WorldControl.hh" int g_argc = 1; diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index b8a817e56..852cb247a 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -19,12 +19,12 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include -#include "ignition/gui/Helpers.hh" +#include "gz/gui/Helpers.hh" namespace gz { diff --git a/src/plugins/world_stats/WorldStats.hh b/src/plugins/world_stats/WorldStats.hh index 46d0cf3ee..6eb15da81 100644 --- a/src/plugins/world_stats/WorldStats.hh +++ b/src/plugins/world_stats/WorldStats.hh @@ -23,14 +23,14 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif -#include +#include -#include "ignition/gui/Export.hh" -#include "ignition/gui/Plugin.hh" +#include "gz/gui/Export.hh" +#include "gz/gui/Plugin.hh" #ifndef _WIN32 # define WorldStats_EXPORTS_API diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc index 14e807c44..bbcc8bc9a 100644 --- a/src/plugins/world_stats/WorldStats_TEST.cc +++ b/src/plugins/world_stats/WorldStats_TEST.cc @@ -17,14 +17,14 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" #include "WorldStats.hh" int g_argc = 1; diff --git a/test/helpers/TestHelper.hh b/test/helpers/TestHelper.hh index 73a9ee201..00c2e0eb5 100644 --- a/test/helpers/TestHelper.hh +++ b/test/helpers/TestHelper.hh @@ -17,9 +17,9 @@ #ifndef GZ_GUI_TESTHELPER_HH_ #define GZ_GUI_TESTHELPER_HH_ -#include -#include -#include +#include +#include +#include #ifndef _WIN32 # define TestHelper_EXPORTS_API diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc index 9b8c1b5af..9c5c77817 100644 --- a/test/integration/ExamplesBuild_TEST.cc +++ b/test/integration/ExamplesBuild_TEST.cc @@ -18,9 +18,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc index cd8b4b219..d5c81875c 100644 --- a/test/integration/Examples_TEST.cc +++ b/test/integration/Examples_TEST.cc @@ -17,12 +17,12 @@ #include -#include -#include -#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) -#include "ignition/gui/Application.hh" +#include "gz/gui/Application.hh" int g_argc = 1; char* g_argv[] = diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc index 2ddd4d117..16ebcd74a 100644 --- a/test/integration/scene3d.cc +++ b/test/integration/scene3d.cc @@ -17,21 +17,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include "test_config.h" // NOLINT(build/include) #include "../helpers/TestHelper.hh" -#include "ignition/gui/Application.hh" -#include "ignition/gui/GuiEvents.hh" -#include "ignition/gui/Plugin.hh" -#include "ignition/gui/MainWindow.hh" +#include "gz/gui/Application.hh" +#include "gz/gui/GuiEvents.hh" +#include "gz/gui/Plugin.hh" +#include "gz/gui/MainWindow.hh" int g_argc = 1; char* g_argv[] = diff --git a/test/plugins/TestBadInheritancePlugin.cc b/test/plugins/TestBadInheritancePlugin.cc index 532e972cc..8a52e4f20 100644 --- a/test/plugins/TestBadInheritancePlugin.cc +++ b/test/plugins/TestBadInheritancePlugin.cc @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "TestBadInheritancePlugin.hh" diff --git a/test/plugins/TestBadInheritancePlugin.hh b/test/plugins/TestBadInheritancePlugin.hh index 35ef0c2f2..bd301cf36 100644 --- a/test/plugins/TestBadInheritancePlugin.hh +++ b/test/plugins/TestBadInheritancePlugin.hh @@ -19,8 +19,8 @@ #define GZ_GUI_TEST_TESTBADINHERITANCEPLUGIN_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace gz diff --git a/test/plugins/TestInvalidQmlPlugin.cc b/test/plugins/TestInvalidQmlPlugin.cc index feb0b15ff..b0dbc4357 100644 --- a/test/plugins/TestInvalidQmlPlugin.cc +++ b/test/plugins/TestInvalidQmlPlugin.cc @@ -15,7 +15,7 @@ * */ -#include +#include #include "TestInvalidQmlPlugin.hh" diff --git a/test/plugins/TestInvalidQmlPlugin.hh b/test/plugins/TestInvalidQmlPlugin.hh index 4793433f4..d70e57c67 100644 --- a/test/plugins/TestInvalidQmlPlugin.hh +++ b/test/plugins/TestInvalidQmlPlugin.hh @@ -18,7 +18,7 @@ #ifndef GZ_GUI_TEST_MALFORMEDPLUGIN_HH_ #define GZ_GUI_TEST_MALFORMEDPLUGIN_HH_ -#include +#include namespace gz { diff --git a/test/plugins/TestNotRegisteredPlugin.cc b/test/plugins/TestNotRegisteredPlugin.cc index 02caed094..10a61e433 100644 --- a/test/plugins/TestNotRegisteredPlugin.cc +++ b/test/plugins/TestNotRegisteredPlugin.cc @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "TestNotRegisteredPlugin.hh" diff --git a/test/plugins/TestNotRegisteredPlugin.hh b/test/plugins/TestNotRegisteredPlugin.hh index f9aad7d0c..42c36578a 100644 --- a/test/plugins/TestNotRegisteredPlugin.hh +++ b/test/plugins/TestNotRegisteredPlugin.hh @@ -19,8 +19,8 @@ #define GZ_GUI_TEST_TESTNOTREGISTEREDPLUGIN_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace gz diff --git a/test/plugins/TestPlugin.cc b/test/plugins/TestPlugin.cc index 828bcfd58..0a4b08146 100644 --- a/test/plugins/TestPlugin.cc +++ b/test/plugins/TestPlugin.cc @@ -15,8 +15,8 @@ * */ -#include -#include +#include +#include #include "TestPlugin.hh" diff --git a/test/plugins/TestPlugin.hh b/test/plugins/TestPlugin.hh index a72d3f039..dcd107b35 100644 --- a/test/plugins/TestPlugin.hh +++ b/test/plugins/TestPlugin.hh @@ -19,8 +19,8 @@ #define GZ_GUI_TEST_TESTPLUGIN_HH_ #ifndef Q_MOC_RUN - #include - #include + #include + #include #endif namespace gz From 516077de10d4f3069e3b6655a33213bfd29d94e2 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 26 Aug 2022 13:17:01 -0700 Subject: [PATCH 4/7] Leave ignition as primary in headers to fix ABI Signed-off-by: methylDragon --- examples/plugin/custom_context_menu/CustomContext.hh | 2 +- examples/plugin/dialog_from_plugin/DialogFromPlugin.hh | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 2 +- examples/plugin/ign_components/IgnComponents.hh | 2 +- examples/plugin/multiple_qml/MultipleQml.hh | 2 +- examples/standalone/custom_drawer/custom_drawer.hh | 2 +- include/gz/gui/Application.hh | 2 +- include/gz/gui/Conversions.hh | 2 +- include/gz/gui/Dialog.hh | 2 +- include/gz/gui/DragDropModel.hh | 2 +- include/gz/gui/Enums.hh | 2 +- include/gz/gui/GuiEvents.hh | 2 +- include/gz/gui/Helpers.hh | 2 +- include/gz/gui/MainWindow.hh | 2 +- include/gz/gui/Plugin.hh | 2 +- include/gz/gui/SearchModel.hh | 2 +- include/gz/gui/config.hh.in | 9 +++++++++ include/gz/gui/qt.h | 2 ++ include/ignition/gui/config.hh | 10 ---------- src/Application.cc | 2 +- src/Dialog.cc | 2 +- src/Dialog_TEST.cc | 2 +- src/MainWindow.cc | 2 +- src/MainWindow_TEST.cc | 2 +- src/plugins/grid_3d/Grid3D.cc | 2 +- src/plugins/grid_3d/Grid3D.hh | 2 +- src/plugins/image_display/ImageDisplay.cc | 4 ++-- src/plugins/image_display/ImageDisplay.hh | 6 +++--- src/plugins/key_publisher/KeyPublisher.cc | 2 +- src/plugins/key_publisher/KeyPublisher.hh | 2 +- src/plugins/publisher/Publisher.cc | 6 +++--- src/plugins/publisher/Publisher.hh | 6 +++--- src/plugins/publisher/Publisher_TEST.cc | 8 ++++---- src/plugins/scene3d/Scene3D.cc | 4 ++-- src/plugins/scene3d/Scene3D.hh | 2 +- src/plugins/screenshot/Screenshot.cc | 2 +- src/plugins/screenshot/Screenshot.hh | 2 +- src/plugins/shutdown_button/ShutdownButton.hh | 2 +- src/plugins/teleop/Teleop.cc | 2 +- src/plugins/teleop/Teleop.hh | 2 +- src/plugins/topic_echo/TopicEcho.cc | 2 +- src/plugins/topic_echo/TopicEcho.hh | 2 +- src/plugins/topic_viewer/TopicViewer.cc | 2 +- src/plugins/topic_viewer/TopicViewer.hh | 2 +- src/plugins/topic_viewer/TopicViewer_TEST.cc | 4 ++-- src/plugins/world_control/WorldControl.cc | 2 +- src/plugins/world_control/WorldControl.hh | 4 ++-- src/plugins/world_stats/WorldStats.cc | 2 +- src/plugins/world_stats/WorldStats.hh | 4 ++-- test/helpers/TestHelper.cc | 2 +- test/helpers/TestHelper.hh | 2 +- test/integration/deprecated_TEST.cc | 1 + test/plugins/TestBadInheritancePlugin.hh | 2 +- test/plugins/TestInvalidQmlPlugin.hh | 2 +- test/plugins/TestNotRegisteredPlugin.hh | 2 +- test/plugins/TestPlugin.hh | 2 +- test/test_config.h.in | 2 ++ tutorials/03_plugins.md | 4 ++-- 58 files changed, 82 insertions(+), 78 deletions(-) diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh index e87989f5b..fa229eb57 100644 --- a/examples/plugin/custom_context_menu/CustomContext.hh +++ b/examples/plugin/custom_context_menu/CustomContext.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh index e800d7732..60d98120d 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh index 0e555c76d..144937d75 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace gui { diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh index 1922e54ac..b48a49fe4 100644 --- a/examples/plugin/ign_components/IgnComponents.hh +++ b/examples/plugin/ign_components/IgnComponents.hh @@ -20,7 +20,7 @@ #include -namespace gz +namespace ignition { namespace gui { diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh index ae0d9114f..489b53b2f 100644 --- a/examples/plugin/multiple_qml/MultipleQml.hh +++ b/examples/plugin/multiple_qml/MultipleQml.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh index e062afa69..64a7edd25 100644 --- a/examples/standalone/custom_drawer/custom_drawer.hh +++ b/examples/standalone/custom_drawer/custom_drawer.hh @@ -24,7 +24,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index cdb703dcd..d7b1494ec 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -37,7 +37,7 @@ namespace tinyxml2 class XMLElement; } -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index b0e88595a..5984a8a56 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -33,7 +33,7 @@ #include "gz/gui/qt.h" #include "gz/gui/Export.hh" -namespace gz +namespace ignition { namespace common { diff --git a/include/gz/gui/Dialog.hh b/include/gz/gui/Dialog.hh index df1f3a055..2b3e2b9ae 100644 --- a/include/gz/gui/Dialog.hh +++ b/include/gz/gui/Dialog.hh @@ -31,7 +31,7 @@ #pragma warning(disable: 4251) #endif -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh index eb384567a..cffe3be44 100644 --- a/include/gz/gui/DragDropModel.hh +++ b/include/gz/gui/DragDropModel.hh @@ -20,7 +20,7 @@ #include "gz/gui/Export.hh" #include "gz/gui/qt.h" -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/Enums.hh b/include/gz/gui/Enums.hh index b612fe6ea..9fc2ab9ab 100644 --- a/include/gz/gui/Enums.hh +++ b/include/gz/gui/Enums.hh @@ -20,7 +20,7 @@ #include "gz/gui/qt.h" -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh index 5c1cca09f..f5f04540d 100644 --- a/include/gz/gui/GuiEvents.hh +++ b/include/gz/gui/GuiEvents.hh @@ -23,7 +23,7 @@ #include #include -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index 490aaa372..d361bf672 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -22,7 +22,7 @@ #include "gz/gui/Enums.hh" #include "gz/gui/Export.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/MainWindow.hh b/include/gz/gui/MainWindow.hh index bd275b817..8f1de6ef7 100644 --- a/include/gz/gui/MainWindow.hh +++ b/include/gz/gui/MainWindow.hh @@ -35,7 +35,7 @@ #pragma warning(disable: 4251) #endif -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh index 6519c0e4c..dc96bc56e 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -31,7 +31,7 @@ #pragma warning(disable: 4251) #endif -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/SearchModel.hh b/include/gz/gui/SearchModel.hh index 7ef58d0f3..df75295fb 100644 --- a/include/gz/gui/SearchModel.hh +++ b/include/gz/gui/SearchModel.hh @@ -20,7 +20,7 @@ #include "gz/gui/Export.hh" #include "gz/gui/qt.h" -namespace gz +namespace ignition { namespace gui { diff --git a/include/gz/gui/config.hh.in b/include/gz/gui/config.hh.in index e439764c9..21fe1b32c 100644 --- a/include/gz/gui/config.hh.in +++ b/include/gz/gui/config.hh.in @@ -15,3 +15,12 @@ #cmakedefine BUILD_TYPE_RELEASE 1 #define IGN_GUI_PLUGIN_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/${IGN_LIB_INSTALL_DIR}/ign-${GZ_DESIGNATION}-${PROJECT_VERSION_MAJOR}/plugins" + +namespace ignition +{ +} + +namespace gz +{ + using namespace ignition; +} diff --git a/include/gz/gui/qt.h b/include/gz/gui/qt.h index 81b842915..e03d51dfb 100644 --- a/include/gz/gui/qt.h +++ b/include/gz/gui/qt.h @@ -41,5 +41,7 @@ #include #include +#include + #endif // GZ_GUI_QT_H_ diff --git a/include/ignition/gui/config.hh b/include/ignition/gui/config.hh index f7bbf8f3f..bcaae7f88 100644 --- a/include/ignition/gui/config.hh +++ b/include/ignition/gui/config.hh @@ -36,14 +36,4 @@ // #define IGN_GUI_PLUGIN_INSTALL_DIR GZ_GUI_PLUGIN_INSTALL_DIR -namespace gz -{ -} - -namespace ignition -{ - using namespace gz; -} - - #endif diff --git a/src/Application.cc b/src/Application.cc index d9f2b6ccb..77ad238c3 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -36,7 +36,7 @@ #include "gz/transport/TopicUtils.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/Dialog.cc b/src/Dialog.cc index 19aba6f94..c8b4b3455 100644 --- a/src/Dialog.cc +++ b/src/Dialog.cc @@ -21,7 +21,7 @@ #include "gz/gui/Application.hh" #include "gz/gui/Dialog.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/Dialog_TEST.cc b/src/Dialog_TEST.cc index 74197eacd..e502a78ca 100644 --- a/src/Dialog_TEST.cc +++ b/src/Dialog_TEST.cc @@ -24,7 +24,7 @@ #include "gz/gui/Application.hh" #include "gz/gui/Dialog.hh" -std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*) +std::string kTestConfigFile = "/tmp/gz-gui-test.config"; // NOLINT(*) int g_argc = 1; char* g_argv[] = { diff --git a/src/MainWindow.cc b/src/MainWindow.cc index 45049d08d..555cd5944 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -29,7 +29,7 @@ #include "gz/msgs/server_control.pb.h" #include "gz/transport/Node.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index 3c49e76b8..86c2e76e7 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -32,7 +32,7 @@ #include "gz/gui/MainWindow.hh" #include "gz/gui/Plugin.hh" -std::string kTestConfigFile = "/tmp/ign-gui-test.config"; // NOLINT(*) +std::string kTestConfigFile = "/tmp/gz-gui-test.config"; // NOLINT(*) int g_argc = 1; char* g_argv[] = { diff --git a/src/plugins/grid_3d/Grid3D.cc b/src/plugins/grid_3d/Grid3D.cc index 4bcbba836..37cbe64ed 100644 --- a/src/plugins/grid_3d/Grid3D.cc +++ b/src/plugins/grid_3d/Grid3D.cc @@ -32,7 +32,7 @@ #include "Grid3D.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/grid_3d/Grid3D.hh b/src/plugins/grid_3d/Grid3D.hh index 59fb3096b..85063686b 100644 --- a/src/plugins/grid_3d/Grid3D.hh +++ b/src/plugins/grid_3d/Grid3D.hh @@ -22,7 +22,7 @@ #include "gz/gui/Plugin.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc index 801a65e49..01378901c 100644 --- a/src/plugins/image_display/ImageDisplay.cc +++ b/src/plugins/image_display/ImageDisplay.cc @@ -30,7 +30,7 @@ #include "gz/gui/Application.hh" #include "gz/gui/MainWindow.hh" -namespace gz +namespace ignition { namespace gui { @@ -189,7 +189,7 @@ void ImageDisplay::OnRefresh() this->dataPtr->node.TopicInfo(topic, publishers); for (auto pub : publishers) { - if (pub.MsgTypeName() == "gz.msgs.Image") + if (pub.MsgTypeName() == "ignition.msgs.Image") { this->dataPtr->topicList.push_back(QString::fromStdString(topic)); break; diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh index edaa06f07..4c7bcf782 100644 --- a/src/plugins/image_display/ImageDisplay.hh +++ b/src/plugins/image_display/ImageDisplay.hh @@ -42,7 +42,7 @@ #include "gz/gui/Plugin.hh" -namespace gz +namespace ignition { namespace gui { @@ -116,12 +116,12 @@ namespace plugins public slots: void OnTopic(const QString _topic); /// \brief Get the topic list as a string, for example - /// 'gz.msgs.StringMsg' + /// 'ignition.msgs.StringMsg' /// \return Message type public: Q_INVOKABLE QStringList TopicList() const; /// \brief Set the topic list from a string, for example - /// 'gz.msgs.StringMsg' + /// 'ignition.msgs.StringMsg' /// \param[in] _topicList Message type public: Q_INVOKABLE void SetTopicList(const QStringList &_topicList); diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc index bdafd5d67..36b54a91a 100644 --- a/src/plugins/key_publisher/KeyPublisher.cc +++ b/src/plugins/key_publisher/KeyPublisher.cc @@ -31,7 +31,7 @@ #include "KeyPublisher.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/key_publisher/KeyPublisher.hh b/src/plugins/key_publisher/KeyPublisher.hh index 67106ab21..39b45433c 100644 --- a/src/plugins/key_publisher/KeyPublisher.hh +++ b/src/plugins/key_publisher/KeyPublisher.hh @@ -25,7 +25,7 @@ #include #include -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/publisher/Publisher.cc b/src/plugins/publisher/Publisher.cc index 21655516c..61184f8de 100644 --- a/src/plugins/publisher/Publisher.cc +++ b/src/plugins/publisher/Publisher.cc @@ -19,7 +19,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -29,7 +29,7 @@ #include "Publisher.hh" -namespace gz +namespace ignition { namespace gui { @@ -38,7 +38,7 @@ namespace plugins class PublisherPrivate { /// \brief Message type - public: QString msgType = "gz.msgs.StringMsg"; + public: QString msgType = "ignition.msgs.StringMsg"; /// \brief Message contents public: QString msgData = "data: \"Hello\""; diff --git a/src/plugins/publisher/Publisher.hh b/src/plugins/publisher/Publisher.hh index cf7a5f2b7..c8e74a78f 100644 --- a/src/plugins/publisher/Publisher.hh +++ b/src/plugins/publisher/Publisher.hh @@ -32,7 +32,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { @@ -94,12 +94,12 @@ namespace plugins public slots: void OnPublish(const bool _checked); /// \brief Get the message type as a string, for example - /// 'gz.msgs.StringMsg' + /// 'ignition.msgs.StringMsg' /// \return Message type public: Q_INVOKABLE QString MsgType() const; /// \brief Set the message type from a string, for example - /// 'gz.msgs.StringMsg' + /// 'ignition.msgs.StringMsg' /// \param[in] _msgType Message type public: Q_INVOKABLE void SetMsgType(const QString &_msgType); diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc index b192c0a63..a48f746c3 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -104,7 +104,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) EXPECT_EQ(plugin->Title(), "Publisher!"); // Message type - EXPECT_EQ(plugin->MsgType(), "gz.msgs.StringMsg"); + EXPECT_EQ(plugin->MsgType(), "ignition.msgs.StringMsg"); // Message EXPECT_EQ(plugin->MsgData(), "data: \"Hello\""); @@ -190,7 +190,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) plugin->OnPublish(false); // Bad message type - msg combination - plugin->SetMsgType("gz.msgs.StringMsg"); + plugin->SetMsgType("ignition.msgs.StringMsg"); plugin->SetMsgData("banana: apple"); plugin->OnPublish(true); @@ -221,7 +221,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) "" "/fruit" "number: 1 fruit {name:\"banana\"}" - "gz.msgs.Fruits" + "ignition.msgs.Fruits" "0.1" ""; @@ -245,7 +245,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) EXPECT_EQ(plugin->Title(), "Publisher"); // Message type - EXPECT_EQ(plugin->MsgType(), "gz.msgs.Fruits"); + EXPECT_EQ(plugin->MsgType(), "ignition.msgs.Fruits"); // Message EXPECT_EQ(plugin->MsgData(), "number: 1 fruit {name:\"banana\"}"); diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc index 2a0386014..09d0fe5b2 100644 --- a/src/plugins/scene3d/Scene3D.cc +++ b/src/plugins/scene3d/Scene3D.cc @@ -38,7 +38,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #include #include @@ -58,7 +58,7 @@ #include "gz/gui/GuiEvents.hh" #include "gz/gui/MainWindow.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index b27ed2ec3..aaf3cd176 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -32,7 +32,7 @@ #include "gz/gui/qt.h" #include "gz/gui/Plugin.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/screenshot/Screenshot.cc b/src/plugins/screenshot/Screenshot.cc index 317bac40b..b50141a32 100644 --- a/src/plugins/screenshot/Screenshot.cc +++ b/src/plugins/screenshot/Screenshot.cc @@ -40,7 +40,7 @@ #include "gz/gui/GuiEvents.hh" #include "gz/gui/MainWindow.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/screenshot/Screenshot.hh b/src/plugins/screenshot/Screenshot.hh index 9921b3944..b76decaa5 100644 --- a/src/plugins/screenshot/Screenshot.hh +++ b/src/plugins/screenshot/Screenshot.hh @@ -31,7 +31,7 @@ #include "gz/gui/qt.h" #include "gz/gui/Plugin.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/shutdown_button/ShutdownButton.hh b/src/plugins/shutdown_button/ShutdownButton.hh index 7af124b2f..e54e56909 100644 --- a/src/plugins/shutdown_button/ShutdownButton.hh +++ b/src/plugins/shutdown_button/ShutdownButton.hh @@ -30,7 +30,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/teleop/Teleop.cc b/src/plugins/teleop/Teleop.cc index 7574d226f..210318ac8 100644 --- a/src/plugins/teleop/Teleop.cc +++ b/src/plugins/teleop/Teleop.cc @@ -33,7 +33,7 @@ #include #include -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/teleop/Teleop.hh b/src/plugins/teleop/Teleop.hh index fd3ecaeb2..3144aa4c6 100644 --- a/src/plugins/teleop/Teleop.hh +++ b/src/plugins/teleop/Teleop.hh @@ -35,7 +35,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/topic_echo/TopicEcho.cc b/src/plugins/topic_echo/TopicEcho.cc index eb01400db..b531fed8e 100644 --- a/src/plugins/topic_echo/TopicEcho.cc +++ b/src/plugins/topic_echo/TopicEcho.cc @@ -23,7 +23,7 @@ #include "gz/gui/Application.hh" #include "TopicEcho.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh index 977a2dc74..c39c7c11a 100644 --- a/src/plugins/topic_echo/TopicEcho.hh +++ b/src/plugins/topic_echo/TopicEcho.hh @@ -40,7 +40,7 @@ #include "gz/gui/Plugin.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/topic_viewer/TopicViewer.cc b/src/plugins/topic_viewer/TopicViewer.cc index 9f2f3edd7..3fffc9e8d 100644 --- a/src/plugins/topic_viewer/TopicViewer.cc +++ b/src/plugins/topic_viewer/TopicViewer.cc @@ -46,7 +46,7 @@ #define PATH_ROLE 54 #define PLOT_ROLE 55 -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/topic_viewer/TopicViewer.hh b/src/plugins/topic_viewer/TopicViewer.hh index a8839bbbf..af14d334f 100644 --- a/src/plugins/topic_viewer/TopicViewer.hh +++ b/src/plugins/topic_viewer/TopicViewer.hh @@ -28,7 +28,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc index 1f2f984f8..cee8a902e 100644 --- a/src/plugins/topic_viewer/TopicViewer_TEST.cc +++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc @@ -145,7 +145,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { foundCollision = true; - EXPECT_EQ(child->data(TYPE_ROLE), "gz.msgs.Collision"); + EXPECT_EQ(child->data(TYPE_ROLE), "ignition.msgs.Collision"); EXPECT_EQ(child->rowCount(), 8); auto pose = child->child(5); @@ -162,7 +162,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { foundInt = true; - EXPECT_EQ(child->data(TYPE_ROLE), "gz.msgs.Int32"); + EXPECT_EQ(child->data(TYPE_ROLE), "ignition.msgs.Int32"); EXPECT_EQ(child->rowCount(), 2); auto data = child->child(1); diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc index dc33149a9..e8f0d16c9 100644 --- a/src/plugins/world_control/WorldControl.cc +++ b/src/plugins/world_control/WorldControl.cc @@ -26,7 +26,7 @@ #include "gz/gui/Helpers.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/world_control/WorldControl.hh b/src/plugins/world_control/WorldControl.hh index 22dab4567..4adb560f1 100644 --- a/src/plugins/world_control/WorldControl.hh +++ b/src/plugins/world_control/WorldControl.hh @@ -23,7 +23,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -41,7 +41,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index 852cb247a..ca1d1a222 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -26,7 +26,7 @@ #include "gz/gui/Helpers.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/src/plugins/world_stats/WorldStats.hh b/src/plugins/world_stats/WorldStats.hh index 6eb15da81..5ff96d807 100644 --- a/src/plugins/world_stats/WorldStats.hh +++ b/src/plugins/world_stats/WorldStats.hh @@ -23,7 +23,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -42,7 +42,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/test/helpers/TestHelper.cc b/test/helpers/TestHelper.cc index 7316f5e24..e7d70984d 100644 --- a/test/helpers/TestHelper.cc +++ b/test/helpers/TestHelper.cc @@ -17,7 +17,7 @@ #include "TestHelper.hh" -namespace gz +namespace ignition { namespace gui { diff --git a/test/helpers/TestHelper.hh b/test/helpers/TestHelper.hh index 00c2e0eb5..4dd761b33 100644 --- a/test/helpers/TestHelper.hh +++ b/test/helpers/TestHelper.hh @@ -31,7 +31,7 @@ # endif #endif -namespace gz +namespace ignition { namespace gui { diff --git a/test/integration/deprecated_TEST.cc b/test/integration/deprecated_TEST.cc index 66709f54c..8070c9e77 100644 --- a/test/integration/deprecated_TEST.cc +++ b/test/integration/deprecated_TEST.cc @@ -23,4 +23,5 @@ TEST(Deprecated, IgnitionNamespace) { ignition::gui::Plugin plugin; + EXPECT_TRUE(plugin.Title().empty()); } diff --git a/test/plugins/TestBadInheritancePlugin.hh b/test/plugins/TestBadInheritancePlugin.hh index bd301cf36..c8fb2bfe6 100644 --- a/test/plugins/TestBadInheritancePlugin.hh +++ b/test/plugins/TestBadInheritancePlugin.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/test/plugins/TestInvalidQmlPlugin.hh b/test/plugins/TestInvalidQmlPlugin.hh index d70e57c67..d10731d37 100644 --- a/test/plugins/TestInvalidQmlPlugin.hh +++ b/test/plugins/TestInvalidQmlPlugin.hh @@ -20,7 +20,7 @@ #include -namespace gz +namespace ignition { namespace gui { diff --git a/test/plugins/TestNotRegisteredPlugin.hh b/test/plugins/TestNotRegisteredPlugin.hh index 42c36578a..adf7b49bf 100644 --- a/test/plugins/TestNotRegisteredPlugin.hh +++ b/test/plugins/TestNotRegisteredPlugin.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/test/plugins/TestPlugin.hh b/test/plugins/TestPlugin.hh index dcd107b35..1577a263b 100644 --- a/test/plugins/TestPlugin.hh +++ b/test/plugins/TestPlugin.hh @@ -23,7 +23,7 @@ #include #endif -namespace gz +namespace ignition { namespace gui { diff --git a/test/test_config.h.in b/test/test_config.h.in index 0ccf50434..124a68eb9 100644 --- a/test/test_config.h.in +++ b/test/test_config.h.in @@ -1,6 +1,8 @@ #define PROJECT_SOURCE_PATH "${PROJECT_SOURCE_DIR}" #define PROJECT_BINARY_PATH "${CMAKE_BINARY_DIR}" +#include + #if (_MSC_VER >= 1400) // Visual Studio 2005 #include diff --git a/tutorials/03_plugins.md b/tutorials/03_plugins.md index 7d9ca74a8..9625642d8 100644 --- a/tutorials/03_plugins.md +++ b/tutorials/03_plugins.md @@ -20,7 +20,7 @@ Ignition GUI will look for plugins on the following paths, in this order: 1. All paths set on the `IGN_GUI_PLUGIN_PATH` environment variable 2. All paths added by calling `gz::gui::addPluginPath` 3. `~/.ignition/gui/plugins` -4. [Plugins which are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/3.3/namespace gz_1_1gui_1_1plugins.html) +4. [Plugins which are installed with Gazebo GUI](https://gazebosim.org/api/gui/3.3/namespaceignition_1_1gui_1_1plugins.html) ## Configuring plugins @@ -120,4 +120,4 @@ order: 1. All paths set on the `IGN_GUI_DISPLAY_PLUGIN_PATH` environment variable 2. `~/.ignition/gui/display_plugins` -3. [Display plugins that are installed with Ignition GUI](https://ignitionrobotics.org/api/gui/0.1/namespace gz_1_1gui_1_1display_plugins.html) +3. [Display plugins that are installed with Gazebo GUI](https://gazebosim.org/api/gui/0.1/namespaceignition_1_1gui_1_1plugins.html) From efafa332c4a2c59264f35fe57fc59178b54661d1 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 29 Nov 2022 13:57:13 -0800 Subject: [PATCH 5/7] Changed more Ignition names Signed-off-by: Nate Koenig --- CONTRIBUTING.md | 2 +- Changelog.md | 52 +++++++++---------- Migration.md | 12 ++--- api.md.in | 4 +- examples/README.md | 6 +-- examples/config/plugin_params.config | 2 +- .../plugin/custom_context_menu/CMakeLists.txt | 2 +- .../plugin/dialog_from_plugin/CMakeLists.txt | 2 +- examples/plugin/hello_plugin/CMakeLists.txt | 2 +- examples/plugin/hello_plugin/HelloPlugin.hh | 2 +- examples/plugin/ign_components/README.md | 2 +- examples/plugin/multiple_qml/CMakeLists.txt | 2 +- .../standalone/custom_drawer/CMakeLists.txt | 2 +- .../standalone/custom_drawer/CustomDrawer.qml | 2 +- examples/standalone/dialogs/CMakeLists.txt | 2 +- examples/standalone/window/CMakeLists.txt | 2 +- include/gz/gui/Application.hh | 4 +- include/gz/gui/Conversions.hh | 22 ++++---- include/gz/gui/Plugin.hh | 4 +- include/gz/gui/config.hh.in | 2 +- include/gz/gui/qml/Main.qml | 4 +- src/Application.cc | 6 +-- src/Conversions_TEST.cc | 12 ++--- src/cmd/cmdgui.rb.in | 4 +- src/plugins/CMakeLists.txt | 4 +- src/plugins/grid_3d/Grid3D.hh | 2 +- src/plugins/image_display/ImageDisplay.hh | 2 +- src/plugins/image_display/ImageDisplay.qml | 2 +- src/plugins/publisher/Publisher.hh | 2 +- src/plugins/scene3d/Scene3D.hh | 2 +- src/plugins/topic_echo/TopicEcho.hh | 2 +- tutorials.md.in | 4 +- tutorials/01_install.md | 14 ++--- tutorials/02_commandline.md | 4 +- tutorials/03_plugins.md | 22 ++++---- tutorials/04_layout.md | 4 +- tutorials/05_style.md | 10 ++-- tutorials/06_example.md | 10 ++-- tutorials/07_config.md | 10 ++-- tutorials/08_screenshot.md | 2 +- tutorials/index.md | 2 +- 41 files changed, 127 insertions(+), 127 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 147239ce5..606c4a55a 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Ignition Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). diff --git a/Changelog.md b/Changelog.md index 73459be91..cba8a1c6b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -40,10 +40,10 @@ 1. Change `IGN_DESIGNATION` to `GZ_DESIGNATION` * [Pull request #437](https://github.com/gazebosim/gz-gui/pull/437) -1. Ignition -> Gazebo +1. Gazebo -> Gazebo * [Pull request #435](https://github.com/gazebosim/gz-gui/pull/435) -### Ignition Gui 3.10.0 (2022-07-13) +### Gazebo Gui 3.10.0 (2022-07-13) 1. Add common widget for vector3 * [Pull request #427](https://github.com/gazebosim/gz-gui/pull/427) @@ -101,7 +101,7 @@ 1. Backport GridConfig improvements to Citadel's Grid3D * [Pull request #363](https://github.com/gazebosim/gz-gui/pull/363) -### Ignition Gui 3.9.0 (2022-01-14) +### Gazebo Gui 3.9.0 (2022-01-14) 1. Added a button that allows shutting down both the client and server. * [Pull request #335](https://github.com/ignitionrobotics/ign-gui/pull/335) @@ -127,7 +127,7 @@ 1. Added log storing for `ign gui` CLI * [Pull request #272](https://github.com/ignitionrobotics/ign-gui/pull/272) -### Ignition Gui 3.8.0 (2021-10-12) +### Gazebo Gui 3.8.0 (2021-10-12) 1. Improved doxygen * [Pull request #275](https://github.com/ignitionrobotics/ign-gui/pull/275) @@ -144,7 +144,7 @@ 1. New teleop plugin implementation. * [Pull request #245](https://github.com/ignitionrobotics/ign-gui/pull/245) -### Ignition Gui 3.7.0 (2021-07-14) +### Gazebo Gui 3.7.0 (2021-07-14) 1. Fix codeowners * [Pull request #251](https://github.com/ignitionrobotics/ign-gui/pull/251) @@ -161,7 +161,7 @@ 1. Detect ign instead of using cmake module to check for ignition-tools * [Pull request #240](https://github.com/ignitionrobotics/ign-gui/pull/240) -### Ignition Gui 3.6.0 (2021-06-17) +### Gazebo Gui 3.6.0 (2021-06-17) 1. Update codeowners * [Pull request #232](https://github.com/ignitionrobotics/ign-gui/pull/232) @@ -187,7 +187,7 @@ 1. `check_test_ran.py`: remove grep/xsltproc * [Pull request #203](https://github.com/ignitionrobotics/ign-gui/pull/203) -### Ignition Gui 3.5.1 (2021-03-18) +### Gazebo Gui 3.5.1 (2021-03-18) 1. Scene3D: port mesh material fixes from ign-gazebo * [Pull request #191](https://github.com/ignitionrobotics/ign-gui/pull/191) @@ -195,7 +195,7 @@ 1. Improve the height of plugins in the right split * [Pull request #194](https://github.com/ignitionrobotics/ign-gui/pull/194) -### Ignition Gui 3.5.0 (2021-03-10) +### Gazebo Gui 3.5.0 (2021-03-10) 1. Screenshot plugin * [Pull request #170](https://github.com/ignitionrobotics/ign-gui/pull/170) @@ -218,7 +218,7 @@ 1. Fix codecheck * [Pull request #157](https://github.com/ignitionrobotics/ign-gui/pull/157) -### Ignition Gui 3.4.0 (2020-12-10) +### Gazebo Gui 3.4.0 (2020-12-10) 1. Publish plugin API docs * [Pull request 128](https://github.com/ignitionrobotics/ign-gui/pull/128) @@ -241,7 +241,7 @@ 1. Resolve updated codecheck issues * [Pull request 144](https://github.com/ignitionrobotics/ign-gui/pull/144) -1. Port Gazebo GUI events to Ignition GUI +1. Port Gazebo GUI events to Gazebo GUI * [Pull request 148](https://github.com/ignitionrobotics/ign-gui/pull/148) 1. Change deprecated Qt::MidButton @@ -250,7 +250,7 @@ 1. Add right mouse events and tests * [Pull request 154](https://github.com/ignitionrobotics/ign-gui/pull/154) -### Ignition Gui 3.3.0 (2020-08-31) +### Gazebo Gui 3.3.0 (2020-08-31) 1. rename key publisher plugin * [Pull request 93](https://github.com/ignitionrobotics/ign-gui/pull/93) @@ -295,7 +295,7 @@ 1. Fix ImageDisplay in Ubuntu 20.04 * [Pull request 96](https://github.com/ignitionrobotics/ign-gui/pull/96) -### Ignition Gui 3.2.0 (2020-06-22) +### Gazebo Gui 3.2.0 (2020-06-22) 1. Sort GUI plugins alphabetically * [Pull request 71](https://github.com/ignitionrobotics/ign-gui/pull/71) @@ -321,7 +321,7 @@ * [Pull request 56](https://github.com/ignitionrobotics/ign-gui/pull/56) * [Pull request 57](https://github.com/ignitionrobotics/ign-gui/pull/57) -### Ignition Gui 3.1.0 (2020-03-27) +### Gazebo Gui 3.1.0 (2020-03-27) 1. Remove old ign-gui0 stuff * [BitBucket pull request 248](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/248) @@ -373,7 +373,7 @@ * [BitBucket pull request 228](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/228) * [BitBucket pull request 230](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/230) -### Ignition Gui 3.0.0 (2019-12-10) +### Gazebo Gui 3.0.0 (2019-12-10) 1. Depend on ign-transport8 and ign-msgs5 * [BitBucket pull request 225](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/225) @@ -381,9 +381,9 @@ 1. Depend on ign-rendering3 * [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/221) -## Ignition Gui 2 +## Gazebo Gui 2 -### Ignition Gui 2.3.3 (2020-08-31) +### Gazebo Gui 2.3.3 (2020-08-31) 1. Fix running plugins with bad world names. * [Pull request 111](https://github.com/ignitionrobotics/ign-gui/pull/111) @@ -391,17 +391,17 @@ 1. Disable more tests known to fail on macOS and Windows. * [Pull request 112](https://github.com/ignitionrobotics/ign-gui/pull/112) -### Ignition Gui 2.3.2 (2020-08-19) +### Gazebo Gui 2.3.2 (2020-08-19) 1. Revert pull request #107 * [Pull request 110](https://github.com/ignitionrobotics/ign-gui/pull/110) -### Ignition Gui 2.3.1 (2020-08-17) +### Gazebo Gui 2.3.1 (2020-08-17) 1. Fix running plugins with bad world name * [Pull request 107](https://github.com/ignitionrobotics/ign-gui/pull/107) -### Ignition Gui 2.3.0 (2020-08-11) +### Gazebo Gui 2.3.0 (2020-08-11) 1. Add shift + drag to rotate camera * [Pull request 96](https://github.com/ignitionrobotics/ign-gui/pull/96) @@ -422,7 +422,7 @@ 1. Use world name in default topics * [Pull request 104](https://github.com/ignitionrobotics/ign-gui/pull/104) -### Ignition Gui 2.2.0 (2020-06-17) +### Gazebo Gui 2.2.0 (2020-06-17) 1. Sort GUI plugins alphabetically * [Pull request 71](https://github.com/ignitionrobotics/ign-gui/pull/71) @@ -447,7 +447,7 @@ * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249) -### Ignition Gui 2.1.0 (2020-03-04) +### Gazebo Gui 2.1.0 (2020-03-04) 1. Add space for pausing sim * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/245) @@ -476,7 +476,7 @@ 1. Fix changing topics in ImageDisplay * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/224) -### Ignition Gui 2.0.1 +### Gazebo Gui 2.0.1 1. Made image display responsive. * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/223) @@ -484,7 +484,7 @@ 1. Downstream applications can override this using MainWindow::setIcon once they get the window. * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/222) -### Ignition Gui 2.0.0 +### Gazebo Gui 2.0.0 1. Delete QmlApplicationEngine later. * [BitBucket pull request 209](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/209) @@ -513,9 +513,9 @@ 1. Fix topic echo test and make msgs visible. * [BitBucket pull request 201](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/201) -## Ignition Gui 1 +## Gazebo Gui 1 -### Ignition Gui 1.X.X +### Gazebo Gui 1.X.X 1. Move files not ported to v1 to a separate dir for clarity. * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/196) @@ -523,4 +523,4 @@ 1. Get ign-gui plugin interface in case there are others. * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/186) -### Ignition Gui 1.0.0 +### Gazebo Gui 1.0.0 diff --git a/Migration.md b/Migration.md index 4cfaf0201..754d83e64 100644 --- 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/api.md.in b/api.md.in index 31af86575..afd386f2f 100644 --- 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 Robotics, a set of libraries designed to rapidly develop robot and simulation applications. ## License diff --git a/examples/README.md b/examples/README.md index 66d367799..3745b01b1 100644 --- 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 index 8f6e60850..46fb98998 100644 --- a/examples/config/plugin_params.config +++ b/examples/config/plugin_params.config @@ -6,7 +6,7 @@ diff --git a/examples/plugin/custom_context_menu/CMakeLists.txt b/examples/plugin/custom_context_menu/CMakeLists.txt index d0d5a6afe..a11491d3a 100644 --- 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/dialog_from_plugin/CMakeLists.txt b/examples/plugin/dialog_from_plugin/CMakeLists.txt index 067aeaf15..a4235b12b 100644 --- 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/hello_plugin/CMakeLists.txt b/examples/plugin/hello_plugin/CMakeLists.txt index db3cf7bc0..52fa65973 100644 --- 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.hh b/examples/plugin/hello_plugin/HelloPlugin.hh index 144937d75..5b4f105cb 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.hh +++ b/examples/plugin/hello_plugin/HelloPlugin.hh @@ -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/README.md b/examples/plugin/ign_components/README.md index bee793933..66c9cd6d5 100644 --- 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 index 1860e5bd9..026fd5884 100644 --- 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/standalone/custom_drawer/CMakeLists.txt b/examples/standalone/custom_drawer/CMakeLists.txt index b341e6a81..724e1aa46 100644 --- 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 index 6ac642687..dcbf089a5 100644 --- 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/dialogs/CMakeLists.txt b/examples/standalone/dialogs/CMakeLists.txt index 3e0ffae75..6bf03a0a7 100644 --- 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}") diff --git a/examples/standalone/window/CMakeLists.txt b/examples/standalone/window/CMakeLists.txt index 35da108e8..18cf6a883 100644 --- a/examples/standalone/window/CMakeLists.txt +++ b/examples/standalone/window/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}") diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh index d7b1494ec..161dfec0b 100644 --- a/include/gz/gui/Application.hh +++ b/include/gz/gui/Application.hh @@ -58,7 +58,7 @@ namespace ignition kDialog = 1 }; - /// \brief An Ignition GUI application loads a QML engine and + /// \brief An Gazebo GUI application loads a QML engine and /// provides an API to load plugins and configuration files. The application /// supports either running a single main window or several plugins as /// standalone dialogs. @@ -141,7 +141,7 @@ namespace ignition /// 1. Paths given by the environment variable /// 2. Paths added by calling addPluginPath /// 3. Path ~/.ignition/gui/plugins - /// 4. The path where Ignition GUI plugins are installed + /// 4. The path where Gazebo GUI plugins are installed /// /// \return A vector of pairs, where each pair contains: /// * A path diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh index 5984a8a56..a592aaff2 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -43,47 +43,47 @@ namespace ignition namespace gui { /// \brief Return the equivalent qt color - /// \param[in] _color Ignition color to convert + /// \param[in] _color Gazebo color to convert /// \return Qt color value IGNITION_GUI_VISIBLE QColor convert(const math::Color &_color); - /// \brief Return the equivalent ignition color + /// \brief Return the equivalent gazebo color /// \param[in] _color Qt color to convert - /// \return Ignition color value + /// \return Gazebo color value IGNITION_GUI_VISIBLE math::Color convert(const QColor &_color); /// \brief Return the equivalent QPointF. - /// \param[in] _pt Ignition vector to convert. + /// \param[in] _pt Gazebo vector to convert. /// \return QPointF. IGNITION_GUI_VISIBLE QPointF convert(const math::Vector2d &_pt); - /// \brief Return the equivalent ignition vector. + /// \brief Return the equivalent gazebo vector. /// \param[in] _pt QPointF to convert - /// \return Ignition Vector2d. + /// \return Gazebo Vector2d. IGNITION_GUI_VISIBLE math::Vector2d convert(const QPointF &_pt); /// \brief Return the equivalent qt vector 3d. - /// \param[in] _vec Ignition vector 3d to convert. + /// \param[in] _vec Gazebo vector 3d to convert. /// \return Qt vector 3d value. IGNITION_GUI_VISIBLE QVector3D convert(const math::Vector3d &_vec); - /// \brief Return the equivalent ignition vector 3d. + /// \brief Return the equivalent gazebo vector 3d. /// \param[in] _vec Qt vector 3d to convert. - /// \return Ignition vector 3d value + /// \return Gazebo vector 3d value IGNITION_GUI_VISIBLE math::Vector3d convert(const QVector3D &_vec); - /// \brief Return the equivalent ignition mouse event. + /// \brief Return the equivalent gazebo mouse event. /// /// Note that there isn't a 1-1 mapping between these types, so fields such /// as common::MouseEvent::PressPos need to be set afterwards. /// \param[in] _e Qt mouse event - /// \return Ignition mouse event + /// \return Gazebo mouse event IGNITION_GUI_VISIBLE common::MouseEvent convert(const QMouseEvent &_e); diff --git a/include/gz/gui/Plugin.hh b/include/gz/gui/Plugin.hh index dc96bc56e..ed15ebfbe 100644 --- a/include/gz/gui/Plugin.hh +++ b/include/gz/gui/Plugin.hh @@ -37,7 +37,7 @@ namespace ignition { class PluginPrivate; - /// \brief Base class for Ignition GUI plugins. + /// \brief Base class for Gazebo GUI plugins. /// /// When inheriting from this plugin, the following are assumed: /// @@ -127,7 +127,7 @@ namespace ignition protected: std::string configStr; /// \brief Load configuration which is common to all plugins and handled - /// by Ignition GUI. + /// by Gazebo GUI. /// \details Called when a plugin is first created. /// \sa LoadConfig /// \param[in] _ignGuiElem element within the . diff --git a/include/gz/gui/config.hh.in b/include/gz/gui/config.hh.in index 21fe1b32c..aef429786 100644 --- a/include/gz/gui/config.hh.in +++ b/include/gz/gui/config.hh.in @@ -8,7 +8,7 @@ #define IGNITION_GUI_VERSION "${PROJECT_VERSION}" #define IGNITION_GUI_VERSION_FULL "${PROJECT_VERSION_FULL}" -#define IGNITION_GUI_VERSION_HEADER "Ignition ${GZ_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" +#define IGNITION_GUI_VERSION_HEADER "Gazebo ${GZ_DESIGNATION}, version ${PROJECT_VERSION_FULL}\nCopyright (C) 2017 Open Source Robotics Foundation.\nReleased under the Apache 2.0 License.\n\n" #cmakedefine BUILD_TYPE_PROFILE 1 #cmakedefine BUILD_TYPE_DEBUG 1 diff --git a/include/gz/gui/qml/Main.qml b/include/gz/gui/qml/Main.qml index 4ce98ff64..9cc59485f 100644 --- a/include/gz/gui/qml/Main.qml +++ b/include/gz/gui/qml/Main.qml @@ -24,7 +24,7 @@ import "qrc:/qml" ApplicationWindow { - title: qsTr("Ignition GUI") + title: qsTr("Gazebo GUI") width: 1200 height: 1000 minimumWidth: 300 @@ -260,7 +260,7 @@ ApplicationWindow id: aboutDialog modal: true focus: true - title: "Ignition GUI" + title: "Gazebo GUI" x: (window.width - width) / 2 y: window.height / 6 width: Math.min(window.width, window.height) / 3 * 2 diff --git a/src/Application.cc b/src/Application.cc index 7934b25c6..39ec03f02 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -91,9 +91,9 @@ Application::Application(int &_argc, char **_argv, const WindowType _type) { igndbg << "Initializing application." << std::endl; - this->setOrganizationName("Ignition"); - this->setOrganizationDomain("ignitionrobotics.org"); - this->setApplicationName("Ignition GUI"); + this->setOrganizationName("Gazebo"); + this->setOrganizationDomain("gazebosim.org"); + this->setApplicationName("Gazebo GUI"); // Configure console common::Console::SetPrefix("[GUI] "); diff --git a/src/Conversions_TEST.cc b/src/Conversions_TEST.cc index a46ad39a3..168ec794f 100644 --- a/src/Conversions_TEST.cc +++ b/src/Conversions_TEST.cc @@ -30,7 +30,7 @@ using namespace gui; ///////////////////////////////////////////////// TEST(ConversionsTest, Color) { - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { double red = 0.1; double green = 0.3; @@ -48,7 +48,7 @@ TEST(ConversionsTest, Color) EXPECT_NEAR(newColor.A(), newColor.A(), tol); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { int red = 100; int green = 150; @@ -66,13 +66,13 @@ TEST(ConversionsTest, Point2d) double x = -0.5; double y = 123; - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { math::Vector2d point(x, y); EXPECT_EQ(convert(convert(point)), point); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { QPointF point(x, y); EXPECT_EQ(convert(convert(point)), point); @@ -86,13 +86,13 @@ TEST(ConversionsTest, Vector3d) double y = 0; double z = 1234; - // Ignition to Qt to Ignition + // Gazebo to Qt to Gazebo { math::Vector3d vec(x, y, z); EXPECT_EQ(convert(convert(vec)), vec); } - // Qt to Ignition to Qt + // Qt to Gazebo to Qt { QVector3D vec(x, y, z); EXPECT_EQ(convert(convert(vec)), vec); diff --git a/src/cmd/cmdgui.rb.in b/src/cmd/cmdgui.rb.in index ddc84f728..9350e29ef 100644 --- a/src/cmd/cmdgui.rb.in +++ b/src/cmd/cmdgui.rb.in @@ -37,7 +37,7 @@ COMMON_OPTIONS = " \n" + ' --versions Show the available versions.' COMMANDS = { 'gui' => - "Ignition GUI tool.\n\n" + + "Gazebo GUI tool.\n\n" + " ign gui [options]\n\n" + "Options:\n\n" + " -l [ --list ] List all available plugins.\n" + @@ -59,7 +59,7 @@ COMMANDS = { 'gui' => } # -# Class for the Ignition gui command line tools. +# Class for the Gazebo gui command line tools. # class Cmd # diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 8084b7a56..8ce646463 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -4,7 +4,7 @@ # [PUBLIC_LINK_LIBS ] # [PRIVATE_LINK_LIBS ]) # -# Add a plugin library to Ignition GUI. +# Add a plugin library to Gazebo GUI. # # Required. Name of the library # @@ -47,7 +47,7 @@ endfunction() # [PUBLIC_LINK_LIBS ] # [PRIVATE_LINK_LIBS ]) # -# Add a plugin to Ignition GUI. +# Add a plugin to Gazebo GUI. # # Required. Name of the plugin. # diff --git a/src/plugins/grid_3d/Grid3D.hh b/src/plugins/grid_3d/Grid3D.hh index 85063686b..ffc1f207c 100644 --- a/src/plugins/grid_3d/Grid3D.hh +++ b/src/plugins/grid_3d/Grid3D.hh @@ -33,7 +33,7 @@ namespace plugins // TODO(chapulina) Delete this plugin when forward porting to `ign-gui6` in // favor of `GridConfig` - /// \brief Manages grids in an Ignition Rendering scene. This plugin can be + /// \brief Manages grids in an Gazebo Rendering scene. This plugin can be /// used for: /// * Introspecting grids /// * Editing grids diff --git a/src/plugins/image_display/ImageDisplay.hh b/src/plugins/image_display/ImageDisplay.hh index 4c7bcf782..2d4e17298 100644 --- a/src/plugins/image_display/ImageDisplay.hh +++ b/src/plugins/image_display/ImageDisplay.hh @@ -81,7 +81,7 @@ namespace plugins private: QImage img; }; - /// \brief Display images coming through an Ignition transport topic. + /// \brief Display images coming through an Gazebo transport topic. /// /// ## Configuration /// diff --git a/src/plugins/image_display/ImageDisplay.qml b/src/plugins/image_display/ImageDisplay.qml index b11021a74..ccd18a8e5 100644 --- a/src/plugins/image_display/ImageDisplay.qml +++ b/src/plugins/image_display/ImageDisplay.qml @@ -85,7 +85,7 @@ Rectangle { ToolTip.visible: hovered ToolTip.delay: tooltipDelay ToolTip.timeout: tooltipTimeout - ToolTip.text: qsTr("Ignition transport topics publishing Image messages") + ToolTip.text: qsTr("Gazebo transport topics publishing Image messages") } } Image { diff --git a/src/plugins/publisher/Publisher.hh b/src/plugins/publisher/Publisher.hh index c8e74a78f..e48833921 100644 --- a/src/plugins/publisher/Publisher.hh +++ b/src/plugins/publisher/Publisher.hh @@ -40,7 +40,7 @@ namespace plugins { class PublisherPrivate; - /// \brief Widget which publishes a custom Ignition transport message. + /// \brief Widget which publishes a custom Gazebo transport message. /// /// ## Configuration /// This plugin doesn't accept any custom configuration. diff --git a/src/plugins/scene3d/Scene3D.hh b/src/plugins/scene3d/Scene3D.hh index aaf3cd176..bee762f8a 100644 --- a/src/plugins/scene3d/Scene3D.hh +++ b/src/plugins/scene3d/Scene3D.hh @@ -46,7 +46,7 @@ namespace plugins /// It is possible to orbit the camera around the scene with /// the mouse. Use other plugins to manage objects in the scene. /// - /// Only one plugin displaying an Ignition Rendering scene can be used at a + /// Only one plugin displaying an Gazebo Rendering scene can be used at a /// time. /// /// ## Configuration diff --git a/src/plugins/topic_echo/TopicEcho.hh b/src/plugins/topic_echo/TopicEcho.hh index c39c7c11a..d11582f97 100644 --- a/src/plugins/topic_echo/TopicEcho.hh +++ b/src/plugins/topic_echo/TopicEcho.hh @@ -48,7 +48,7 @@ namespace plugins { class TopicEchoPrivate; - /// \brief Echo messages coming through an Ignition transport topic. + /// \brief Echo messages coming through an Gazebo transport topic. /// /// ## Configuration /// This plugin doesn't accept any custom configuration. diff --git a/tutorials.md.in b/tutorials.md.in index 49e9caf34..ab26d2562 100644 --- a/tutorials.md.in +++ b/tutorials.md.in @@ -1,8 +1,8 @@ \page tutorials Tutorials -Welcome to the Ignition @GZ_DESIGNATION_CAP@ tutorials. These tutorials +Welcome to the Gazebo @GZ_DESIGNATION_CAP@ tutorials. These tutorials will guide you through the process of understanding the capabilities of the -Ignition @GZ_DESIGNATION_CAP@ library and how to use the library effectively. +Gazebo @GZ_DESIGNATION_CAP@ library and how to use the library effectively. **The tutorials** diff --git a/tutorials/01_install.md b/tutorials/01_install.md index e4086b94e..7db42c8e2 100644 --- a/tutorials/01_install.md +++ b/tutorials/01_install.md @@ -4,9 +4,9 @@ Next Tutorial: \ref commandline # Install -These instructions are for installing only Ignition GUI. If you're interested -in using all the Ignition libraries, not only Igniton GUI, check out this -[Ignition installation](https://ignitionrobotics.org/docs/latest/install). +These instructions are for installing only Gazebo GUI. If you're interested +in using all the Gazebo libraries, not only Igniton GUI, check out this +[Gazebo installation](https://ignitionrobotics.org/docs/latest/install). We recommend following the binary install instructions to get up and running as quickly and painlessly as possible. @@ -19,7 +19,7 @@ contribution. ### Ubuntu -On Ubuntu, it's possible to install Ignition GUI as follows: +On Ubuntu, it's possible to install Gazebo GUI as follows: Add OSRF packages: ``` @@ -28,7 +28,7 @@ Add OSRF packages: sudo apt update ``` -Install Ignition GUI: +Install Gazebo GUI: ``` sudo apt install libignition-gui<#>-dev ``` @@ -44,7 +44,7 @@ On macOS, add OSRF packages: brew tap osrf/simulation ``` -Install Ignition GUI: +Install Gazebo GUI: ``` brew install ignition-gui<#> ``` @@ -118,7 +118,7 @@ Install dependencies: conda install qt --channel conda-forge ``` -Install Ignition dependencies, replacing `<#>` with the desired versions: +Install Gazebo dependencies, replacing `<#>` with the desired versions: ``` conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-transport<#> libignition-msgs<#> libignition-plugin<#> libignition-tools<#> --channel conda-forge ``` diff --git a/tutorials/02_commandline.md b/tutorials/02_commandline.md index 978021331..15e8d5c32 100644 --- a/tutorials/02_commandline.md +++ b/tutorials/02_commandline.md @@ -5,11 +5,11 @@ Previous Tutorial: \ref install ## Overview -If you have Ignition Tools installed, you can use the `ign gui` command line tool: +If you have Gazebo Tools installed, you can use the `ign gui` command line tool: `ign gui -h` - Ignition GUI tool. + Gazebo GUI tool. ign gui [options] diff --git a/tutorials/03_plugins.md b/tutorials/03_plugins.md index 9625642d8..7849de845 100644 --- a/tutorials/03_plugins.md +++ b/tutorials/03_plugins.md @@ -5,7 +5,7 @@ Previous Tutorial: \ref commandline ## Writing plugins -An Ignition GUI plugin is a shared library that defines a widget. +An Gazebo GUI plugin is a shared library that defines a widget. The plugin contains [QML](https://doc.qt.io/qt-5/qtqml-index.html) code that specifies what the widget looks like, as well as C++ code that defines the plugin's behaviour and ties it to other libraries. @@ -15,7 +15,7 @@ for an example. ## Finding plugins -Ignition GUI will look for plugins on the following paths, in this order: +Gazebo GUI will look for plugins on the following paths, in this order: 1. All paths set on the `IGN_GUI_PLUGIN_PATH` environment variable 2. All paths added by calling `gz::gui::addPluginPath` @@ -24,7 +24,7 @@ Ignition GUI will look for plugins on the following paths, in this order: ## Configuring plugins -Ignition GUI supports loading XML configuration files, which may contain +Gazebo GUI supports loading XML configuration files, which may contain parameters to be passed directly to the plugin. See the \subpage config tutorial for more information. @@ -32,7 +32,7 @@ tutorial for more information. ### Image display -Display images from an Ignition Transport topic. +Display images from an Gazebo Transport topic. ign gui -c examples/config/image.config @@ -42,7 +42,7 @@ or ### Publisher -Publish messages on an Ignition Transport topic. +Publish messages on an Gazebo Transport topic. 1. Listen to string messages on the `/echo` topic: @@ -64,13 +64,13 @@ Publish messages on an Ignition Transport topic. ### Topic echo -Echo messages from an Ignition Transport topic. +Echo messages from an Gazebo Transport topic. ign gui -c examples/config/pubsub.config ### Key publisher -Publish key presses through Ignition Transport. +Publish key presses through Gazebo Transport. ign gui -c examples/config/keypublisher.config @@ -80,7 +80,7 @@ Change the topic to echo to `/keyboard/keypress`, echo, and start pressing keys. **Not ported to versions 1 or higher yet** -Discover all Ignition Transport topics and introspect its fields. +Discover all Gazebo Transport topics and introspect its fields. ign gui -c examples/config/topicViewer.config @@ -88,7 +88,7 @@ Discover all Ignition Transport topics and introspect its fields. **Not ported to versions 1 or higher yet** -Show basic stats of all Ignition Transport topics at the same time. +Show basic stats of all Gazebo Transport topics at the same time. ign gui -c examples/config/topicsStats.config @@ -107,7 +107,7 @@ plugins. This is a container for various Display Plugins that each paint on a Scene. The following example includes the display plugins that are installed with -Ignition GUI by default. +Gazebo GUI by default. ign gui -c examples/config/display_plugins.config @@ -115,7 +115,7 @@ Ignition GUI by default. **Not ported to versions 1 or higher yet** -Ignition GUI will look for display plugins on the following paths, in this +Gazebo GUI will look for display plugins on the following paths, in this order: 1. All paths set on the `IGN_GUI_DISPLAY_PLUGIN_PATH` environment variable diff --git a/tutorials/04_layout.md b/tutorials/04_layout.md index 90ff70d7d..66acb981e 100644 --- a/tutorials/04_layout.md +++ b/tutorials/04_layout.md @@ -32,7 +32,7 @@ by adding a `` element to the config file. The child elements are: `` is `false`, closing the window will emit a server shutdown request with `stop = true` to the `` topic. This can be used - in applications like Ignition Gazebo which can run a + in applications like Gazebo Gazebo which can run a server in a process separate from the GUI to stop both the GUI and the server when the window is closed. The value is case-insensitive. @@ -83,7 +83,7 @@ config file. For example: 1. Click on `File->Save configuration as` and save on a new file. > You can also click on `File -> Save configuration` to save that as the - default configuration which is loaded whenever Ignition GUI is opened + default configuration which is loaded whenever Gazebo GUI is opened without a config file. 1. Close the window, then load the new config file: diff --git a/tutorials/05_style.md b/tutorials/05_style.md index 29d65873f..b046ba8da 100644 --- a/tutorials/05_style.md +++ b/tutorials/05_style.md @@ -5,7 +5,7 @@ Previous Tutorial: \ref layout ## Overview -Ignition GUI leverages +Gazebo GUI leverages [QtQuick Controls 2 Styles](https://doc.qt.io/qt-5.9/qtquickcontrols2-styles.html) for styling. The recommended and best supported style is the Material Style, but it is also possible to use others such as Default and Universal. This tutorial @@ -19,7 +19,7 @@ There are a few ways to override the default style: * Through the graphical interface (GUI) * Setting environment variables (env) -* Through Ignition GUI config files (config) +* Through Gazebo GUI config files (config) If styles are set from multiple sources, this is the order in which they take precendence: @@ -35,13 +35,13 @@ Users can customize the whole application's material style using just a few vari QML types provided by [QtQuick Controls 2](https://doc.qt.io/qt-5/qtquick-controls2-qmlmodule.html), -as well as QML types provided by Ignition GUI, use these variables as appropriate. +as well as QML types provided by Gazebo GUI, use these variables as appropriate. It's recommended that developers make sure their plugins use these variables for a more integrated experience. ### Top toolbar -On top of those, Ignition GUI also offers a few variables specific to customizing +On top of those, Gazebo GUI also offers a few variables specific to customizing the top toolbar. By default, the top toolbar will use the primary color, while the plugin toolbars will @@ -86,7 +86,7 @@ these environment variable preferences. \note Toolbar colors can't be changed through environment variables yet. -\note Applications built on top of Ignition GUI may override custom environment variables. +\note Applications built on top of Gazebo GUI may override custom environment variables. ## Config files diff --git a/tutorials/06_example.md b/tutorials/06_example.md index 469df35c8..2ada94250 100644 --- a/tutorials/06_example.md +++ b/tutorials/06_example.md @@ -5,12 +5,12 @@ Previous Tutorial: \ref style ## Overview -Ignition GUI comes with several examples of plugins and other files +Gazebo GUI comes with several examples of plugins and other files under the `examples` folder. ## Standalone applications -Ignition GUI can be used as a C++ library by other applications. +Gazebo GUI can be used as a C++ library by other applications. Examples provided under `examples/standalone` can be compiled and run without the `ign gui` command line tool. @@ -30,7 +30,7 @@ Then run it: ## Custom plugins -Ignition GUI comes with several plugins, but its true power is loading custom +Gazebo GUI comes with several plugins, but its true power is loading custom plugins developed by others. Under `examples/plugins`, there are several examples on how to build different types of plugins. @@ -42,7 +42,7 @@ For example, we can build the `hello_plugin` example plugin: cmake .. make -Then create the plugins directory and copy the generated library to it so that Ignition GUI can find the plugin: +Then create the plugins directory and copy the generated library to it so that Gazebo GUI can find the plugin: mkdir -p ~/.ignition/gui/plugins cp libHelloPlugin.so ~/.ignition/gui/plugins/ @@ -58,7 +58,7 @@ Now you can use the command line to open it: ## Configuration files -Configuration files are used to load an Ignition GUI window with several +Configuration files are used to load an Gazebo GUI window with several plugins and custom window configurations. Example configuration files are provided in the `/examples/config` folder. diff --git a/tutorials/07_config.md b/tutorials/07_config.md index 8178cbda6..32e9f6110 100644 --- a/tutorials/07_config.md +++ b/tutorials/07_config.md @@ -4,12 +4,12 @@ Next Tutorial: \ref layout ## Configuration files -Ignition GUI supports loading XML configuration files that define what +Gazebo GUI supports loading XML configuration files that define what the window should look like and which plugins should be loaded. ### Loading -By default, Ignition GUI will load the config file at +By default, Gazebo GUI will load the config file at `$HOME/.ignition/gui/default.config`, if it exists. Configuration files can also be loaded from the command line or through the @@ -34,13 +34,13 @@ From the C++ API, pass the file path to ### File structure -Ignition GUI accepts the following top-level elements on a config file: +Gazebo GUI accepts the following top-level elements on a config file: * ``: Options related to the entire window's layout. See \subpage layout for more details. * ``: Zero or more plugins to be loaded at startup. * `filename`: This attribute specifies the plugin library to be loaded. - * ``: Ignition GUI processes this block before passing the + * ``: Gazebo GUI processes this block before passing the config to the plugin. See [plugin_params.config](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/config/plugin_params.config) for an example. @@ -59,7 +59,7 @@ See the example plugin block below: /camera -This will load the `libImageDisplay.so` plugin, Ignition GUI will set its +This will load the `libImageDisplay.so` plugin, Gazebo GUI will set its `height` to `120` pixels, and the plugin-specific `` parameter will be handled within `ImageDisplay::LoadConfig`. diff --git a/tutorials/08_screenshot.md b/tutorials/08_screenshot.md index 300f18b05..14d5e2992 100644 --- a/tutorials/08_screenshot.md +++ b/tutorials/08_screenshot.md @@ -10,7 +10,7 @@ the filename will be the timestamp of when the screenshot was taken. It is possible to change the default directory to a different location, which will be shown in the example below. -**Note**: This example is using Ignition Gazebo but is not required. +**Note**: This example is using Gazebo Gazebo but is not required. The same steps can be done using `ign gui` with a 3D scene. First, go to the plugins menu on the top right (vertical ellipsis) then select diff --git a/tutorials/index.md b/tutorials/index.md index b1d04f063..1141d23c7 100644 --- a/tutorials/index.md +++ b/tutorials/index.md @@ -1,6 +1,6 @@ # Introduction -Ignition GUI is a component in the Ignition framework, a set +Gazebo GUI is a component in the Gazebo framework, a set of libraries designed to rapidly develop robot applications. [http://ignitionrobotics.org](http://ignitionrobotics.org) From 01b006c8109b99a2b5806c44cf041cbde8bd03d9 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Tue, 29 Nov 2022 15:54:34 -0800 Subject: [PATCH 6/7] Update ignitionrobotics to gazebosim Signed-off-by: Nate Koenig --- CONTRIBUTING.md | 2 +- Changelog.md | 266 +++++++++--------- NEWS | 2 +- src/Application_TEST.cc | 2 +- src/Helpers_TEST.cc | 4 +- src/MainWindow_TEST.cc | 2 +- src/Plugin_TEST.cc | 2 +- src/gz_TEST.cc | 2 +- src/plugins/publisher/Publisher_TEST.cc | 2 +- src/plugins/scene3d/Scene3D.cc | 2 +- .../shutdown_button/ShutdownButton_TEST.cc | 2 +- src/plugins/topic_viewer/TopicViewer_TEST.cc | 4 +- .../world_control/WorldControl_TEST.cc | 2 +- src/plugins/world_stats/WorldStats_TEST.cc | 2 +- test/integration/ExamplesBuild_TEST.cc | 4 +- test/integration/Examples_TEST.cc | 2 +- tutorials/01_install.md | 16 +- tutorials/03_plugins.md | 2 +- tutorials/05_style.md | 2 +- tutorials/07_config.md | 8 +- tutorials/index.md | 2 +- 21 files changed, 166 insertions(+), 166 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 606c4a55a..f50156a33 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Gazebo Robotics contributing guide](https://ignitionrobotics.org/docs/all/contributing). +See the [Gazebo Robotics contributing guide](https://gazebosim.org/docs/all/contributing). diff --git a/Changelog.md b/Changelog.md index cba8a1c6b..d81e9a31e 100644 --- a/Changelog.md +++ b/Changelog.md @@ -104,423 +104,423 @@ ### Gazebo Gui 3.9.0 (2022-01-14) 1. Added a button that allows shutting down both the client and server. - * [Pull request #335](https://github.com/ignitionrobotics/ign-gui/pull/335) + * [Pull request #335](https://github.com/gazebosim/gz-gui/pull/335) 1. Prevent Scene3D 💥 if another scene is already loaded - * [Pull request #347](https://github.com/ignitionrobotics/ign-gui/pull/347) + * [Pull request #347](https://github.com/gazebosim/gz-gui/pull/347) 1. Add project() to examples and remove hard-dependency on Ogre1 - * [Pull request #345](https://github.com/ignitionrobotics/ign-gui/pull/345) + * [Pull request #345](https://github.com/gazebosim/gz-gui/pull/345) 1. Fix codecheck - * [Pull request #329](https://github.com/ignitionrobotics/ign-gui/pull/329) + * [Pull request #329](https://github.com/gazebosim/gz-gui/pull/329) 1. Use `qmldir` to define QML module with `IgnSpinBox` - * [Pull request #319](https://github.com/ignitionrobotics/ign-gui/pull/319) + * [Pull request #319](https://github.com/gazebosim/gz-gui/pull/319) 1. Fix `TopicEcho` plugin message display - * [Pull request #322](https://github.com/ignitionrobotics/ign-gui/pull/322) + * [Pull request #322](https://github.com/gazebosim/gz-gui/pull/322) 1. Don't crash if a plugin has invalid QML - * [Pull request #315](https://github.com/ignitionrobotics/ign-gui/pull/315) + * [Pull request #315](https://github.com/gazebosim/gz-gui/pull/315) 1. Added log storing for `ign gui` CLI - * [Pull request #272](https://github.com/ignitionrobotics/ign-gui/pull/272) + * [Pull request #272](https://github.com/gazebosim/gz-gui/pull/272) ### Gazebo Gui 3.8.0 (2021-10-12) 1. Improved doxygen - * [Pull request #275](https://github.com/ignitionrobotics/ign-gui/pull/275) + * [Pull request #275](https://github.com/gazebosim/gz-gui/pull/275) 1. Add a filter to the plugin menu - * [Pull request #277](https://github.com/ignitionrobotics/ign-gui/pull/277) + * [Pull request #277](https://github.com/gazebosim/gz-gui/pull/277) 1. 👩‍🌾 Remove bitbucket-pipelines.yml - * [Pull request #274](https://github.com/ignitionrobotics/ign-gui/pull/274) + * [Pull request #274](https://github.com/gazebosim/gz-gui/pull/274) 1. Require ign-rendering 3.5 - * [Pull request #264](https://github.com/ignitionrobotics/ign-gui/pull/264) + * [Pull request #264](https://github.com/gazebosim/gz-gui/pull/264) 1. New teleop plugin implementation. - * [Pull request #245](https://github.com/ignitionrobotics/ign-gui/pull/245) + * [Pull request #245](https://github.com/gazebosim/gz-gui/pull/245) ### Gazebo Gui 3.7.0 (2021-07-14) 1. Fix codeowners - * [Pull request #251](https://github.com/ignitionrobotics/ign-gui/pull/251) + * [Pull request #251](https://github.com/gazebosim/gz-gui/pull/251) 1. Fix plugin added signal, add PluginByName - * [Pull request #249](https://github.com/ignitionrobotics/ign-gui/pull/249) + * [Pull request #249](https://github.com/gazebosim/gz-gui/pull/249) 1. Fixed tests by passing valid argv - * [Pull request #244](https://github.com/ignitionrobotics/ign-gui/pull/244) + * [Pull request #244](https://github.com/gazebosim/gz-gui/pull/244) 1. Screenshot plugin fixed dbg message - * [Pull request #246](https://github.com/ignitionrobotics/ign-gui/pull/246) + * [Pull request #246](https://github.com/gazebosim/gz-gui/pull/246) 1. Detect ign instead of using cmake module to check for ignition-tools - * [Pull request #240](https://github.com/ignitionrobotics/ign-gui/pull/240) + * [Pull request #240](https://github.com/gazebosim/gz-gui/pull/240) ### Gazebo Gui 3.6.0 (2021-06-17) 1. Update codeowners - * [Pull request #232](https://github.com/ignitionrobotics/ign-gui/pull/232) + * [Pull request #232](https://github.com/gazebosim/gz-gui/pull/232) 1. Confirmation dialog when closing main window - * [Pull request #225](https://github.com/ignitionrobotics/ign-gui/pull/225) + * [Pull request #225](https://github.com/gazebosim/gz-gui/pull/225) 1. Avoid grid3D crash - * [Pull request #227](https://github.com/ignitionrobotics/ign-gui/pull/227) + * [Pull request #227](https://github.com/gazebosim/gz-gui/pull/227) 1. Emit more events from Scene3D - * [Pull request #213](https://github.com/ignitionrobotics/ign-gui/pull/213) + * [Pull request #213](https://github.com/gazebosim/gz-gui/pull/213) 1. Removed duplicated code with rendering::sceneFromFirstRenderEngine - * [Pull request #223](https://github.com/ignitionrobotics/ign-gui/pull/223) + * [Pull request #223](https://github.com/gazebosim/gz-gui/pull/223) 1. Remove `tools/code_check` and update codecov - * [Pull request #222](https://github.com/ignitionrobotics/ign-gui/pull/222) + * [Pull request #222](https://github.com/gazebosim/gz-gui/pull/222) 1. Fixed material specular in `Scene3D` - * [Pull request #218](https://github.com/ignitionrobotics/ign-gui/pull/218) + * [Pull request #218](https://github.com/gazebosim/gz-gui/pull/218) 1. `check_test_ran.py`: remove grep/xsltproc - * [Pull request #203](https://github.com/ignitionrobotics/ign-gui/pull/203) + * [Pull request #203](https://github.com/gazebosim/gz-gui/pull/203) ### Gazebo Gui 3.5.1 (2021-03-18) 1. Scene3D: port mesh material fixes from ign-gazebo - * [Pull request #191](https://github.com/ignitionrobotics/ign-gui/pull/191) + * [Pull request #191](https://github.com/gazebosim/gz-gui/pull/191) 1. Improve the height of plugins in the right split - * [Pull request #194](https://github.com/ignitionrobotics/ign-gui/pull/194) + * [Pull request #194](https://github.com/gazebosim/gz-gui/pull/194) ### Gazebo Gui 3.5.0 (2021-03-10) 1. Screenshot plugin - * [Pull request #170](https://github.com/ignitionrobotics/ign-gui/pull/170) + * [Pull request #170](https://github.com/gazebosim/gz-gui/pull/170) 1. Master branch updates - * [Pull request #187](https://github.com/ignitionrobotics/ign-gui/pull/187) + * [Pull request #187](https://github.com/gazebosim/gz-gui/pull/187) 1. Backport Publisher test from v4 - * [Pull request #173](https://github.com/ignitionrobotics/ign-gui/pull/173) + * [Pull request #173](https://github.com/gazebosim/gz-gui/pull/173) 1. Better error messages when component can't be loaded - * [Pull request #175](https://github.com/ignitionrobotics/ign-gui/pull/175) + * [Pull request #175](https://github.com/gazebosim/gz-gui/pull/175) 1. Make Grid3D plugin more flexible - * [Pull request #172](https://github.com/ignitionrobotics/ign-gui/pull/172) + * [Pull request #172](https://github.com/gazebosim/gz-gui/pull/172) 1. Add Windows Installation - * [Pull request #168](https://github.com/ignitionrobotics/ign-gui/pull/168) + * [Pull request #168](https://github.com/gazebosim/gz-gui/pull/168) 1. Fix codecheck - * [Pull request #157](https://github.com/ignitionrobotics/ign-gui/pull/157) + * [Pull request #157](https://github.com/gazebosim/gz-gui/pull/157) ### Gazebo Gui 3.4.0 (2020-12-10) 1. Publish plugin API docs - * [Pull request 128](https://github.com/ignitionrobotics/ign-gui/pull/128) + * [Pull request 128](https://github.com/gazebosim/gz-gui/pull/128) 1. Tutorial tweaks - * [Pull request 132](https://github.com/ignitionrobotics/ign-gui/pull/132) + * [Pull request 132](https://github.com/gazebosim/gz-gui/pull/132) 1. Floating and standalone plugins respect minimum dimensions - * [Pull request 135](https://github.com/ignitionrobotics/ign-gui/pull/135) + * [Pull request 135](https://github.com/gazebosim/gz-gui/pull/135) 1. Add scrollable indicator for plugin menu - * [Pull request 134](https://github.com/ignitionrobotics/ign-gui/pull/134) + * [Pull request 134](https://github.com/gazebosim/gz-gui/pull/134) 1. Re-enable image.config test - * [Pull request 148](https://github.com/ignitionrobotics/ign-gui/pull/148) + * [Pull request 148](https://github.com/gazebosim/gz-gui/pull/148) 1. Improve fork experience - * [Pull request 139](https://github.com/ignitionrobotics/ign-gui/pull/139) + * [Pull request 139](https://github.com/gazebosim/gz-gui/pull/139) 1. Resolve updated codecheck issues - * [Pull request 144](https://github.com/ignitionrobotics/ign-gui/pull/144) + * [Pull request 144](https://github.com/gazebosim/gz-gui/pull/144) 1. Port Gazebo GUI events to Gazebo GUI - * [Pull request 148](https://github.com/ignitionrobotics/ign-gui/pull/148) + * [Pull request 148](https://github.com/gazebosim/gz-gui/pull/148) 1. Change deprecated Qt::MidButton - * [Pull request 153](https://github.com/ignitionrobotics/ign-gui/pull/153) + * [Pull request 153](https://github.com/gazebosim/gz-gui/pull/153) 1. Add right mouse events and tests - * [Pull request 154](https://github.com/ignitionrobotics/ign-gui/pull/154) + * [Pull request 154](https://github.com/gazebosim/gz-gui/pull/154) ### Gazebo Gui 3.3.0 (2020-08-31) 1. rename key publisher plugin - * [Pull request 93](https://github.com/ignitionrobotics/ign-gui/pull/93) + * [Pull request 93](https://github.com/gazebosim/gz-gui/pull/93) 1. Add shift + drag to rotate camera - * [Pull request 96](https://github.com/ignitionrobotics/ign-gui/pull/96) + * [Pull request 96](https://github.com/gazebosim/gz-gui/pull/96) 1. Scroll bar adjustment - * [Pull request 97](https://github.com/ignitionrobotics/ign-gui/pull/97) + * [Pull request 97](https://github.com/gazebosim/gz-gui/pull/97) 1. Minimize GUI plugin - * [Pull request 84](https://github.com/ignitionrobotics/ign-gui/pull/84) - * [Pull request 99](https://github.com/ignitionrobotics/ign-gui/pull/99) - * [Pull request 102](https://github.com/ignitionrobotics/ign-gui/pull/102) + * [Pull request 84](https://github.com/gazebosim/gz-gui/pull/84) + * [Pull request 99](https://github.com/gazebosim/gz-gui/pull/99) + * [Pull request 102](https://github.com/gazebosim/gz-gui/pull/102) 1. Fix tests on actions - * [Pull request 98](https://github.com/ignitionrobotics/ign-gui/pull/98) + * [Pull request 98](https://github.com/gazebosim/gz-gui/pull/98) 1. Disable failing tests - * [Pull request 76](https://github.com/ignitionrobotics/ign-gui/pull/76) + * [Pull request 76](https://github.com/gazebosim/gz-gui/pull/76) 1. Use world name in default topics - * [Pull request 104](https://github.com/ignitionrobotics/ign-gui/pull/104) + * [Pull request 104](https://github.com/gazebosim/gz-gui/pull/104) 1. Fix running plugins with bad world name - * [Pull request 107](https://github.com/ignitionrobotics/ign-gui/pull/107) - * [Pull request 110](https://github.com/ignitionrobotics/ign-gui/pull/110) - * [Pull request 111](https://github.com/ignitionrobotics/ign-gui/pull/111) + * [Pull request 107](https://github.com/gazebosim/gz-gui/pull/107) + * [Pull request 110](https://github.com/gazebosim/gz-gui/pull/110) + * [Pull request 111](https://github.com/gazebosim/gz-gui/pull/111) 1. Disable more tests known to fail on macOS and Windows - * [Pull request 112](https://github.com/ignitionrobotics/ign-gui/pull/112) + * [Pull request 112](https://github.com/gazebosim/gz-gui/pull/112) 1. Add render event - * [Pull request 70](https://github.com/ignitionrobotics/ign-gui/pull/70) + * [Pull request 70](https://github.com/gazebosim/gz-gui/pull/70) 1. Fixed left menu events - * [Pull request 85](https://github.com/ignitionrobotics/ign-gui/pull/85) + * [Pull request 85](https://github.com/gazebosim/gz-gui/pull/85) 1. Added Topic Viewer plugin, list all transport topics - * [Pull request 69](https://github.com/ignitionrobotics/ign-gui/pull/69) + * [Pull request 69](https://github.com/gazebosim/gz-gui/pull/69) 1. Fix ImageDisplay in Ubuntu 20.04 - * [Pull request 96](https://github.com/ignitionrobotics/ign-gui/pull/96) + * [Pull request 96](https://github.com/gazebosim/gz-gui/pull/96) ### Gazebo Gui 3.2.0 (2020-06-22) 1. Sort GUI plugins alphabetically - * [Pull request 71](https://github.com/ignitionrobotics/ign-gui/pull/71) + * [Pull request 71](https://github.com/gazebosim/gz-gui/pull/71) 1. Add color palette to plugin settings to change background color - * [Pull request 62](https://github.com/ignitionrobotics/ign-gui/pull/62) + * [Pull request 62](https://github.com/gazebosim/gz-gui/pull/62) 1. Close plugin menu after a plugin has been added - * [Pull request 60](https://github.com/ignitionrobotics/ign-gui/pull/60) + * [Pull request 60](https://github.com/gazebosim/gz-gui/pull/60) 1. Resize undocked plugins by dragging corners - * [Pull request 78](https://github.com/ignitionrobotics/ign-gui/pull/78) + * [Pull request 78](https://github.com/gazebosim/gz-gui/pull/78) 1. Move each plugin to its own directory - * [Pull request 64](https://github.com/ignitionrobotics/ign-gui/pull/64) + * [Pull request 64](https://github.com/gazebosim/gz-gui/pull/64) 1. Add Key Publisher plugin - * [Pull request 81](https://github.com/ignitionrobotics/ign-gui/pull/81) + * [Pull request 81](https://github.com/gazebosim/gz-gui/pull/81) 1. GitHub migration - * [Pull request 46](https://github.com/ignitionrobotics/ign-gui/pull/46) - * [Pull request 47](https://github.com/ignitionrobotics/ign-gui/pull/47) - * [Pull request 56](https://github.com/ignitionrobotics/ign-gui/pull/56) - * [Pull request 57](https://github.com/ignitionrobotics/ign-gui/pull/57) + * [Pull request 46](https://github.com/gazebosim/gz-gui/pull/46) + * [Pull request 47](https://github.com/gazebosim/gz-gui/pull/47) + * [Pull request 56](https://github.com/gazebosim/gz-gui/pull/56) + * [Pull request 57](https://github.com/gazebosim/gz-gui/pull/57) ### Gazebo Gui 3.1.0 (2020-03-27) 1. Remove old ign-gui0 stuff - * [BitBucket pull request 248](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/248) + * [BitBucket pull request 248](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/248) 1. Fix homebrew warnings - * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249) + * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/249) 1. Add space for pausing sim - * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/245) + * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/245) 1. Prettify plugin menu - * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/231) + * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/231) 1. Expose QML context to plugins - * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/244) + * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/244) 1. Fix changing topics in ImageDisplay - * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/224) + * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/224) 1. Made image display responsive. - * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/223) + * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/223) 1. Downstream applications can override icon using MainWindow::setIcon once they get the window. - * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/222) + * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/222) 1. Add support for visualizing int 16 bit images in ImageDisplay - * [BitBucket pull request 241](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/241) + * [BitBucket pull request 241](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/241) 1. Example opening a dialog and accessing main window from plugin - * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/242) + * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/242) 1. Example composing one plugin with multiple QML files - * [BitBucket pull request 235](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/235) + * [BitBucket pull request 235](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/235) 1. Protect against null tinyxml GetText - * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/236) + * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/236) 1. Example using Ign\*.qml components - * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/240) + * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/240) 1. Config tutorial - * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/233) + * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/233) 1. Add copyright to all QML files - * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/232) + * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/232) 1. Documentation updates - * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/229) - * [BitBucket pull request 228](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/228) - * [BitBucket pull request 230](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/230) + * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/229) + * [BitBucket pull request 228](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/228) + * [BitBucket pull request 230](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/230) ### Gazebo Gui 3.0.0 (2019-12-10) 1. Depend on ign-transport8 and ign-msgs5 - * [BitBucket pull request 225](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/225) + * [BitBucket pull request 225](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/225) 1. Depend on ign-rendering3 - * [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/221) + * [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/221) ## Gazebo Gui 2 ### Gazebo Gui 2.3.3 (2020-08-31) 1. Fix running plugins with bad world names. - * [Pull request 111](https://github.com/ignitionrobotics/ign-gui/pull/111) + * [Pull request 111](https://github.com/gazebosim/gz-gui/pull/111) 1. Disable more tests known to fail on macOS and Windows. - * [Pull request 112](https://github.com/ignitionrobotics/ign-gui/pull/112) + * [Pull request 112](https://github.com/gazebosim/gz-gui/pull/112) ### Gazebo Gui 2.3.2 (2020-08-19) 1. Revert pull request #107 - * [Pull request 110](https://github.com/ignitionrobotics/ign-gui/pull/110) + * [Pull request 110](https://github.com/gazebosim/gz-gui/pull/110) ### Gazebo Gui 2.3.1 (2020-08-17) 1. Fix running plugins with bad world name - * [Pull request 107](https://github.com/ignitionrobotics/ign-gui/pull/107) + * [Pull request 107](https://github.com/gazebosim/gz-gui/pull/107) ### Gazebo Gui 2.3.0 (2020-08-11) 1. Add shift + drag to rotate camera - * [Pull request 96](https://github.com/ignitionrobotics/ign-gui/pull/96) + * [Pull request 96](https://github.com/gazebosim/gz-gui/pull/96) 1. Scroll bar adjustment - * [Pull request 97](https://github.com/ignitionrobotics/ign-gui/pull/97) + * [Pull request 97](https://github.com/gazebosim/gz-gui/pull/97) 1. Minimize GUI plugin - * [Pull request 84](https://github.com/ignitionrobotics/ign-gui/pull/84) - * [Pull request 99](https://github.com/ignitionrobotics/ign-gui/pull/99) + * [Pull request 84](https://github.com/gazebosim/gz-gui/pull/84) + * [Pull request 99](https://github.com/gazebosim/gz-gui/pull/99) 1. Fix tests on actions - * [Pull request 98](https://github.com/ignitionrobotics/ign-gui/pull/98) + * [Pull request 98](https://github.com/gazebosim/gz-gui/pull/98) 1. Disable failing tests - * [Pull request 76](https://github.com/ignitionrobotics/ign-gui/pull/76) + * [Pull request 76](https://github.com/gazebosim/gz-gui/pull/76) 1. Use world name in default topics - * [Pull request 104](https://github.com/ignitionrobotics/ign-gui/pull/104) + * [Pull request 104](https://github.com/gazebosim/gz-gui/pull/104) ### Gazebo Gui 2.2.0 (2020-06-17) 1. Sort GUI plugins alphabetically - * [Pull request 71](https://github.com/ignitionrobotics/ign-gui/pull/71) + * [Pull request 71](https://github.com/gazebosim/gz-gui/pull/71) 1. Add color palette to plugin settings to change background color - * [Pull request 62](https://github.com/ignitionrobotics/ign-gui/pull/62) + * [Pull request 62](https://github.com/gazebosim/gz-gui/pull/62) 1. Close plugin menu after a plugin has been added - * [Pull request 60](https://github.com/ignitionrobotics/ign-gui/pull/60) + * [Pull request 60](https://github.com/gazebosim/gz-gui/pull/60) 1. Resize undocked plugins by dragging corners - * [Pull request 78](https://github.com/ignitionrobotics/ign-gui/pull/78) + * [Pull request 78](https://github.com/gazebosim/gz-gui/pull/78) 1. Move each plugin to its own directory - * [Pull request 64](https://github.com/ignitionrobotics/ign-gui/pull/64) + * [Pull request 64](https://github.com/gazebosim/gz-gui/pull/64) 1. GitHub migration - * [Pull request 46](https://github.com/ignitionrobotics/ign-gui/pull/46) - * [Pull request 56](https://github.com/ignitionrobotics/ign-gui/pull/56) + * [Pull request 46](https://github.com/gazebosim/gz-gui/pull/46) + * [Pull request 56](https://github.com/gazebosim/gz-gui/pull/56) 1. Fix homebrew warnings - * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249) + * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/249) ### Gazebo Gui 2.1.0 (2020-03-04) 1. Add space for pausing sim - * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/245) + * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/245) 1. Expose QML context to plugins - * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/244) + * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/244) 1. Prettify plugin menu - * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/231) + * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/231) 1. Example opening a dialog and accessing main window from plugin - * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/242) + * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/242) 1. Example using Ign\*.qml components - * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/240) + * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/240) 1. Protect against null tinyxml GetText - * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/236) + * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/236) 1. Config tutorial - * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/233) + * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/233) 1. Add copyright to all QML files - * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/232) + * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/232) 1. Fix changing topics in ImageDisplay - * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/224) + * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/224) ### Gazebo Gui 2.0.1 1. Made image display responsive. - * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/223) + * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/223) 1. Downstream applications can override this using MainWindow::setIcon once they get the window. - * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/222) + * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/222) ### Gazebo Gui 2.0.0 1. Delete QmlApplicationEngine later. - * [BitBucket pull request 209](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/209) + * [BitBucket pull request 209](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/209) 1. Decouple toolbar colors from material theme colors. - * [BitBucket pull request 208](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/208) + * [BitBucket pull request 208](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/208) 1. Stop mouse wheel propagation at the card level. - * [BitBucket pull request 207](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/207) + * [BitBucket pull request 207](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/207) 1. Fix theme support. - * [BitBucket pull request 206](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/206) + * [BitBucket pull request 206](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/206) 1. Don't install plugin headers, move images to unported. - * [BitBucket pull request 205](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/205) + * [BitBucket pull request 205](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/205) 1. Application PluginAdded signal. - * [BitBucket pull request 204](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/204) + * [BitBucket pull request 204](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/204) 1. Use the new `msgs::Image::pixel_format_type` field, and treat `msgs::Image::pixel_format` as a backup. - * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/203) + * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/203) 1. Upgrade to ignition-msgs4 and ignition-transport7. - * [BitBucket pull request 202](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/202) + * [BitBucket pull request 202](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/202) 1. Fix topic echo test and make msgs visible. - * [BitBucket pull request 201](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/201) + * [BitBucket pull request 201](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/201) ## Gazebo Gui 1 ### Gazebo Gui 1.X.X 1. Move files not ported to v1 to a separate dir for clarity. - * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/196) + * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/196) 1. Get ign-gui plugin interface in case there are others. - * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/186) + * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/186) ### Gazebo Gui 1.0.0 diff --git a/NEWS b/NEWS index 604eba665..a73d9b7c1 100644 --- a/NEWS +++ b/NEWS @@ -1 +1 @@ -http://ignitionrobotics.org +http://gazebosim.org diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc index 83b4ca5a4..fbbbbf7b7 100644 --- a/src/Application_TEST.cc +++ b/src/Application_TEST.cc @@ -35,7 +35,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 ////////////////////////////////////////////////// TEST(ApplicationTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor)) { diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index 359ed480c..931dafb8b 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -119,7 +119,7 @@ TEST(HelpersTest, stringTypeFromKey) } ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty)) { Application app(gg_argc, gg_argv); @@ -146,7 +146,7 @@ TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty)) } ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(worldNames)) { // No app, no window, no names diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index 86c2e76e7..182d921a9 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -44,7 +44,7 @@ using namespace gui; using namespace std::chrono_literals; ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(MainWindowTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Constructor)) { common::Console::SetVerbosity(4); diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc index 6955f91c6..87a4d3412 100644 --- a/src/Plugin_TEST.cc +++ b/src/Plugin_TEST.cc @@ -35,7 +35,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(PluginTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(DeleteLater)) { common::Console::SetVerbosity(4); diff --git a/src/gz_TEST.cc b/src/gz_TEST.cc index d923bd421..ecf3ef653 100644 --- a/src/gz_TEST.cc +++ b/src/gz_TEST.cc @@ -85,7 +85,7 @@ class CmdLine : public ::testing::Test public: std::string realHome; }; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST_F(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(list)) { // Clear home if it exists diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc index a48f746c3..8a7892030 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -43,7 +43,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc index 09d0fe5b2..4cc30e7e9 100644 --- a/src/plugins/scene3d/Scene3D.cc +++ b/src/plugins/scene3d/Scene3D.cc @@ -1334,7 +1334,7 @@ void TextureNode::PrepareNode() newId, sz, QQuickWindow::TextureIsOpaque); #else // TODO(anyone) Use createTextureFromNativeObject - // https://github.com/ignitionrobotics/ign-gui/issues/113 + // https://github.com/gazebosim/gz-gui/issues/113 #ifndef _WIN32 # pragma GCC diagnostic push # pragma GCC diagnostic ignored "-Wdeprecated-declarations" diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc index 97fdac6a1..2e42a97dd 100644 --- a/src/plugins/shutdown_button/ShutdownButton_TEST.cc +++ b/src/plugins/shutdown_button/ShutdownButton_TEST.cc @@ -36,7 +36,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc index cee8a902e..4022a4b5d 100644 --- a/src/plugins/topic_viewer/TopicViewer_TEST.cc +++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc @@ -44,7 +44,7 @@ using namespace gui; using namespace plugins; ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -70,7 +70,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { setenv("IGN_PARTITION", "ign-gazebo-test", 1); diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc index 3fd396b9b..a2ff3dfbb 100644 --- a/src/plugins/world_control/WorldControl_TEST.cc +++ b/src/plugins/world_control/WorldControl_TEST.cc @@ -36,7 +36,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc index bbcc8bc9a..dc81a6e77 100644 --- a/src/plugins/world_stats/WorldStats_TEST.cc +++ b/src/plugins/world_stats/WorldStats_TEST.cc @@ -36,7 +36,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc index 9c5c77817..389e43c3d 100644 --- a/test/integration/ExamplesBuild_TEST.cc +++ b/test/integration/ExamplesBuild_TEST.cc @@ -27,7 +27,7 @@ using namespace gz; // Helper functions copied from -// https://github.com/ignitionrobotics/ign-common/raw/ign-common3/src/Filesystem_TEST.cc +// https://github.com/gazebosim/gz-common/raw/ign-common3/src/Filesystem_TEST.cc #ifndef _WIN32 #include // NOLINT(build/include_order) @@ -167,7 +167,7 @@ void ExamplesBuild::Build(const std::string &_type) } ////////////////////////////////////////////////// -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 TEST_P(ExamplesBuild, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Build)) { Build(GetParam()); diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc index d5c81875c..82eba4ff8 100644 --- a/test/integration/Examples_TEST.cc +++ b/test/integration/Examples_TEST.cc @@ -33,7 +33,7 @@ char* g_argv[] = using namespace gz; using namespace gui; -// See https://github.com/ignitionrobotics/ign-gui/issues/75 +// See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// TEST(ExampleTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Configs)) { diff --git a/tutorials/01_install.md b/tutorials/01_install.md index 7db42c8e2..41eec185d 100644 --- a/tutorials/01_install.md +++ b/tutorials/01_install.md @@ -6,7 +6,7 @@ Next Tutorial: \ref commandline These instructions are for installing only Gazebo GUI. If you're interested in using all the Gazebo libraries, not only Igniton GUI, check out this -[Gazebo installation](https://ignitionrobotics.org/docs/latest/install). +[Gazebo installation](https://gazebosim.org/docs/latest/install). We recommend following the binary install instructions to get up and running as quickly and painlessly as possible. @@ -74,7 +74,7 @@ Add OSRF packages: Clone source code: ``` # This checks out the default branch. You can append `-b ign-gui#` (replace # with a number) to checkout a specific version - git clone http://github.com/ignitionrobotics/ign-gui + git clone http://github.com/gazebosim/gz-gui ``` Install dependencies @@ -103,7 +103,7 @@ Build and install as follows: #### Install Prerequisites -First, follow the [ign-cmake](https://github.com/ignitionrobotics/ign-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. +First, follow the [ign-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. Navigate to `condabin` if necessary to use the `conda` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of `condabin` in Anaconda Prompt, `where conda`). @@ -123,7 +123,7 @@ Install Gazebo dependencies, replacing `<#>` with the desired versions: conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-transport<#> libignition-msgs<#> libignition-plugin<#> libignition-tools<#> --channel conda-forge ``` -Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) becomes available on conda-forge, follow its tutorial to build it from source. +Before [ign-rendering](https://github.com/gazebosim/gz-rendering) becomes available on conda-forge, follow its tutorial to build it from source. #### Build from source @@ -135,7 +135,7 @@ Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) become 1. Navigate to where you would like to build the library, and clone the repository. ``` # Optionally, append `-b ign-gui#` (replace # with a number) to check out a specific version - git clone https://github.com/ignitionrobotics/ign-gui.git + git clone https://github.com/gazebosim/gz-gui.git ``` 1. Configure and build @@ -159,7 +159,7 @@ Before [ign-rendering](https://github.com/ignitionrobotics/ign-rendering) become # Documentation API documentation and tutorials can be accessed at -[https://ignitionrobotics.org/libs/gui](https://ignitionrobotics.org/libs/gui) +[https://gazebosim.org/libs/gui](https://gazebosim.org/libs/gui) You can also generate the documentation from a clone of this repository by following these steps. @@ -170,7 +170,7 @@ You can also generate the documentation from a clone of this repository by follo 2. Clone the repository ``` - git clone https://github.com/ignitionrobotics/ign-gui + git clone https://github.com/gazebosim/gz-gui ``` 3. Configure and build the documentation. @@ -203,5 +203,5 @@ Follow these steps to run tests and static code analysis in your clone of this r make codecheck ``` -See the [Writing Tests section of the contributor guide](https://ignitionrobotics.org/docs/all/contributing#writing-tests) for help creating or modifying tests. +See the [Writing Tests section of the contributor guide](https://gazebosim.org/docs/all/contributing#writing-tests) for help creating or modifying tests. diff --git a/tutorials/03_plugins.md b/tutorials/03_plugins.md index 7849de845..bbd8c71f7 100644 --- a/tutorials/03_plugins.md +++ b/tutorials/03_plugins.md @@ -10,7 +10,7 @@ The plugin contains [QML](https://doc.qt.io/qt-5/qtqml-index.html) code that specifies what the widget looks like, as well as C++ code that defines the plugin's behaviour and ties it to other libraries. -See [HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/examples/plugin/hello_plugin/) +See [HelloPlugin](https://github.com/gazebosim/gz-gui/blob/ign-gui3/examples/plugin/hello_plugin/) for an example. ## Finding plugins diff --git a/tutorials/05_style.md b/tutorials/05_style.md index b046ba8da..ffc64c558 100644 --- a/tutorials/05_style.md +++ b/tutorials/05_style.md @@ -12,7 +12,7 @@ but it is also possible to use others such as Default and Universal. This tutori focuses on customizing the Material style. The default style is hardcoded into the -[qtquickcontrols2.conf](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf) +[qtquickcontrols2.conf](https://github.com/gazebosim/gz-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf) file. There are a few ways to override the default style: diff --git a/tutorials/07_config.md b/tutorials/07_config.md index 32e9f6110..2b6aa059f 100644 --- a/tutorials/07_config.md +++ b/tutorials/07_config.md @@ -30,7 +30,7 @@ environment variable `GZ_GUI_RESOURCE_PATH`, like so: `GZ_GUI_RESOURCE_PATH=/absolute/path/to/ ign gui --config example.config` From the C++ API, pass the file path to -[Application::LoadConfig](https://ignitionrobotics.org/api/gui/3.0/classignition_1_1gui_1_1Application.html#a03c4c3a1b1e58cc4bff05658f21fff17). +[Application::LoadConfig](https://gazebosim.org/api/gui/3.0/classignition_1_1gui_1_1Application.html#a03c4c3a1b1e58cc4bff05658f21fff17). ### File structure @@ -42,12 +42,12 @@ Gazebo GUI accepts the following top-level elements on a config file: * `filename`: This attribute specifies the plugin library to be loaded. * ``: Gazebo GUI processes this block before passing the config to the plugin. See - [plugin_params.config](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/config/plugin_params.config) + [plugin_params.config](https://github.com/gazebosim/gz-gui/blob/ign-gui2/examples/config/plugin_params.config) for an example. * custom elements: Developers can read custom plugin configurations overriding the - [Plugin::LoadConfig](https://ignitionrobotics.org/api/gui/3.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee) + [Plugin::LoadConfig](https://gazebosim.org/api/gui/3.0/classignition_1_1gui_1_1Plugin.html#a72064530af4cd247b994b905559fd4ee) function, see the - [HelloPlugin](https://github.com/ignitionrobotics/ign-gui/blob/ign-gui2/examples/plugin/hello_plugin/HelloPlugin.cc) + [HelloPlugin](https://github.com/gazebosim/gz-gui/blob/ign-gui2/examples/plugin/hello_plugin/HelloPlugin.cc) example. See the example plugin block below: diff --git a/tutorials/index.md b/tutorials/index.md index 1141d23c7..1902b0564 100644 --- a/tutorials/index.md +++ b/tutorials/index.md @@ -3,4 +3,4 @@ Gazebo GUI is a component in the Gazebo framework, a set of libraries designed to rapidly develop robot applications. -[http://ignitionrobotics.org](http://ignitionrobotics.org) +[http://gazebosim.org](http://gazebosim.org) From 90f16943acfea46af69bac2c41632e4b2b6769c2 Mon Sep 17 00:00:00 2001 From: Nate Koenig Date: Wed, 30 Nov 2022 11:54:31 -0800 Subject: [PATCH 7/7] Update renaming Signed-off-by: Nate Koenig --- CONTRIBUTING.md | 2 +- Changelog.md | 90 +++++++++++++++++++-------------------- api.md.in | 2 +- include/gz/gui/Helpers.hh | 6 +-- tutorials/01_install.md | 4 +- tutorials/05_style.md | 2 +- 6 files changed, 53 insertions(+), 53 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f50156a33..a1c121ea4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1 +1 @@ -See the [Gazebo Robotics contributing guide](https://gazebosim.org/docs/all/contributing). +See the [Gazebo contributing guide](https://gazebosim.org/docs/all/contributing). diff --git a/Changelog.md b/Changelog.md index d81e9a31e..b90db2f71 100644 --- a/Changelog.md +++ b/Changelog.md @@ -40,7 +40,7 @@ 1. Change `IGN_DESIGNATION` to `GZ_DESIGNATION` * [Pull request #437](https://github.com/gazebosim/gz-gui/pull/437) -1. Gazebo -> Gazebo +1. Ignition -> Gazebo * [Pull request #435](https://github.com/gazebosim/gz-gui/pull/435) ### Gazebo Gui 3.10.0 (2022-07-13) @@ -241,7 +241,7 @@ 1. Resolve updated codecheck issues * [Pull request 144](https://github.com/gazebosim/gz-gui/pull/144) -1. Port Gazebo GUI events to Gazebo GUI +1. Port Gazebo GUI events to Ignition GUI * [Pull request 148](https://github.com/gazebosim/gz-gui/pull/148) 1. Change deprecated Qt::MidButton @@ -324,62 +324,62 @@ ### Gazebo Gui 3.1.0 (2020-03-27) 1. Remove old ign-gui0 stuff - * [BitBucket pull request 248](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/248) + * [BitBucket pull request 248](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/248) 1. Fix homebrew warnings - * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/249) + * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249) 1. Add space for pausing sim - * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/245) + * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/245) 1. Prettify plugin menu - * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/231) + * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/231) 1. Expose QML context to plugins - * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/244) + * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/244) 1. Fix changing topics in ImageDisplay - * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/224) + * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/224) 1. Made image display responsive. - * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/223) + * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/223) 1. Downstream applications can override icon using MainWindow::setIcon once they get the window. - * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/222) + * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/222) 1. Add support for visualizing int 16 bit images in ImageDisplay - * [BitBucket pull request 241](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/241) + * [BitBucket pull request 241](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/241) 1. Example opening a dialog and accessing main window from plugin - * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/242) + * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/242) 1. Example composing one plugin with multiple QML files - * [BitBucket pull request 235](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/235) + * [BitBucket pull request 235](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/235) 1. Protect against null tinyxml GetText - * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/236) + * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/236) 1. Example using Ign\*.qml components - * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/240) + * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/240) 1. Config tutorial - * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/233) + * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/233) 1. Add copyright to all QML files - * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/232) + * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/232) 1. Documentation updates - * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/229) - * [BitBucket pull request 228](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/228) - * [BitBucket pull request 230](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/230) + * [BitBucket pull request 229](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/229) + * [BitBucket pull request 228](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/228) + * [BitBucket pull request 230](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/230) ### Gazebo Gui 3.0.0 (2019-12-10) 1. Depend on ign-transport8 and ign-msgs5 - * [BitBucket pull request 225](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/225) + * [BitBucket pull request 225](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/225) 1. Depend on ign-rendering3 - * [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/221) + * [BitBucket pull request 221](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/221) ## Gazebo Gui 2 @@ -444,83 +444,83 @@ * [Pull request 56](https://github.com/gazebosim/gz-gui/pull/56) 1. Fix homebrew warnings - * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/249) + * [BitBucket pull request 249](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/249) ### Gazebo Gui 2.1.0 (2020-03-04) 1. Add space for pausing sim - * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/245) + * [BitBucket pull request 245](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/245) 1. Expose QML context to plugins - * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/244) + * [BitBucket pull request 244](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/244) 1. Prettify plugin menu - * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/231) + * [BitBucket pull request 231](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/231) 1. Example opening a dialog and accessing main window from plugin - * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/242) + * [BitBucket pull request 242](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/242) 1. Example using Ign\*.qml components - * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/240) + * [BitBucket pull request 240](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/240) 1. Protect against null tinyxml GetText - * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/236) + * [BitBucket pull request 236](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/236) 1. Config tutorial - * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/233) + * [BitBucket pull request 233](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/233) 1. Add copyright to all QML files - * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/232) + * [BitBucket pull request 232](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/232) 1. Fix changing topics in ImageDisplay - * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/224) + * [BitBucket pull request 224](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/224) ### Gazebo Gui 2.0.1 1. Made image display responsive. - * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/223) + * [BitBucket pull request 223](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/223) 1. Downstream applications can override this using MainWindow::setIcon once they get the window. - * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/222) + * [BitBucket pull request 222](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/222) ### Gazebo Gui 2.0.0 1. Delete QmlApplicationEngine later. - * [BitBucket pull request 209](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/209) + * [BitBucket pull request 209](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/209) 1. Decouple toolbar colors from material theme colors. - * [BitBucket pull request 208](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/208) + * [BitBucket pull request 208](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/208) 1. Stop mouse wheel propagation at the card level. - * [BitBucket pull request 207](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/207) + * [BitBucket pull request 207](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/207) 1. Fix theme support. - * [BitBucket pull request 206](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/206) + * [BitBucket pull request 206](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/206) 1. Don't install plugin headers, move images to unported. - * [BitBucket pull request 205](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/205) + * [BitBucket pull request 205](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/205) 1. Application PluginAdded signal. - * [BitBucket pull request 204](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/204) + * [BitBucket pull request 204](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/204) 1. Use the new `msgs::Image::pixel_format_type` field, and treat `msgs::Image::pixel_format` as a backup. - * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/203) + * [BitBucket pull request 203](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/203) 1. Upgrade to ignition-msgs4 and ignition-transport7. - * [BitBucket pull request 202](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/202) + * [BitBucket pull request 202](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/202) 1. Fix topic echo test and make msgs visible. - * [BitBucket pull request 201](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/201) + * [BitBucket pull request 201](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/201) ## Gazebo Gui 1 ### Gazebo Gui 1.X.X 1. Move files not ported to v1 to a separate dir for clarity. - * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/196) + * [BitBucket pull request 196](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/196) 1. Get ign-gui plugin interface in case there are others. - * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/gazebosim/gz-gui/pull-requests/186) + * [BitBucket pull request 186](https://osrf-migration.github.io/ignition-gh-pages/#!/ignitionrobotics/ign-gui/pull-requests/186) ### Gazebo Gui 1.0.0 diff --git a/api.md.in b/api.md.in index afd386f2f..bb345ae15 100644 --- a/api.md.in +++ b/api.md.in @@ -1,6 +1,6 @@ ## Gazebo @GZ_DESIGNATION_CAP@ -Gazebo @GZ_DESIGNATION_CAP@ is a component in Gazebo 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/include/gz/gui/Helpers.hh b/include/gz/gui/Helpers.hh index d361bf672..dffb43b42 100644 --- a/include/gz/gui/Helpers.hh +++ b/include/gz/gui/Helpers.hh @@ -80,11 +80,11 @@ namespace ignition QStringList worldNames(); - /// \brief Import path for ign-gui QML modules added to the Qt resource + /// \brief Import path for gz-gui QML modules added to the Qt resource /// system. This helper function returns the QRC resource path where custom - /// ignition QML modules can be imported from. To import an ignition QML + /// Gazebo QML modules can be imported from. To import a Gazebo QML /// module, add this path to the QML engine's import path list before - /// attempting to load a QML file that imports ignition QML modules. + /// attempting to load a QML file that imports Gazebo QML modules. /// \return Resousrce path prefix as a string IGNITION_GUI_VISIBLE const QString qmlQrcImportPath(); diff --git a/tutorials/01_install.md b/tutorials/01_install.md index 41eec185d..0603de59c 100644 --- a/tutorials/01_install.md +++ b/tutorials/01_install.md @@ -103,7 +103,7 @@ Build and install as follows: #### Install Prerequisites -First, follow the [ign-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. +First, follow the [gz-cmake](https://github.com/gazebosim/gz-cmake) tutorial for installing Conda, Visual Studio, CMake, etc., prerequisites, and creating a Conda environment. Navigate to `condabin` if necessary to use the `conda` command (i.e., if Conda is not in your `PATH` environment variable. You can find the location of `condabin` in Anaconda Prompt, `where conda`). @@ -123,7 +123,7 @@ Install Gazebo dependencies, replacing `<#>` with the desired versions: conda install libignition-cmake<#> libignition-common<#> libignition-math<#> libignition-transport<#> libignition-msgs<#> libignition-plugin<#> libignition-tools<#> --channel conda-forge ``` -Before [ign-rendering](https://github.com/gazebosim/gz-rendering) becomes available on conda-forge, follow its tutorial to build it from source. +Before [gz-rendering](https://github.com/gazebosim/gz-rendering) becomes available on conda-forge, follow its tutorial to build it from source. #### Build from source diff --git a/tutorials/05_style.md b/tutorials/05_style.md index ffc64c558..e2d997ff7 100644 --- a/tutorials/05_style.md +++ b/tutorials/05_style.md @@ -12,7 +12,7 @@ but it is also possible to use others such as Default and Universal. This tutori focuses on customizing the Material style. The default style is hardcoded into the -[qtquickcontrols2.conf](https://github.com/gazebosim/gz-gui/blob/ign-gui3/include/ignition/gui/qtquickcontrols2.conf) +[qtquickcontrols2.conf](https://github.com/gazebosim/gz-gui/blob/ign-gui3/include/gz/gui/qtquickcontrols2.conf) file. There are a few ways to override the default style: