Migrate sources in src, test, examples, and include (#1477)

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 16, 2022 · 1169f7a · 1169f7a
1 parent 146d92f
commit 1169f7a
Show file tree

Hide file tree

Showing 557 changed files with 3,981 additions and 3,981 deletions.
diff --git a/examples/plugin/command_actor/CommandActor.cc b/examples/plugin/command_actor/CommandActor.cc
@@ -16,8 +16,8 @@
  */
 #include "CommandActor.hh"
 
-#include <ignition/gazebo/components/Pose.hh>
-#include <ignition/plugin/Register.hh>
+#include <gz/sim/components/Pose.hh>
+#include <gz/plugin/Register.hh>
 
 IGNITION_ADD_PLUGIN(
     command_actor::CommandActor,

diff --git a/examples/plugin/command_actor/CommandActor.hh b/examples/plugin/command_actor/CommandActor.hh
@@ -18,7 +18,7 @@
 #define SYSTEM_PLUGIN_COMMANDACTOR_HH_
 
 #include <chrono>
-#include <ignition/gazebo/System.hh>
+#include <gz/sim/System.hh>
 
 namespace command_actor
 {

diff --git a/examples/plugin/custom_component/CustomComponentPlugin.cc b/examples/plugin/custom_component/CustomComponentPlugin.cc
@@ -16,7 +16,7 @@
 */
 #include "CustomComponentPlugin.hh"
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 IGNITION_ADD_PLUGIN(examples::CustomComponentPlugin,
     ignition::gazebo::System,

diff --git a/examples/plugin/custom_component/CustomComponentPlugin.hh b/examples/plugin/custom_component/CustomComponentPlugin.hh
@@ -18,13 +18,13 @@
 #define EXAMPLES_PLUGINS_CUSTOMCOMPONENTPLUGIN_HH_
 
 // This header provides components::Component
-#include <ignition/gazebo/components/Component.hh>
+#include <gz/sim/components/Component.hh>
 
 // This header provides the registration macro
-#include <ignition/gazebo/components/Factory.hh>
+#include <gz/sim/components/Factory.hh>
 
-#include <ignition/gazebo/System.hh>
-#include <ignition/gazebo/config.hh>
+#include <gz/sim/System.hh>
+#include <gz/sim/config.hh>
 
 namespace examples
 {

diff --git a/examples/plugin/custom_sensor_system/OdometerSystem.cc b/examples/plugin/custom_sensor_system/OdometerSystem.cc
@@ -15,26 +15,26 @@
  *
  */
 
-#include <ignition/msgs/double.pb.h>
+#include <gz/msgs/double.pb.h>
 
 #include <string>
 #include <unordered_map>
 #include <utility>
 
-#include <ignition/common/Profiler.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/sensors/Noise.hh>
-#include <ignition/sensors/SensorFactory.hh>
+#include <gz/common/Profiler.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/sensors/Noise.hh>
+#include <gz/sensors/SensorFactory.hh>
 
 #include <sdf/Sensor.hh>
 
-#include <ignition/gazebo/components/CustomSensor.hh>
-#include <ignition/gazebo/components/Name.hh>
-#include <ignition/gazebo/components/ParentEntity.hh>
-#include <ignition/gazebo/components/Sensor.hh>
-#include <ignition/gazebo/components/World.hh>
-#include <ignition/gazebo/EntityComponentManager.hh>
-#include <ignition/gazebo/Util.hh>
+#include <gz/sim/components/CustomSensor.hh>
+#include <gz/sim/components/Name.hh>
+#include <gz/sim/components/ParentEntity.hh>
+#include <gz/sim/components/Sensor.hh>
+#include <gz/sim/components/World.hh>
+#include <gz/sim/EntityComponentManager.hh>
+#include <gz/sim/Util.hh>
 
 #include "Odometer.hh"
 #include "OdometerSystem.hh"

diff --git a/examples/plugin/custom_sensor_system/OdometerSystem.hh b/examples/plugin/custom_sensor_system/OdometerSystem.hh
@@ -17,9 +17,9 @@
 #ifndef ODOMETERSYSTEM_HH_
 #define ODOMETERSYSTEM_HH_
 
-#include <ignition/gazebo/System.hh>
-#include <ignition/sensors/Sensor.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/sim/System.hh>
+#include <gz/sensors/Sensor.hh>
+#include <gz/transport/Node.hh>
 
 namespace custom
 {

diff --git a/examples/plugin/gui_system_plugin/GuiSystemPlugin.cc b/examples/plugin/gui_system_plugin/GuiSystemPlugin.cc
@@ -15,11 +15,11 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
-#include <ignition/gazebo/components/Name.hh>
-#include <ignition/gazebo/components/World.hh>
-#include <ignition/gazebo/EntityComponentManager.hh>
-#include <ignition/gazebo/gui/GuiEvents.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/sim/components/Name.hh>
+#include <gz/sim/components/World.hh>
+#include <gz/sim/EntityComponentManager.hh>
+#include <gz/sim/gui/GuiEvents.hh>
 
 #include "GuiSystemPlugin.hh"
 

diff --git a/examples/plugin/gui_system_plugin/GuiSystemPlugin.hh b/examples/plugin/gui_system_plugin/GuiSystemPlugin.hh
@@ -15,10 +15,10 @@
  *
 */
 
-#ifndef IGNITION_GAZEBO_GUISYSTEMPLUGIN_HH_
-#define IGNITION_GAZEBO_GUISYSTEMPLUGIN_HH_
+#ifndef GZ_GAZEBO_GUISYSTEMPLUGIN_HH_
+#define GZ_GAZEBO_GUISYSTEMPLUGIN_HH_
 
-#include <ignition/gazebo/gui/GuiSystem.hh>
+#include <gz/sim/gui/GuiSystem.hh>
 
 /// \brief Example of a GUI plugin that has access to entities and components.
 class GuiSystemPlugin : public ignition::gazebo::GuiSystem

diff --git a/examples/plugin/hello_world/HelloWorld.cc b/examples/plugin/hello_world/HelloWorld.cc
@@ -18,11 +18,11 @@
 // We'll use a string and the ignmsg command below for a brief example.
 // Remove these includes if your plugin doesn't need them.
 #include <string>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 
 // This header is required to register plugins. It's good practice to place it
 // in the cc file, like it's done here.
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 // Don't forget to include the plugin's header.
 #include "HelloWorld.hh"

diff --git a/examples/plugin/hello_world/HelloWorld.hh b/examples/plugin/hello_world/HelloWorld.hh
@@ -20,7 +20,7 @@
 
 // The only required include in the header is this one.
 // All others will depend on what your plugin does.
-#include <ignition/gazebo/System.hh>
+#include <gz/sim/System.hh>
 
 // It's good practice to use a custom namespace for your project.
 namespace hello_world

diff --git a/examples/plugin/rendering_plugins/RenderingGuiPlugin.cc b/examples/plugin/rendering_plugins/RenderingGuiPlugin.cc
@@ -15,16 +15,16 @@
  *
 */
 
-#include <ignition/gui/Application.hh>
+#include <gz/gui/Application.hh>
 //! [includeGuiEvents]
-#include <ignition/gui/GuiEvents.hh>
+#include <gz/gui/GuiEvents.hh>
 //! [includeGuiEvents]
-#include <ignition/gui/MainWindow.hh>
-#include <ignition/math/Rand.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/rendering/RenderEngine.hh>
-#include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/gui/MainWindow.hh>
+#include <gz/math/Rand.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/rendering/RenderEngine.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/Scene.hh>
 
 #include "RenderingGuiPlugin.hh"
 

diff --git a/examples/plugin/rendering_plugins/RenderingGuiPlugin.hh b/examples/plugin/rendering_plugins/RenderingGuiPlugin.hh
@@ -18,9 +18,9 @@
 #ifndef RENDERING_GUI_PLUGIN_HH_
 #define RENDERING_GUI_PLUGIN_HH_
 
-#include <ignition/gui/qt.h>
-#include <ignition/gui/Plugin.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/gui/qt.h>
+#include <gz/gui/Plugin.hh>
+#include <gz/rendering/Scene.hh>
 
 /// \brief Example of a GUI plugin that uses Ignition Rendering.
 /// This plugin works with either Ignition GUI's Scene3D or Ignition Gazebo's

diff --git a/examples/plugin/rendering_plugins/RenderingServerPlugin.cc b/examples/plugin/rendering_plugins/RenderingServerPlugin.cc
@@ -17,13 +17,13 @@
 #include "RenderingServerPlugin.hh"
 
 //! [includeRenderingEvents]
-#include <ignition/gazebo/rendering/Events.hh>
+#include <gz/sim/rendering/Events.hh>
 //! [includeRenderingEvents]
-#include <ignition/math/Rand.hh>
-#include <ignition/plugin/Register.hh>
-#include <ignition/rendering/RenderEngine.hh>
-#include <ignition/rendering/RenderingIface.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/math/Rand.hh>
+#include <gz/plugin/Register.hh>
+#include <gz/rendering/RenderEngine.hh>
+#include <gz/rendering/RenderingIface.hh>
+#include <gz/rendering/Scene.hh>
 
 using namespace std::literals::chrono_literals;
 

diff --git a/examples/plugin/rendering_plugins/RenderingServerPlugin.hh b/examples/plugin/rendering_plugins/RenderingServerPlugin.hh
@@ -17,8 +17,8 @@
 #ifndef RENDERING_SERVER_PLUGIN_HH_
 #define RENDERING_SERVER_PLUGIN_HH_
 
-#include <ignition/gazebo/System.hh>
-#include <ignition/rendering/Scene.hh>
+#include <gz/sim/System.hh>
+#include <gz/rendering/Scene.hh>
 
 /// \brief Server-side system that uses Ignition Rendering APIs.
 /// It changes the ambient color every 2 simulation seconds.

diff --git a/examples/plugin/system_plugin/SampleSystem.cc b/examples/plugin/system_plugin/SampleSystem.cc
@@ -1,7 +1,7 @@
 #include "SampleSystem.hh"
 
 //! [registerSampleSystem]
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 // Include a line in your source file for each interface implemented.
 IGNITION_ADD_PLUGIN(

diff --git a/examples/plugin/system_plugin/SampleSystem.hh b/examples/plugin/system_plugin/SampleSystem.hh
@@ -18,7 +18,7 @@
 #define SYSTEM_PLUGIN_SAMPLESYSTEM_HH_
 
 //! [header]
-#include <ignition/gazebo/System.hh>
+#include <gz/sim/System.hh>
 
 namespace sample_system
 {

diff --git a/examples/plugin/system_plugin/SampleSystem2.cc b/examples/plugin/system_plugin/SampleSystem2.cc
@@ -1,7 +1,7 @@
 #include "SampleSystem.hh"
 
 //! [registerSampleSystem2]
-#include <ignition/plugin/RegisterMore.hh>
+#include <gz/plugin/RegisterMore.hh>
 
 IGNITION_ADD_PLUGIN(
     sample_system::SampleSystem2,

diff --git a/examples/standalone/comms/publisher.cc b/examples/standalone/comms/publisher.cc
@@ -24,8 +24,8 @@
 #include <string>
 #include <thread>
 
-#include <ignition/msgs.hh>
-#include <ignition/transport.hh>
+#include <gz/msgs.hh>
+#include <gz/transport.hh>
 
 /// \brief Flag used to break the publisher loop and terminate the program.
 static std::atomic<bool> g_terminatePub(false);

diff --git a/examples/standalone/custom_server/custom_server.cc b/examples/standalone/custom_server/custom_server.cc
@@ -15,8 +15,8 @@
  *
 */
 
-#include <ignition/common/Console.hh>
-#include <ignition/gazebo/Server.hh>
+#include <gz/common/Console.hh>
+#include <gz/sim/Server.hh>
 
 /////////////////////////////////////////////////
 int main()

diff --git a/examples/standalone/each_performance/each.cc b/examples/standalone/each_performance/each.cc
@@ -16,12 +16,12 @@
 */
 
 #include <fstream>
-#include <ignition/math/Stopwatch.hh>
+#include <gz/math/Stopwatch.hh>
 
-#include <ignition/gazebo/Entity.hh>
-#include <ignition/gazebo/EntityComponentManager.hh>
-#include <ignition/gazebo/components/World.hh>
-#include <ignition/gazebo/components/Name.hh>
+#include <gz/sim/Entity.hh>
+#include <gz/sim/EntityComponentManager.hh>
+#include <gz/sim/components/World.hh>
+#include <gz/sim/components/Name.hh>
 
 using namespace ignition;
 using namespace gazebo;

diff --git a/examples/standalone/entity_creation/entity_creation.cc b/examples/standalone/entity_creation/entity_creation.cc
@@ -15,11 +15,11 @@
  *
 */
 
-#include <ignition/msgs/entity_factory.pb.h>
+#include <gz/msgs/entity_factory.pb.h>
 
 #include <iostream>
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 
 // Create a transport node.
 ignition::transport::Node node;

diff --git a/examples/standalone/external_ecm/external_ecm.cc b/examples/standalone/external_ecm/external_ecm.cc
@@ -16,11 +16,11 @@
 */
 
 #include <iostream>
-#include <ignition/gazebo/EntityComponentManager.hh>
-#include <ignition/gazebo/components/Name.hh>
-#include <ignition/gazebo/components/ParentEntity.hh>
-#include <ignition/msgs/serialized.pb.h>
-#include <ignition/transport/Node.hh>
+#include <gz/sim/EntityComponentManager.hh>
+#include <gz/sim/components/Name.hh>
+#include <gz/sim/components/ParentEntity.hh>
+#include <gz/msgs/serialized.pb.h>
+#include <gz/transport/Node.hh>
 
 //////////////////////////////////////////////////
 int main(int argc, char **argv)

diff --git a/examples/standalone/gtest_setup/command_TEST.cc b/examples/standalone/gtest_setup/command_TEST.cc
@@ -17,16 +17,16 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/msgs/twist.pb.h>
-
-#include <ignition/common/Console.hh>
-#include <ignition/gazebo/Link.hh>
-#include <ignition/gazebo/Model.hh>
-#include <ignition/gazebo/World.hh>
-#include <ignition/gazebo/Server.hh>
-#include <ignition/gazebo/Util.hh>
-#include <ignition/gazebo/TestFixture.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/msgs/twist.pb.h>
+
+#include <gz/common/Console.hh>
+#include <gz/sim/Link.hh>
+#include <gz/sim/Model.hh>
+#include <gz/sim/World.hh>
+#include <gz/sim/Server.hh>
+#include <gz/sim/Util.hh>
+#include <gz/sim/TestFixture.hh>
+#include <gz/transport/Node.hh>
 
 using namespace std::chrono_literals;
 

diff --git a/examples/standalone/gtest_setup/gravity_TEST.cc b/examples/standalone/gtest_setup/gravity_TEST.cc
@@ -17,12 +17,12 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/common/Console.hh>
-#include <ignition/gazebo/Model.hh>
-#include <ignition/gazebo/World.hh>
-#include <ignition/gazebo/Server.hh>
-#include <ignition/gazebo/Util.hh>
-#include <ignition/gazebo/TestFixture.hh>
+#include <gz/common/Console.hh>
+#include <gz/sim/Model.hh>
+#include <gz/sim/World.hh>
+#include <gz/sim/Server.hh>
+#include <gz/sim/Util.hh>
+#include <gz/sim/TestFixture.hh>
 
 //////////////////////////////////////////////////
 // Test that an object falls due to gravity

diff --git a/examples/standalone/joy_to_twist/joy_to_twist.cc b/examples/standalone/joy_to_twist/joy_to_twist.cc
@@ -19,7 +19,7 @@
  * Adapted from https://github.com/ros-teleop/teleop_twist_joy
  */
 
-#include <ignition/transport/Node.hh>
+#include <gz/transport/Node.hh>
 #include <sdf/sdf.hh>
 
 ignition::transport::Node::Publisher cmdVelPub;

diff --git a/examples/standalone/joystick/joystick.cc b/examples/standalone/joystick/joystick.cc
@@ -19,8 +19,8 @@
 #include <linux/joystick.h>
 #include <sys/stat.h>
 #include <unistd.h>
-#include <ignition/math/Helpers.hh>
-#include <ignition/transport/Node.hh>
+#include <gz/math/Helpers.hh>
+#include <gz/transport/Node.hh>
 #include <sdf/sdf.hh>
 
 //////////////////////////////////////////////////

diff --git a/examples/standalone/keyboard/keyboard.cc b/examples/standalone/keyboard/keyboard.cc
@@ -24,10 +24,10 @@
  */
 
 
-#include <ignition/msgs/twist.pb.h>
-#include <ignition/transport/Node.hh>
+#include <gz/msgs/twist.pb.h>
+#include <gz/transport/Node.hh>
 #include <sdf/sdf.hh>
-#include <ignition/common/Console.hh>
+#include <gz/common/Console.hh>
 #include <signal.h>
 #include <termios.h>
 #include <stdio.h>