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

Signed-off-by: methylDragon <[email protected]>
gazebosim · May 11, 2022 · c65d7ee · c65d7ee
1 parent 9642194
commit c65d7ee
Show file tree

Hide file tree

Showing 17 changed files with 75 additions and 75 deletions.
diff --git 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 <memory>
 #include <string>
 #include <vector>
 
-#include <ignition/common/URI.hh>
+#include <gz/common/URI.hh>
 
-#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
@@ -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 <memory>
 #include <string>
 
-#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
@@ -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 <memory>
 #include <string>
 #include <tuple>
 #include <vector>
-#include <ignition/common/URI.hh>
+#include <gz/common/URI.hh>
 
-#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
@@ -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 <string>
-#include <ignition/common/URI.hh>
-#include <ignition/fuel_tools/Export.hh>
+#include <gz/common/URI.hh>
+#include <gz/fuel_tools/Export.hh>
 
 // Use safer functions on Windows
 #ifdef _MSC_VER

diff --git a/include/gz/fuel_tools/Interface.hh b/include/gz/fuel_tools/Interface.hh
@@ -16,8 +16,8 @@
 */
 
 #include <string>
-#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
@@ -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 <map>
 #include <string>
 #include <utility>
 #include <vector>
 
-#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
@@ -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 <memory>
 #include <string>
 
-#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
@@ -15,16 +15,16 @@
  *
 */
 
-#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 <cstdint>
 #include <ctime>
 #include <memory>
 #include <string>
 #include <vector>
 
-#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
@@ -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 <memory>
 
-#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
@@ -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 <map>
 #include <memory>
 #include <string>
 #include <vector>
 
-#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
@@ -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 <memory>
 #include <string>
 
-#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
@@ -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 <memory>
 #include <string>
 
-#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
@@ -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 <memory>
 
-#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
@@ -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 <memory>
 #include <string>
 #include <vector>
 
-#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
@@ -1,3 +1,3 @@
 // Automatically generated
-#include <ignition/fuel_tools/config.hh>
+#include <gz/fuel_tools/config.hh>
 ${ign_headers}
diff --git a/src/ign_TEST.cc b/src/ign_TEST.cc
@@ -110,16 +110,16 @@ TEST(CmdLine,
     IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(ModelListCustomServerPretty))
 {
   auto output = custom_exec_str(
-      g_listCmd + " -t model -u https://staging-fuel.ignitionrobotics.org");
+      g_listCmd + " -t model -u https://staging-fuel.gazebosim.org");
 
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_NE(output.find("owners"), std::string::npos) << output;
   EXPECT_NE(output.find("models"), std::string::npos) << output;
 
   EXPECT_EQ(output.find("https://fuel.ignitionrobotics.org"), std::string::npos)
       << output;
-  EXPECT_EQ(output.find("https://staging-fuel.ignitionrobotics.org/1.0/"),
+  EXPECT_EQ(output.find("https://staging-fuel.gazebosim.org/1.0/"),
       std::string::npos) << output;
 }
 
@@ -128,8 +128,8 @@ TEST(CmdLine,
 TEST(CmdLine, IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListConfigServerUgly))
 {
   auto output = custom_exec_str(g_listCmd +
-      " -t world --raw -u https://staging-fuel.ignitionrobotics.org");
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+      " -t world --raw -u https://staging-fuel.gazebosim.org");
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_EQ(output.find("owners"), std::string::npos) << output;
 }
@@ -140,9 +140,9 @@ TEST(CmdLine,
     IGN_UTILS_TEST_ENABLED_ONLY_ON_LINUX(WorldListCustomServerPretty))
 {
   auto output = custom_exec_str(
-      g_listCmd + " -t world -u https://staging-fuel.ignitionrobotics.org");
+      g_listCmd + " -t world -u https://staging-fuel.gazebosim.org");
 
-  EXPECT_NE(output.find("https://staging-fuel.ignitionrobotics.org"),
+  EXPECT_NE(output.find("https://staging-fuel.gazebosim.org"),
       std::string::npos) << output;
   EXPECT_NE(output.find("owners"), std::string::npos) << output;
   EXPECT_NE(output.find("worlds"), std::string::npos) << output;