From 3e68879c7901384913c03bd587b248a3fd79d9ff Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 30 Apr 2025 11:01:48 +0200 Subject: core: rename participant to Participant --- ui/include/turns/ui/participant_editor.hpp | 12 ++++++------ ui/include/turns/ui/participant_row.hpp | 2 +- ui/src/participant_editor.cpp | 10 +++++----- ui/src/participant_row.cpp | 2 +- ui/src/tracker/actions.cpp | 2 +- ui/src/turn_order_view.cpp | 2 +- ui/tests/participant_row.cpp | 4 ++-- 7 files changed, 17 insertions(+), 17 deletions(-) (limited to 'ui') diff --git a/ui/include/turns/ui/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp index 0b1e0f1..3dfd7fb 100644 --- a/ui/include/turns/ui/participant_editor.hpp +++ b/ui/include/turns/ui/participant_editor.hpp @@ -41,20 +41,20 @@ namespace turns::ui "priority", }; - explicit ParticipantEditor(Glib::RefPtr participant); + explicit ParticipantEditor(Glib::RefPtr participant); [[nodiscard]] auto get_disposition() const -> core::disposition; [[nodiscard]] auto get_name() const -> Glib::ustring; - [[nodiscard]] auto get_participant() const -> Glib::RefPtr; + [[nodiscard]] auto get_participant() const -> Glib::RefPtr; [[nodiscard]] auto get_priority() const -> double; auto set_disposition(core::disposition value) -> void; auto set_name(Glib::ustring const & value) -> void; - auto set_participant(Glib::RefPtr const & value) -> void; + auto set_participant(Glib::RefPtr const & value) -> void; auto set_priority(double value) -> void; - [[nodiscard]] auto property_participant() -> Glib::PropertyProxy>; - [[nodiscard]] auto property_participant() const -> Glib::PropertyProxy_ReadOnly>; + [[nodiscard]] auto property_participant() -> Glib::PropertyProxy>; + [[nodiscard]] auto property_participant() const -> Glib::PropertyProxy_ReadOnly>; auto signal_finished() -> SignalFinishedType; @@ -71,7 +71,7 @@ namespace turns::ui Glib::RefPtr m_disposition_factory; Glib::RefPtr m_disposition_model; - Glib::Property> m_participant; + Glib::Property> m_participant; SignalFinishedType m_signal_finished{}; }; diff --git a/ui/include/turns/ui/participant_row.hpp b/ui/include/turns/ui/participant_row.hpp index ed7b47c..561214b 100644 --- a/ui/include/turns/ui/participant_row.hpp +++ b/ui/include/turns/ui/participant_row.hpp @@ -27,7 +27,7 @@ namespace turns::ui "toggle_defeated", }; - ParticipantRow(Glib::RefPtr participant); + ParticipantRow(Glib::RefPtr participant); auto delete_enabled() -> Glib::PropertyProxy; auto edit_enabled() -> Glib::PropertyProxy; diff --git a/ui/src/participant_editor.cpp b/ui/src/participant_editor.cpp index 0016c02..9c0e0f1 100644 --- a/ui/src/participant_editor.cpp +++ b/ui/src/participant_editor.cpp @@ -40,7 +40,7 @@ namespace turns::ui auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_editor.ui"; } // namespace - ParticipantEditor::ParticipantEditor(Glib::RefPtr participant) + ParticipantEditor::ParticipantEditor(Glib::RefPtr participant) : Glib::ObjectBase{TYPE_NAME} , template_widget{TEMPLATE} , m_disposition{get_widget("disposition")} @@ -88,7 +88,7 @@ namespace turns::ui return m_name->get_text(); } - auto ParticipantEditor::get_participant() const -> Glib::RefPtr + auto ParticipantEditor::get_participant() const -> Glib::RefPtr { return m_participant.get_value(); } @@ -108,7 +108,7 @@ namespace turns::ui m_name->set_text(value); } - auto ParticipantEditor::set_participant(Glib::RefPtr const & value) -> void + auto ParticipantEditor::set_participant(Glib::RefPtr const & value) -> void { m_participant.set_value(value); } @@ -118,12 +118,12 @@ namespace turns::ui m_priority->set_value(value); } - auto ParticipantEditor::property_participant() -> Glib::PropertyProxy> + auto ParticipantEditor::property_participant() -> Glib::PropertyProxy> { return m_participant.get_proxy(); } - auto ParticipantEditor::property_participant() const -> Glib::PropertyProxy_ReadOnly> + auto ParticipantEditor::property_participant() const -> Glib::PropertyProxy_ReadOnly> { return m_participant.get_proxy(); } diff --git a/ui/src/participant_row.cpp b/ui/src/participant_row.cpp index e5075cd..782182d 100644 --- a/ui/src/participant_row.cpp +++ b/ui/src/participant_row.cpp @@ -47,7 +47,7 @@ namespace turns::ui } } // namespace - ParticipantRow::ParticipantRow(Glib::RefPtr participant) + ParticipantRow::ParticipantRow(Glib::RefPtr participant) : Glib::ObjectBase(TYPE_NAME) , template_widget{TEMPLATE} , m_delete{get_widget("delete")} diff --git a/ui/src/tracker/actions.cpp b/ui/src/tracker/actions.cpp index 796345a..08d321a 100644 --- a/ui/src/tracker/actions.cpp +++ b/ui/src/tracker/actions.cpp @@ -62,7 +62,7 @@ namespace turns::ui auto Tracker::edit_participant(Glib::VariantBase param) -> void { auto index = Glib::VariantBase::cast_dynamic>(param); - auto participant = m_turn_order->get_typed_object(index.get()); + auto participant = m_turn_order->get_typed_object(index.get()); auto dialog = Gtk::make_managed(participant); dialog->signal_finished().connect([participant](auto n, auto p, auto d) { participant->property_name() = n; diff --git a/ui/src/turn_order_view.cpp b/ui/src/turn_order_view.cpp index d1be0d4..08fdf5d 100644 --- a/ui/src/turn_order_view.cpp +++ b/ui/src/turn_order_view.cpp @@ -47,7 +47,7 @@ namespace turns::ui auto TurnOrderView::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * { - auto participant = std::dynamic_pointer_cast(item); + auto participant = std::dynamic_pointer_cast(item); auto row = Gtk::make_managed(participant); Glib::Binding::bind_property(m_model->is_running(), diff --git a/ui/tests/participant_row.cpp b/ui/tests/participant_row.cpp index 920858b..6e5319f 100644 --- a/ui/tests/participant_row.cpp +++ b/ui/tests/participant_row.cpp @@ -18,12 +18,12 @@ namespace turns::ui::tests { SECTION("can be created without a participant") { - REQUIRE(std::make_shared(Glib::RefPtr{})); + REQUIRE(std::make_shared(Glib::RefPtr{})); } SECTION("can be created with a participant") { - REQUIRE(std::make_shared(core::participant::create("Tazmyla Fireforge", 13, core::disposition::secret))); + REQUIRE(std::make_shared(core::Participant::create("Tazmyla Fireforge", 13, core::disposition::secret))); } } -- cgit v1.2.3