Migrate include statements

Signed-off-by: methylDragon <[email protected]>
gazebosim · Aug 19, 2022 · 4a53b07 · 4a53b07
1 parent 1712cf5
commit 4a53b07
Show file tree

Hide file tree

Showing 61 changed files with 99 additions and 99 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -16,7 +16,7 @@ set(IGN_CMAKE_VER ${ignition-cmake2_VERSION_MAJOR})
 #============================================================================
 ign_configure_project(
   REPLACE_IGNITION_INCLUDE_PATH gz/plugin
-  VERSION_SUFFIX pre1
+  VERSION_SUFFIX
 )
 
 #============================================================================

diff --git a/MIGRATION.md b/MIGRATION.md
@@ -68,9 +68,9 @@ simply need to make sure that the compiler can resolve the names of the classes
 that you pass to it (and there will be a compilation error if it cannot).
 
 It is now possible to register plugins across **multiple translation units**
-within a single library. To do this, use `#include <ignition/plugin/Register.hh>`
+within a single library. To do this, use `#include <gz/plugin/Register.hh>`
 in **exactly one** of your library's translation units, and then use
-`#include <ignition/plugin/RegisterMore.hh>` in all other translation units. It
+`#include <gz/plugin/RegisterMore.hh>` in all other translation units. It
 does not matter which translation unit you choose to be the "first", as long as
 you choose exactly one.
 
@@ -84,7 +84,7 @@ then you should continue to use it. It does not have a replacement in `ign-plugi
 
 Here is a list of things that you *should* replace:
 
-* `#include <gz/common/PluginLoader.hh>` should be replaced with `#include <ignition/plugin/Loader.hh>`
+* `#include <gz/common/PluginLoader.hh>` should be replaced with `#include <gz/plugin/Loader.hh>`
 * `gz::common::PluginLoader` should be replaced with `gz::plugin::Loader`
 * When calling `Loader::Instantiate("....")` do **NOT** prefix the class name with `::`. E.g. `"::some_namespace::MyClass"` should now be `"some_namespace::MyClass"`.
 

diff --git a/core/include/gz/plugin/EnablePluginFromThis.hh b/core/include/gz/plugin/EnablePluginFromThis.hh
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/Factory.hh b/core/include/gz/plugin/Factory.hh
@@ -23,7 +23,7 @@
 #include <memory>
 #include <tuple>
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/Info.hh b/core/include/gz/plugin/Info.hh
@@ -25,9 +25,9 @@
 #include <string>
 #include <unordered_map>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/Export.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/Plugin.hh b/core/include/gz/plugin/Plugin.hh
@@ -23,10 +23,10 @@
 #include <map>
 #include <string>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Export.hh>
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Export.hh>
+#include <gz/plugin/Info.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/PluginPtr.hh b/core/include/gz/plugin/PluginPtr.hh
@@ -23,7 +23,7 @@
 #include <string>
 #include <memory>
 
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/SpecializedPlugin.hh b/core/include/gz/plugin/SpecializedPlugin.hh
@@ -20,7 +20,7 @@
 #define GZ_PLUGIN_SPECIALIZEDPLUGIN_HH_
 
 #include <memory>
-#include "ignition/plugin/Plugin.hh"
+#include "gz/plugin/Plugin.hh"
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/SpecializedPluginPtr.hh b/core/include/gz/plugin/SpecializedPluginPtr.hh
@@ -19,8 +19,8 @@
 #ifndef GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
 #define GZ_PLUGIN_SPECIALIZEDPLUGINPTR_HH_
 
-#include "ignition/plugin/PluginPtr.hh"
-#include "ignition/plugin/SpecializedPlugin.hh"
+#include "gz/plugin/PluginPtr.hh"
+#include "gz/plugin/SpecializedPlugin.hh"
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/WeakPluginPtr.hh b/core/include/gz/plugin/WeakPluginPtr.hh
@@ -20,7 +20,7 @@
 
 #include <memory>
 
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/detail/Factory.hh b/core/include/gz/plugin/detail/Factory.hh
@@ -21,9 +21,9 @@
 #include <memory>
 #include <utility>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/detail/Plugin.hh b/core/include/gz/plugin/detail/Plugin.hh
@@ -21,7 +21,7 @@
 
 #include <memory>
 #include <string>
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Plugin.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/detail/PluginPtr.hh b/core/include/gz/plugin/detail/PluginPtr.hh
@@ -21,8 +21,8 @@
 
 #include <memory>
 #include <utility>
-#include <ignition/plugin/PluginPtr.hh>
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/PluginPtr.hh>
+#include <gz/plugin/utility.hh>
 
 namespace gz
 {

diff --git a/core/include/gz/plugin/detail/SpecializedPlugin.hh b/core/include/gz/plugin/detail/SpecializedPlugin.hh
@@ -20,7 +20,7 @@
 #define GZ_PLUGIN_DETAIL_SPECIALIZEDPLUGIN_HH_
 
 #include <memory>
-#include "ignition/plugin/SpecializedPlugin.hh"
+#include "gz/plugin/SpecializedPlugin.hh"
 
 // This preprocessor token should only be used by the unittest that is
 // responsible for checking that the specialized routines are being used to

diff --git a/core/include/gz/plugin/utility.hh b/core/include/gz/plugin/utility.hh
@@ -22,7 +22,7 @@
 #include <string>
 
 #include <gz/plugin/detail/utility.hh>
-#include <ignition/plugin/Export.hh>
+#include <gz/plugin/Export.hh>
 
 namespace gz
 {

diff --git a/core/src/EnablePluginFromThis.cc b/core/src/EnablePluginFromThis.cc
@@ -15,8 +15,8 @@
  *
 */
 
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
 
 namespace gz
 {

diff --git a/core/src/Factory.cc b/core/src/Factory.cc
@@ -20,7 +20,7 @@
 #include <thread>
 #include <vector>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 namespace
 {

diff --git a/core/src/Factory_TEST.cc b/core/src/Factory_TEST.cc
@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 
-#include <ignition/plugin/Factory.hh>
+#include <gz/plugin/Factory.hh>
 
 // Dev Note (MXG): These tests are just here to make sure that the template and
 // inheritance schemes for Factories are working as expected. If the

diff --git a/core/src/Info.cc b/core/src/Info.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 namespace gz
 {

diff --git a/core/src/Info_TEST.cc b/core/src/Info_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/Info.hh>
+#include <gz/plugin/Info.hh>
 
 struct SomeInterface
 {

diff --git a/core/src/Plugin.cc b/core/src/Plugin.cc
@@ -19,8 +19,8 @@
 #include <cassert>
 #include <iostream>
 
-#include "ignition/plugin/Plugin.hh"
-#include "ignition/plugin/Info.hh"
+#include "gz/plugin/Plugin.hh"
+#include "gz/plugin/Info.hh"
 
 namespace gz
 {

diff --git a/core/src/WeakPluginPtr.cc b/core/src/WeakPluginPtr.cc
@@ -15,7 +15,7 @@
  *
  */
 
-#include <ignition/plugin/WeakPluginPtr.hh>
+#include <gz/plugin/WeakPluginPtr.hh>
 
 namespace gz
 {

diff --git a/core/src/utility.cc b/core/src/utility.cc
@@ -25,7 +25,7 @@
 #include <cxxabi.h>
 #endif
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 namespace gz
 {

diff --git a/core/src/utility_TEST.cc b/core/src/utility_TEST.cc
@@ -17,7 +17,7 @@
 
 #include <gtest/gtest.h>
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 using namespace gz::plugin;
 

diff --git a/examples/integrators.cc b/examples/integrators.cc
@@ -22,8 +22,8 @@
 #include <cmath>
 #include <set>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/common/SystemPaths.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/common/SystemPaths.hh>
 
 #include "plugins/integrators.hh"
 

diff --git a/examples/plugins/ExponentialODE.cc b/examples/plugins/ExponentialODE.cc
@@ -17,7 +17,7 @@
 
 #include <cmath>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 

diff --git a/examples/plugins/ForwardEuler.cc b/examples/plugins/ForwardEuler.cc
@@ -17,7 +17,7 @@
 
 #include <cassert>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 

diff --git a/examples/plugins/PolynomialODE.cc b/examples/plugins/PolynomialODE.cc
@@ -17,7 +17,7 @@
 
 #include <cmath>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 

diff --git a/examples/plugins/RungeKutta4.cc b/examples/plugins/RungeKutta4.cc
@@ -17,7 +17,7 @@
 
 #include <cassert>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 #include "integrators.hh"
 

diff --git a/examples/plugins/robot.hh b/examples/plugins/robot.hh
@@ -20,10 +20,10 @@
 
 #include <utility>
 
-#include <ignition/math/Vector2.hh>
-#include <ignition/math/Vector3.hh>
+#include <gz/math/Vector2.hh>
+#include <gz/math/Vector3.hh>
 
-#include <ignition/plugin/Register.hh>
+#include <gz/plugin/Register.hh>
 
 namespace gz
 {

diff --git a/examples/robot.cc b/examples/robot.cc
@@ -22,9 +22,9 @@
 
 #include "plugins/robot.hh"
 
-#include <ignition/common/SystemPaths.hh>
-#include <ignition/plugin/SpecializedPluginPtr.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/common/SystemPaths.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/Loader.hh>
 
 #ifdef HAVE_BOOST_PROGRAM_OPTIONS
 #include <boost/program_options.hpp>

diff --git a/loader/include/gz/plugin/Loader.hh b/loader/include/gz/plugin/Loader.hh
@@ -25,10 +25,10 @@
 #include <typeinfo>
 #include <unordered_set>
 
-#include <ignition/utilities/SuppressWarning.hh>
+#include <gz/utilities/SuppressWarning.hh>
 
-#include <ignition/plugin/loader/Export.hh>
-#include <ignition/plugin/PluginPtr.hh>
+#include <gz/plugin/loader/Export.hh>
+#include <gz/plugin/PluginPtr.hh>
 
 namespace gz
 {

diff --git a/loader/include/gz/plugin/detail/Loader.hh b/loader/include/gz/plugin/detail/Loader.hh
@@ -22,8 +22,8 @@
 #include <memory>
 #include <string>
 #include <unordered_set>
-#include <ignition/plugin/EnablePluginFromThis.hh>
-#include <ignition/plugin/Loader.hh>
+#include <gz/plugin/EnablePluginFromThis.hh>
+#include <gz/plugin/Loader.hh>
 
 namespace gz
 {

diff --git a/loader/src/Loader.cc b/loader/src/Loader.cc
@@ -26,11 +26,11 @@
 #include <unordered_map>
 #include <vector>
 
-#include <ignition/plugin/Info.hh>
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/Plugin.hh>
+#include <gz/plugin/Info.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/Plugin.hh>
 
-#include <ignition/plugin/utility.hh>
+#include <gz/plugin/utility.hh>
 
 namespace gz
 {

diff --git a/loader/src/Loader_TEST.cc b/loader/src/Loader_TEST.cc
@@ -19,10 +19,10 @@
 
 #include <algorithm>
 
-#include <ignition/plugin/Loader.hh>
-#include <ignition/plugin/config.hh>
+#include <gz/plugin/Loader.hh>
+#include <gz/plugin/config.hh>
 
-#include <ignition/plugin/SpecializedPluginPtr.hh>
+#include <gz/plugin/SpecializedPluginPtr.hh>
 
 /////////////////////////////////////////////////
 TEST(Loader, InitialNoInterfacesImplemented)

diff --git a/loader/src/gz.cc b/loader/src/gz.cc
@@ -18,8 +18,8 @@
 #include <iostream>
 #include <string>
 
-#include "ignition/plugin/Loader.hh"
-#include "ignition/plugin/config.hh"
+#include "gz/plugin/Loader.hh"
+#include "gz/plugin/config.hh"
 
 using namespace gz;
 using namespace plugin;

diff --git a/loader/src/gz_TEST.cc b/loader/src/gz_TEST.cc
@@ -21,7 +21,7 @@
 #include <string>
 
 #include "gtest/gtest.h"
-#include "ignition/plugin/Loader.hh"
+#include "gz/plugin/Loader.hh"
 
 #ifdef _MSC_VER
 #    define popen _popen
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      *
      */
-    #include <ignition/plugin/Info.hh>
+    #include <gz/plugin/Info.hh>
     namespace gz
     {
@@ Expand Down @@