From 8d62ea3f69e61d9403b4af5256c0ea04730706e4 Mon Sep 17 00:00:00 2001 From: methylDragon Date: Thu, 28 Apr 2022 00:26:46 -0700 Subject: [PATCH] Migrate sources in src, test, examples, and include Signed-off-by: methylDragon --- av/include/gz/common/AudioDecoder.hh | 10 +++---- av/include/gz/common/HWEncoder.hh | 14 +++++----- av/include/gz/common/HWVideo.hh | 6 ++--- av/include/gz/common/Video.hh | 8 +++--- av/include/gz/common/VideoEncoder.hh | 12 ++++----- av/include/gz/common/av/Util.hh | 4 +-- av/include/gz/common/ffmpeg_inc.hh | 8 +++--- events/include/gz/common/Event.hh | 12 ++++----- events/include/gz/common/KeyEvent.hh | 10 +++---- events/include/gz/common/MouseEvent.hh | 12 ++++----- events/include/gz/common/events/Types.hh | 4 +-- examples/assert_example.cc | 2 +- examples/console.cc | 2 +- examples/events.cc | 2 +- examples/logging_performance.cc | 2 +- examples/profiler.cc | 6 ++--- .../include/gz/common/geospatial/Dem.hh | 14 +++++----- .../gz/common/geospatial/HeightmapData.hh | 8 +++--- .../gz/common/geospatial/ImageHeightmap.hh | 12 ++++----- graphics/include/gz/common/Animation.hh | 16 ++++++------ graphics/include/gz/common/BVHLoader.hh | 10 +++---- graphics/include/gz/common/ColladaExporter.hh | 14 +++++----- graphics/include/gz/common/ColladaLoader.hh | 12 ++++----- graphics/include/gz/common/GTSMeshUtils.hh | 10 +++---- graphics/include/gz/common/Image.hh | 12 ++++----- graphics/include/gz/common/KeyFrame.hh | 14 +++++----- graphics/include/gz/common/Material.hh | 14 +++++----- graphics/include/gz/common/Mesh.hh | 16 ++++++------ graphics/include/gz/common/MeshCSG.hh | 10 +++---- graphics/include/gz/common/MeshExporter.hh | 6 ++--- graphics/include/gz/common/MeshLoader.hh | 8 +++--- graphics/include/gz/common/MeshManager.hh | 26 +++++++++---------- graphics/include/gz/common/NodeAnimation.hh | 14 +++++----- graphics/include/gz/common/NodeTransform.hh | 16 ++++++------ graphics/include/gz/common/OBJLoader.hh | 10 +++---- graphics/include/gz/common/Pbr.hh | 8 +++--- graphics/include/gz/common/STLLoader.hh | 12 ++++----- graphics/include/gz/common/SVGLoader.hh | 14 +++++----- graphics/include/gz/common/Skeleton.hh | 14 +++++----- .../include/gz/common/SkeletonAnimation.hh | 16 ++++++------ graphics/include/gz/common/SkeletonNode.hh | 12 ++++----- graphics/include/gz/common/SubMesh.hh | 14 +++++----- graphics/include/gz/common/graphics/Types.hh | 4 +-- include/gz/common/Base64.hh | 6 ++--- include/gz/common/Battery.hh | 8 +++--- include/gz/common/Console.hh | 10 +++---- include/gz/common/EnumIface.hh | 8 +++--- include/gz/common/Filesystem.hh | 8 +++--- include/gz/common/FlagSet.hh | 4 +-- include/gz/common/MaterialDensity.hh | 6 ++--- include/gz/common/MovingWindowFilter.hh | 4 +-- include/gz/common/Plugin.hh | 10 +++---- include/gz/common/PluginInfo.hh | 4 +-- include/gz/common/PluginLoader.hh | 12 ++++----- include/gz/common/PluginMacros.hh | 6 ++--- include/gz/common/PluginPtr.hh | 8 +++--- include/gz/common/SignalHandler.hh | 6 ++--- include/gz/common/SingletonT.hh | 4 +-- include/gz/common/SpecializedPlugin.hh | 10 +++---- include/gz/common/SpecializedPluginPtr.hh | 10 +++---- include/gz/common/StringUtils.hh | 6 ++--- include/gz/common/SuppressWarning.hh | 6 ++--- include/gz/common/SystemPaths.hh | 12 ++++----- include/gz/common/TempDirectory.hh | 12 ++++----- include/gz/common/TemplateHelpers.hh | 6 ++--- include/gz/common/Timer.hh | 8 +++--- include/gz/common/URI.hh | 8 +++--- include/gz/common/Util.hh | 16 ++++++------ include/gz/common/Uuid.hh | 6 ++--- include/gz/common/WorkerPool.hh | 8 +++--- include/gz/common/detail/Plugin.hh | 6 ++--- include/gz/common/detail/PluginLoader.hh | 6 ++--- include/gz/common/detail/PluginMacros.hh | 8 +++--- include/gz/common/detail/PluginPtr.hh | 8 +++--- include/gz/common/detail/SpecializedPlugin.hh | 6 ++--- include/gz/common/detail/TemplateHelpers.hh | 4 +-- profiler/include/gz/common/Profiler.hh | 12 ++++----- .../gz/common/testing/AutoLogFixture.hh | 10 +++---- .../gz/common/testing/BazelTestPaths.hh | 10 +++---- .../gz/common/testing/CMakeTestPaths.hh | 10 +++---- .../include/gz/common/testing/TestPaths.hh | 14 +++++----- testing/include/gz/common/testing/Utils.hh | 8 +++--- .../common/testing/detail/AutoLogFixture.hh | 16 ++++++------ 83 files changed, 390 insertions(+), 390 deletions(-) diff --git a/av/include/gz/common/AudioDecoder.hh b/av/include/gz/common/AudioDecoder.hh index 830f3ead9..d6a864ee1 100644 --- a/av/include/gz/common/AudioDecoder.hh +++ b/av/include/gz/common/AudioDecoder.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_AUDIO_DECODER_HH_ -#define IGNITION_COMMON_AUDIO_DECODER_HH_ +#ifndef GZ_COMMON_AUDIO_DECODER_HH_ +#define GZ_COMMON_AUDIO_DECODER_HH_ #include #include -#include -#include +#include +#include namespace ignition { namespace common { - /// \class AudioDecoder AudioDecoder.hh ignition/common/common.hh + /// \class AudioDecoder AudioDecoder.hh gz/common/common.hh /// \brief An audio decoder based on FFMPEG. class IGNITION_COMMON_AV_VISIBLE AudioDecoder { diff --git a/av/include/gz/common/HWEncoder.hh b/av/include/gz/common/HWEncoder.hh index 4eeed1f8b..8a857434b 100644 --- a/av/include/gz/common/HWEncoder.hh +++ b/av/include/gz/common/HWEncoder.hh @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef IGNITION_COMMON_HWENCODER_HH -#define IGNITION_COMMON_HWENCODER_HH +#ifndef GZ_COMMON_HWENCODER_HH +#define GZ_COMMON_HWENCODER_HH #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /// This is an internal-use only class encapsulating HW video encoding. All /// symbols defined here are hidden from the public API. diff --git a/av/include/gz/common/HWVideo.hh b/av/include/gz/common/HWVideo.hh index 1d3da6491..3576b1ae5 100644 --- a/av/include/gz/common/HWVideo.hh +++ b/av/include/gz/common/HWVideo.hh @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef IGNITION_COMMON_HWVIDEO_HH -#define IGNITION_COMMON_HWVIDEO_HH +#ifndef GZ_COMMON_HWVIDEO_HH +#define GZ_COMMON_HWVIDEO_HH -#include +#include namespace ignition::common { diff --git a/av/include/gz/common/Video.hh b/av/include/gz/common/Video.hh index b186e51a3..a6857d369 100644 --- a/av/include/gz/common/Video.hh +++ b/av/include/gz/common/Video.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_VIDEO_HH_ -#define IGNITION_COMMON_VIDEO_HH_ +#ifndef GZ_COMMON_VIDEO_HH_ +#define GZ_COMMON_VIDEO_HH_ #include -#include -#include +#include +#include struct AVFormatContext; struct AVCodecContext; diff --git a/av/include/gz/common/VideoEncoder.hh b/av/include/gz/common/VideoEncoder.hh index 3b40dfc23..acc60b2c4 100644 --- a/av/include/gz/common/VideoEncoder.hh +++ b/av/include/gz/common/VideoEncoder.hh @@ -14,17 +14,17 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_VIDEOENCODER_HH_ -#define IGNITION_COMMON_VIDEOENCODER_HH_ +#ifndef GZ_COMMON_VIDEOENCODER_HH_ +#define GZ_COMMON_VIDEOENCODER_HH_ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include // Default bitrate (0) indicates that a bitrate should be calculated when // Start is called. diff --git a/av/include/gz/common/av/Util.hh b/av/include/gz/common/av/Util.hh index e8aabc9e2..58d3ad756 100644 --- a/av/include/gz/common/av/Util.hh +++ b/av/include/gz/common/av/Util.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_COMMON_AV_UTIL_HH_ -#define IGNITION_COMMON_AV_UTIL_HH_ +#ifndef GZ_COMMON_AV_UTIL_HH_ +#define GZ_COMMON_AV_UTIL_HH_ namespace ignition { diff --git a/av/include/gz/common/ffmpeg_inc.hh b/av/include/gz/common/ffmpeg_inc.hh index be0c07124..5ca16c5a9 100644 --- a/av/include/gz/common/ffmpeg_inc.hh +++ b/av/include/gz/common/ffmpeg_inc.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_FFMPEG_INC_HH_ -#define IGNITION_COMMON_FFMPEG_INC_HH_ +#ifndef GZ_COMMON_FFMPEG_INC_HH_ +#define GZ_COMMON_FFMPEG_INC_HH_ #include -#include +#include #ifndef _WIN32 #pragma GCC system_header @@ -49,7 +49,7 @@ extern "C" { #endif } -#include +#include namespace ignition { diff --git a/events/include/gz/common/Event.hh b/events/include/gz/common/Event.hh index 5095d39a0..d814b445e 100644 --- a/events/include/gz/common/Event.hh +++ b/events/include/gz/common/Event.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_EVENT_HH_ -#define IGNITION_COMMON_EVENT_HH_ +#ifndef GZ_COMMON_EVENT_HH_ +#define GZ_COMMON_EVENT_HH_ #include #include @@ -25,15 +25,15 @@ #include #include -#include -#include -#include +#include +#include +#include namespace ignition { namespace common { - /// \class Event Event.hh ignition/common/Event.hh + /// \class Event Event.hh gz/common/Event.hh /// \brief Base class for all events class IGNITION_COMMON_EVENTS_VISIBLE Event { diff --git a/events/include/gz/common/KeyEvent.hh b/events/include/gz/common/KeyEvent.hh index c9eb84ce6..0b1c2297b 100644 --- a/events/include/gz/common/KeyEvent.hh +++ b/events/include/gz/common/KeyEvent.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_KEYEVENT_HH_ -#define IGNITION_COMMON_KEYEVENT_HH_ +#ifndef GZ_COMMON_KEYEVENT_HH_ +#define GZ_COMMON_KEYEVENT_HH_ #include #include -#include -#include +#include +#include namespace ignition { @@ -30,7 +30,7 @@ namespace ignition // Forward declare private data class class KeyEventPrivate; - /// \class KeyEvent KeyEvent.hh ignition/common/KeyEvent.hh + /// \class KeyEvent KeyEvent.hh gz/common/KeyEvent.hh /// \brief Generic description of a keyboard event. class IGNITION_COMMON_EVENTS_VISIBLE KeyEvent { diff --git a/events/include/gz/common/MouseEvent.hh b/events/include/gz/common/MouseEvent.hh index b76826e0f..c31e3097a 100644 --- a/events/include/gz/common/MouseEvent.hh +++ b/events/include/gz/common/MouseEvent.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MOUSEEVENT_HH_ -#define IGNITION_COMMON_MOUSEEVENT_HH_ +#ifndef GZ_COMMON_MOUSEEVENT_HH_ +#define GZ_COMMON_MOUSEEVENT_HH_ #include -#include +#include -#include -#include +#include +#include namespace ignition { @@ -30,7 +30,7 @@ namespace ignition /// Forward declare private data class MouseEventPrivate; - /// \class MouseEvent MouseEvent.hh ignition/common/MouseEvent.hh + /// \class MouseEvent MouseEvent.hh gz/common/MouseEvent.hh /// \brief Generic description of a mouse event. class IGNITION_COMMON_EVENTS_VISIBLE MouseEvent { diff --git a/events/include/gz/common/events/Types.hh b/events/include/gz/common/events/Types.hh index 114e0d7ab..f1ba2544f 100644 --- a/events/include/gz/common/events/Types.hh +++ b/events/include/gz/common/events/Types.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_COMMON_EVENTS_TYPES_HH_ -#define IGNITION_COMMON_EVENTS_TYPES_HH_ +#ifndef GZ_COMMON_EVENTS_TYPES_HH_ +#define GZ_COMMON_EVENTS_TYPES_HH_ #include diff --git a/examples/assert_example.cc b/examples/assert_example.cc index 2fa852de3..99c5a1896 100644 --- a/examples/assert_example.cc +++ b/examples/assert_example.cc @@ -1,4 +1,4 @@ -#include +#include int main(int argc, char **argv) { diff --git a/examples/console.cc b/examples/console.cc index 0fe561a48..7b5194c57 100644 --- a/examples/console.cc +++ b/examples/console.cc @@ -14,7 +14,7 @@ * limitations under the License. * */ -#include +#include int main(int argc, char **argv) { diff --git a/examples/events.cc b/examples/events.cc index 62e7bf22f..82276813c 100644 --- a/examples/events.cc +++ b/examples/events.cc @@ -17,7 +17,7 @@ #include #include -#include +#include using namespace ignition; diff --git a/examples/logging_performance.cc b/examples/logging_performance.cc index f92fa0fdb..d72bc6558 100644 --- a/examples/logging_performance.cc +++ b/examples/logging_performance.cc @@ -25,7 +25,7 @@ #include #include -#include +#include namespace { const uint64_t g_iterations{1000000}; diff --git a/examples/profiler.cc b/examples/profiler.cc index f37bda37c..b2c41e3ef 100644 --- a/examples/profiler.cc +++ b/examples/profiler.cc @@ -18,9 +18,9 @@ #include #include -#include "ignition/common/Console.hh" -#include "ignition/common/Profiler.hh" -#include "ignition/common/SignalHandler.hh" +#include "gz/common/Console.hh" +#include "gz/common/Profiler.hh" +#include "gz/common/SignalHandler.hh" std::atomic running; diff --git a/geospatial/include/gz/common/geospatial/Dem.hh b/geospatial/include/gz/common/geospatial/Dem.hh index 18813bd0e..b22b4e5a0 100644 --- a/geospatial/include/gz/common/geospatial/Dem.hh +++ b/geospatial/include/gz/common/geospatial/Dem.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_GEOSPATIAL_DEM_HH_ -#define IGNITION_COMMON_GEOSPATIAL_DEM_HH_ +#ifndef GZ_COMMON_GEOSPATIAL_DEM_HH_ +#define GZ_COMMON_GEOSPATIAL_DEM_HH_ #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include namespace ignition diff --git a/geospatial/include/gz/common/geospatial/HeightmapData.hh b/geospatial/include/gz/common/geospatial/HeightmapData.hh index e161b5b62..9d261f946 100644 --- a/geospatial/include/gz/common/geospatial/HeightmapData.hh +++ b/geospatial/include/gz/common/geospatial/HeightmapData.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_GEOSPATIAL_HEIGHTMAPDATA_HH_ -#define IGNITION_COMMON_GEOSPATIAL_HEIGHTMAPDATA_HH_ +#ifndef GZ_COMMON_GEOSPATIAL_HEIGHTMAPDATA_HH_ +#define GZ_COMMON_GEOSPATIAL_HEIGHTMAPDATA_HH_ #include #include -#include -#include +#include +#include namespace ignition { diff --git a/geospatial/include/gz/common/geospatial/ImageHeightmap.hh b/geospatial/include/gz/common/geospatial/ImageHeightmap.hh index 35cabb870..4144371c1 100644 --- a/geospatial/include/gz/common/geospatial/ImageHeightmap.hh +++ b/geospatial/include/gz/common/geospatial/ImageHeightmap.hh @@ -14,17 +14,17 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_GEOSPATIAL_IMAGEHEIGHTMAPDATA_HH_ -#define IGNITION_COMMON_GEOSPATIAL_IMAGEHEIGHTMAPDATA_HH_ +#ifndef GZ_COMMON_GEOSPATIAL_IMAGEHEIGHTMAPDATA_HH_ +#define GZ_COMMON_GEOSPATIAL_IMAGEHEIGHTMAPDATA_HH_ #include #include #include -#include +#include -#include -#include -#include +#include +#include +#include namespace ignition { diff --git a/graphics/include/gz/common/Animation.hh b/graphics/include/gz/common/Animation.hh index 7ef0b9952..6a7cb9944 100644 --- a/graphics/include/gz/common/Animation.hh +++ b/graphics/include/gz/common/Animation.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_ANIMATION_HH_ -#define IGNITION_COMMON_ANIMATION_HH_ +#ifndef GZ_COMMON_ANIMATION_HH_ +#define GZ_COMMON_ANIMATION_HH_ #include #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include namespace ignition { @@ -37,7 +37,7 @@ namespace ignition class PoseKeyFrame; class NumericKeyFrame; - /// \class Animation Animation.hh ignition/common/Animation.hh + /// \class Animation Animation.hh gz/common/Animation.hh /// \brief Manages an animation, which is a collection of keyframes and /// the ability to interpolate between the keyframes class IGNITION_COMMON_GRAPHICS_VISIBLE Animation diff --git a/graphics/include/gz/common/BVHLoader.hh b/graphics/include/gz/common/BVHLoader.hh index b8c10e997..98d7660ab 100644 --- a/graphics/include/gz/common/BVHLoader.hh +++ b/graphics/include/gz/common/BVHLoader.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_BVHLOADER_HH_ -#define IGNITION_COMMON_BVHLOADER_HH_ +#ifndef GZ_COMMON_BVHLOADER_HH_ +#define GZ_COMMON_BVHLOADER_HH_ #include #include -#include -#include +#include +#include namespace ignition { @@ -29,7 +29,7 @@ namespace ignition { class Skeleton; - /// \class BVHLoader BVHLoader.hh ignition/common/BVHLoader.hh + /// \class BVHLoader BVHLoader.hh gz/common/BVHLoader.hh /// \brief Handles loading BVH animation files class IGNITION_COMMON_GRAPHICS_VISIBLE BVHLoader { diff --git a/graphics/include/gz/common/ColladaExporter.hh b/graphics/include/gz/common/ColladaExporter.hh index 5add1a5cb..4f59dd933 100644 --- a/graphics/include/gz/common/ColladaExporter.hh +++ b/graphics/include/gz/common/ColladaExporter.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_COLLADAEXPORTER_HH_ -#define IGNITION_COMMON_COLLADAEXPORTER_HH_ +#ifndef GZ_COMMON_COLLADAEXPORTER_HH_ +#define GZ_COMMON_COLLADAEXPORTER_HH_ #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include namespace ignition { diff --git a/graphics/include/gz/common/ColladaLoader.hh b/graphics/include/gz/common/ColladaLoader.hh index 199212f3b..a0dd39748 100644 --- a/graphics/include/gz/common/ColladaLoader.hh +++ b/graphics/include/gz/common/ColladaLoader.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_COLLADALOADER_HH_ -#define IGNITION_COMMON_COLLADALOADER_HH_ +#ifndef GZ_COMMON_COLLADALOADER_HH_ +#define GZ_COMMON_COLLADALOADER_HH_ #include -#include -#include +#include +#include -#include +#include namespace ignition { namespace common { - /// \class ColladaLoader ColladaLoader.hh ignition/common/ColladaLoader.hh + /// \class ColladaLoader ColladaLoader.hh gz/common/ColladaLoader.hh /// \brief Class used to load Collada mesh files class IGNITION_COMMON_GRAPHICS_VISIBLE ColladaLoader : public MeshLoader { diff --git a/graphics/include/gz/common/GTSMeshUtils.hh b/graphics/include/gz/common/GTSMeshUtils.hh index 7dc3a0d19..a14bdec87 100644 --- a/graphics/include/gz/common/GTSMeshUtils.hh +++ b/graphics/include/gz/common/GTSMeshUtils.hh @@ -15,13 +15,13 @@ * */ -#ifndef IGNITION_COMMON_GTSMESHUTILS_HH_ -#define IGNITION_COMMON_GTSMESHUTILS_HH_ +#ifndef GZ_COMMON_GTSMESHUTILS_HH_ +#define GZ_COMMON_GTSMESHUTILS_HH_ #include -#include -#include +#include +#include struct _GtsSurface; @@ -33,7 +33,7 @@ namespace ignition { class SubMesh; - /// \class GTSMeshUtils GTSMeshUtils.hh ignition/common/GTSMeshUtils.hh + /// \class GTSMeshUtils GTSMeshUtils.hh gz/common/GTSMeshUtils.hh /// \brief Creates GTS utilities for meshes class IGNITION_COMMON_GRAPHICS_VISIBLE GTSMeshUtils { diff --git a/graphics/include/gz/common/Image.hh b/graphics/include/gz/common/Image.hh index 91ac1ad60..fabc61f23 100644 --- a/graphics/include/gz/common/Image.hh +++ b/graphics/include/gz/common/Image.hh @@ -14,18 +14,18 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_IMAGE_HH_ -#define IGNITION_COMMON_IMAGE_HH_ +#ifndef GZ_COMMON_IMAGE_HH_ +#define GZ_COMMON_IMAGE_HH_ #include #include #include #include #include -#include -#include +#include +#include -#include +#include namespace ignition { @@ -56,7 +56,7 @@ namespace ignition "BAYER_GRBG8" }; - /// \class Image Image.hh ignition/common/common.hh + /// \class Image Image.hh gz/common/common.hh /// \brief Encapsulates an image class IGNITION_COMMON_GRAPHICS_VISIBLE Image { diff --git a/graphics/include/gz/common/KeyFrame.hh b/graphics/include/gz/common/KeyFrame.hh index 6dfbc6354..e7829221e 100644 --- a/graphics/include/gz/common/KeyFrame.hh +++ b/graphics/include/gz/common/KeyFrame.hh @@ -14,22 +14,22 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_KEYFRAME_HH_ -#define IGNITION_COMMON_KEYFRAME_HH_ +#ifndef GZ_COMMON_KEYFRAME_HH_ +#define GZ_COMMON_KEYFRAME_HH_ -#include -#include +#include +#include -#include +#include -#include +#include namespace ignition { namespace common { - /// \class KeyFrame KeyFrame.hh ignition/common/KeyFrame.hh + /// \class KeyFrame KeyFrame.hh gz/common/KeyFrame.hh /// \brief A key frame in an animation class IGNITION_COMMON_GRAPHICS_VISIBLE KeyFrame { diff --git a/graphics/include/gz/common/Material.hh b/graphics/include/gz/common/Material.hh index 4f438d59a..a5285f7e3 100644 --- a/graphics/include/gz/common/Material.hh +++ b/graphics/include/gz/common/Material.hh @@ -14,19 +14,19 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MATERIAL_HH_ -#define IGNITION_COMMON_MATERIAL_HH_ +#ifndef GZ_COMMON_MATERIAL_HH_ +#define GZ_COMMON_MATERIAL_HH_ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include namespace ignition { diff --git a/graphics/include/gz/common/Mesh.hh b/graphics/include/gz/common/Mesh.hh index 733a3e212..391d82bd7 100644 --- a/graphics/include/gz/common/Mesh.hh +++ b/graphics/include/gz/common/Mesh.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MESH_HH_ -#define IGNITION_COMMON_MESH_HH_ +#ifndef GZ_COMMON_MESH_HH_ +#define GZ_COMMON_MESH_HH_ #include #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { @@ -36,7 +36,7 @@ namespace ignition class Material; class Skeleton; - /// \class Mesh Mesh.hh ignition/common/Mesh.hh + /// \class Mesh Mesh.hh gz/common/Mesh.hh /// \brief A 3D mesh class IGNITION_COMMON_GRAPHICS_VISIBLE Mesh { diff --git a/graphics/include/gz/common/MeshCSG.hh b/graphics/include/gz/common/MeshCSG.hh index a2d445a0a..56be57029 100644 --- a/graphics/include/gz/common/MeshCSG.hh +++ b/graphics/include/gz/common/MeshCSG.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MESHCSG_HH_ -#define IGNITION_COMMON_MESHCSG_HH_ +#ifndef GZ_COMMON_MESHCSG_HH_ +#define GZ_COMMON_MESHCSG_HH_ -#include +#include -#include +#include struct _GtsSurface; typedef _GtsSurface GtsSurface; @@ -32,7 +32,7 @@ namespace ignition { class Mesh; - /// \class MeshCSG MeshCSG.hh ignition/common/MeshCSG.hh + /// \class MeshCSG MeshCSG.hh gz/common/MeshCSG.hh /// \brief Creates CSG meshes class IGNITION_COMMON_GRAPHICS_VISIBLE MeshCSG { diff --git a/graphics/include/gz/common/MeshExporter.hh b/graphics/include/gz/common/MeshExporter.hh index a1e54e3aa..2372b14a1 100644 --- a/graphics/include/gz/common/MeshExporter.hh +++ b/graphics/include/gz/common/MeshExporter.hh @@ -14,11 +14,11 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MESHEXPORTER_HH_ -#define IGNITION_COMMON_MESHEXPORTER_HH_ +#ifndef GZ_COMMON_MESHEXPORTER_HH_ +#define GZ_COMMON_MESHEXPORTER_HH_ #include -#include +#include namespace ignition { diff --git a/graphics/include/gz/common/MeshLoader.hh b/graphics/include/gz/common/MeshLoader.hh index 4a7dd4a59..598feda61 100644 --- a/graphics/include/gz/common/MeshLoader.hh +++ b/graphics/include/gz/common/MeshLoader.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MESHLOADER_HH_ -#define IGNITION_COMMON_MESHLOADER_HH_ +#ifndef GZ_COMMON_MESHLOADER_HH_ +#define GZ_COMMON_MESHLOADER_HH_ #include -#include +#include namespace ignition { @@ -27,7 +27,7 @@ namespace ignition { class Mesh; - /// \class MeshLoader MeshLoader.hh ignition/common/MeshLoader.hh + /// \class MeshLoader MeshLoader.hh gz/common/MeshLoader.hh /// \brief Base class for loading meshes class IGNITION_COMMON_GRAPHICS_VISIBLE MeshLoader { diff --git a/graphics/include/gz/common/MeshManager.hh b/graphics/include/gz/common/MeshManager.hh index f7dc59ff5..ecdb51e4e 100644 --- a/graphics/include/gz/common/MeshManager.hh +++ b/graphics/include/gz/common/MeshManager.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MESHMANAGER_HH_ -#define IGNITION_COMMON_MESHMANAGER_HH_ +#ifndef GZ_COMMON_MESHMANAGER_HH_ +#define GZ_COMMON_MESHMANAGER_HH_ #include #include @@ -23,18 +23,18 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include namespace ignition { @@ -44,7 +44,7 @@ namespace ignition class Mesh; class SubMesh; - /// \class MeshManager MeshManager.hh ignition/common/MeshManager.hh + /// \class MeshManager MeshManager.hh gz/common/MeshManager.hh /// \brief Maintains and manages all meshes class IGNITION_COMMON_GRAPHICS_VISIBLE MeshManager : public SingletonT diff --git a/graphics/include/gz/common/NodeAnimation.hh b/graphics/include/gz/common/NodeAnimation.hh index dd92ba528..48d3048a8 100644 --- a/graphics/include/gz/common/NodeAnimation.hh +++ b/graphics/include/gz/common/NodeAnimation.hh @@ -14,24 +14,24 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_NODE_ANIMATION_HH_ -#define IGNITION_COMMON_NODE_ANIMATION_HH_ +#ifndef GZ_COMMON_NODE_ANIMATION_HH_ +#define GZ_COMMON_NODE_ANIMATION_HH_ #include #include -#include -#include +#include +#include -#include +#include -#include +#include namespace ignition { namespace common { - /// \class NodeAnimation NodeAnimation.hh ignition/common/NodeAnimation.hh + /// \class NodeAnimation NodeAnimation.hh gz/common/NodeAnimation.hh /// \brief Node animation class IGNITION_COMMON_GRAPHICS_VISIBLE NodeAnimation { diff --git a/graphics/include/gz/common/NodeTransform.hh b/graphics/include/gz/common/NodeTransform.hh index 62136d18d..26b0e691a 100644 --- a/graphics/include/gz/common/NodeTransform.hh +++ b/graphics/include/gz/common/NodeTransform.hh @@ -14,24 +14,24 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_NODE_TRANSFORM_HH_ -#define IGNITION_COMMON_NODE_TRANSFORM_HH_ +#ifndef GZ_COMMON_NODE_TRANSFORM_HH_ +#define GZ_COMMON_NODE_TRANSFORM_HH_ #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { namespace common { - /// \class NodeTransform NodeTransform.hh ignition/common/NodeTransform.hh + /// \class NodeTransform NodeTransform.hh gz/common/NodeTransform.hh /// \brief A transformation node class IGNITION_COMMON_GRAPHICS_VISIBLE NodeTransform { diff --git a/graphics/include/gz/common/OBJLoader.hh b/graphics/include/gz/common/OBJLoader.hh index 7267b8558..4018d714a 100644 --- a/graphics/include/gz/common/OBJLoader.hh +++ b/graphics/include/gz/common/OBJLoader.hh @@ -15,16 +15,16 @@ * */ -#ifndef IGNITION_COMMON_OBJLOADER_HH_ -#define IGNITION_COMMON_OBJLOADER_HH_ +#ifndef GZ_COMMON_OBJLOADER_HH_ +#define GZ_COMMON_OBJLOADER_HH_ #include #include -#include +#include -#include -#include +#include +#include namespace ignition { diff --git a/graphics/include/gz/common/Pbr.hh b/graphics/include/gz/common/Pbr.hh index 516cbe6a4..00768a6c9 100644 --- a/graphics/include/gz/common/Pbr.hh +++ b/graphics/include/gz/common/Pbr.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_PBR_HH_ -#define IGNITION_COMMON_PBR_HH_ +#ifndef GZ_COMMON_PBR_HH_ +#define GZ_COMMON_PBR_HH_ #include -#include +#include -#include +#include namespace ignition { diff --git a/graphics/include/gz/common/STLLoader.hh b/graphics/include/gz/common/STLLoader.hh index 021c3205f..ab243ca3d 100644 --- a/graphics/include/gz/common/STLLoader.hh +++ b/graphics/include/gz/common/STLLoader.hh @@ -14,16 +14,16 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_STLLOADER_HH_ -#define IGNITION_COMMON_STLLOADER_HH_ +#ifndef GZ_COMMON_STLLOADER_HH_ +#define GZ_COMMON_STLLOADER_HH_ #include #include -#include +#include -#include "ignition/common/MeshLoader.hh" -#include "ignition/common/graphics/Export.hh" +#include "gz/common/MeshLoader.hh" +#include "gz/common/graphics/Export.hh" #define LINE_MAX_LEN 256 #define COR3_MAX 200000 @@ -34,7 +34,7 @@ namespace ignition { namespace common { - /// \class STLLoader STLLoader.hh ignition/common/STLLoader.hh + /// \class STLLoader STLLoader.hh gz/common/STLLoader.hh /// \brief Class used to load STL mesh files class IGNITION_COMMON_GRAPHICS_VISIBLE STLLoader : public MeshLoader { diff --git a/graphics/include/gz/common/SVGLoader.hh b/graphics/include/gz/common/SVGLoader.hh index 429286a1d..88af0d17e 100644 --- a/graphics/include/gz/common/SVGLoader.hh +++ b/graphics/include/gz/common/SVGLoader.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SVGLOADER_HH_ -#define IGNITION_COMMON_SVGLOADER_HH_ +#ifndef GZ_COMMON_SVGLOADER_HH_ +#define GZ_COMMON_SVGLOADER_HH_ #include #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { diff --git a/graphics/include/gz/common/Skeleton.hh b/graphics/include/gz/common/Skeleton.hh index 015f33485..939efaeb6 100644 --- a/graphics/include/gz/common/Skeleton.hh +++ b/graphics/include/gz/common/Skeleton.hh @@ -14,20 +14,20 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SKELETON_HH_ -#define IGNITION_COMMON_SKELETON_HH_ +#ifndef GZ_COMMON_SKELETON_HH_ +#define GZ_COMMON_SKELETON_HH_ #include #include #include #include -#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { @@ -35,7 +35,7 @@ namespace ignition { class SkeletonAnimation; - /// \class Skeleton Skeleton.hh ignition/common/Skeleton.hh + /// \class Skeleton Skeleton.hh gz/common/Skeleton.hh /// \brief A skeleton, usually used for animation purposes. class IGNITION_COMMON_GRAPHICS_VISIBLE Skeleton { diff --git a/graphics/include/gz/common/SkeletonAnimation.hh b/graphics/include/gz/common/SkeletonAnimation.hh index ca096bc35..ceab7e362 100644 --- a/graphics/include/gz/common/SkeletonAnimation.hh +++ b/graphics/include/gz/common/SkeletonAnimation.hh @@ -14,27 +14,27 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SKELETONANIMATION_HH_ -#define IGNITION_COMMON_SKELETONANIMATION_HH_ +#ifndef GZ_COMMON_SKELETONANIMATION_HH_ +#define GZ_COMMON_SKELETONANIMATION_HH_ #include #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { namespace common { /// \class SkeletonAnimation SkeletonAnimation.hh - /// ignition/common/SkeletonAnimation.hh + /// gz/common/SkeletonAnimation.hh /// \brief Skeleton animation class IGNITION_COMMON_GRAPHICS_VISIBLE SkeletonAnimation { diff --git a/graphics/include/gz/common/SkeletonNode.hh b/graphics/include/gz/common/SkeletonNode.hh index 3983f5e0f..df18bf3d9 100644 --- a/graphics/include/gz/common/SkeletonNode.hh +++ b/graphics/include/gz/common/SkeletonNode.hh @@ -14,23 +14,23 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SKELETON_NODE_HH_ -#define IGNITION_COMMON_SKELETON_NODE_HH_ +#ifndef GZ_COMMON_SKELETON_NODE_HH_ +#define GZ_COMMON_SKELETON_NODE_HH_ #include #include #include -#include +#include -#include -#include +#include +#include namespace ignition { namespace common { - /// \class SkeletonNode Skeleton.hh ignition/common/SkeletonNode.hh + /// \class SkeletonNode Skeleton.hh gz/common/SkeletonNode.hh /// \brief A skeleton node class IGNITION_COMMON_GRAPHICS_VISIBLE SkeletonNode { diff --git a/graphics/include/gz/common/SubMesh.hh b/graphics/include/gz/common/SubMesh.hh index d0ccd5062..25eb31fd4 100644 --- a/graphics/include/gz/common/SubMesh.hh +++ b/graphics/include/gz/common/SubMesh.hh @@ -14,21 +14,21 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SUBMESH_HH_ -#define IGNITION_COMMON_SUBMESH_HH_ +#ifndef GZ_COMMON_SUBMESH_HH_ +#define GZ_COMMON_SUBMESH_HH_ #include #include #include #include -#include -#include +#include +#include -#include +#include -#include -#include +#include +#include namespace ignition { diff --git a/graphics/include/gz/common/graphics/Types.hh b/graphics/include/gz/common/graphics/Types.hh index bf0d619d1..f1202d2ea 100644 --- a/graphics/include/gz/common/graphics/Types.hh +++ b/graphics/include/gz/common/graphics/Types.hh @@ -15,8 +15,8 @@ * */ -#ifndef IGNITION_COMMON_GRAPHICS_TYPES_HH_ -#define IGNITION_COMMON_GRAPHICS_TYPES_HH_ +#ifndef GZ_COMMON_GRAPHICS_TYPES_HH_ +#define GZ_COMMON_GRAPHICS_TYPES_HH_ #include diff --git a/include/gz/common/Base64.hh b/include/gz/common/Base64.hh index e362a497c..2f128c543 100644 --- a/include/gz/common/Base64.hh +++ b/include/gz/common/Base64.hh @@ -14,11 +14,11 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_BASE64_HH_ -#define IGNITION_COMMON_BASE64_HH_ +#ifndef GZ_COMMON_BASE64_HH_ +#define GZ_COMMON_BASE64_HH_ #include -#include +#include namespace ignition { diff --git a/include/gz/common/Battery.hh b/include/gz/common/Battery.hh index 87cbb7dc6..fd5e042b2 100644 --- a/include/gz/common/Battery.hh +++ b/include/gz/common/Battery.hh @@ -14,17 +14,17 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_BATTERY_HH_ -#define IGNITION_COMMON_BATTERY_HH_ +#ifndef GZ_COMMON_BATTERY_HH_ +#define GZ_COMMON_BATTERY_HH_ #include #include #include #include -#include +#include -#include +#include namespace ignition { diff --git a/include/gz/common/Console.hh b/include/gz/common/Console.hh index e5245fbbf..6a1f423d6 100644 --- a/include/gz/common/Console.hh +++ b/include/gz/common/Console.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_CONSOLE_HH_ -#define IGNITION_COMMON_CONSOLE_HH_ +#ifndef GZ_COMMON_CONSOLE_HH_ +#define GZ_COMMON_CONSOLE_HH_ #include #include @@ -23,9 +23,9 @@ #include #include -#include -#include -#include +#include +#include +#include namespace ignition { diff --git a/include/gz/common/EnumIface.hh b/include/gz/common/EnumIface.hh index 898eeea70..b95ce1b39 100644 --- a/include/gz/common/EnumIface.hh +++ b/include/gz/common/EnumIface.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_ENUMITERATOR_HH_ -#define IGNITION_COMMON_ENUMITERATOR_HH_ +#ifndef GZ_COMMON_ENUMITERATOR_HH_ +#define GZ_COMMON_ENUMITERATOR_HH_ #include #include #include -#include -#include +#include +#include namespace ignition { diff --git a/include/gz/common/Filesystem.hh b/include/gz/common/Filesystem.hh index 6948a2df0..a859a6af1 100644 --- a/include/gz/common/Filesystem.hh +++ b/include/gz/common/Filesystem.hh @@ -15,14 +15,14 @@ * */ -#ifndef IGNITION_COMMON_FILESYSTEM_HH_ -#define IGNITION_COMMON_FILESYSTEM_HH_ +#ifndef GZ_COMMON_FILESYSTEM_HH_ +#define GZ_COMMON_FILESYSTEM_HH_ #include -#include +#include -#include +#include namespace ignition { diff --git a/include/gz/common/FlagSet.hh b/include/gz/common/FlagSet.hh index 30e1d1c18..1c4e88bf1 100644 --- a/include/gz/common/FlagSet.hh +++ b/include/gz/common/FlagSet.hh @@ -22,8 +22,8 @@ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * SOFTWARE. */ -#ifndef IGNITION_COMMON_FLAGSET_HH -#define IGNITION_COMMON_FLAGSET_HH +#ifndef GZ_COMMON_FLAGSET_HH +#define GZ_COMMON_FLAGSET_HH // FlagSet is a type-safe class for using enums as flags in C++14 with an // underlying std::bitset. diff --git a/include/gz/common/MaterialDensity.hh b/include/gz/common/MaterialDensity.hh index 95de5e7d3..7dfa3f089 100644 --- a/include/gz/common/MaterialDensity.hh +++ b/include/gz/common/MaterialDensity.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MATERIALDENSITY_HH_ -#define IGNITION_COMMON_MATERIALDENSITY_HH_ +#ifndef GZ_COMMON_MATERIALDENSITY_HH_ +#define GZ_COMMON_MATERIALDENSITY_HH_ #include #include #include #include -#include "ignition/common/Export.hh" +#include "gz/common/Export.hh" namespace ignition { diff --git a/include/gz/common/MovingWindowFilter.hh b/include/gz/common/MovingWindowFilter.hh index dc16df24f..83938e495 100644 --- a/include/gz/common/MovingWindowFilter.hh +++ b/include/gz/common/MovingWindowFilter.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_MOVINGWINDOWFILTER_HH_ -#define IGNITION_COMMON_MOVINGWINDOWFILTER_HH_ +#ifndef GZ_COMMON_MOVINGWINDOWFILTER_HH_ +#define GZ_COMMON_MOVINGWINDOWFILTER_HH_ #include #include diff --git a/include/gz/common/Plugin.hh b/include/gz/common/Plugin.hh index ee8352576..51cad8beb 100644 --- a/include/gz/common/Plugin.hh +++ b/include/gz/common/Plugin.hh @@ -16,15 +16,15 @@ */ -#ifndef IGNITION_COMMON_PLUGIN_HH_ -#define IGNITION_COMMON_PLUGIN_HH_ +#ifndef GZ_COMMON_PLUGIN_HH_ +#define GZ_COMMON_PLUGIN_HH_ #include #include #include -#include -#include +#include +#include namespace ignition { @@ -191,6 +191,6 @@ namespace ignition } } -#include "ignition/common/detail/Plugin.hh" +#include "gz/common/detail/Plugin.hh" #endif diff --git a/include/gz/common/PluginInfo.hh b/include/gz/common/PluginInfo.hh index c819c4a19..4ae4941b6 100644 --- a/include/gz/common/PluginInfo.hh +++ b/include/gz/common/PluginInfo.hh @@ -16,8 +16,8 @@ */ -#ifndef IGNITION_COMMON_PLUGININFO_HH_ -#define IGNITION_COMMON_PLUGININFO_HH_ +#ifndef GZ_COMMON_PLUGININFO_HH_ +#define GZ_COMMON_PLUGININFO_HH_ #include #include diff --git a/include/gz/common/PluginLoader.hh b/include/gz/common/PluginLoader.hh index 8b3b5b642..3f696c660 100644 --- a/include/gz/common/PluginLoader.hh +++ b/include/gz/common/PluginLoader.hh @@ -16,17 +16,17 @@ */ -#ifndef IGNITION_COMMON_PLUGINLOADER_HH_ -#define IGNITION_COMMON_PLUGINLOADER_HH_ +#ifndef GZ_COMMON_PLUGINLOADER_HH_ +#define GZ_COMMON_PLUGINLOADER_HH_ #include #include #include #include -#include -#include -#include +#include +#include +#include namespace ignition { @@ -99,6 +99,6 @@ namespace ignition } } -#include "ignition/common/detail/PluginLoader.hh" +#include "gz/common/detail/PluginLoader.hh" #endif diff --git a/include/gz/common/PluginMacros.hh b/include/gz/common/PluginMacros.hh index ecc9b677f..ce293e193 100644 --- a/include/gz/common/PluginMacros.hh +++ b/include/gz/common/PluginMacros.hh @@ -16,10 +16,10 @@ */ -#ifndef IGNITION_COMMON_REGISTERMACROS_HH_ -#define IGNITION_COMMON_REGISTERMACROS_HH_ +#ifndef GZ_COMMON_REGISTERMACROS_HH_ +#define GZ_COMMON_REGISTERMACROS_HH_ -#include "ignition/common/detail/PluginMacros.hh" +#include "gz/common/detail/PluginMacros.hh" // --------------- Specialize a plugin interface (optional) ------------------- diff --git a/include/gz/common/PluginPtr.hh b/include/gz/common/PluginPtr.hh index c202b84c0..0cc07abda 100644 --- a/include/gz/common/PluginPtr.hh +++ b/include/gz/common/PluginPtr.hh @@ -16,14 +16,14 @@ */ -#ifndef IGNITION_COMMON_PLUGINPTR_HH_ -#define IGNITION_COMMON_PLUGINPTR_HH_ +#ifndef GZ_COMMON_PLUGINPTR_HH_ +#define GZ_COMMON_PLUGINPTR_HH_ #include #include #include -#include "ignition/common/Plugin.hh" +#include "gz/common/Plugin.hh" namespace ignition { @@ -226,6 +226,6 @@ namespace ignition } } -#include "ignition/common/detail/PluginPtr.hh" +#include "gz/common/detail/PluginPtr.hh" #endif diff --git a/include/gz/common/SignalHandler.hh b/include/gz/common/SignalHandler.hh index 5452eb094..a8476de44 100644 --- a/include/gz/common/SignalHandler.hh +++ b/include/gz/common/SignalHandler.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SIGNALHANDLER_HH_ -#define IGNITION_COMMON_SIGNALHANDLER_HH_ +#ifndef GZ_COMMON_SIGNALHANDLER_HH_ +#define GZ_COMMON_SIGNALHANDLER_HH_ #include -#include +#include namespace ignition { diff --git a/include/gz/common/SingletonT.hh b/include/gz/common/SingletonT.hh index 61127f957..c7a556299 100644 --- a/include/gz/common/SingletonT.hh +++ b/include/gz/common/SingletonT.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SINGLETONT_HH_ -#define IGNITION_COMMON_SINGLETONT_HH_ +#ifndef GZ_COMMON_SINGLETONT_HH_ +#define GZ_COMMON_SINGLETONT_HH_ namespace ignition { diff --git a/include/gz/common/SpecializedPlugin.hh b/include/gz/common/SpecializedPlugin.hh index 8f4c86a8a..910ec9742 100644 --- a/include/gz/common/SpecializedPlugin.hh +++ b/include/gz/common/SpecializedPlugin.hh @@ -14,12 +14,12 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SPECIALIZEDPLUGIN_HH_ -#define IGNITION_COMMON_SPECIALIZEDPLUGIN_HH_ +#ifndef GZ_COMMON_SPECIALIZEDPLUGIN_HH_ +#define GZ_COMMON_SPECIALIZEDPLUGIN_HH_ #include -#include "ignition/common/Plugin.hh" +#include "gz/common/Plugin.hh" namespace ignition { @@ -62,7 +62,7 @@ namespace ignition /// Only interfaces that have been "specialized" can be passed as arguments /// to the SpecializedPlugin template. To specialize an interface, simply /// put the macro IGN_COMMON_SPECIALIZE_INTERFACE(~) from - /// ignition/common/PluginMacros.hh into a public location of its class + /// gz/common/PluginMacros.hh into a public location of its class /// definition. template class SpecializedPlugin : public virtual Plugin @@ -165,6 +165,6 @@ namespace ignition } } -#include "ignition/common/detail/SpecializedPlugin.hh" +#include "gz/common/detail/SpecializedPlugin.hh" #endif diff --git a/include/gz/common/SpecializedPluginPtr.hh b/include/gz/common/SpecializedPluginPtr.hh index b09702f81..a27253aba 100644 --- a/include/gz/common/SpecializedPluginPtr.hh +++ b/include/gz/common/SpecializedPluginPtr.hh @@ -16,11 +16,11 @@ */ -#ifndef IGNITION_COMMON_SPECIALIZEDPLUGINPTR_HH_ -#define IGNITION_COMMON_SPECIALIZEDPLUGINPTR_HH_ +#ifndef GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_ +#define GZ_COMMON_SPECIALIZEDPLUGINPTR_HH_ -#include "ignition/common/PluginPtr.hh" -#include "ignition/common/SpecializedPlugin.hh" +#include "gz/common/PluginPtr.hh" +#include "gz/common/SpecializedPlugin.hh" namespace ignition { @@ -64,7 +64,7 @@ namespace ignition /// Only interfaces that have been "specialized" can be passed as arguments /// to the SpecializedPluginPtr template. To specialize an interface, simply /// put the macro IGN_COMMON_SPECIALIZE_INTERFACE(~) from - /// ignition/common/PluginMacros.hh into a public location of its class + /// gz/common/PluginMacros.hh into a public location of its class /// definition. template using SpecializedPluginPtr = diff --git a/include/gz/common/StringUtils.hh b/include/gz/common/StringUtils.hh index 6075fc935..cf0b601b0 100644 --- a/include/gz/common/StringUtils.hh +++ b/include/gz/common/StringUtils.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_STRINGUTILS_HH_ -#define IGNITION_COMMON_STRINGUTILS_HH_ +#ifndef GZ_COMMON_STRINGUTILS_HH_ +#define GZ_COMMON_STRINGUTILS_HH_ #include #include -#include +#include namespace ignition { diff --git a/include/gz/common/SuppressWarning.hh b/include/gz/common/SuppressWarning.hh index a4e00c8db..cc2f0b93d 100644 --- a/include/gz/common/SuppressWarning.hh +++ b/include/gz/common/SuppressWarning.hh @@ -15,10 +15,10 @@ * */ -#ifndef IGNITION_COMMON_SUPPRESSWARNING_HH_ -#define IGNITION_COMMON_SUPPRESSWARNING_HH_ +#ifndef GZ_COMMON_SUPPRESSWARNING_HH_ +#define GZ_COMMON_SUPPRESSWARNING_HH_ -#include +#include #pragma message("ign-common SuppressWarning is deprecated, use ign-utils") // These macros have been moved to ign-utils so they may be more broadly used. diff --git a/include/gz/common/SystemPaths.hh b/include/gz/common/SystemPaths.hh index d368dc737..19ba715f0 100644 --- a/include/gz/common/SystemPaths.hh +++ b/include/gz/common/SystemPaths.hh @@ -14,24 +14,24 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_SYSTEMPATHS_HH_ -#define IGNITION_COMMON_SYSTEMPATHS_HH_ +#ifndef GZ_COMMON_SYSTEMPATHS_HH_ +#define GZ_COMMON_SYSTEMPATHS_HH_ #include #include #include #include -#include -#include +#include +#include -#include +#include namespace ignition { namespace common { - /// \class SystemPaths SystemPaths.hh ignition/common/SystemPaths.hh + /// \class SystemPaths SystemPaths.hh gz/common/SystemPaths.hh /// \brief Functions to handle getting system paths, keeps track of: /// \li SystemPaths#pluginPaths - plugin library paths /// for common::WorldPlugin diff --git a/include/gz/common/TempDirectory.hh b/include/gz/common/TempDirectory.hh index 259acdf1f..36a5d3a02 100644 --- a/include/gz/common/TempDirectory.hh +++ b/include/gz/common/TempDirectory.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_COMMON_TEMPDIRECTORY_HH_ -#define IGNITION_COMMON_TEMPDIRECTORY_HH_ +#ifndef GZ_COMMON_TEMPDIRECTORY_HH_ +#define GZ_COMMON_TEMPDIRECTORY_HH_ #include -#include -#include +#include +#include -#include +#include namespace ignition { @@ -120,5 +120,5 @@ namespace ignition }; } // namespace common } // namespace ignition -#endif // IGNITION_COMMON_TEMPDIRECTORY_HH_ +#endif // GZ_COMMON_TEMPDIRECTORY_HH_ diff --git a/include/gz/common/TemplateHelpers.hh b/include/gz/common/TemplateHelpers.hh index 1dd9be5c1..f85d44d88 100644 --- a/include/gz/common/TemplateHelpers.hh +++ b/include/gz/common/TemplateHelpers.hh @@ -16,11 +16,11 @@ */ -#ifndef IGNITION_COMMON_TEMPLATEHELPERS_HH_ -#define IGNITION_COMMON_TEMPLATEHELPERS_HH_ +#ifndef GZ_COMMON_TEMPLATEHELPERS_HH_ +#define GZ_COMMON_TEMPLATEHELPERS_HH_ -#include "ignition/common/detail/TemplateHelpers.hh" +#include "gz/common/detail/TemplateHelpers.hh" namespace ignition { diff --git a/include/gz/common/Timer.hh b/include/gz/common/Timer.hh index 098c31680..e155fe56c 100644 --- a/include/gz/common/Timer.hh +++ b/include/gz/common/Timer.hh @@ -14,11 +14,11 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TIMER_HH_ -#define IGNITION_COMMON_TIMER_HH_ +#ifndef GZ_COMMON_TIMER_HH_ +#define GZ_COMMON_TIMER_HH_ -#include -#include +#include +#include #include #include diff --git a/include/gz/common/URI.hh b/include/gz/common/URI.hh index a03904071..c0b7e3ee2 100644 --- a/include/gz/common/URI.hh +++ b/include/gz/common/URI.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_URI_HH_ -#define IGNITION_COMMON_URI_HH_ +#ifndef GZ_COMMON_URI_HH_ +#define GZ_COMMON_URI_HH_ #include #include -#include +#include -#include +#include namespace ignition { diff --git a/include/gz/common/Util.hh b/include/gz/common/Util.hh index 5390d08ca..2f69e5473 100644 --- a/include/gz/common/Util.hh +++ b/include/gz/common/Util.hh @@ -14,8 +14,8 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_UTIL_HH_ -#define IGNITION_COMMON_UTIL_HH_ +#ifndef GZ_COMMON_UTIL_HH_ +#define GZ_COMMON_UTIL_HH_ #include #include @@ -25,18 +25,18 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include ///////////////////////////////////////////////// // Defines #ifdef _WIN32 -# define IGN_HOMEDIR "USERPROFILE" +# define GZ_HOMEDIR "USERPROFILE" #else -# define IGN_HOMEDIR "HOME" +# define GZ_HOMEDIR "HOME" #endif /// \brief Seconds in one nano second. diff --git a/include/gz/common/Uuid.hh b/include/gz/common/Uuid.hh index d9718951f..48a648c43 100644 --- a/include/gz/common/Uuid.hh +++ b/include/gz/common/Uuid.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_UUID_HH_INCLUDED_ -#define IGNITION_COMMON_UUID_HH_INCLUDED_ +#ifndef GZ_COMMON_UUID_HH_INCLUDED_ +#define GZ_COMMON_UUID_HH_INCLUDED_ #include #include -#include +#include #ifdef _WIN32 #include diff --git a/include/gz/common/WorkerPool.hh b/include/gz/common/WorkerPool.hh index d7f5aeebc..6220cd0d8 100644 --- a/include/gz/common/WorkerPool.hh +++ b/include/gz/common/WorkerPool.hh @@ -15,14 +15,14 @@ * */ -#ifndef IGNITION_COMMON_WORKER_POOL_HH_ -#define IGNITION_COMMON_WORKER_POOL_HH_ +#ifndef GZ_COMMON_WORKER_POOL_HH_ +#define GZ_COMMON_WORKER_POOL_HH_ #include -#include +#include -#include +#include namespace ignition { diff --git a/include/gz/common/detail/Plugin.hh b/include/gz/common/detail/Plugin.hh index a7d2d2c22..3a8a048c1 100644 --- a/include/gz/common/detail/Plugin.hh +++ b/include/gz/common/detail/Plugin.hh @@ -16,12 +16,12 @@ */ -#ifndef IGNITION_COMMON_DETAIL_PLUGIN_HH_ -#define IGNITION_COMMON_DETAIL_PLUGIN_HH_ +#ifndef GZ_COMMON_DETAIL_PLUGIN_HH_ +#define GZ_COMMON_DETAIL_PLUGIN_HH_ #include #include -#include "ignition/common/Plugin.hh" +#include "gz/common/Plugin.hh" namespace ignition { diff --git a/include/gz/common/detail/PluginLoader.hh b/include/gz/common/detail/PluginLoader.hh index 84504470a..2ef11c625 100644 --- a/include/gz/common/detail/PluginLoader.hh +++ b/include/gz/common/detail/PluginLoader.hh @@ -16,11 +16,11 @@ */ -#ifndef IGNITION_COMMON_DETAIL_PLUGINLOADER_HH_ -#define IGNITION_COMMON_DETAIL_PLUGINLOADER_HH_ +#ifndef GZ_COMMON_DETAIL_PLUGINLOADER_HH_ +#define GZ_COMMON_DETAIL_PLUGINLOADER_HH_ #include -#include "ignition/common/PluginLoader.hh" +#include "gz/common/PluginLoader.hh" namespace ignition { diff --git a/include/gz/common/detail/PluginMacros.hh b/include/gz/common/detail/PluginMacros.hh index 733c91938..4e93ae447 100644 --- a/include/gz/common/detail/PluginMacros.hh +++ b/include/gz/common/detail/PluginMacros.hh @@ -16,16 +16,16 @@ */ -#ifndef IGNITION_COMMON_DETAIL_PLUGINMACROS_HH_ -#define IGNITION_COMMON_DETAIL_PLUGINMACROS_HH_ +#ifndef GZ_COMMON_DETAIL_PLUGINMACROS_HH_ +#define GZ_COMMON_DETAIL_PLUGINMACROS_HH_ #include #include #include #include #include -#include "ignition/common/PluginInfo.hh" -#include "ignition/utils/SuppressWarning.hh" +#include "gz/common/PluginInfo.hh" +#include "gz/utils/SuppressWarning.hh" #if defined _WIN32 || defined __CYGWIN__ diff --git a/include/gz/common/detail/PluginPtr.hh b/include/gz/common/detail/PluginPtr.hh index 133bb2764..93952868e 100644 --- a/include/gz/common/detail/PluginPtr.hh +++ b/include/gz/common/detail/PluginPtr.hh @@ -16,13 +16,13 @@ */ -#ifndef IGNITION_COMMON_DETAIL_PLUGINPTR_HH_ -#define IGNITION_COMMON_DETAIL_PLUGINPTR_HH_ +#ifndef GZ_COMMON_DETAIL_PLUGINPTR_HH_ +#define GZ_COMMON_DETAIL_PLUGINPTR_HH_ #include #include -#include "ignition/common/PluginPtr.hh" -#include "ignition/common/TemplateHelpers.hh" +#include "gz/common/PluginPtr.hh" +#include "gz/common/TemplateHelpers.hh" namespace ignition { diff --git a/include/gz/common/detail/SpecializedPlugin.hh b/include/gz/common/detail/SpecializedPlugin.hh index 7c6bf31d2..dff284cca 100644 --- a/include/gz/common/detail/SpecializedPlugin.hh +++ b/include/gz/common/detail/SpecializedPlugin.hh @@ -16,10 +16,10 @@ */ -#ifndef IGNITION_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_ -#define IGNITION_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_ +#ifndef GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_ +#define GZ_COMMON_DETAIL_SPECIALIZEDPLUGIN_HH_ -#include "ignition/common/SpecializedPlugin.hh" +#include "gz/common/SpecializedPlugin.hh" #include // This preprocessor token should only be used by the unittest that is diff --git a/include/gz/common/detail/TemplateHelpers.hh b/include/gz/common/detail/TemplateHelpers.hh index 7cecae948..332755ed8 100644 --- a/include/gz/common/detail/TemplateHelpers.hh +++ b/include/gz/common/detail/TemplateHelpers.hh @@ -16,8 +16,8 @@ */ -#ifndef IGNITION_COMMON_DETAIL_TEMPLATEHELPERS_HH_ -#define IGNITION_COMMON_DETAIL_TEMPLATEHELPERS_HH_ +#ifndef GZ_COMMON_DETAIL_TEMPLATEHELPERS_HH_ +#define GZ_COMMON_DETAIL_TEMPLATEHELPERS_HH_ #include diff --git a/profiler/include/gz/common/Profiler.hh b/profiler/include/gz/common/Profiler.hh index 8190a113b..c2d0e9dac 100644 --- a/profiler/include/gz/common/Profiler.hh +++ b/profiler/include/gz/common/Profiler.hh @@ -15,15 +15,15 @@ * */ -#ifndef IGNITION_COMMON_PROFILER_HH_ -#define IGNITION_COMMON_PROFILER_HH_ +#ifndef GZ_COMMON_PROFILER_HH_ +#define GZ_COMMON_PROFILER_HH_ #include #include -#include -#include -#include +#include +#include +#include namespace ignition { @@ -162,4 +162,4 @@ ignition::common::ScopedProfile __profile##line(name, &__hash##line); #define IGN_PROFILER_VALID \ IGN_PROFILER_ENABLE && ignition::common::Profiler::Instance()->Valid() -#endif // IGNITION_COMMON_PROFILER_HH_ +#endif // GZ_COMMON_PROFILER_HH_ diff --git a/testing/include/gz/common/testing/AutoLogFixture.hh b/testing/include/gz/common/testing/AutoLogFixture.hh index c685723f9..204b3107b 100644 --- a/testing/include/gz/common/testing/AutoLogFixture.hh +++ b/testing/include/gz/common/testing/AutoLogFixture.hh @@ -14,15 +14,15 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_AUTOLOGFIXTURE_HH_ -#define IGNITION_COMMON_TESTING_AUTOLOGFIXTURE_HH_ +#ifndef GZ_COMMON_TESTING_AUTOLOGFIXTURE_HH_ +#define GZ_COMMON_TESTING_AUTOLOGFIXTURE_HH_ #include #include #include -#include +#include namespace ignition::common::testing { @@ -54,6 +54,6 @@ class AutoLogFixture : public ::testing::Test }; } // namespace ignition::common::testing -#include +#include -#endif // IGNITION_COMMON_TESTING_AUTOLOGFIXTURE_HH_ +#endif // GZ_COMMON_TESTING_AUTOLOGFIXTURE_HH_ diff --git a/testing/include/gz/common/testing/BazelTestPaths.hh b/testing/include/gz/common/testing/BazelTestPaths.hh index b8927a86f..f50ff7718 100644 --- a/testing/include/gz/common/testing/BazelTestPaths.hh +++ b/testing/include/gz/common/testing/BazelTestPaths.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_BAZELTESTPATHS_HH_ -#define IGNITION_COMMON_TESTING_BAZELTESTPATHS_HH_ +#ifndef GZ_COMMON_TESTING_BAZELTESTPATHS_HH_ +#define GZ_COMMON_TESTING_BAZELTESTPATHS_HH_ #include -#include "ignition/common/testing/TestPaths.hh" -#include "ignition/common/testing/Export.hh" +#include "gz/common/testing/TestPaths.hh" +#include "gz/common/testing/Export.hh" namespace ignition::common::testing { @@ -55,4 +55,4 @@ class BazelTestPaths: public TestPaths } // namespace ignition::common::testing -#endif // IGNITION_COMMON_TESTING_AUTOLOGFIXTURE_HH_ +#endif // GZ_COMMON_TESTING_AUTOLOGFIXTURE_HH_ diff --git a/testing/include/gz/common/testing/CMakeTestPaths.hh b/testing/include/gz/common/testing/CMakeTestPaths.hh index 9b18dd10c..1ce948bc4 100644 --- a/testing/include/gz/common/testing/CMakeTestPaths.hh +++ b/testing/include/gz/common/testing/CMakeTestPaths.hh @@ -14,13 +14,13 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_CMAKETESTPATHS_HH_ -#define IGNITION_COMMON_TESTING_CMAKETESTPATHS_HH_ +#ifndef GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ +#define GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ #include -#include "ignition/common/testing/TestPaths.hh" -#include "ignition/common/testing/Export.hh" +#include "gz/common/testing/TestPaths.hh" +#include "gz/common/testing/Export.hh" namespace ignition::common::testing { @@ -45,4 +45,4 @@ class CMakeTestPaths: public TestPaths TestTmpPath(std::string &_tmpDir) override; }; } // namespace ignition::common::testing -#endif // IGNITION_COMMON_TESTING_CMAKETESTPATHS_HH_ +#endif // GZ_COMMON_TESTING_CMAKETESTPATHS_HH_ diff --git a/testing/include/gz/common/testing/TestPaths.hh b/testing/include/gz/common/testing/TestPaths.hh index da20fb214..1fb7b3894 100644 --- a/testing/include/gz/common/testing/TestPaths.hh +++ b/testing/include/gz/common/testing/TestPaths.hh @@ -14,17 +14,17 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_TESTPATHS_HH_ -#define IGNITION_COMMON_TESTING_TESTPATHS_HH_ +#ifndef GZ_COMMON_TESTING_TESTPATHS_HH_ +#define GZ_COMMON_TESTING_TESTPATHS_HH_ #include #include -#include "ignition/common/Filesystem.hh" -#include "ignition/common/TempDirectory.hh" -#include "ignition/common/Util.hh" +#include "gz/common/Filesystem.hh" +#include "gz/common/TempDirectory.hh" +#include "gz/common/Util.hh" -#include "ignition/common/testing/Export.hh" +#include "gz/common/testing/Export.hh" #ifndef TESTING_PROJECT_SOURCE_DIR #define TESTING_PROJECT_SOURCE_DIR "" @@ -198,4 +198,4 @@ std::string TempPath(Args const &... args) return common::joinPaths(dataDir, args...); } } // namespace ignition::common::testing -#endif // IGNITION_COMMON_TESTING_TESTPATHS_HH_ +#endif // GZ_COMMON_TESTING_TESTPATHS_HH_ diff --git a/testing/include/gz/common/testing/Utils.hh b/testing/include/gz/common/testing/Utils.hh index a4ae24c1a..44ca5132c 100644 --- a/testing/include/gz/common/testing/Utils.hh +++ b/testing/include/gz/common/testing/Utils.hh @@ -14,14 +14,14 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_UTILS_HH_ -#define IGNITION_COMMON_TESTING_UTILS_HH_ +#ifndef GZ_COMMON_TESTING_UTILS_HH_ +#define GZ_COMMON_TESTING_UTILS_HH_ #include #include #include -#include "ignition/common/testing/Export.hh" +#include "gz/common/testing/Export.hh" namespace ignition::common::testing { @@ -37,4 +37,4 @@ createNewEmptyFile(const std::string &_filename); } // namespace ignition::common::testing -#endif // IGNITION_COMMON_TESTING_TESTPATHS_HH_ +#endif // GZ_COMMON_TESTING_TESTPATHS_HH_ diff --git a/testing/include/gz/common/testing/detail/AutoLogFixture.hh b/testing/include/gz/common/testing/detail/AutoLogFixture.hh index e44914590..4d19ebb8f 100644 --- a/testing/include/gz/common/testing/detail/AutoLogFixture.hh +++ b/testing/include/gz/common/testing/detail/AutoLogFixture.hh @@ -14,18 +14,18 @@ * limitations under the License. * */ -#ifndef IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_ -#define IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_ +#ifndef GZ_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_ +#define GZ_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_ -#include "ignition/common/testing/AutoLogFixture.hh" +#include "gz/common/testing/AutoLogFixture.hh" #include #include -#include -#include -#include -#include +#include +#include +#include +#include namespace ignition::common::testing { @@ -116,5 +116,5 @@ std::string AutoLogFixture::LogContent() const } // namespace ignition::common::testing -#endif // IGNITION_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_ +#endif // GZ_COMMON_TESTING_DETAIL_AUTOLOGFIXTURE_HH_