From 9e3c6314236d8c59e7bba41c3d01a1e7fbc8b092 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 1 May 2025 15:17:53 +0200 Subject: core: rename disposition to Disposition --- core/include/turns/core/disposition.hpp | 21 +++++++++++++++++---- core/include/turns/core/fwd.hpp | 2 +- core/include/turns/core/participant.hpp | 10 +++++----- core/include/turns/core/turn_order.hpp | 2 +- 4 files changed, 24 insertions(+), 11 deletions(-) (limited to 'core/include') diff --git a/core/include/turns/core/disposition.hpp b/core/include/turns/core/disposition.hpp index 92a7d03..89a2cb0 100644 --- a/core/include/turns/core/disposition.hpp +++ b/core/include/turns/core/disposition.hpp @@ -2,13 +2,15 @@ #define TURNS_CORE_DISPOSITION_HPP #include +#include + +#include #include namespace turns::core { - - enum struct disposition : std::uint8_t + enum struct Disposition : std::uint8_t { neutral, friendly, @@ -19,8 +21,19 @@ namespace turns::core END }; - auto presentation_name_for(disposition value) -> Glib::ustring; - + auto presentation_name_for(Disposition value) -> Glib::ustring; } // namespace turns::core +namespace Glib +{ + template<> + class Value : public Glib::Value_Enum + { + GType static constinit inline gtype_{}; + + public: + auto static value_type() -> GType; + }; +} // namespace Glib + #endif \ No newline at end of file diff --git a/core/include/turns/core/fwd.hpp b/core/include/turns/core/fwd.hpp index 612e8c8..48380e3 100644 --- a/core/include/turns/core/fwd.hpp +++ b/core/include/turns/core/fwd.hpp @@ -5,7 +5,7 @@ namespace turns::core { - enum struct disposition : std::uint8_t; + enum struct Disposition : std::uint8_t; struct Participant; struct turn_order; diff --git a/core/include/turns/core/participant.hpp b/core/include/turns/core/participant.hpp index d2f2035..0edc421 100644 --- a/core/include/turns/core/participant.hpp +++ b/core/include/turns/core/participant.hpp @@ -16,21 +16,21 @@ namespace turns::core { struct Participant : Glib::Object { - auto static create(Glib::ustring name, float priority, disposition disposition) -> Glib::RefPtr; + auto static create(Glib::ustring name, float priority, Disposition disposition) -> Glib::RefPtr; auto static create(nlohmann::json const & serialized) -> Glib::RefPtr; Participant(); - Participant(Glib::ustring name, float priority, disposition disposition); + Participant(Glib::ustring name, float priority, Disposition disposition); auto operator<=>(Participant const & other) const noexcept -> std::partial_ordering; - [[nodiscard]] auto get_disposition() const -> disposition; + [[nodiscard]] auto get_disposition() const -> Disposition; [[nodiscard]] auto get_is_active() const -> bool; [[nodiscard]] auto get_is_defeated() const -> bool; [[nodiscard]] auto get_name() const -> Glib::ustring; [[nodiscard]] auto get_priority() const -> float; - auto set_disposition(disposition value) -> void; + auto set_disposition(Disposition value) -> void; auto set_is_active(bool value) -> void; auto set_is_defeated(bool value) -> void; auto set_name(Glib::ustring const & value) -> void; @@ -45,7 +45,7 @@ namespace turns::core auto serialize() -> nlohmann::json; private: - Glib::Property m_disposition{*this, "disposition", core::disposition::neutral}; + Glib::Property m_disposition{*this, "disposition", core::Disposition::neutral}; Glib::Property m_is_active{*this, "is-active", false}; Glib::Property m_is_defeated{*this, "is-defeated", false}; Glib::Property m_name{*this, "name", ""}; diff --git a/core/include/turns/core/turn_order.hpp b/core/include/turns/core/turn_order.hpp index 6a0ee43..030f4c9 100644 --- a/core/include/turns/core/turn_order.hpp +++ b/core/include/turns/core/turn_order.hpp @@ -57,7 +57,7 @@ namespace turns::core auto skip_defeated() -> Glib::PropertyProxy; /** Element Modifications */ - auto add(Glib::ustring const & name, float priority, disposition disposition) -> void; + auto add(Glib::ustring const & name, float priority, Disposition disposition) -> void; auto clear() -> void; auto remove(unsigned index) -> void; -- cgit v1.2.3