From d7e8f758e84c7106fdeb4504952556e0ddf4ec79 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Fri, 26 Aug 2022 13:17:01 -0700 Subject: [PATCH] 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 | 4 ++-- 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 | 7 +++---- src/Application.cc | 2 +- src/Dialog.cc | 2 +- src/MainWindow.cc | 6 +++--- src/MainWindow_TEST.cc | 4 ++-- 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 | 8 ++++---- src/plugins/image_display/ImageDisplay_TEST.cc | 2 +- src/plugins/key_publisher/KeyPublisher.cc | 4 ++-- 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 | 10 +++++----- src/plugins/scene3d/Scene3D.cc | 4 ++-- src/plugins/scene3d/Scene3D.hh | 2 +- src/plugins/screenshot/Screenshot.cc | 2 +- src/plugins/screenshot/Screenshot.hh | 6 +++--- src/plugins/screenshot/Screenshot_TEST.cc | 4 ++-- src/plugins/shutdown_button/ShutdownButton.hh | 2 +- src/plugins/teleop/Teleop.cc | 4 ++-- src/plugins/teleop/Teleop.hh | 2 +- src/plugins/teleop/Teleop_TEST.cc | 2 +- src/plugins/topic_echo/TopicEcho.cc | 2 +- src/plugins/topic_echo/TopicEcho.hh | 2 +- src/plugins/topic_echo/TopicEcho_TEST.cc | 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/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 ++ 59 files changed, 96 insertions(+), 84 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..717c11a87 100644 --- a/include/gz/gui/Conversions.hh +++ b/include/gz/gui/Conversions.hh @@ -21,7 +21,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -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..739980918 100644 --- a/include/ignition/gui/config.hh +++ b/include/ignition/gui/config.hh @@ -36,14 +36,13 @@ // #define IGN_GUI_PLUGIN_INSTALL_DIR GZ_GUI_PLUGIN_INSTALL_DIR -namespace gz +namespace ignition { } -namespace ignition +namespace gz { - using namespace gz; + using namespace ignition; } - #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/MainWindow.cc b/src/MainWindow.cc index 45049d08d..f517de65b 100644 --- a/src/MainWindow.cc +++ b/src/MainWindow.cc @@ -25,11 +25,11 @@ #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 "ignition/msgs/boolean.pb.h" +#include "ignition/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..2caa40e87 100644 --- a/src/MainWindow_TEST.cc +++ b/src/MainWindow_TEST.cc @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include 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..d24e1ad8e 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 @@ -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/image_display/ImageDisplay_TEST.cc b/src/plugins/image_display/ImageDisplay_TEST.cc index 4c3a7bc2d..c0df4674c 100644 --- a/src/plugins/image_display/ImageDisplay_TEST.cc +++ b/src/plugins/image_display/ImageDisplay_TEST.cc @@ -20,7 +20,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif diff --git a/src/plugins/key_publisher/KeyPublisher.cc b/src/plugins/key_publisher/KeyPublisher.cc index bdafd5d67..c8995daea 100644 --- a/src/plugins/key_publisher/KeyPublisher.cc +++ b/src/plugins/key_publisher/KeyPublisher.cc @@ -18,7 +18,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -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..e9fe5eedb 100644 --- a/src/plugins/publisher/Publisher_TEST.cc +++ b/src/plugins/publisher/Publisher_TEST.cc @@ -19,7 +19,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -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..83552232c 100644 --- a/src/plugins/screenshot/Screenshot.hh +++ b/src/plugins/screenshot/Screenshot.hh @@ -20,8 +20,8 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include -#include +#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif @@ -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/screenshot/Screenshot_TEST.cc b/src/plugins/screenshot/Screenshot_TEST.cc index 3918a0803..e2456bb55 100644 --- a/src/plugins/screenshot/Screenshot_TEST.cc +++ b/src/plugins/screenshot/Screenshot_TEST.cc @@ -17,8 +17,8 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include -#include +#include +#include #include #ifdef _MSC_VER #pragma warning(pop) 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..4dcee0a53 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 @@ -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/teleop/Teleop_TEST.cc b/src/plugins/teleop/Teleop_TEST.cc index 0ea98e609..c4ab2e4d9 100644 --- a/src/plugins/teleop/Teleop_TEST.cc +++ b/src/plugins/teleop/Teleop_TEST.cc @@ -19,7 +19,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif 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_echo/TopicEcho_TEST.cc b/src/plugins/topic_echo/TopicEcho_TEST.cc index d848eca92..da573bd3a 100644 --- a/src/plugins/topic_echo/TopicEcho_TEST.cc +++ b/src/plugins/topic_echo/TopicEcho_TEST.cc @@ -21,7 +21,7 @@ #ifdef _MSC_VER #pragma warning(push, 0) #endif -#include +#include #ifdef _MSC_VER #pragma warning(pop) #endif 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/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