From 3f5499cebc06356ed99159be3fb9676292cf7b8b Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 24 Jul 2024 10:44:13 +0200 Subject: turns: rename domain to core --- app/CMakeLists.txt | 2 +- app/include/turns/app/widgets/participant_row.hpp | 4 ++-- app/include/turns/app/widgets/turn_order_view.hpp | 8 ++++---- app/include/turns/app/windows/participant_editor.hpp | 12 ++++++------ app/include/turns/app/windows/tracker.hpp | 4 ++-- app/src/widgets/participant_row.cpp | 10 +++++----- app/src/widgets/turn_order_view.cpp | 4 ++-- app/src/windows/participant_editor.cpp | 10 +++++----- app/src/windows/tracker.cpp | 16 ++++++++-------- app/tests/widgets/participant_row.cpp | 8 ++++---- app/tests/windows/participant_editor.cpp | 6 +++--- 11 files changed, 42 insertions(+), 42 deletions(-) (limited to 'app') diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 0514383..22cf9bf 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -30,7 +30,7 @@ target_link_libraries("app" PUBLIC "PkgConfig::adwaita" "PkgConfig::gtkmm" - "turns::domain" + "turns::core" "turns::lang" "$<$:-Wl,--whole-archive>" diff --git a/app/include/turns/app/widgets/participant_row.hpp b/app/include/turns/app/widgets/participant_row.hpp index b1942b1..d5c896a 100644 --- a/app/include/turns/app/widgets/participant_row.hpp +++ b/app/include/turns/app/widgets/participant_row.hpp @@ -2,7 +2,7 @@ #define TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP #include "turns/app/widgets/template_widget.hpp" -#include "turns/domain/participant.hpp" +#include "turns/core/participant.hpp" #include @@ -27,7 +27,7 @@ namespace turns::app::widgets "toggle_defeated", }; - participant_row(Glib::RefPtr participant); + participant_row(Glib::RefPtr participant); auto property_delete_enabled() -> Glib::PropertyProxy; auto property_edit_enabled() -> Glib::PropertyProxy; diff --git a/app/include/turns/app/widgets/turn_order_view.hpp b/app/include/turns/app/widgets/turn_order_view.hpp index 15524a9..cb996f8 100644 --- a/app/include/turns/app/widgets/turn_order_view.hpp +++ b/app/include/turns/app/widgets/turn_order_view.hpp @@ -2,9 +2,9 @@ #define TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP #include "turns/app/widgets/template_widget.hpp" -#include "turns/domain/disposition.hpp" -#include "turns/domain/participant.hpp" -#include "turns/domain/turn_order.hpp" +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" +#include "turns/core/turn_order.hpp" #include @@ -18,7 +18,7 @@ namespace turns::app::widgets { struct turn_order_view : template_widget { - using model_type = domain::turn_order; + using model_type = core::turn_order; auto constexpr inline static children = std::array{ "view", diff --git a/app/include/turns/app/windows/participant_editor.hpp b/app/include/turns/app/windows/participant_editor.hpp index 23d0569..1ca3e43 100644 --- a/app/include/turns/app/windows/participant_editor.hpp +++ b/app/include/turns/app/windows/participant_editor.hpp @@ -1,7 +1,7 @@ #ifndef TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP #define TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP -#include "turns/domain/participant.hpp" +#include "turns/core/participant.hpp" #include @@ -21,11 +21,11 @@ namespace turns::app::windows struct participant_editor : Gtk::Widget { - using signal_finished_type = sigc::signal().name().get_value()), - decltype(std::declval().priority().get_value()), - decltype(std::declval().disposition().get_value()))>; + using signal_finished_type = sigc::signal().name().get_value()), + decltype(std::declval().priority().get_value()), + decltype(std::declval().disposition().get_value()))>; - participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj = {}); + participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj = {}); auto present(Gtk::Widget * parent) -> void; @@ -45,7 +45,7 @@ namespace turns::app::windows Glib::RefPtr m_disposition_factory; Glib::RefPtr m_disposition_model; - Glib::RefPtr m_participant; + Glib::RefPtr m_participant; signal_finished_type m_signal_finished{}; }; diff --git a/app/include/turns/app/windows/tracker.hpp b/app/include/turns/app/windows/tracker.hpp index e1349f8..b9dea52 100644 --- a/app/include/turns/app/windows/tracker.hpp +++ b/app/include/turns/app/windows/tracker.hpp @@ -2,7 +2,7 @@ #define TURNS_APP_WINDOWS_TRACKER_HPP #include "turns/app/widgets/turn_order_view.hpp" -#include "turns/domain/turn_order.hpp" +#include "turns/core/turn_order.hpp" #include #include @@ -36,7 +36,7 @@ namespace turns::app::windows Gtk::Stack * m_stack; Gtk::Button * m_start; AdwWindowTitle * m_title; - Glib::RefPtr m_turn_order; + Glib::RefPtr m_turn_order; widgets::turn_order_view * m_turn_order_view; Glib::PropertyProxy m_subtitle; }; diff --git a/app/src/widgets/participant_row.cpp b/app/src/widgets/participant_row.cpp index 87cc217..6a274d5 100644 --- a/app/src/widgets/participant_row.cpp +++ b/app/src/widgets/participant_row.cpp @@ -18,15 +18,15 @@ namespace turns::app::widgets auto constexpr static TYPE_NAME = "participant_row"; auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui"; - auto css_class_for(domain::disposition value) -> Glib::ustring + auto css_class_for(core::disposition value) -> Glib::ustring { switch (value) { - case domain::disposition::friendly: + case core::disposition::friendly: return "disposition-friendly"; - case domain::disposition::hostile: + case core::disposition::hostile: return "disposition-hostile"; - case domain::disposition::secret: + case core::disposition::secret: return "disposition-secret"; default: return ""; @@ -34,7 +34,7 @@ namespace turns::app::widgets } } // namespace - participant_row::participant_row(Glib::RefPtr participant) + participant_row::participant_row(Glib::RefPtr participant) : Glib::ObjectBase(TYPE_NAME) , template_widget{TEMPLATE} , m_delete{get_widget("delete")} diff --git a/app/src/widgets/turn_order_view.cpp b/app/src/widgets/turn_order_view.cpp index 67e0afa..172b6a2 100644 --- a/app/src/widgets/turn_order_view.cpp +++ b/app/src/widgets/turn_order_view.cpp @@ -1,7 +1,7 @@ #include "turns/app/widgets/turn_order_view.hpp" #include "turns/app/widgets/participant_row.hpp" -#include "turns/domain/participant.hpp" +#include "turns/core/participant.hpp" #include "turns/lang/messages.hpp" #include @@ -32,7 +32,7 @@ namespace turns::app::widgets auto turn_order_view::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/app/src/windows/participant_editor.cpp b/app/src/windows/participant_editor.cpp index 0b35c72..b31ad77 100644 --- a/app/src/windows/participant_editor.cpp +++ b/app/src/windows/participant_editor.cpp @@ -1,6 +1,6 @@ #include "turns/app/windows/participant_editor.hpp" -#include "turns/domain/disposition.hpp" +#include "turns/core/disposition.hpp" #include "turns/lang/messages.hpp" #include @@ -14,7 +14,7 @@ namespace turns::app::windows { - participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj) + participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj) : Gtk::Widget{base} , m_adw{ADW_DIALOG(gobj())} , m_disposition{ADW_COMBO_ROW(builder->get_widget("disposition")->gobj())} @@ -29,9 +29,9 @@ namespace turns::app::windows adw_dialog_set_title(m_adw, _(obj ? lang::edit_participant : lang::add_participant)); m_finish->signal_clicked().connect(sigc::mem_fun(*this, &participant_editor::handle_finish_clicked)); - for (auto n : std::views::iota(std::uint8_t{}, static_cast(domain::disposition::END))) + for (auto n : std::views::iota(std::uint8_t{}, static_cast(core::disposition::END))) { - m_disposition_model->append(presentation_name_for(domain::disposition{n})); + m_disposition_model->append(presentation_name_for(core::disposition{n})); } m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &participant_editor::handle_item_bind)); @@ -62,7 +62,7 @@ namespace turns::app::windows { auto name = gtk_editable_get_text(GTK_EDITABLE(m_name)); auto priority = adw_spin_row_get_value(m_priority); - auto disposition = static_cast(adw_combo_row_get_selected(m_disposition)); + auto disposition = static_cast(adw_combo_row_get_selected(m_disposition)); if (m_participant) { diff --git a/app/src/windows/tracker.cpp b/app/src/windows/tracker.cpp index 11f4642..7c4d2cd 100644 --- a/app/src/windows/tracker.cpp +++ b/app/src/windows/tracker.cpp @@ -16,13 +16,13 @@ namespace turns::app::windows namespace { - auto editor_for(Glib::RefPtr participant) + auto editor_for(Glib::RefPtr participant) { auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); return std::pair{builder, Gtk::Builder::get_widget_derived(builder, "participant_editor", participant)}; } - auto stop_dialog_callback(AdwAlertDialog * dialog, GAsyncResult * result, domain::turn_order * order) + auto stop_dialog_callback(AdwAlertDialog * dialog, GAsyncResult * result, core::turn_order * order) { auto response = adw_alert_dialog_choose_finish(dialog, result); if (response == Glib::ustring{"clear"}) @@ -42,7 +42,7 @@ namespace turns::app::windows , m_stack{builder->get_widget("stack")} , m_start{builder->get_widget("start")} , m_title(ADW_WINDOW_TITLE(builder->get_widget("title")->gobj())) - , m_turn_order{domain::turn_order::create()} + , m_turn_order{core::turn_order::create()} , m_turn_order_view{Gtk::make_managed(m_turn_order)} , m_subtitle{Glib::wrap(GTK_WIDGET(m_title)), "subtitle"} { @@ -84,7 +84,7 @@ namespace turns::app::windows { static_cast(param); 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 [lifeline, dialog] = editor_for(participant); dialog->present(this); } @@ -120,7 +120,7 @@ namespace turns::app::windows // win.clear // depends-on: turn_order:is_empty == false { - auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &domain::turn_order::clear)); + auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::turn_order::clear)); Glib::Binding::bind_property(m_turn_order->is_empty(), action->property_enabled(), @@ -130,7 +130,7 @@ namespace turns::app::windows // win.next // depends-on: turn_order:state == running { - auto action = add_action("next", sigc::mem_fun(*m_turn_order, &domain::turn_order::next)); + auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::turn_order::next)); Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); } @@ -138,7 +138,7 @@ namespace turns::app::windows // win.previous // depends-on: turn_order:has_previous == true { - auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &domain::turn_order::previous)); + auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::turn_order::previous)); Glib::Binding::bind_property(m_turn_order->has_previous(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); } @@ -146,7 +146,7 @@ namespace turns::app::windows // win.start // depends-on: turn_order:is_empty == false { - auto action = add_action("start", sigc::mem_fun(*m_turn_order, &domain::turn_order::start)); + auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::turn_order::start)); Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), diff --git a/app/tests/widgets/participant_row.cpp b/app/tests/widgets/participant_row.cpp index 04950ad..ebf1762 100644 --- a/app/tests/widgets/participant_row.cpp +++ b/app/tests/widgets/participant_row.cpp @@ -1,7 +1,7 @@ #include "turns/app/widgets/participant_row.hpp" -#include "turns/domain/disposition.hpp" -#include "turns/domain/participant.hpp" +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" #include "turns/lang/messages.hpp" #include @@ -19,12 +19,12 @@ namespace turns::app::widgets::tests { SECTION("can be created without a participant") { - REQUIRE(Gtk::make_managed(Glib::RefPtr{})); + REQUIRE(Gtk::make_managed(Glib::RefPtr{})); } SECTION("can be created with a participant") { - REQUIRE(Gtk::make_managed(domain::participant::create("Tazmyla Fireforge", 13, domain::disposition::secret))); + REQUIRE(Gtk::make_managed(core::participant::create("Tazmyla Fireforge", 13, core::disposition::secret))); } } diff --git a/app/tests/windows/participant_editor.cpp b/app/tests/windows/participant_editor.cpp index 9f73861..670e56f 100644 --- a/app/tests/windows/participant_editor.cpp +++ b/app/tests/windows/participant_editor.cpp @@ -1,7 +1,7 @@ #include "turns/app/windows/participant_editor.hpp" -#include "turns/domain/participant.hpp" -#include "turns/domain/disposition.hpp" +#include "turns/core/participant.hpp" +#include "turns/core/disposition.hpp" #include "turns/lang/messages.hpp" #include @@ -70,7 +70,7 @@ namespace turns::app::windows::tests auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8"); setlocale(LC_ALL, locale); - auto participant = domain::participant::create("Qibi Babblebranch", 12, domain::disposition::neutral); + auto participant = core::participant::create("Qibi Babblebranch", 12, core::disposition::neutral); auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); auto instance = Gtk::Builder::get_widget_derived(builder, "participant_editor", participant); auto window = Gtk::Window{}; -- cgit v1.2.3