Skip to content
Snippets Groups Projects
Commit 18b7a9be authored by René Paris's avatar René Paris
Browse files

Merge branch '20-clang-tidy-align-and-setup-first-set-of-rules' into 'master'

.clang-tidy

Closes #20

See merge request !78
parents d93c8a85 ab224f4f
No related branches found
No related tags found
No related merge requests found
#ifndef MANTLEAPI_TRAFFIC_I_CONTROLLER_REPOSITORY_H
#define MANTLEAPI_TRAFFIC_I_CONTROLLER_REPOSITORY_H
/******************************************************************************** /********************************************************************************
* Copyright (c) 2021 in-tech GmbH * Copyright (c) 2021 in-tech GmbH
* *
...@@ -27,10 +30,11 @@ public: ...@@ -27,10 +30,11 @@ public:
[[deprecated]] virtual IController& Create(UniqueId id, std::unique_ptr<IControllerConfig> config) = 0; // deprecated [[deprecated]] virtual IController& Create(UniqueId id, std::unique_ptr<IControllerConfig> config) = 0; // deprecated
virtual std::optional<std::reference_wrapper<IController>> Get(UniqueId id) = 0; virtual std::optional<std::reference_wrapper<IController>> Get(UniqueId id) = 0;
virtual bool Contains(UniqueId id) const = 0; [[nodiscard]] virtual bool Contains(UniqueId id) const = 0;
virtual void Delete(UniqueId id) = 0; virtual void Delete(UniqueId id) = 0;
}; };
} // namespace mantle_api } // namespace mantle_api
\ No newline at end of file #endif
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
/** @file i_entity.h */ /** @file i_entity.h */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MANTLEAPI_TRAFFIC_IENTITY_H #ifndef MANTLEAPI_TRAFFIC_I_ENTITY_H
#define MANTLEAPI_TRAFFIC_IENTITY_H #define MANTLEAPI_TRAFFIC_I_ENTITY_H
#include <MantleAPI/Common/bounding_box.h> #include <MantleAPI/Common/bounding_box.h>
#include <MantleAPI/Common/i_identifiable.h> #include <MantleAPI/Common/i_identifiable.h>
...@@ -53,43 +53,43 @@ public: ...@@ -53,43 +53,43 @@ public:
/// The position of the entity is the geometric center of its bounding box. The origin of the entity coordinate system /// The position of the entity is the geometric center of its bounding box. The origin of the entity coordinate system
/// can be defined flexibly in relation to the geometric center (see bounding box). /// can be defined flexibly in relation to the geometric center (see bounding box).
virtual void SetPosition(const Vec3<units::length::meter_t>& inert_pos) = 0; virtual void SetPosition(const Vec3<units::length::meter_t>& inert_pos) = 0;
virtual Vec3<units::length::meter_t> GetPosition() const = 0; [[nodiscard]] virtual Vec3<units::length::meter_t> GetPosition() const = 0;
virtual void SetVelocity(const Vec3<units::velocity::meters_per_second_t>& velocity) = 0; virtual void SetVelocity(const Vec3<units::velocity::meters_per_second_t>& velocity) = 0;
virtual Vec3<units::velocity::meters_per_second_t> GetVelocity() const = 0; [[nodiscard]] virtual Vec3<units::velocity::meters_per_second_t> GetVelocity() const = 0;
virtual void SetAcceleration(const Vec3<units::acceleration::meters_per_second_squared_t>& acceleration) = 0; virtual void SetAcceleration(const Vec3<units::acceleration::meters_per_second_squared_t>& acceleration) = 0;
virtual Vec3<units::acceleration::meters_per_second_squared_t> GetAcceleration() const = 0; [[nodiscard]] virtual Vec3<units::acceleration::meters_per_second_squared_t> GetAcceleration() const = 0;
virtual void SetOrientation(const Orientation3<units::angle::radian_t>& orientation) = 0; virtual void SetOrientation(const Orientation3<units::angle::radian_t>& orientation) = 0;
virtual Orientation3<units::angle::radian_t> GetOrientation() const = 0; [[nodiscard]] virtual Orientation3<units::angle::radian_t> GetOrientation() const = 0;
virtual void SetOrientationRate( virtual void SetOrientationRate(
const Orientation3<units::angular_velocity::radians_per_second_t>& orientation_rate) = 0; const Orientation3<units::angular_velocity::radians_per_second_t>& orientation_rate) = 0;
virtual Orientation3<units::angular_velocity::radians_per_second_t> GetOrientationRate() const = 0; [[nodiscard]] virtual Orientation3<units::angular_velocity::radians_per_second_t> GetOrientationRate() const = 0;
virtual void SetOrientationAcceleration( virtual void SetOrientationAcceleration(
const Orientation3<units::angular_acceleration::radians_per_second_squared_t>& orientation_acceleration) = 0; const Orientation3<units::angular_acceleration::radians_per_second_squared_t>& orientation_acceleration) = 0;
virtual Orientation3<units::angular_acceleration::radians_per_second_squared_t> GetOrientationAcceleration() [[nodiscard]] virtual Orientation3<units::angular_acceleration::radians_per_second_squared_t> GetOrientationAcceleration()
const = 0; const = 0;
virtual void SetProperties(std::unique_ptr<mantle_api::EntityProperties> properties) = 0; virtual void SetProperties(std::unique_ptr<mantle_api::EntityProperties> properties) = 0;
virtual EntityProperties* GetProperties() const = 0; [[nodiscard]] virtual EntityProperties* GetProperties() const = 0;
virtual void SetAssignedLaneIds(const std::vector<std::uint64_t>& assigned_lane_ids) = 0; virtual void SetAssignedLaneIds(const std::vector<std::uint64_t>& assigned_lane_ids) = 0;
virtual std::vector<std::uint64_t> GetAssignedLaneIds() const = 0; [[nodiscard]] virtual std::vector<std::uint64_t> GetAssignedLaneIds() const = 0;
virtual void SetVisibility(const EntityVisibilityConfig& visibility) = 0; virtual void SetVisibility(const EntityVisibilityConfig& visibility) = 0;
virtual EntityVisibilityConfig GetVisibility() const = 0; [[nodiscard]] virtual EntityVisibilityConfig GetVisibility() const = 0;
}; };
class IVehicle : public virtual IEntity class IVehicle : public virtual IEntity
{ {
public: public:
virtual VehicleProperties* GetProperties() const = 0; [[nodiscard]] VehicleProperties* GetProperties() const override = 0;
virtual void SetIndicatorState(IndicatorState state) = 0; virtual void SetIndicatorState(IndicatorState state) = 0;
virtual IndicatorState GetIndicatorState() const = 0; [[nodiscard]] virtual IndicatorState GetIndicatorState() const = 0;
// virtual bool IsHost() const = 0; // virtual bool IsHost() const = 0;
// virtual void SetHost() = 0; // virtual void SetHost() = 0;
...@@ -98,15 +98,15 @@ public: ...@@ -98,15 +98,15 @@ public:
class IPedestrian : public virtual IEntity class IPedestrian : public virtual IEntity
{ {
public: public:
virtual PedestrianProperties* GetProperties() const = 0; [[nodiscard]] PedestrianProperties* GetProperties() const override = 0;
}; };
class IStaticObject : public virtual IEntity class IStaticObject : public virtual IEntity
{ {
public: public:
virtual StaticObjectProperties* GetProperties() const = 0; [[nodiscard]] StaticObjectProperties* GetProperties() const override = 0;
}; };
} // namespace mantle_api } // namespace mantle_api
#endif // MANTLEAPI_TRAFFIC_IENTITY_H #endif // MANTLEAPI_TRAFFIC_I_ENTITY_H
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
/** @file i_entity_repository.h */ /** @file i_entity_repository.h */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H #ifndef MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
#define MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H #define MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
#include <MantleAPI/Traffic/entity_properties.h> #include <MantleAPI/Traffic/entity_properties.h>
#include <MantleAPI/Traffic/i_entity.h> #include <MantleAPI/Traffic/i_entity.h>
...@@ -38,15 +38,15 @@ public: ...@@ -38,15 +38,15 @@ public:
virtual IVehicle& GetHost() = 0; virtual IVehicle& GetHost() = 0;
virtual std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) = 0; virtual std::optional<std::reference_wrapper<IEntity>> Get(const std::string& name) = 0;
virtual std::optional<std::reference_wrapper<const IEntity>> Get(const std::string& name) const = 0; [[nodiscard]] virtual std::optional<std::reference_wrapper<const IEntity>> Get(const std::string& name) const = 0;
virtual std::optional<std::reference_wrapper<IEntity>> Get(UniqueId id) = 0; virtual std::optional<std::reference_wrapper<IEntity>> Get(UniqueId id) = 0;
virtual std::optional<std::reference_wrapper<const IEntity>> Get(UniqueId id) const = 0; [[nodiscard]] virtual std::optional<std::reference_wrapper<const IEntity>> Get(UniqueId id) const = 0;
virtual bool Contains(UniqueId id) const = 0; [[nodiscard]] virtual bool Contains(UniqueId id) const = 0;
virtual void Delete(const std::string& name) = 0; virtual void Delete(const std::string& name) = 0;
virtual void Delete(UniqueId id) = 0; virtual void Delete(UniqueId id) = 0;
virtual const std::vector<std::unique_ptr<mantle_api::IEntity>>& GetEntities() const = 0; [[nodiscard]] virtual const std::vector<std::unique_ptr<mantle_api::IEntity>>& GetEntities() const = 0;
virtual void RegisterEntityCreatedCallback(const std::function<void(IEntity&)>& callback) = 0; virtual void RegisterEntityCreatedCallback(const std::function<void(IEntity&)>& callback) = 0;
virtual void RegisterEntityDeletedCallback(const std::function<void(const std::string&)>& callback) = 0; virtual void RegisterEntityDeletedCallback(const std::function<void(const std::string&)>& callback) = 0;
...@@ -55,4 +55,4 @@ public: ...@@ -55,4 +55,4 @@ public:
} // namespace mantle_api } // namespace mantle_api
#endif // MANTLEAPI_TRAFFIC_IENTITYREPOSITORY_H #endif // MANTLEAPI_TRAFFIC_I_ENTITY_REPOSITORY_H
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
/** @file traffic_light_properties.h */ /** @file traffic_light_properties.h */
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#ifndef MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H #ifndef MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H
#define MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H #define MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H
#include <MantleAPI/Common/time_utils.h> #include <MantleAPI/Common/time_utils.h>
#include <vector> #include <vector>
...@@ -56,4 +56,4 @@ struct TrafficLightPhase ...@@ -56,4 +56,4 @@ struct TrafficLightPhase
} // namespace mantle_api } // namespace mantle_api
#endif // MANTLEAPI_TRAFFIC_TRAFFICLIGHTPROPERTIES_H #endif // MANTLEAPI_TRAFFIC_TRAFFIC_LIGHT_PROPERTIES_H
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment