Skip to content

Commit

Permalink
Leave ignition as primary in headers to fix ABI
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <methylDragon@gmail.com>
  • Loading branch information
methylDragon committed Sep 5, 2022
1 parent b804f63 commit 516077d
Show file tree
Hide file tree
Showing 58 changed files with 82 additions and 78 deletions.
2 changes: 1 addition & 1 deletion examples/plugin/custom_context_menu/CustomContext.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/gui/Plugin.hh>
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/gui/Plugin.hh>
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/hello_plugin/HelloPlugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/gui/qt.h>
#include <gz/gui/Plugin.hh>

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/ign_components/IgnComponents.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include <gz/gui/Plugin.hh>

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/multiple_qml/MultipleQml.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <gz/gui/Plugin.hh>
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion examples/standalone/custom_drawer/custom_drawer.hh
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#include <gz/gui/qt.h>
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Application.hh
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ namespace tinyxml2
class XMLElement;
}

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Conversions.hh
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
#include "gz/gui/qt.h"
#include "gz/gui/Export.hh"

namespace gz
namespace ignition
{
namespace common
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Dialog.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#pragma warning(disable: 4251)
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/DragDropModel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "gz/gui/Export.hh"
#include "gz/gui/qt.h"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Enums.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

#include "gz/gui/qt.h"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/GuiEvents.hh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#include <vector>
#include <gz/math/Vector3.hh>

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Helpers.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
#include "gz/gui/Enums.hh"
#include "gz/gui/Export.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/MainWindow.hh
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#pragma warning(disable: 4251)
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/Plugin.hh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
#pragma warning(disable: 4251)
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/gui/SearchModel.hh
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#include "gz/gui/Export.hh"
#include "gz/gui/qt.h"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
9 changes: 9 additions & 0 deletions include/gz/gui/config.hh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
2 changes: 2 additions & 0 deletions include/gz/gui/qt.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,5 +41,7 @@
#include <QSGSimpleTextureNode>
#include <QStandardItemModel>

#include <gz/gui/config.hh>


#endif // GZ_GUI_QT_H_
10 changes: 0 additions & 10 deletions include/ignition/gui/config.hh
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,4 @@

// #define IGN_GUI_PLUGIN_INSTALL_DIR GZ_GUI_PLUGIN_INSTALL_DIR

namespace gz
{
}

namespace ignition
{
using namespace gz;
}


#endif
2 changes: 1 addition & 1 deletion src/Application.cc
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

#include "gz/transport/TopicUtils.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion src/Dialog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "gz/gui/Application.hh"
#include "gz/gui/Dialog.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion src/Dialog_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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[] =
{
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow.cc
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
#include "gz/msgs/server_control.pb.h"
#include "gz/transport/Node.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion src/MainWindow_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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[] =
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grid_3d/Grid3D.cc
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

#include "Grid3D.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/grid_3d/Grid3D.hh
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include "gz/gui/Plugin.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
4 changes: 2 additions & 2 deletions src/plugins/image_display/ImageDisplay.cc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include "gz/gui/Application.hh"
#include "gz/gui/MainWindow.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/image_display/ImageDisplay.hh
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@

#include "gz/gui/Plugin.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/key_publisher/KeyPublisher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@

#include "KeyPublisher.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/key_publisher/KeyPublisher.hh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <gz/gui/Plugin.hh>
#include <gz/transport/Node.hh>

namespace gz
namespace ignition
{
namespace gui
{
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/publisher/Publisher.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,7 +29,7 @@

#include "Publisher.hh"

namespace gz
namespace ignition
{
namespace gui
{
Expand All @@ -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\"";
Expand Down
6 changes: 3 additions & 3 deletions src/plugins/publisher/Publisher.hh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
# endif
#endif

namespace gz
namespace ignition
{
namespace gui
{
Expand Down Expand Up @@ -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);

Expand Down
8 changes: 4 additions & 4 deletions src/plugins/publisher/Publisher_TEST.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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\"");
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -221,7 +221,7 @@ TEST(PublisherTest, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ParamsFromSDF))
"<plugin filename=\"Publisher\">"
"<topic>/fruit</topic>"
"<message>number: 1 fruit {name:\"banana\"}</message>"
"<message_type>gz.msgs.Fruits</message_type>"
"<message_type>ignition.msgs.Fruits</message_type>"
"<frequency>0.1</frequency>"
"</plugin>";

Expand All @@ -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\"}");
Expand Down
Loading

0 comments on commit 516077d

Please sign in to comment.