Leave ignition as primary in headers to fix ABI

Signed-off-by: methylDragon <methylDragon@gmail.com>
gazebosim · Aug 26, 2022 · d7e8f75 · d7e8f75
1 parent b804f63
commit d7e8f75
Show file tree

Hide file tree

Showing 59 changed files with 96 additions and 84 deletions.
diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh
@@ -23,7 +23,7 @@
   #include <gz/gui/Plugin.hh>
 #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
@@ -23,7 +23,7 @@
   #include <gz/gui/Plugin.hh>
 #endif
 
-namespace gz
+namespace ignition
 {
   namespace gui
   {

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

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

diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh
@@ -23,7 +23,7 @@
   #include <gz/gui/Plugin.hh>
 #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
@@ -24,7 +24,7 @@
   #include <gz/gui/qt.h>
 #endif
 
-namespace gz
+namespace ignition
 {
   namespace gui
   {

diff --git 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
@@ -21,7 +21,7 @@
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <gz/msgs/time.pb.h>
+#include <ignition/msgs/time.pb.h>
 #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
@@ -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
@@ -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
@@ -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
@@ -23,7 +23,7 @@
 #include <vector>
 #include <gz/math/Vector3.hh>
 
-namespace gz
+namespace ignition
 {
   namespace gui
   {

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -41,5 +41,7 @@
 #include <QSGSimpleTextureNode>
 #include <QStandardItemModel>
 
+#include <gz/gui/config.hh>
+
 
 #endif  // GZ_GUI_QT_H_
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -22,8 +22,8 @@
 #include <QQmlProperty>
 
 #include <gz/common/Console.hh>
-#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>
 #include <gz/utilities/ExtraTestMacros.hh>
 

diff --git 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
@@ -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
@@ -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
@@ -25,7 +25,7 @@
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <gz/msgs/image.pb.h>
+#include <ignition/msgs/image.pb.h>
 #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
@@ -20,7 +20,7 @@
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <gz/msgs/stringmsg.pb.h>
+#include <ignition/msgs/stringmsg.pb.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif

diff --git 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 <gz/msgs/int32.pb.h>
+#include <ignition/msgs/int32.pb.h>
 #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
@@ -25,7 +25,7 @@
 #include <gz/gui/Plugin.hh>
 #include <gz/transport/Node.hh>
 
-namespace gz
+namespace ignition
 {
 namespace gui
 {

diff --git 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 <gz/msgs.hh>
+#include <ignition/msgs.hh>
 #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
@@ -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);