Skip to content

Commit

Permalink
Migrate sources in src, test, examples, and include
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Apr 28, 2022
1 parent 7a0277f commit 8d62ea3
Show file tree
Hide file tree
Showing 83 changed files with 390 additions and 390 deletions.
10 changes: 5 additions & 5 deletions av/include/gz/common/AudioDecoder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <stdint.h>
#include <string>

#include <ignition/common/av/Export.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/common/av/Export.hh>
#include <gz/utils/ImplPtr.hh>

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
{
Expand Down
14 changes: 7 additions & 7 deletions av/include/gz/common/HWEncoder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>
#include <optional>

#include <ignition/common/FlagSet.hh>
#include <ignition/common/av/Export.hh>
#include <ignition/common/HWVideo.hh>
#include <ignition/common/ffmpeg_inc.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/common/FlagSet.hh>
#include <gz/common/av/Export.hh>
#include <gz/common/HWVideo.hh>
#include <gz/common/ffmpeg_inc.hh>
#include <gz/utils/ImplPtr.hh>

/// This is an internal-use only class encapsulating HW video encoding. All
/// symbols defined here are hidden from the public API.
Expand Down
6 changes: 3 additions & 3 deletions av/include/gz/common/HWVideo.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <ignition/common/EnumIface.hh>
#include <gz/common/EnumIface.hh>

namespace ignition::common
{
Expand Down
8 changes: 4 additions & 4 deletions av/include/gz/common/Video.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>

#include <ignition/common/av/Export.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/common/av/Export.hh>
#include <gz/utils/ImplPtr.hh>

struct AVFormatContext;
struct AVCodecContext;
Expand Down
12 changes: 6 additions & 6 deletions av/include/gz/common/VideoEncoder.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <chrono>
#include <string>
#include <optional>

#include <ignition/common/FlagSet.hh>
#include <ignition/common/av/Export.hh>
#include <ignition/common/HWVideo.hh>
#include <ignition/utils/ImplPtr.hh>
#include <gz/common/FlagSet.hh>
#include <gz/common/av/Export.hh>
#include <gz/common/HWVideo.hh>
#include <gz/utils/ImplPtr.hh>

// Default bitrate (0) indicates that a bitrate should be calculated when
// Start is called.
Expand Down
4 changes: 2 additions & 2 deletions av/include/gz/common/av/Util.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
8 changes: 4 additions & 4 deletions av/include/gz/common/ffmpeg_inc.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>

#include <ignition/common/config.hh>
#include <gz/common/config.hh>

#ifndef _WIN32
#pragma GCC system_header
Expand Down Expand Up @@ -49,7 +49,7 @@ extern "C" {
#endif
}

#include <ignition/common/av/Export.hh>
#include <gz/common/av/Export.hh>

namespace ignition
{
Expand Down
12 changes: 6 additions & 6 deletions events/include/gz/common/Event.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <atomic>
#include <functional>
Expand All @@ -25,15 +25,15 @@
#include <mutex>
#include <utility>

#include <ignition/common/config.hh>
#include <ignition/common/events/Export.hh>
#include <ignition/common/events/Types.hh>
#include <gz/common/config.hh>
#include <gz/common/events/Export.hh>
#include <gz/common/events/Types.hh>

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
{
Expand Down
10 changes: 5 additions & 5 deletions events/include/gz/common/KeyEvent.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <string>

#include <ignition/common/events/Export.hh>
#include <ignition/utils/SuppressWarning.hh>
#include <gz/common/events/Export.hh>
#include <gz/utils/SuppressWarning.hh>

namespace ignition
{
Expand All @@ -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
{
Expand Down
12 changes: 6 additions & 6 deletions events/include/gz/common/MouseEvent.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <ignition/math/Vector2.hh>
#include <gz/math/Vector2.hh>

#include <ignition/common/events/Export.hh>
#include <ignition/utils/SuppressWarning.hh>
#include <gz/common/events/Export.hh>
#include <gz/utils/SuppressWarning.hh>

namespace ignition
{
Expand All @@ -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
{
Expand Down
4 changes: 2 additions & 2 deletions events/include/gz/common/events/Types.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>

Expand Down
2 changes: 1 addition & 1 deletion examples/assert_example.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include <ignition/common.hh>
#include <gz/common.hh>

int main(int argc, char **argv)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/console.cc
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
* limitations under the License.
*
*/
#include <ignition/common.hh>
#include <gz/common.hh>

int main(int argc, char **argv)
{
Expand Down
2 changes: 1 addition & 1 deletion examples/events.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#include <functional>
#include <iostream>
#include <ignition/common/Event.hh>
#include <gz/common/Event.hh>

using namespace ignition;

Expand Down
2 changes: 1 addition & 1 deletion examples/logging_performance.cc
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#include <map>
#include <thread>

#include <ignition/common/Console.hh>
#include <gz/common/Console.hh>

namespace {
const uint64_t g_iterations{1000000};
Expand Down
6 changes: 3 additions & 3 deletions examples/profiler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
#include <atomic>
#include <thread>

#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<bool> running;

Expand Down
14 changes: 7 additions & 7 deletions geospatial/include/gz/common/geospatial/Dem.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <memory>
#include <string>
#include <vector>

#include <ignition/math/Vector3.hh>
#include <ignition/math/Angle.hh>
#include <gz/math/Vector3.hh>
#include <gz/math/Angle.hh>

#include <ignition/common/geospatial/Export.hh>
#include <ignition/common/geospatial/HeightmapData.hh>
#include <gz/common/geospatial/Export.hh>
#include <gz/common/geospatial/HeightmapData.hh>

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>


namespace ignition
Expand Down
8 changes: 4 additions & 4 deletions geospatial/include/gz/common/geospatial/HeightmapData.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <string>
#include <vector>
#include <ignition/math/Vector3.hh>
#include <ignition/common/geospatial/Export.hh>
#include <gz/math/Vector3.hh>
#include <gz/common/geospatial/Export.hh>

namespace ignition
{
Expand Down
12 changes: 6 additions & 6 deletions geospatial/include/gz/common/geospatial/ImageHeightmap.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <limits>
#include <string>
#include <vector>
#include <ignition/math/Vector3.hh>
#include <gz/math/Vector3.hh>

#include <ignition/common/geospatial/Export.hh>
#include <ignition/common/geospatial/HeightmapData.hh>
#include <ignition/common/Image.hh>
#include <gz/common/geospatial/Export.hh>
#include <gz/common/geospatial/HeightmapData.hh>
#include <gz/common/Image.hh>

namespace ignition
{
Expand Down
16 changes: 8 additions & 8 deletions graphics/include/gz/common/Animation.hh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <map>
#include <string>
#include <vector>

#include <ignition/math/Pose3.hh>
#include <ignition/math/Spline.hh>
#include <ignition/math/RotationSpline.hh>
#include <gz/math/Pose3.hh>
#include <gz/math/Spline.hh>
#include <gz/math/RotationSpline.hh>

#include <ignition/utils/ImplPtr.hh>
#include <gz/utils/ImplPtr.hh>

#include <ignition/common/graphics/Export.hh>
#include <gz/common/graphics/Export.hh>

namespace ignition
{
Expand All @@ -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
Expand Down
Loading

0 comments on commit 8d62ea3

Please sign in to comment.