From 671e746a59817e08d9d98afda47202ab70c63ce3 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Mon, 6 Jun 2022 16:11:16 -0700 Subject: [PATCH] Migrate upstream macros Signed-off-by: methylDragon --- .../custom_context_menu/CustomContext.cc | 2 +- .../dialog_from_plugin/DialogFromPlugin.cc | 2 +- examples/plugin/gz_components/GzComponents.cc | 2 +- examples/plugin/hello_plugin/HelloPlugin.cc | 2 +- examples/plugin/multiple_qml/MultipleQml.cc | 2 +- include/gz/gui/GuiEvents.hh | 40 +++++++++---------- src/Application.cc | 6 +-- src/Application_TEST.cc | 14 +++---- src/Helpers_TEST.cc | 6 +-- src/MainWindow_TEST.cc | 34 ++++++++-------- src/PlottingInterface_TEST.cc | 6 +-- src/Plugin_TEST.cc | 6 +-- src/ign.cc | 4 +- src/ign_TEST.cc | 8 ++-- src/plugins/camera_tracking/CameraTracking.cc | 8 ++-- src/plugins/grid_config/GridConfig.cc | 2 +- src/plugins/image_display/ImageDisplay.cc | 2 +- .../InteractiveViewControl.cc | 2 +- src/plugins/key_publisher/KeyPublisher.cc | 2 +- src/plugins/marker_manager/MarkerManager.cc | 2 +- src/plugins/minimal_scene/MinimalScene.cc | 2 +- src/plugins/minimal_scene/MinimalScene.hh | 6 +-- src/plugins/navsat_map/NavSatMap.cc | 2 +- src/plugins/plotting/TransportPlotting.cc | 2 +- src/plugins/plotting/TransportPlotting.hh | 4 +- src/plugins/point_cloud/PointCloud.cc | 4 +- src/plugins/point_cloud/PointCloud_TEST.cc | 2 +- src/plugins/publisher/Publisher.cc | 2 +- src/plugins/publisher/Publisher_TEST.cc | 6 +-- src/plugins/scene3d/Scene3D.cc | 2 +- src/plugins/screenshot/Screenshot.cc | 4 +- src/plugins/screenshot/Screenshot_TEST.cc | 2 +- src/plugins/shutdown_button/ShutdownButton.cc | 2 +- .../shutdown_button/ShutdownButton_TEST.cc | 6 +-- src/plugins/tape_measure/TapeMeasure.cc | 2 +- src/plugins/teleop/Teleop.cc | 2 +- src/plugins/teleop/Teleop_TEST.cc | 4 +- src/plugins/topic_echo/TopicEcho.cc | 2 +- src/plugins/topic_viewer/TopicViewer.cc | 2 +- src/plugins/topic_viewer/TopicViewer_TEST.cc | 4 +- .../TransportSceneManager.cc | 2 +- src/plugins/world_control/WorldControl.cc | 2 +- .../world_control/WorldControl_TEST.cc | 12 +++--- src/plugins/world_stats/WorldStats.cc | 2 +- src/plugins/world_stats/WorldStats_TEST.cc | 10 ++--- test/integration/ExamplesBuild_TEST.cc | 2 +- test/integration/Examples_TEST.cc | 2 +- test/integration/camera_tracking.cc | 2 +- test/integration/marker_manager.cc | 2 +- test/integration/minimal_scene.cc | 4 +- test/integration/scene3d.cc | 6 +-- test/integration/transport_scene_manager.cc | 4 +- test/plugins/TestBadInheritancePlugin.cc | 2 +- test/plugins/TestInvalidQmlPlugin.cc | 2 +- test/plugins/TestPlugin.cc | 2 +- 55 files changed, 135 insertions(+), 135 deletions(-) diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc index 45679e963..4aeeb5809 100644 --- a/examples/plugin/custom_context_menu/CustomContext.cc +++ b/examples/plugin/custom_context_menu/CustomContext.cc @@ -35,5 +35,5 @@ CustomContext::~CustomContext() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::CustomContext, +GZ_ADD_PLUGIN(gz::gui::CustomContext, gz::gui::Plugin); diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc index 7184fe0dd..019a81a4d 100644 --- a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc +++ b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc @@ -35,5 +35,5 @@ DialogFromPlugin::~DialogFromPlugin() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::DialogFromPlugin, +GZ_ADD_PLUGIN(gz::gui::DialogFromPlugin, gz::gui::Plugin); diff --git a/examples/plugin/gz_components/GzComponents.cc b/examples/plugin/gz_components/GzComponents.cc index e52ff1253..f1143eca1 100644 --- a/examples/plugin/gz_components/GzComponents.cc +++ b/examples/plugin/gz_components/GzComponents.cc @@ -19,5 +19,5 @@ #include "GzComponents.hh" // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::GzComponents, +GZ_ADD_PLUGIN(gz::gui::GzComponents, gz::gui::Plugin); diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc index 5b95c38b1..c95fa0516 100644 --- a/examples/plugin/hello_plugin/HelloPlugin.cc +++ b/examples/plugin/hello_plugin/HelloPlugin.cc @@ -53,5 +53,5 @@ void HelloPlugin::OnButton() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::HelloPlugin, +GZ_ADD_PLUGIN(gz::gui::HelloPlugin, gz::gui::Plugin); diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc index 8a51a03d3..72f2c599f 100644 --- a/examples/plugin/multiple_qml/MultipleQml.cc +++ b/examples/plugin/multiple_qml/MultipleQml.cc @@ -41,5 +41,5 @@ void MultipleQml::OnButton(const QString &_text) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::MultipleQml, +GZ_ADD_PLUGIN(gz::gui::MultipleQml, gz::gui::Plugin); diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh index a588f4eaa..9545cb3f0 100644 --- a/include/gz/gui/GuiEvents.hh +++ b/include/gz/gui/GuiEvents.hh @@ -86,7 +86,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event called to spawn a resource, given its description as a @@ -107,7 +107,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event called to spawn a resource, which takes the path @@ -127,7 +127,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the 3D coordinates of a @@ -149,7 +149,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the 3D coordinates of a @@ -171,7 +171,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the 3D coordinates of a @@ -193,7 +193,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to enable or disable the dropdown menu. @@ -215,7 +215,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the key release within @@ -235,7 +235,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the key press within @@ -255,7 +255,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast information about left @@ -278,7 +278,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast information about right @@ -301,7 +301,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event that block the Interactive View control when some of the @@ -323,7 +323,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast the 2D coordinates of a @@ -344,7 +344,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event called to clone a resource, given its name as a string. @@ -363,7 +363,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event called to clone a resource, given its name as a string. @@ -389,7 +389,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast information about mouse @@ -408,7 +408,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast information about mouse @@ -429,7 +429,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to broadcast information about mouse @@ -449,7 +449,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event which is called to share WorldControl information. @@ -468,7 +468,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; /// \brief Event called in the render thread of a 3D scene, before the @@ -484,7 +484,7 @@ namespace gz /// \internal /// \brief Private data pointer - IGN_UTILS_IMPL_PTR(dataPtr) + GZ_UTILS_IMPL_PTR(dataPtr) }; } } diff --git a/src/Application.cc b/src/Application.cc index 79d2063ba..462a3d9a1 100644 --- a/src/Application.cc +++ b/src/Application.cc @@ -139,7 +139,7 @@ Application::Application(int &_argc, char **_argv, const WindowType _type) // Default config path std::string home; - common::env(IGN_HOMEDIR, home); + common::env(GZ_HOMEDIR, home); this->dataPtr->defaultConfigPath = common::joinPaths( home, ".ignition", "gui", "default.config"); @@ -432,7 +432,7 @@ bool Application::LoadPlugin(const std::string &_filename, // Add default folder and install folder std::string home; - common::env(IGN_HOMEDIR, home); + common::env(GZ_HOMEDIR, home); systemPaths.AddPluginPaths(home + "/.ignition/gui/plugins:" + GZ_GUI_PLUGIN_INSTALL_DIR); @@ -730,7 +730,7 @@ std::vector>> // 3. ~/.ignition/gui/plugins std::string home; - common::env(IGN_HOMEDIR, home); + common::env(GZ_HOMEDIR, home); paths.push_back(home + "/.ignition/gui/plugins"); // 4. Install path diff --git a/src/Application_TEST.cc b/src/Application_TEST.cc index fb9537513..c4b3a9a9c 100644 --- a/src/Application_TEST.cc +++ b/src/Application_TEST.cc @@ -37,7 +37,7 @@ using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 ////////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) { gz::common::Console::SetVerbosity(4); @@ -63,7 +63,7 @@ TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) } ////////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadPlugin)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadPlugin)) { gz::common::Console::SetVerbosity(4); @@ -147,7 +147,7 @@ TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadPlugin)) } ////////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadConfig)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadConfig)) { gz::common::Console::SetVerbosity(4); @@ -175,7 +175,7 @@ TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadConfig)) } ////////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadDefaultConfig)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadDefaultConfig)) { gz::common::Console::SetVerbosity(4); @@ -201,7 +201,7 @@ TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(LoadDefaultConfig)) ////////////////////////////////////////////////// TEST(ApplicationTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(InitializeMainWindow)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(InitializeMainWindow)) { gz::common::Console::SetVerbosity(4); @@ -271,7 +271,7 @@ TEST(ApplicationTest, } ////////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Dialog)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Dialog)) { gz::common::Console::SetVerbosity(4); @@ -346,7 +346,7 @@ TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Dialog)) } ///////////////////////////////////////////////// -TEST(ApplicationTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(messageHandler)) +TEST(ApplicationTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(messageHandler)) { gz::common::Console::SetVerbosity(4); diff --git a/src/Helpers_TEST.cc b/src/Helpers_TEST.cc index 776058c67..576518965 100644 --- a/src/Helpers_TEST.cc +++ b/src/Helpers_TEST.cc @@ -123,7 +123,7 @@ TEST(HelpersTest, stringTypeFromKey) ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty)) +TEST(HelpersTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty)) { Application app(gg_argc, gg_argv); @@ -153,7 +153,7 @@ TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(findFirstByProperty)) ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(worldNames)) +TEST(HelpersTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(worldNames)) { // No app, no window, no names EXPECT_TRUE(worldNames().empty()); @@ -181,7 +181,7 @@ TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(worldNames)) } ///////////////////////////////////////////////// -TEST(HelpersTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(renderEngine)) +TEST(HelpersTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(renderEngine)) { // No app, no window, no render engine EXPECT_TRUE(renderEngineName().empty()); diff --git a/src/MainWindow_TEST.cc b/src/MainWindow_TEST.cc index c0d508d7a..ba48df778 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -45,7 +45,7 @@ using namespace std::chrono_literals; ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -58,7 +58,7 @@ TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Constructor)) } ///////////////////////////////////////////////// -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnSaveConfig)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnSaveConfig)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -95,7 +95,7 @@ TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnSaveConfig)) } ///////////////////////////////////////////////// -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(SaveConfigAs)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(SaveConfigAs)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -131,7 +131,7 @@ TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(SaveConfigAs)) } ///////////////////////////////////////////////// -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnLoadConfig)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnLoadConfig)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -173,7 +173,7 @@ TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnLoadConfig)) } ///////////////////////////////////////////////// -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnAddPlugin)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnAddPlugin)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -205,7 +205,7 @@ TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(OnAddPlugin)) } ///////////////////////////////////////////////// -TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(defaultValues)) +TEST(WindowConfigTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(defaultValues)) { gz::common::Console::SetVerbosity(4); @@ -240,7 +240,7 @@ TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(defaultValues)) } ///////////////////////////////////////////////// -TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(mergeFromXML)) +TEST(WindowConfigTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(mergeFromXML)) { gz::common::Console::SetVerbosity(4); @@ -278,7 +278,7 @@ TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(mergeFromXML)) } ///////////////////////////////////////////////// -TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(MenusToString)) +TEST(WindowConfigTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(MenusToString)) { gz::common::Console::SetVerbosity(4); @@ -308,7 +308,7 @@ TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(MenusToString)) } ///////////////////////////////////////////////// -TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(IgnoreToString)) +TEST(WindowConfigTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(IgnoreToString)) { gz::common::Console::SetVerbosity(4); @@ -335,7 +335,7 @@ TEST(WindowConfigTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(IgnoreToString)) ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(CloseWithoutSavingChanges)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(CloseWithoutSavingChanges)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -383,7 +383,7 @@ TEST(MainWindowTest, ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DefaultExitActionAutoShutdown)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DefaultExitActionAutoShutdown)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -415,7 +415,7 @@ TEST(MainWindowTest, ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitActionCustomShutdownService)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitActionCustomShutdownService)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -460,7 +460,7 @@ TEST(MainWindowTest, ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DefaultExitActionAutoCloseGui)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DefaultExitActionAutoCloseGui)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -562,7 +562,7 @@ void FindExitDialogButtons( ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogShutdownButton)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogShutdownButton)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -622,7 +622,7 @@ TEST(MainWindowTest, ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogDefaultButtons)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogDefaultButtons)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -670,7 +670,7 @@ TEST(MainWindowTest, ///////////////////////////////////////////////// TEST(MainWindowTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogButtonsText)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ExitDialogButtonsText)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); @@ -711,7 +711,7 @@ TEST(MainWindowTest, } ///////////////////////////////////////////////// -TEST(MainWindowTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ApplyConfig)) +TEST(MainWindowTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ApplyConfig)) { gz::common::Console::SetVerbosity(4); Application app(g_argc, g_argv); diff --git a/src/PlottingInterface_TEST.cc b/src/PlottingInterface_TEST.cc index fa1309e6b..21602c80c 100644 --- a/src/PlottingInterface_TEST.cc +++ b/src/PlottingInterface_TEST.cc @@ -37,7 +37,7 @@ using namespace gui; ////////////////////////////////////////////////// // Disable test on windows until we fix "LNK2001 unresolved external symbol" // error -TEST(PlottingInterfaceTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Topic)) +TEST(PlottingInterfaceTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(Topic)) { common::Console::SetVerbosity(4); @@ -115,7 +115,7 @@ TEST(PlottingInterfaceTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Topic)) ////////////////////////////////////////////////// // Disable test on windows until we fix "LNK2001 unresolved external symbol" // error -TEST(PlottingInterfaceTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(HeaderTime)) +TEST(PlottingInterfaceTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(HeaderTime)) { common::Console::SetVerbosity(4); @@ -162,7 +162,7 @@ TEST(PlottingInterfaceTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(HeaderTime)) ////////////////////////////////////////////////// // Disable test on windows until we fix "LNK2001 unresolved external symbol" // error -TEST(PlottingInterfaceTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Transport)) +TEST(PlottingInterfaceTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(Transport)) { // =========== Publish Test ================= transport::Node node; diff --git a/src/Plugin_TEST.cc b/src/Plugin_TEST.cc index 1a069cb39..dda8819c1 100644 --- a/src/Plugin_TEST.cc +++ b/src/Plugin_TEST.cc @@ -35,7 +35,7 @@ using namespace gz; using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(PluginTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DeleteLater)) +TEST(PluginTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DeleteLater)) { gz::common::Console::SetVerbosity(4); @@ -74,7 +74,7 @@ TEST(PluginTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(DeleteLater)) } ///////////////////////////////////////////////// -TEST(PluginTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(InvalidXmlText)) +TEST(PluginTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(InvalidXmlText)) { gz::common::Console::SetVerbosity(4); @@ -104,7 +104,7 @@ TEST(PluginTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(InvalidXmlText)) } ///////////////////////////////////////////////// -TEST(PluginTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Getters)) +TEST(PluginTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Getters)) { gz::common::Console::SetVerbosity(4); diff --git a/src/ign.cc b/src/ign.cc index 4b2e110f9..4f2ef374c 100644 --- a/src/ign.cc +++ b/src/ign.cc @@ -37,11 +37,11 @@ char* g_argv[] = void startConsoleLog() { std::string home; - gz::common::env(IGN_HOMEDIR, home); + gz::common::env(GZ_HOMEDIR, home); std::string logPathMod = gz::common::joinPaths(home, ".ignition", "gui", "log", - gz::common::timeToIso(IGN_SYSTEM_TIME())); + gz::common::timeToIso(GZ_SYSTEM_TIME())); gzLogInit(logPathMod, "console.log"); } diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc index 5ba2f3a0f..ad5d7a208 100644 --- a/src/ign_TEST.cc +++ b/src/ign_TEST.cc @@ -62,15 +62,15 @@ class CmdLine : public ::testing::Test protected: void SetUp() override { // Change environment variable so that test files aren't written to $HOME - common::env(IGN_HOMEDIR, this->realHome); - EXPECT_TRUE(common::setenv(IGN_HOMEDIR, this->kFakeHome.c_str())); + common::env(GZ_HOMEDIR, this->realHome); + EXPECT_TRUE(common::setenv(GZ_HOMEDIR, this->kFakeHome.c_str())); } // Documentation inherited protected: void TearDown() override { // Restore $HOME - EXPECT_TRUE(common::setenv(IGN_HOMEDIR, this->realHome.c_str())); + EXPECT_TRUE(common::setenv(GZ_HOMEDIR, this->realHome.c_str())); } /// \brief Directory to act as $HOME for tests @@ -82,7 +82,7 @@ class CmdLine : public ::testing::Test }; // See https://github.com/gazebosim/gz-gui/issues/75 -TEST_F(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(list)) +TEST_F(CmdLine, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(list)) { // Clear home if it exists common::removeAll(this->kFakeHome); diff --git a/src/plugins/camera_tracking/CameraTracking.cc b/src/plugins/camera_tracking/CameraTracking.cc index f24db0586..492c16869 100644 --- a/src/plugins/camera_tracking/CameraTracking.cc +++ b/src/plugins/camera_tracking/CameraTracking.cc @@ -321,7 +321,7 @@ void CameraTrackingPrivate::OnRender() // Move To { - IGN_PROFILE("CameraTrackingPrivate::OnRender MoveTo"); + GZ_PROFILE("CameraTrackingPrivate::OnRender MoveTo"); if (!this->moveToTarget.empty()) { if (this->moveToHelper.Idle()) @@ -353,7 +353,7 @@ void CameraTrackingPrivate::OnRender() // Move to pose { - IGN_PROFILE("CameraTrackingPrivate::OnRender MoveToPose"); + GZ_PROFILE("CameraTrackingPrivate::OnRender MoveToPose"); if (this->moveToPoseValue) { if (this->moveToHelper.Idle()) @@ -375,7 +375,7 @@ void CameraTrackingPrivate::OnRender() // Follow { - IGN_PROFILE("CameraTrackingPrivate::OnRender Follow"); + GZ_PROFILE("CameraTrackingPrivate::OnRender Follow"); // reset follow mode if target node got removed if (!this->followTarget.empty()) { @@ -505,5 +505,5 @@ bool CameraTracking::eventFilter(QObject *_obj, QEvent *_event) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::CameraTracking, +GZ_ADD_PLUGIN(gz::gui::plugins::CameraTracking, gz::gui::Plugin) diff --git a/src/plugins/grid_config/GridConfig.cc b/src/plugins/grid_config/GridConfig.cc index 5ed9b5e74..0f6a833b5 100644 --- a/src/plugins/grid_config/GridConfig.cc +++ b/src/plugins/grid_config/GridConfig.cc @@ -409,5 +409,5 @@ void GridConfig::RefreshList() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::GridConfig, +GZ_ADD_PLUGIN(gz::gui::GridConfig, gz::gui::Plugin) diff --git a/src/plugins/image_display/ImageDisplay.cc b/src/plugins/image_display/ImageDisplay.cc index 7f8b401d6..28306d851 100644 --- a/src/plugins/image_display/ImageDisplay.cc +++ b/src/plugins/image_display/ImageDisplay.cc @@ -297,5 +297,5 @@ void ImageDisplay::SetTopicList(const QStringList &_topicList) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::ImageDisplay, +GZ_ADD_PLUGIN(gz::gui::plugins::ImageDisplay, gz::gui::Plugin) diff --git a/src/plugins/interactive_view_control/InteractiveViewControl.cc b/src/plugins/interactive_view_control/InteractiveViewControl.cc index 7f394f6cd..2f1de67cd 100644 --- a/src/plugins/interactive_view_control/InteractiveViewControl.cc +++ b/src/plugins/interactive_view_control/InteractiveViewControl.cc @@ -335,5 +335,5 @@ bool InteractiveViewControl::eventFilter(QObject *_obj, QEvent *_event) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::InteractiveViewControl, +GZ_ADD_PLUGIN(gz::gui::plugins::InteractiveViewControl, gz::gui::Plugin) diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc index 7e61710b0..3694941fe 100644 --- a/src/plugins/key_publisher/KeyPublisher.cc +++ b/src/plugins/key_publisher/KeyPublisher.cc @@ -96,5 +96,5 @@ bool KeyPublisher::eventFilter(QObject *_obj, QEvent *_event) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::KeyPublisher, +GZ_ADD_PLUGIN(gz::gui::KeyPublisher, gz::gui::Plugin) diff --git a/src/plugins/marker_manager/MarkerManager.cc b/src/plugins/marker_manager/MarkerManager.cc index 26e28f48a..190834db9 100644 --- a/src/plugins/marker_manager/MarkerManager.cc +++ b/src/plugins/marker_manager/MarkerManager.cc @@ -781,5 +781,5 @@ bool MarkerManager::eventFilter(QObject *_obj, QEvent *_event) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::MarkerManager, +GZ_ADD_PLUGIN(gz::gui::plugins::MarkerManager, gz::gui::Plugin) diff --git a/src/plugins/minimal_scene/MinimalScene.cc b/src/plugins/minimal_scene/MinimalScene.cc index 24ea2198a..5924533d5 100644 --- a/src/plugins/minimal_scene/MinimalScene.cc +++ b/src/plugins/minimal_scene/MinimalScene.cc @@ -1395,5 +1395,5 @@ void MinimalScene::SetLoadingError(const QString &_loadingError) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::MinimalScene, +GZ_ADD_PLUGIN(gz::gui::plugins::MinimalScene, gz::gui::Plugin) diff --git a/src/plugins/minimal_scene/MinimalScene.hh b/src/plugins/minimal_scene/MinimalScene.hh index 13b8267f4..3d909c611 100644 --- a/src/plugins/minimal_scene/MinimalScene.hh +++ b/src/plugins/minimal_scene/MinimalScene.hh @@ -117,7 +117,7 @@ namespace plugins /// \internal /// \brief Pointer to private data. - IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr) + GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr) }; class RenderSync; @@ -243,7 +243,7 @@ namespace plugins /// \internal /// \brief Pointer to private data. - IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr) + GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr) }; /// \brief Rendering thread @@ -412,7 +412,7 @@ namespace plugins /// \internal /// \brief Pointer to private data. - IGN_UTILS_UNIQUE_IMPL_PTR(dataPtr) + GZ_UTILS_UNIQUE_IMPL_PTR(dataPtr) }; /// \brief Texture node for displaying the render texture from ign-renderer diff --git a/src/plugins/navsat_map/NavSatMap.cc b/src/plugins/navsat_map/NavSatMap.cc index 75a8c2e0e..6f3f8f558 100644 --- a/src/plugins/navsat_map/NavSatMap.cc +++ b/src/plugins/navsat_map/NavSatMap.cc @@ -187,5 +187,5 @@ void NavSatMap::SetTopicList(const QStringList &_topicList) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::NavSatMap, +GZ_ADD_PLUGIN(gz::gui::plugins::NavSatMap, gz::gui::Plugin) diff --git a/src/plugins/plotting/TransportPlotting.cc b/src/plugins/plotting/TransportPlotting.cc index d28026ec2..0a7785bc1 100644 --- a/src/plugins/plotting/TransportPlotting.cc +++ b/src/plugins/plotting/TransportPlotting.cc @@ -39,6 +39,6 @@ TransportPlotting::TransportPlotting() : Plugin(), } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::TransportPlotting, +GZ_ADD_PLUGIN(gz::gui::plugins::TransportPlotting, gz::gui::Plugin) diff --git a/src/plugins/plotting/TransportPlotting.hh b/src/plugins/plotting/TransportPlotting.hh index dc3b76ff6..ab502cf6c 100644 --- a/src/plugins/plotting/TransportPlotting.hh +++ b/src/plugins/plotting/TransportPlotting.hh @@ -46,9 +46,9 @@ class TransportPlotting : public gz::gui::Plugin public: void LoadConfig(const tinyxml2::XMLElement *) override; /// \brief Interface with the UI to Handle Transport Plotting - IGN_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING + GZ_UTILS_WARN_IGNORE__DLL_INTERFACE_MISSING private: std::unique_ptr dataPtr; - IGN_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING + GZ_UTILS_WARN_RESUME__DLL_INTERFACE_MISSING }; } diff --git a/src/plugins/point_cloud/PointCloud.cc b/src/plugins/point_cloud/PointCloud.cc index ad55d4b24..146ee0cff 100644 --- a/src/plugins/point_cloud/PointCloud.cc +++ b/src/plugins/point_cloud/PointCloud.cc @@ -353,7 +353,7 @@ void PointCloud::OnFloatVService( ////////////////////////////////////////////////// void PointCloudPrivate::PublishMarkers() { - IGN_PROFILE("PointCloud::PublishMarkers"); + GZ_PROFILE("PointCloud::PublishMarkers"); if (!this->showing) return; @@ -511,5 +511,5 @@ void PointCloud::SetPointSize(float _pointSize) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::PointCloud, +GZ_ADD_PLUGIN(gz::gui::plugins::PointCloud, gz::gui::Plugin) diff --git a/src/plugins/point_cloud/PointCloud_TEST.cc b/src/plugins/point_cloud/PointCloud_TEST.cc index abd42799f..b4e884a43 100644 --- a/src/plugins/point_cloud/PointCloud_TEST.cc +++ b/src/plugins/point_cloud/PointCloud_TEST.cc @@ -38,7 +38,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -TEST(PointCloudTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(PointCloud)) +TEST(PointCloudTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(PointCloud)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/publisher/Publisher.cc b/src/plugins/publisher/Publisher.cc index d95d9b8eb..2de7ecb98 100644 --- a/src/plugins/publisher/Publisher.cc +++ b/src/plugins/publisher/Publisher.cc @@ -214,5 +214,5 @@ void Publisher::SetFrequency(const double _frequency) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::Publisher, +GZ_ADD_PLUGIN(gz::gui::plugins::Publisher, gz::gui::Plugin) diff --git a/src/plugins/publisher/Publisher_TEST.cc b/src/plugins/publisher/Publisher_TEST.cc index cd7e61e5c..526be6e42 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -44,7 +44,7 @@ using namespace gui; ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(PublisherTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -69,7 +69,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) +TEST(PublisherTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) { common::Console::SetVerbosity(4); @@ -209,7 +209,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Publish)) } ////////////////////////////////////////////////// -TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) +TEST(PublisherTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/scene3d/Scene3D.cc b/src/plugins/scene3d/Scene3D.cc index 574bced9d..eead88cf5 100644 --- a/src/plugins/scene3d/Scene3D.cc +++ b/src/plugins/scene3d/Scene3D.cc @@ -1823,5 +1823,5 @@ void Scene3D::SetLoadingError(const QString &_loadingError) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::Scene3D, +GZ_ADD_PLUGIN(gz::gui::plugins::Scene3D, gz::gui::Plugin) diff --git a/src/plugins/screenshot/Screenshot.cc b/src/plugins/screenshot/Screenshot.cc index a5ed1eee7..37b05dbf9 100644 --- a/src/plugins/screenshot/Screenshot.cc +++ b/src/plugins/screenshot/Screenshot.cc @@ -80,7 +80,7 @@ Screenshot::Screenshot() dataPtr(std::make_unique()) { std::string home; - common::env(IGN_HOMEDIR, home); + common::env(GZ_HOMEDIR, home); // default directory this->dataPtr->directory = @@ -236,5 +236,5 @@ void Screenshot::SetSavedScreenshotPath(const QString &_filename) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::Screenshot, +GZ_ADD_PLUGIN(gz::gui::plugins::Screenshot, gz::gui::Plugin) diff --git a/src/plugins/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc index c6e155226..f4ab257fa 100644 --- a/src/plugins/screenshot/Screenshot_TEST.cc +++ b/src/plugins/screenshot/Screenshot_TEST.cc @@ -49,7 +49,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -TEST(ScreenshotTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(Screenshot)) +TEST(ScreenshotTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(Screenshot)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/shutdown_button/ShutdownButton.cc b/src/plugins/shutdown_button/ShutdownButton.cc index 7d8958333..33cdf6872 100644 --- a/src/plugins/shutdown_button/ShutdownButton.cc +++ b/src/plugins/shutdown_button/ShutdownButton.cc @@ -49,5 +49,5 @@ void ShutdownButton::OnStop() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::ShutdownButton, +GZ_ADD_PLUGIN(gz::gui::plugins::ShutdownButton, gz::gui::Plugin) diff --git a/src/plugins/shutdown_button/ShutdownButton_TEST.cc b/src/plugins/shutdown_button/ShutdownButton_TEST.cc index caf458dcd..56aec5171 100644 --- a/src/plugins/shutdown_button/ShutdownButton_TEST.cc +++ b/src/plugins/shutdown_button/ShutdownButton_TEST.cc @@ -38,7 +38,7 @@ using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// -TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(ShutdownButtonTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -63,7 +63,7 @@ TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ShutdownButton)) +TEST(ShutdownButtonTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ShutdownButton)) { common::Console::SetVerbosity(4); @@ -110,7 +110,7 @@ TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ShutdownButton)) } ///////////////////////////////////////////////// -TEST(ShutdownButtonTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ShutdownGuiOnly)) +TEST(ShutdownButtonTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ShutdownGuiOnly)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/tape_measure/TapeMeasure.cc b/src/plugins/tape_measure/TapeMeasure.cc index 256b9272f..7528b991f 100644 --- a/src/plugins/tape_measure/TapeMeasure.cc +++ b/src/plugins/tape_measure/TapeMeasure.cc @@ -328,5 +328,5 @@ bool TapeMeasure::eventFilter(QObject *_obj, QEvent *_event) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::TapeMeasure, +GZ_ADD_PLUGIN(gz::gui::TapeMeasure, gz::gui::Plugin) diff --git a/src/plugins/teleop/Teleop.cc b/src/plugins/teleop/Teleop.cc index 8a4b8036c..e23426492 100644 --- a/src/plugins/teleop/Teleop.cc +++ b/src/plugins/teleop/Teleop.cc @@ -281,5 +281,5 @@ void Teleop::setAngularDirection(int _angularDir) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::Teleop, +GZ_ADD_PLUGIN(gz::gui::plugins::Teleop, gz::gui::Plugin) diff --git a/src/plugins/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc index d96b6beab..29026f510 100644 --- a/src/plugins/teleop/Teleop_TEST.cc +++ b/src/plugins/teleop/Teleop_TEST.cc @@ -129,7 +129,7 @@ class TeleopTest : public ::testing::Test }; ///////////////////////////////////////////////// -TEST_F(TeleopTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ButtonCommand)) +TEST_F(TeleopTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(ButtonCommand)) { // Forward movement. plugin->setLinearDirection(1); @@ -218,7 +218,7 @@ TEST_F(TeleopTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(ButtonCommand)) } ///////////////////////////////////////////////// -TEST_F(TeleopTest, IGN_UTILS_TEST_DISABLED_ON_WIN32(KeyboardCommand)) +TEST_F(TeleopTest, GZ_UTILS_TEST_DISABLED_ON_WIN32(KeyboardCommand)) { // Generates a key press event on the main window. QKeyEvent *keypress_W = new QKeyEvent(QKeyEvent::KeyPress, diff --git a/src/plugins/topic_echo/TopicEcho.cc b/src/plugins/topic_echo/TopicEcho.cc index 30e73bb65..dfc2020dc 100644 --- a/src/plugins/topic_echo/TopicEcho.cc +++ b/src/plugins/topic_echo/TopicEcho.cc @@ -178,6 +178,6 @@ void TopicEcho::SetPaused(const bool &_paused) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::TopicEcho, +GZ_ADD_PLUGIN(gz::gui::plugins::TopicEcho, gz::gui::Plugin) diff --git a/src/plugins/topic_viewer/TopicViewer.cc b/src/plugins/topic_viewer/TopicViewer.cc index 0752b3021..23ab375d5 100644 --- a/src/plugins/topic_viewer/TopicViewer.cc +++ b/src/plugins/topic_viewer/TopicViewer.cc @@ -425,5 +425,5 @@ void TopicViewer::UpdateModel() // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::TopicViewer, +GZ_ADD_PLUGIN(gz::gui::plugins::TopicViewer, gz::gui::Plugin) diff --git a/src/plugins/topic_viewer/TopicViewer_TEST.cc b/src/plugins/topic_viewer/TopicViewer_TEST.cc index b0d00994c..27459b158 100644 --- a/src/plugins/topic_viewer/TopicViewer_TEST.cc +++ b/src/plugins/topic_viewer/TopicViewer_TEST.cc @@ -45,7 +45,7 @@ using namespace plugins; ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(TopicViewerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -71,7 +71,7 @@ TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) ///////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST(TopicViewerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) +TEST(TopicViewerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Model)) { setenv("GZ_PARTITION", "ign-gazebo-test", 1); diff --git a/src/plugins/transport_scene_manager/TransportSceneManager.cc b/src/plugins/transport_scene_manager/TransportSceneManager.cc index a9322a46d..1f5f6537b 100644 --- a/src/plugins/transport_scene_manager/TransportSceneManager.cc +++ b/src/plugins/transport_scene_manager/TransportSceneManager.cc @@ -875,5 +875,5 @@ void TransportSceneManagerPrivate::DeleteEntity(const unsigned int _entity) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::TransportSceneManager, +GZ_ADD_PLUGIN(gz::gui::plugins::TransportSceneManager, gz::gui::Plugin) diff --git a/src/plugins/world_control/WorldControl.cc b/src/plugins/world_control/WorldControl.cc index fea859288..4b0298eb4 100644 --- a/src/plugins/world_control/WorldControl.cc +++ b/src/plugins/world_control/WorldControl.cc @@ -339,5 +339,5 @@ void WorldControlPrivate::SendEventMsg(const gz::msgs::WorldControl &_msg) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::WorldControl, +GZ_ADD_PLUGIN(gz::gui::plugins::WorldControl, gz::gui::Plugin) diff --git a/src/plugins/world_control/WorldControl_TEST.cc b/src/plugins/world_control/WorldControl_TEST.cc index 9497fa90a..288995440 100644 --- a/src/plugins/world_control/WorldControl_TEST.cc +++ b/src/plugins/world_control/WorldControl_TEST.cc @@ -39,7 +39,7 @@ using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// -TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(WorldControlTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -72,7 +72,7 @@ TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldControl)) +TEST(WorldControlTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldControl)) { common::Console::SetVerbosity(4); @@ -141,7 +141,7 @@ TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldControl)) } ///////////////////////////////////////////////// -TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoService)) +TEST(WorldControlTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoService)) { common::Console::SetVerbosity(4); @@ -194,7 +194,7 @@ TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoService)) ///////////////////////////////////////////////// TEST(WorldControlTest, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameBadService)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameBadService)) { common::Console::SetVerbosity(4); @@ -249,7 +249,7 @@ TEST(WorldControlTest, } ///////////////////////////////////////////////// -TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoProp)) +TEST(WorldControlTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoProp)) { common::Console::SetVerbosity(4); @@ -300,7 +300,7 @@ TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoProp)) } ///////////////////////////////////////////////// -TEST(WorldControlTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldControlEvent)) +TEST(WorldControlTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldControlEvent)) { common::Console::SetVerbosity(4); diff --git a/src/plugins/world_stats/WorldStats.cc b/src/plugins/world_stats/WorldStats.cc index a80b5f4a7..cc2327434 100644 --- a/src/plugins/world_stats/WorldStats.cc +++ b/src/plugins/world_stats/WorldStats.cc @@ -296,5 +296,5 @@ void WorldStats::SetIterations(const QString &_iterations) } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::plugins::WorldStats, +GZ_ADD_PLUGIN(gz::gui::plugins::WorldStats, gz::gui::Plugin) diff --git a/src/plugins/world_stats/WorldStats_TEST.cc b/src/plugins/world_stats/WorldStats_TEST.cc index c2477a598..503243600 100644 --- a/src/plugins/world_stats/WorldStats_TEST.cc +++ b/src/plugins/world_stats/WorldStats_TEST.cc @@ -38,7 +38,7 @@ using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// -TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(WorldStatsTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -76,7 +76,7 @@ TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldStats)) +TEST(WorldStatsTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldStats)) { common::Console::SetVerbosity(4); @@ -188,7 +188,7 @@ TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldStats)) } ///////////////////////////////////////////////// -TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoTopic)) +TEST(WorldStatsTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoTopic)) { common::Console::SetVerbosity(4); @@ -248,7 +248,7 @@ TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoTopic)) } ///////////////////////////////////////////////// -TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameBadTopic)) +TEST(WorldStatsTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameBadTopic)) { common::Console::SetVerbosity(4); @@ -309,7 +309,7 @@ TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameBadTopic)) } ///////////////////////////////////////////////// -TEST(WorldStatsTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoProp)) +TEST(WorldStatsTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldNameNoProp)) { common::Console::SetVerbosity(4); diff --git a/test/integration/ExamplesBuild_TEST.cc b/test/integration/ExamplesBuild_TEST.cc index 594bc4a91..2bbe1e3ca 100644 --- a/test/integration/ExamplesBuild_TEST.cc +++ b/test/integration/ExamplesBuild_TEST.cc @@ -168,7 +168,7 @@ void ExamplesBuild::Build(const std::string &_type) ////////////////////////////////////////////////// // See https://github.com/gazebosim/gz-gui/issues/75 -TEST_P(ExamplesBuild, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Build)) +TEST_P(ExamplesBuild, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Build)) { Build(GetParam()); } diff --git a/test/integration/Examples_TEST.cc b/test/integration/Examples_TEST.cc index 92649a161..509abc391 100644 --- a/test/integration/Examples_TEST.cc +++ b/test/integration/Examples_TEST.cc @@ -35,7 +35,7 @@ using namespace gui; // See https://github.com/gazebosim/gz-gui/issues/75 ///////////////////////////////////////////////// -TEST(ExampleTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Configs)) +TEST(ExampleTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Configs)) { common::Console::SetVerbosity(4); auto exampleConfigPath = common::joinPaths(std::string(PROJECT_SOURCE_PATH), diff --git a/test/integration/camera_tracking.cc b/test/integration/camera_tracking.cc index 1a932f876..c774f384c 100644 --- a/test/integration/camera_tracking.cc +++ b/test/integration/camera_tracking.cc @@ -52,7 +52,7 @@ using namespace gui; using namespace std::chrono_literals; ///////////////////////////////////////////////// -TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) +TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) { common::Console::SetVerbosity(4); diff --git a/test/integration/marker_manager.cc b/test/integration/marker_manager.cc index c5deb3627..2a697b3f3 100644 --- a/test/integration/marker_manager.cc +++ b/test/integration/marker_manager.cc @@ -101,7 +101,7 @@ class MarkerManagerTestFixture : public ::testing::Test ///////////////////////////////////////////////// TEST_F(MarkerManagerTestFixture, - IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(MarkerManager)) + GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(MarkerManager)) { common::Console::SetVerbosity(4); diff --git a/test/integration/minimal_scene.cc b/test/integration/minimal_scene.cc index 46037df50..760ca2758 100644 --- a/test/integration/minimal_scene.cc +++ b/test/integration/minimal_scene.cc @@ -43,7 +43,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -70,7 +70,7 @@ TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(MinimalSceneTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) +TEST(MinimalSceneTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) { common::Console::SetVerbosity(4); diff --git a/test/integration/scene3d.cc b/test/integration/scene3d.cc index c97dc67f8..40fbc481a 100644 --- a/test/integration/scene3d.cc +++ b/test/integration/scene3d.cc @@ -43,7 +43,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -TEST(Scene3DTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(Scene3DTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -69,7 +69,7 @@ TEST(Scene3DTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(Scene3DTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) +TEST(Scene3DTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) { common::Console::SetVerbosity(4); @@ -142,7 +142,7 @@ TEST(Scene3DTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) } ///////////////////////////////////////////////// -TEST(Scene3DTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Events)) +TEST(Scene3DTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Events)) { common::Console::SetVerbosity(4); diff --git a/test/integration/transport_scene_manager.cc b/test/integration/transport_scene_manager.cc index 60bb59283..eee90ed26 100644 --- a/test/integration/transport_scene_manager.cc +++ b/test/integration/transport_scene_manager.cc @@ -46,7 +46,7 @@ using namespace gz; using namespace gui; ///////////////////////////////////////////////// -TEST(TransportSceneManagerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) +TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) { common::Console::SetVerbosity(4); @@ -80,7 +80,7 @@ TEST(TransportSceneManagerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Load)) } ///////////////////////////////////////////////// -TEST(TransportSceneManagerTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) +TEST(TransportSceneManagerTest, GZ_UTILS_TEST_ENABLED_ONLY_ON_LINUX(Config)) { bool sceneRequested{false}; std::function sceneService = diff --git a/test/plugins/TestBadInheritancePlugin.cc b/test/plugins/TestBadInheritancePlugin.cc index d618ce170..274d7e602 100644 --- a/test/plugins/TestBadInheritancePlugin.cc +++ b/test/plugins/TestBadInheritancePlugin.cc @@ -35,5 +35,5 @@ TestBadInheritancePlugin::~TestBadInheritancePlugin() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::TestBadInheritancePlugin, +GZ_ADD_PLUGIN(gz::gui::TestBadInheritancePlugin, gz::gui::MainWindow) diff --git a/test/plugins/TestInvalidQmlPlugin.cc b/test/plugins/TestInvalidQmlPlugin.cc index f34f68716..7347e2847 100644 --- a/test/plugins/TestInvalidQmlPlugin.cc +++ b/test/plugins/TestInvalidQmlPlugin.cc @@ -34,5 +34,5 @@ TestInvalidQmlPlugin::~TestInvalidQmlPlugin() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::TestInvalidQmlPlugin, +GZ_ADD_PLUGIN(gz::gui::TestInvalidQmlPlugin, gz::gui::Plugin) diff --git a/test/plugins/TestPlugin.cc b/test/plugins/TestPlugin.cc index 6845fcc70..2feec319f 100644 --- a/test/plugins/TestPlugin.cc +++ b/test/plugins/TestPlugin.cc @@ -35,5 +35,5 @@ TestPlugin::~TestPlugin() } // Register this plugin -IGNITION_ADD_PLUGIN(gz::gui::TestPlugin, +GZ_ADD_PLUGIN(gz::gui::TestPlugin, gz::gui::Plugin)