From 5de75244a5d0734745fc9bb14c0d874289a83868 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 00:34:19 -0700 Subject: [PATCH] Migrate sources in src, test, examples, and include (#248) Signed-off-by: methylDragon --- include/gz/fuel_tools/ClientConfig.hh | 8 ++++---- include/gz/fuel_tools/CollectionIdentifier.hh | 6 +++--- include/gz/fuel_tools/FuelClient.hh | 14 +++++++------- include/gz/fuel_tools/Helpers.hh | 8 ++++---- include/gz/fuel_tools/Interface.hh | 4 ++-- include/gz/fuel_tools/JSONParser.hh | 12 ++++++------ include/gz/fuel_tools/Model.hh | 10 +++++----- include/gz/fuel_tools/ModelIdentifier.hh | 6 +++--- include/gz/fuel_tools/ModelIter.hh | 8 ++++---- include/gz/fuel_tools/RestClient.hh | 6 +++--- include/gz/fuel_tools/Result.hh | 6 +++--- include/gz/fuel_tools/WorldIdentifier.hh | 6 +++--- include/gz/fuel_tools/WorldIter.hh | 6 +++--- include/gz/fuel_tools/Zip.hh | 6 +++--- include/gz/fuel_tools/gz_auto_headers.hh.in | 2 +- 15 files changed, 54 insertions(+), 54 deletions(-) diff --git a/include/gz/fuel_tools/ClientConfig.hh b/include/gz/fuel_tools/ClientConfig.hh index b6522285..bb272cbe 100644 --- a/include/gz/fuel_tools/ClientConfig.hh +++ b/include/gz/fuel_tools/ClientConfig.hh @@ -15,16 +15,16 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_CLIENTCONFIG_HH_ -#define IGNITION_FUEL_TOOLS_CLIENTCONFIG_HH_ +#ifndef GZ_FUEL_TOOLS_CLIENTCONFIG_HH_ +#define GZ_FUEL_TOOLS_CLIENTCONFIG_HH_ #include #include #include -#include +#include -#include "ignition/fuel_tools/Export.hh" +#include "gz/fuel_tools/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/CollectionIdentifier.hh b/include/gz/fuel_tools/CollectionIdentifier.hh index 3917b9c7..90e42ca1 100644 --- a/include/gz/fuel_tools/CollectionIdentifier.hh +++ b/include/gz/fuel_tools/CollectionIdentifier.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_COLLECTIONIDENTIFIER_HH_ -#define IGNITION_FUEL_TOOLS_COLLECTIONIDENTIFIER_HH_ +#ifndef GZ_FUEL_TOOLS_COLLECTIONIDENTIFIER_HH_ +#define GZ_FUEL_TOOLS_COLLECTIONIDENTIFIER_HH_ #include #include -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/FuelClient.hh b/include/gz/fuel_tools/FuelClient.hh index 674ed0a6..2741e8e0 100644 --- a/include/gz/fuel_tools/FuelClient.hh +++ b/include/gz/fuel_tools/FuelClient.hh @@ -15,19 +15,19 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_FUELCLIENT_HH_ -#define IGNITION_FUEL_TOOLS_FUELCLIENT_HH_ +#ifndef GZ_FUEL_TOOLS_FUELCLIENT_HH_ +#define GZ_FUEL_TOOLS_FUELCLIENT_HH_ #include #include #include #include -#include +#include -#include "ignition/fuel_tools/ModelIter.hh" -#include "ignition/fuel_tools/RestClient.hh" -#include "ignition/fuel_tools/Result.hh" -#include "ignition/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/RestClient.hh" +#include "gz/fuel_tools/Result.hh" +#include "gz/fuel_tools/WorldIter.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/Helpers.hh b/include/gz/fuel_tools/Helpers.hh index 748cfb40..ddda71a8 100644 --- a/include/gz/fuel_tools/Helpers.hh +++ b/include/gz/fuel_tools/Helpers.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_HELPERS_HH_ -#define IGNITION_FUEL_TOOLS_HELPERS_HH_ +#ifndef GZ_FUEL_TOOLS_HELPERS_HH_ +#define GZ_FUEL_TOOLS_HELPERS_HH_ #include -#include -#include +#include +#include // Use safer functions on Windows #ifdef _MSC_VER diff --git a/include/gz/fuel_tools/Interface.hh b/include/gz/fuel_tools/Interface.hh index f3e61aaa..e9fcb837 100644 --- a/include/gz/fuel_tools/Interface.hh +++ b/include/gz/fuel_tools/Interface.hh @@ -16,8 +16,8 @@ */ #include -#include "ignition/fuel_tools/Export.hh" -#include "ignition/fuel_tools/FuelClient.hh" +#include "gz/fuel_tools/Export.hh" +#include "gz/fuel_tools/FuelClient.hh" namespace ignition { diff --git a/include/gz/fuel_tools/JSONParser.hh b/include/gz/fuel_tools/JSONParser.hh index 79028a50..a655153e 100644 --- a/include/gz/fuel_tools/JSONParser.hh +++ b/include/gz/fuel_tools/JSONParser.hh @@ -15,18 +15,18 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_JSONPARSER_HH_ -#define IGNITION_FUEL_TOOLS_JSONPARSER_HH_ +#ifndef GZ_FUEL_TOOLS_JSONPARSER_HH_ +#define GZ_FUEL_TOOLS_JSONPARSER_HH_ #include #include #include #include -#include "ignition/fuel_tools/ModelIdentifier.hh" -#include "ignition/fuel_tools/ModelIter.hh" -#include "ignition/fuel_tools/WorldIdentifier.hh" -#include "ignition/fuel_tools/WorldIter.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/ModelIter.hh" +#include "gz/fuel_tools/WorldIdentifier.hh" +#include "gz/fuel_tools/WorldIter.hh" namespace Json { diff --git a/include/gz/fuel_tools/Model.hh b/include/gz/fuel_tools/Model.hh index 46648db0..960a1ea5 100644 --- a/include/gz/fuel_tools/Model.hh +++ b/include/gz/fuel_tools/Model.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_MODEL_HH_ -#define IGNITION_FUEL_TOOLS_MODEL_HH_ +#ifndef GZ_FUEL_TOOLS_MODEL_HH_ +#define GZ_FUEL_TOOLS_MODEL_HH_ #include #include -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/Result.hh" -#include "ignition/fuel_tools/ModelIdentifier.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Result.hh" +#include "gz/fuel_tools/ModelIdentifier.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/ModelIdentifier.hh b/include/gz/fuel_tools/ModelIdentifier.hh index e593c1c8..947974b3 100644 --- a/include/gz/fuel_tools/ModelIdentifier.hh +++ b/include/gz/fuel_tools/ModelIdentifier.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_MODELIDENTIFIER_HH_ -#define IGNITION_FUEL_TOOLS_MODELIDENTIFIER_HH_ +#ifndef GZ_FUEL_TOOLS_MODELIDENTIFIER_HH_ +#define GZ_FUEL_TOOLS_MODELIDENTIFIER_HH_ #include #include @@ -24,7 +24,7 @@ #include #include -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/ModelIter.hh b/include/gz/fuel_tools/ModelIter.hh index 834f5f5b..77c5e85d 100644 --- a/include/gz/fuel_tools/ModelIter.hh +++ b/include/gz/fuel_tools/ModelIter.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_MODELITER_HH_ -#define IGNITION_FUEL_TOOLS_MODELITER_HH_ +#ifndef GZ_FUEL_TOOLS_MODELITER_HH_ +#define GZ_FUEL_TOOLS_MODELITER_HH_ #include -#include "ignition/fuel_tools/Helpers.hh" -#include "ignition/fuel_tools/Model.hh" +#include "gz/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Model.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/RestClient.hh b/include/gz/fuel_tools/RestClient.hh index 2ef2cfdf..8fa2fd5f 100644 --- a/include/gz/fuel_tools/RestClient.hh +++ b/include/gz/fuel_tools/RestClient.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_FUEL_TOOLS_RESTCLIENT_HH_ -#define IGNITION_FUEL_TOOLS_RESTCLIENT_HH_ +#ifndef GZ_FUEL_TOOLS_RESTCLIENT_HH_ +#define GZ_FUEL_TOOLS_RESTCLIENT_HH_ #include #include #include #include -#include "ignition/fuel_tools/Export.hh" +#include "gz/fuel_tools/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/Result.hh b/include/gz/fuel_tools/Result.hh index 37458aec..13109664 100644 --- a/include/gz/fuel_tools/Result.hh +++ b/include/gz/fuel_tools/Result.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_RESULT_HH_ -#define IGNITION_FUEL_TOOLS_RESULT_HH_ +#ifndef GZ_FUEL_TOOLS_RESULT_HH_ +#define GZ_FUEL_TOOLS_RESULT_HH_ #include #include -#include "ignition/fuel_tools/Export.hh" +#include "gz/fuel_tools/Export.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/WorldIdentifier.hh b/include/gz/fuel_tools/WorldIdentifier.hh index d05c1397..65e98f01 100644 --- a/include/gz/fuel_tools/WorldIdentifier.hh +++ b/include/gz/fuel_tools/WorldIdentifier.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_WORLDIDENTIFIER_HH_ -#define IGNITION_FUEL_TOOLS_WORLDIDENTIFIER_HH_ +#ifndef GZ_FUEL_TOOLS_WORLDIDENTIFIER_HH_ +#define GZ_FUEL_TOOLS_WORLDIDENTIFIER_HH_ #include #include -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/WorldIter.hh b/include/gz/fuel_tools/WorldIter.hh index 48e7e438..0d617c3f 100644 --- a/include/gz/fuel_tools/WorldIter.hh +++ b/include/gz/fuel_tools/WorldIter.hh @@ -15,12 +15,12 @@ * */ -#ifndef IGNITION_FUEL_TOOLS_WORLDITER_HH_ -#define IGNITION_FUEL_TOOLS_WORLDITER_HH_ +#ifndef GZ_FUEL_TOOLS_WORLDITER_HH_ +#define GZ_FUEL_TOOLS_WORLDITER_HH_ #include -#include "ignition/fuel_tools/Helpers.hh" +#include "gz/fuel_tools/Helpers.hh" #ifdef _WIN32 // Disable warning C4251 which is triggered by diff --git a/include/gz/fuel_tools/Zip.hh b/include/gz/fuel_tools/Zip.hh index 0ed9428d..d51782df 100644 --- a/include/gz/fuel_tools/Zip.hh +++ b/include/gz/fuel_tools/Zip.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_FUEL_TOOLS_ZIP_HH_ -#define IGNITION_FUEL_TOOLS_ZIP_HH_ +#ifndef GZ_FUEL_TOOLS_ZIP_HH_ +#define GZ_FUEL_TOOLS_ZIP_HH_ #include #include #include -#include "ignition/fuel_tools/Export.hh" +#include "gz/fuel_tools/Export.hh" namespace ignition { diff --git a/include/gz/fuel_tools/gz_auto_headers.hh.in b/include/gz/fuel_tools/gz_auto_headers.hh.in index a71c496d..7ff2f63e 100644 --- a/include/gz/fuel_tools/gz_auto_headers.hh.in +++ b/include/gz/fuel_tools/gz_auto_headers.hh.in @@ -1,3 +1,3 @@ // Automatically generated -#include +#include ${ign_headers}