From 64c2e6601c62d583f9ce06079bfaa6b052626f6b Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 29 Apr 2025 17:05:15 +0200 Subject: ui: rename turn_order_view to TurnOrderView --- ui/include/turns/ui/tracker.hpp | 2 +- ui/include/turns/ui/turn_order_view.hpp | 4 ++-- ui/src/init.cpp | 2 +- ui/src/tracker.cpp | 2 +- ui/src/turn_order_view.cpp | 8 ++++---- ui/src/turn_order_view.ui | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ui') diff --git a/ui/include/turns/ui/tracker.hpp b/ui/include/turns/ui/tracker.hpp index 3bd631e..94ecda3 100644 --- a/ui/include/turns/ui/tracker.hpp +++ b/ui/include/turns/ui/tracker.hpp @@ -73,7 +73,7 @@ namespace turns::ui Gtk::Button * m_start; Adwaita::WindowTitle * m_title; Glib::RefPtr m_turn_order; - turn_order_view * m_turn_order_view; + TurnOrderView * m_turn_order_view; Glib::RefPtr m_settings{}; Glib::PropertyProxy m_subtitle; diff --git a/ui/include/turns/ui/turn_order_view.hpp b/ui/include/turns/ui/turn_order_view.hpp index 12a51eb..f026854 100644 --- a/ui/include/turns/ui/turn_order_view.hpp +++ b/ui/include/turns/ui/turn_order_view.hpp @@ -17,7 +17,7 @@ namespace turns::ui { - struct turn_order_view : template_widget + struct TurnOrderView : template_widget { using model_type = core::turn_order; @@ -26,7 +26,7 @@ namespace turns::ui "view", }; - explicit turn_order_view(Glib::RefPtr model = {}); + explicit TurnOrderView(Glib::RefPtr model = {}); private: auto handle_create_row(Glib::RefPtr const item) -> Gtk::Widget *; diff --git a/ui/src/init.cpp b/ui/src/init.cpp index 22440f4..28e2a77 100644 --- a/ui/src/init.cpp +++ b/ui/src/init.cpp @@ -13,7 +13,7 @@ namespace turns::ui static_cast(ParticipantEditor{{}}); static_cast(ParticipantRow{{}}); static_cast(Preferences{{}}); - static_cast(turn_order_view{{}}); + static_cast(TurnOrderView{{}}); } } // namespace turns::ui \ No newline at end of file diff --git a/ui/src/tracker.cpp b/ui/src/tracker.cpp index 17aff89..3e9ea43 100644 --- a/ui/src/tracker.cpp +++ b/ui/src/tracker.cpp @@ -57,7 +57,7 @@ namespace turns::ui , m_start{builder->get_widget("start")} , m_title{builder->get_widget("title")} , m_turn_order{core::turn_order::create()} - , m_turn_order_view{Gtk::make_managed(m_turn_order)} + , m_turn_order_view{Gtk::make_managed(m_turn_order)} , m_settings{std::move(settings)} , m_subtitle{m_title->property_subtitle()} , m_css{Gtk::CssProvider::create()} diff --git a/ui/src/turn_order_view.cpp b/ui/src/turn_order_view.cpp index 51a0de8..d1be0d4 100644 --- a/ui/src/turn_order_view.cpp +++ b/ui/src/turn_order_view.cpp @@ -23,11 +23,11 @@ namespace turns::ui { namespace { - auto constexpr static TYPE_NAME = "turn_order_view"; + auto constexpr static TYPE_NAME = "TurnOrderView"; auto constexpr static TEMPLATE = "/ch/arknet/Turns/turn_order_view.ui"; } // namespace - turn_order_view::turn_order_view(Glib::RefPtr model) + TurnOrderView::TurnOrderView(Glib::RefPtr model) : Glib::ObjectBase(TYPE_NAME) , template_widget{TEMPLATE} , m_model{model} @@ -41,11 +41,11 @@ namespace turns::ui set_orientation(Gtk::Orientation::VERTICAL); - m_view->bind_model(m_model, sigc::mem_fun(*this, &turn_order_view::handle_create_row)); + m_view->bind_model(m_model, sigc::mem_fun(*this, &TurnOrderView::handle_create_row)); Glib::Binding::bind_property(m_model->progress(), m_progress->property_fraction(), Glib::Binding::Flags::SYNC_CREATE); } - auto turn_order_view::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * + auto TurnOrderView::handle_create_row(Glib::RefPtr const item) -> Gtk::Widget * { auto participant = std::dynamic_pointer_cast(item); auto row = Gtk::make_managed(participant); diff --git a/ui/src/turn_order_view.ui b/ui/src/turn_order_view.ui index d5a1006..28a4bd0 100644 --- a/ui/src/turn_order_view.ui +++ b/ui/src/turn_order_view.ui @@ -4,7 +4,7 @@ -