diff options
Diffstat (limited to 'domain')
| -rw-r--r-- | domain/include/turns/domain/participant.hpp | 10 | ||||
| -rw-r--r-- | domain/include/turns/domain/turn_order.hpp | 2 | ||||
| -rw-r--r-- | domain/src/participant.cpp | 18 | ||||
| -rw-r--r-- | domain/src/turn_order.cpp | 6 | ||||
| -rw-r--r-- | domain/tests/participant.cpp | 22 |
5 files changed, 29 insertions, 29 deletions
diff --git a/domain/include/turns/domain/participant.hpp b/domain/include/turns/domain/participant.hpp index 934e0bb..f417ec7 100644 --- a/domain/include/turns/domain/participant.hpp +++ b/domain/include/turns/domain/participant.hpp @@ -14,20 +14,20 @@ namespace turns::domain struct participant : Glib::Object { - auto static create(Glib::ustring name, float order_value) -> Glib::RefPtr<participant>; + auto static create(Glib::ustring name, float priority) -> Glib::RefPtr<participant>; - participant(Glib::ustring name, float order_value); + participant(Glib::ustring name, float priority); auto operator<=>(participant const & other) const noexcept -> std::partial_ordering; auto property_name() -> Glib::PropertyProxy<Glib::ustring>; auto property_name() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>; - auto property_order_value() -> Glib::PropertyProxy<float>; - auto property_order_value() const -> Glib::PropertyProxy_ReadOnly<float>; + auto property_priority() -> Glib::PropertyProxy<float>; + auto property_priority() const -> Glib::PropertyProxy_ReadOnly<float>; private: Glib::Property<Glib::ustring> m_name; - Glib::Property<float> m_order_value; + Glib::Property<float> m_priority; }; auto operator<=>(Glib::RefPtr<participant> const & lhs, Glib::RefPtr<participant> const & rhs) -> std::partial_ordering; diff --git a/domain/include/turns/domain/turn_order.hpp b/domain/include/turns/domain/turn_order.hpp index 6495a27..f7eb773 100644 --- a/domain/include/turns/domain/turn_order.hpp +++ b/domain/include/turns/domain/turn_order.hpp @@ -20,7 +20,7 @@ namespace turns::domain auto static create() -> Glib::RefPtr<turn_order>; - auto append(Glib::ustring const & name, float order_value) -> void; + auto append(Glib::ustring const & name, float priority) -> void; auto remove(Glib::RefPtr<participant> item) -> void; auto sort() -> void; }; diff --git a/domain/src/participant.cpp b/domain/src/participant.cpp index b52bcca..5c31e2a 100644 --- a/domain/src/participant.cpp +++ b/domain/src/participant.cpp @@ -6,21 +6,21 @@ namespace turns::domain { - auto participant::create(Glib::ustring name, float order_value) -> Glib::RefPtr<participant> + auto participant::create(Glib::ustring name, float priority) -> Glib::RefPtr<participant> { - return Glib::make_refptr_for_instance(new participant{name, order_value}); + return Glib::make_refptr_for_instance(new participant{name, priority}); } - participant::participant(Glib::ustring name, float order_value) + participant::participant(Glib::ustring name, float priority) : Glib::ObjectBase{typeid(participant)} , m_name{*this, "name", name} - , m_order_value{*this, "order_value", order_value} + , m_priority{*this, "priority", priority} { } auto participant::operator<=>(participant const & other) const noexcept -> std::partial_ordering { - return m_order_value <=> other.m_order_value; + return m_priority <=> other.m_priority; } auto participant::property_name() -> Glib::PropertyProxy<Glib::ustring> @@ -33,14 +33,14 @@ namespace turns::domain return m_name.get_proxy(); } - auto participant::property_order_value() -> Glib::PropertyProxy<float> + auto participant::property_priority() -> Glib::PropertyProxy<float> { - return m_order_value.get_proxy(); + return m_priority.get_proxy(); } - auto participant::property_order_value() const -> Glib::PropertyProxy_ReadOnly<float> + auto participant::property_priority() const -> Glib::PropertyProxy_ReadOnly<float> { - return m_order_value.get_proxy(); + return m_priority.get_proxy(); } auto operator<=>(Glib::RefPtr<participant> const & lhs, Glib::RefPtr<participant> const & rhs) -> std::partial_ordering diff --git a/domain/src/turn_order.cpp b/domain/src/turn_order.cpp index 677e993..4c5c587 100644 --- a/domain/src/turn_order.cpp +++ b/domain/src/turn_order.cpp @@ -24,10 +24,10 @@ namespace turns::domain return Glib::make_refptr_for_instance(new turn_order{}); } - auto turn_order::append(Glib::ustring const & name, float order_value) -> void + auto turn_order::append(Glib::ustring const & name, float priority) -> void { - auto participant = participant::create(name, order_value); - participant->property_order_value().signal_changed().connect([this] { sort(); }); + auto participant = participant::create(name, priority); + participant->property_priority().signal_changed().connect([this] { sort(); }); insert_sorted(participant, comparator); } diff --git a/domain/tests/participant.cpp b/domain/tests/participant.cpp index 4f32aa0..f6abef9 100644 --- a/domain/tests/participant.cpp +++ b/domain/tests/participant.cpp @@ -12,12 +12,12 @@ namespace turns::domain::tests TEST_CASE("A participant") { auto constexpr constructed_name = "Vana Thistletop"; - auto constexpr constructed_order = 17; - auto instance = participant{constructed_name, constructed_order}; + auto constexpr constructed_priority = 17; + auto instance = participant{constructed_name, constructed_priority}; SECTION("can be created") { - REQUIRE(participant::create(constructed_name, constructed_order)); + REQUIRE(participant::create(constructed_name, constructed_priority)); } SECTION("the name can be read") @@ -31,22 +31,22 @@ namespace turns::domain::tests REQUIRE(instance.property_name() == "replaced"); } - SECTION("the order can be read") + SECTION("the priority can be read") { - REQUIRE(instance.property_order_value() == constructed_order); + REQUIRE(instance.property_priority() == constructed_priority); } - SECTION("the order can be changed") + SECTION("the priority can be changed") { - instance.property_order_value() = 8; - REQUIRE(instance.property_order_value() == 8); + instance.property_priority() = 8; + REQUIRE(instance.property_priority() == 8); } SECTION("can be compared with another participant") { - auto equivalent_instance = participant{"Equivalent", constructed_order}; - auto lesser_instance = participant{"Lesser", constructed_order - 1}; - auto greater_instance = participant{"Greater", constructed_order + 1}; + auto equivalent_instance = participant{"Equivalent", constructed_priority}; + auto lesser_instance = participant{"Lesser", constructed_priority - 1}; + auto greater_instance = participant{"Greater", constructed_priority + 1}; SECTION("yielding std::partial_ordering::equivalent for itself") { |