Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge d923324 into bdbaaac
Browse files Browse the repository at this point in the history
methylDragon authored May 11, 2022
2 parents bdbaaac + d923324 commit f9a6933
Showing 81 changed files with 7,161 additions and 2,377 deletions.
4 changes: 3 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion doc/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/

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

#include "CustomContext.hh"

8 changes: 4 additions & 4 deletions examples/plugin/custom_context_menu/CustomContext.hh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion examples/plugin/dialog_from_plugin/DialogFromPlugin.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/

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

#include "DialogFromPlugin.hh"

8 changes: 4 additions & 4 deletions examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion examples/plugin/hello_plugin/HelloPlugin.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/

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

#include "HelloPlugin.hh"

8 changes: 4 additions & 4 deletions examples/plugin/hello_plugin/HelloPlugin.hh
Original file line number Diff line number Diff line change
@@ -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
{
2 changes: 1 addition & 1 deletion examples/plugin/ign_components/IgnComponents.cc
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@
*
*/

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

// Register this plugin
6 changes: 3 additions & 3 deletions examples/plugin/ign_components/IgnComponents.hh
Original file line number Diff line number Diff line change
@@ -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
{
2 changes: 1 addition & 1 deletion examples/plugin/multiple_qml/MultipleQml.cc
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@
*/

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

#include "MultipleQml.hh"

8 changes: 4 additions & 4 deletions examples/plugin/multiple_qml/MultipleQml.hh
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions examples/standalone/custom_drawer/custom_drawer.cc
Original file line number Diff line number Diff line change
@@ -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

6 changes: 3 additions & 3 deletions examples/standalone/custom_drawer/custom_drawer.hh
Original file line number Diff line number Diff line change
@@ -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
8 changes: 4 additions & 4 deletions examples/standalone/dialogs/dialogs.cc
Original file line number Diff line number Diff line change
@@ -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

//////////////////////////////////////////////////
6 changes: 3 additions & 3 deletions examples/standalone/marker/marker.cc
Original file line number Diff line number Diff line change
@@ -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>

6 changes: 3 additions & 3 deletions examples/standalone/point_cloud/point_cloud.cc
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 6 additions & 6 deletions examples/standalone/scene_provider/scene_provider.cc
Original file line number Diff line number Diff line change
@@ -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;

6 changes: 3 additions & 3 deletions examples/standalone/window/window.cc
Original file line number Diff line number Diff line change
@@ -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

//////////////////////////////////////////////////
3 changes: 2 additions & 1 deletion include/CMakeLists.txt
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})
File renamed without changes.
Loading

0 comments on commit f9a6933

Please sign in to comment.