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

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 14, 2022 · 3edd6d1 · 3edd6d1
1 parent 2bf0f0b
commit 3edd6d1
Show file tree

Hide file tree

Showing 40 changed files with 156 additions and 143 deletions.
diff --git a/examples/plugin/custom_context_menu/CustomContext.cc b/examples/plugin/custom_context_menu/CustomContext.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "CustomContext.hh"
 

diff --git a/examples/plugin/custom_context_menu/CustomContext.hh b/examples/plugin/custom_context_menu/CustomContext.hh
@@ -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

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc b/examples/plugin/dialog_from_plugin/DialogFromPlugin.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "DialogFromPlugin.hh"
 

diff --git a/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh b/examples/plugin/dialog_from_plugin/DialogFromPlugin.hh
@@ -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

diff --git a/examples/plugin/hello_plugin/HelloPlugin.cc b/examples/plugin/hello_plugin/HelloPlugin.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "HelloPlugin.hh"
 

diff --git a/examples/plugin/hello_plugin/HelloPlugin.hh b/examples/plugin/hello_plugin/HelloPlugin.hh
@@ -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
 {

diff --git a/examples/plugin/ign_components/IgnComponents.cc b/examples/plugin/ign_components/IgnComponents.cc
@@ -15,7 +15,7 @@
  *
 */
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 #include "IgnComponents.hh"
 
 // Register this plugin

diff --git a/examples/plugin/ign_components/IgnComponents.hh b/examples/plugin/ign_components/IgnComponents.hh
@@ -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
 {

diff --git a/examples/plugin/multiple_qml/MultipleQml.cc b/examples/plugin/multiple_qml/MultipleQml.cc
@@ -16,7 +16,7 @@
 */
 
 #include <iostream>
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "MultipleQml.hh"
 

diff --git a/examples/plugin/multiple_qml/MultipleQml.hh b/examples/plugin/multiple_qml/MultipleQml.hh
@@ -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

diff --git a/examples/standalone/custom_drawer/custom_drawer.cc b/examples/standalone/custom_drawer/custom_drawer.cc
@@ -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
 

diff --git a/examples/standalone/custom_drawer/custom_drawer.hh b/examples/standalone/custom_drawer/custom_drawer.hh
@@ -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

diff --git a/examples/standalone/dialogs/dialogs.cc b/examples/standalone/dialogs/dialogs.cc
@@ -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
 
 //////////////////////////////////////////////////

diff --git a/examples/standalone/marker/marker.cc b/examples/standalone/marker/marker.cc
@@ -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>
 

diff --git a/examples/standalone/point_cloud/point_cloud.cc b/examples/standalone/point_cloud/point_cloud.cc
@@ -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>

diff --git a/examples/standalone/scene_provider/scene_provider.cc b/examples/standalone/scene_provider/scene_provider.cc
@@ -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;
 

diff --git a/examples/standalone/window/window.cc b/examples/standalone/window/window.cc
@@ -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
 
 //////////////////////////////////////////////////

diff --git a/include/gz/gui/Application.hh b/include/gz/gui/Application.hh
@@ -14,16 +14,16 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GUI_APPLICATION_HH_
-#define IGNITION_GUI_APPLICATION_HH_
+#ifndef GZ_GUI_APPLICATION_HH_
+#define GZ_GUI_APPLICATION_HH_
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by
@@ -138,7 +138,7 @@ namespace ignition
       ///
       /// 1. Paths given by the environment variable
       /// 2. Paths added by calling addPluginPath
-      /// 3. Path ~/.ignition/gui/plugins
+      /// 3. Path ~/.gz/gui/plugins
       /// 4. The path where Ignition GUI plugins are installed
       ///
       /// \return A vector of pairs, where each pair contains:

diff --git a/include/gz/gui/Conversions.hh b/include/gz/gui/Conversions.hh
@@ -15,24 +15,24 @@
  *
 */
 
-#ifndef IGNITION_GUI_CONVERSIONS_HH_
-#define IGNITION_GUI_CONVERSIONS_HH_
+#ifndef GZ_GUI_CONVERSIONS_HH_
+#define GZ_GUI_CONVERSIONS_HH_
 
 #ifdef _MSC_VER
 #pragma warning(push, 0)
 #endif
-#include <ignition/msgs/time.pb.h>
+#include <gz/msgs/time.pb.h>
 #ifdef _MSC_VER
 #pragma warning(pop)
 #endif
-#include <ignition/common/KeyEvent.hh>
-#include <ignition/common/MouseEvent.hh>
-#include <ignition/math/Color.hh>
-#include <ignition/math/Vector2.hh>
-#include <ignition/math/Vector3.hh>
+#include <gz/common/KeyEvent.hh>
+#include <gz/common/MouseEvent.hh>
+#include <gz/math/Color.hh>
+#include <gz/math/Vector2.hh>
+#include <gz/math/Vector3.hh>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 namespace ignition
 {

diff --git a/include/gz/gui/Dialog.hh b/include/gz/gui/Dialog.hh
@@ -15,13 +15,13 @@
  *
  */
 
-#ifndef IGNITION_GUI_DIALOG_HH_
-#define IGNITION_GUI_DIALOG_HH_
+#ifndef GZ_GUI_DIALOG_HH_
+#define GZ_GUI_DIALOG_HH_
 
 #include <memory>
 
-#include "ignition/gui/qt.h"
-#include "ignition/gui/Export.hh"
+#include "gz/gui/qt.h"
+#include "gz/gui/Export.hh"
 
 #ifdef _WIN32
 // Disable warning C4251 which is triggered by

diff --git a/include/gz/gui/DragDropModel.hh b/include/gz/gui/DragDropModel.hh
@@ -14,11 +14,11 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GUI_DRAGDROPMODEL_HH_
-#define IGNITION_GUI_DRAGDROPMODEL_HH_
+#ifndef GZ_GUI_DRAGDROPMODEL_HH_
+#define GZ_GUI_DRAGDROPMODEL_HH_
 
-#include "ignition/gui/Export.hh"
-#include "ignition/gui/qt.h"
+#include "gz/gui/Export.hh"
+#include "gz/gui/qt.h"
 
 namespace ignition
 {

diff --git a/include/gz/gui/Enums.hh b/include/gz/gui/Enums.hh
@@ -15,10 +15,10 @@
  *
 */
 
-#ifndef IGNITION_GUI_ENUMS_HH_
-#define IGNITION_GUI_ENUMS_HH_
+#ifndef GZ_GUI_ENUMS_HH_
+#define GZ_GUI_ENUMS_HH_
 
-#include "ignition/gui/qt.h"
+#include "gz/gui/qt.h"
 
 namespace ignition
 {

diff --git a/include/gz/gui/GuiEvents.hh b/include/gz/gui/GuiEvents.hh
@@ -14,23 +14,23 @@
  * limitations under the License.
  *
 */
-#ifndef IGNITION_GUI_GUIEVENTS_HH_
-#define IGNITION_GUI_GUIEVENTS_HH_
+#ifndef GZ_GUI_GUIEVENTS_HH_
+#define GZ_GUI_GUIEVENTS_HH_
 
 #include <QEvent>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <ignition/common/KeyEvent.hh>
-#include <ignition/common/MouseEvent.hh>
-#include <ignition/math/Vector2.hh>
-#include <ignition/math/Vector3.hh>
-#include <ignition/msgs/world_control.pb.h>
-#include <ignition/utils/ImplPtr.hh>
+#include <gz/common/KeyEvent.hh>
+#include <gz/common/MouseEvent.hh>
+#include <gz/math/Vector2.hh>
+#include <gz/math/Vector3.hh>
+#include <gz/msgs/world_control.pb.h>
+#include <gz/utils/ImplPtr.hh>
 
-#include "ignition/gui/Export.hh"
+#include "gz/gui/Export.hh"
 
 namespace ignition
 {
@@ -490,4 +490,4 @@ namespace ignition
   }
 }
 
-#endif  // IGNITION_GUI_GUIEVENTS_HH_
+#endif  // GZ_GUI_GUIEVENTS_HH_