Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ign -> gz Header Migration : gz-gui #395

Merged
merged 4 commits into from
May 14, 2022
Merged

ign -> gz Header Migration : gz-gui #395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
642813f
Move header files with git mv (#395)
methylDragon May 6, 2022
d2caef8
Create redirection aliases (#395)
methylDragon May 6, 2022
d9f235f
Migrate sources in src, test, examples, and include (#395)
methylDragon May 6, 2022
589074b
Migrate CMake files (#395)
methylDragon May 6, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,9 @@ find_package(ignition-cmake3 REQUIRED)
#============================================================================
# Configure the project
#============================================================================
ign_configure_project(VERSION_SUFFIX pre1)
ign_configure_project(
REPLACE_IGNITION_INCLUDE_PATH gz/gui
VERSION_SUFFIX pre1)

#============================================================================
# Set project-specific options
Expand Down
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,5 @@ if (DOXYGEN_FOUND)
COMMENT "Generating API documentation with Doxygen" VERBATIM)

install(FILES ${CMAKE_BINARY_DIR}/doc/${PROJECT_NAME_LOWER}.tag.xml
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/ignition/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gz/${PROJECT_NAME_LOWER}_${PROJECT_VERSION_MINOR})
endif()
2 changes: 1 addition & 1 deletion examples/plugin/custom_context_menu/CustomContext.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <iostream>
#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "CustomContext.hh"

Expand Down
8 changes: 4 additions & 4 deletions examples/plugin/custom_context_menu/CustomContext.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_
#define IGNITION_GUI_CUSTOMCONTEXTPLUGIN_HH_
#ifndef GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_
#define GZ_GUI_CUSTOMCONTEXTPLUGIN_HH_

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <ignition/gui/Plugin.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Plugin.hh>
#endif

namespace ignition
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/dialog_from_plugin/DialogFromPlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <iostream>
#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "DialogFromPlugin.hh"

Expand Down
8 changes: 4 additions & 4 deletions examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_GUI_DIALOGFROMPLUGIN_HH_
#define IGNITION_GUI_DIALOGFROMPLUGIN_HH_
#ifndef GZ_GUI_DIALOGFROMPLUGIN_HH_
#define GZ_GUI_DIALOGFROMPLUGIN_HH_

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <ignition/gui/Plugin.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Plugin.hh>
#endif

namespace ignition
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/hello_plugin/HelloPlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <iostream>
#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "HelloPlugin.hh"

Expand Down
8 changes: 4 additions & 4 deletions examples/plugin/hello_plugin/HelloPlugin.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
*/

#ifndef IGNITION_GUI_HELLOPLUGIN_HH_
#define IGNITION_GUI_HELLOPLUGIN_HH_
#ifndef GZ_GUI_HELLOPLUGIN_HH_
#define GZ_GUI_HELLOPLUGIN_HH_

#include <string>

#include <ignition/gui/qt.h>
#include <ignition/gui/Plugin.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Plugin.hh>

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/ign_components/IgnComponents.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*
*/

#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>
#include "IgnComponents.hh"

// Register this plugin
Expand Down
6 changes: 3 additions & 3 deletions examples/plugin/ign_components/IgnComponents.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*
*/

#ifndef IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
#define IGNITION_GUI_EXAMPLES_PLUGIN_IGNCOMPONENTS_HH_
#ifndef GZ_GUI_EXAMPLES_PLUGIN_GZCOMPONENTS_HH_
#define GZ_GUI_EXAMPLES_PLUGIN_GZCOMPONENTS_HH_

#include <ignition/gui/Plugin.hh>
#include <gz/gui/Plugin.hh>

namespace ignition
{
Expand Down
2 changes: 1 addition & 1 deletion examples/plugin/multiple_qml/MultipleQml.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

#include <iostream>
#include <ignition/plugin/Register.hh>
#include <gz/plugin/Register.hh>

#include "MultipleQml.hh"

Expand Down
8 changes: 4 additions & 4 deletions examples/plugin/multiple_qml/MultipleQml.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#ifndef IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
#define IGNITION_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
#ifndef GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_
#define GZ_GUI_EXAMPLES_PLUGINS_MULTIPLEQML_HH_

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <ignition/gui/Plugin.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Plugin.hh>
#endif

namespace ignition
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/custom_drawer/custom_drawer.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@
*
*/

#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>

#ifndef Q_MOC_RUN
#include <ignition/gui/Application.hh>
#include <ignition/gui/MainWindow.hh>
#include <ignition/gui/qt.h>
#include <gz/gui/Application.hh>
#include <gz/gui/MainWindow.hh>
#include <gz/gui/qt.h>
#include "custom_drawer.hh"
#endif

Expand Down
6 changes: 3 additions & 3 deletions examples/standalone/custom_drawer/custom_drawer.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
*
*/

#ifndef IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
#define IGNITION_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
#ifndef GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_
#define GZ_GUI_EXAMPLES_STANDALONE_CUSTOMDRAWER_HH_

#include <iostream>

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <gz/gui/qt.h>
#endif

namespace ignition
Expand Down
8 changes: 4 additions & 4 deletions examples/standalone/dialogs/dialogs.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@

#include <iostream>

#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <ignition/gui/Application.hh>
#include <ignition/gui/Dialog.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Application.hh>
#include <gz/gui/Dialog.hh>
#endif

//////////////////////////////////////////////////
Expand Down
6 changes: 3 additions & 3 deletions examples/standalone/marker/marker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
*
*/

#include <ignition/transport.hh>
#include <ignition/math.hh>
#include <ignition/msgs.hh>
#include <gz/transport.hh>
#include <gz/math.hh>
#include <gz/msgs.hh>

#include <iostream>

Expand Down
6 changes: 3 additions & 3 deletions examples/standalone/point_cloud/point_cloud.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@
*
*/

#include <ignition/msgs/float_v.pb.h>
#include <ignition/msgs/pointcloud_packed.pb.h>
#include <gz/msgs/float_v.pb.h>
#include <gz/msgs/pointcloud_packed.pb.h>

#include <ignition/transport/Node.hh>
#include <gz/transport/Node.hh>

#include <atomic>
#include <chrono>
Expand Down
12 changes: 6 additions & 6 deletions examples/standalone/scene_provider/scene_provider.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@
#include <chrono>
#include <iostream>
#include <string>
#include <ignition/math/Rand.hh>
#include <ignition/msgs/pose_v.pb.h>
#include <ignition/msgs/scene.pb.h>
#include <ignition/msgs/scene.pb.h>
#include <ignition/msgs/world_stats.pb.h>
#include <ignition/transport/Node.hh>
#include <gz/math/Rand.hh>
#include <gz/msgs/pose_v.pb.h>
#include <gz/msgs/scene.pb.h>
#include <gz/msgs/scene.pb.h>
#include <gz/msgs/world_stats.pb.h>
#include <gz/transport/Node.hh>

using namespace std::chrono_literals;

Expand Down
6 changes: 3 additions & 3 deletions examples/standalone/window/window.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <iostream>

#ifndef Q_MOC_RUN
#include <ignition/gui/qt.h>
#include <ignition/gui/Application.hh>
#include <ignition/gui/MainWindow.hh>
#include <gz/gui/qt.h>
#include <gz/gui/Application.hh>
#include <gz/gui/MainWindow.hh>
#endif

//////////////////////////////////////////////////
Expand Down
3 changes: 2 additions & 1 deletion include/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
add_subdirectory(ignition)
add_subdirectory(gz)
install(DIRECTORY ignition DESTINATION ${IGN_INCLUDE_INSTALL_DIR_FULL})
0 include/ignition/CMakeLists.txt → include/gz/CMakeLists.txt
View file
Open in desktop
File renamed without changes.
Loading