Skip to content

Commit

Permalink
Migrate sources in src, test, examples, and include (#248)
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed May 7, 2022
1 parent 716f70b commit 5de7524
Show file tree
Hide file tree
Showing 15 changed files with 54 additions and 54 deletions.
8 changes: 4 additions & 4 deletions include/gz/fuel_tools/ClientConfig.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/CollectionIdentifier.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions include/gz/fuel_tools/FuelClient.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/gz/fuel_tools/Helpers.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions include/gz/fuel_tools/Interface.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
12 changes: 6 additions & 6 deletions include/gz/fuel_tools/JSONParser.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
10 changes: 5 additions & 5 deletions include/gz/fuel_tools/Model.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/ModelIdentifier.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions include/gz/fuel_tools/ModelIter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/RestClient.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/Result.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/WorldIdentifier.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/WorldIter.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions include/gz/fuel_tools/Zip.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
2 changes: 1 addition & 1 deletion include/gz/fuel_tools/gz_auto_headers.hh.in
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
// Automatically generated
#include <ignition/fuel_tools/config.hh>
#include <gz/fuel_tools/config.hh>
${ign_headers}

0 comments on commit 5de7524

Please sign in to comment.