Skip to content

Commit

Permalink
Migrate upstream macros
Browse files Browse the repository at this point in the history 
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
@methylDragon
methylDragon committed Jun 7, 2022
1 parent c76518a commit 671e746
Show file tree
Hide file tree
Showing 55 changed files with 135 additions and 135 deletions.
2 changes: 1 addition & 1 deletion examples/plugin/custom_context_menu/CustomContext.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ CustomContext::~CustomContext()
}

// Register this plugin
IGNITION_ADD_PLUGIN(gz::gui::CustomContext,
GZ_ADD_PLUGIN(gz::gui::CustomContext,
gz::gui::Plugin);
2 changes: 1 addition & 1 deletion examples/plugin/dialog_from_plugin/DialogFromPlugin.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@ DialogFromPlugin::~DialogFromPlugin()
}

// Register this plugin
IGNITION_ADD_PLUGIN(gz::gui::DialogFromPlugin,
GZ_ADD_PLUGIN(gz::gui::DialogFromPlugin,
gz::gui::Plugin);
2 changes: 1 addition & 1 deletion examples/plugin/gz_components/GzComponents.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion examples/plugin/hello_plugin/HelloPlugin.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
2 changes: 1 addition & 1 deletion examples/plugin/multiple_qml/MultipleQml.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
40 changes: 20 additions & 20 deletions include/gz/gui/GuiEvents.hh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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.
Expand All @@ -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
Expand All @@ -484,7 +484,7 @@ namespace gz

/// \internal
/// \brief Private data pointer
IGN_UTILS_IMPL_PTR(dataPtr)
GZ_UTILS_IMPL_PTR(dataPtr)
};
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/Application.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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");

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -730,7 +730,7 @@ std::vector<std::pair<std::string, std::vector<std::string>>>

// 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
Expand Down
14 changes: 7 additions & 7 deletions src/Application_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand All @@ -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);

Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions src/Helpers_TEST.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down Expand Up @@ -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());
Expand Down Expand Up @@ -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());
Expand Down
Loading

0 comments on commit 671e746

Please sign in to comment.