From 6b839ff6e2cf8a2b0e885a16e6876415f5ba1425 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 15 Aug 2024 11:43:20 +0200 Subject: turns: use Glib::unwrap where appropriate --- core/src/turn_order.cpp | 3 ++- ui/include/turns/ui/widgets/template_widget.hpp | 5 +++-- ui/src/windows/participant_editor.cpp | 15 ++++++++------- ui/src/windows/tracker/actions.cpp | 3 ++- ui/tests/windows/participant_editor.cpp | 17 +++++++++-------- ui/tests/windows/tracker.cpp | 9 +++++---- 6 files changed, 29 insertions(+), 23 deletions(-) diff --git a/core/src/turn_order.cpp b/core/src/turn_order.cpp index e7b92db..31b6830 100644 --- a/core/src/turn_order.cpp +++ b/core/src/turn_order.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include @@ -266,7 +267,7 @@ namespace turns::core } auto item = m_data[position]; item->reference(); - return item->gobj(); + return Glib::unwrap(item); } /** Signal handlers */ diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp index c01fff2..f04f331 100644 --- a/ui/include/turns/ui/widgets/template_widget.hpp +++ b/ui/include/turns/ui/widgets/template_widget.hpp @@ -3,6 +3,7 @@ #include #include +#include #include @@ -32,8 +33,8 @@ namespace turns::ui::widgets auto get_widget(char const * name) -> WidgetType * { auto self = static_cast(this); - auto widget = GTK_WIDGET(self->gobj()); - auto type = G_OBJECT_TYPE(self->gobj()); + auto widget = GTK_WIDGET(Glib::unwrap(self)); + auto type = G_OBJECT_TYPE(Glib::unwrap(self)); auto child = GTK_WIDGET(gtk_widget_get_template_child(widget, type, name)); g_assert_nonnull(child); return dynamic_cast(Glib::wrap(child)); diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp index e41bc92..1577554 100644 --- a/ui/src/windows/participant_editor.cpp +++ b/ui/src/windows/participant_editor.cpp @@ -8,6 +8,7 @@ #include #include +#include #include #include @@ -34,11 +35,11 @@ namespace turns::ui::windows 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())} + , m_adw{ADW_DIALOG(Glib::unwrap(this))} + , m_disposition{ADW_COMBO_ROW(Glib::unwrap(builder->get_widget("disposition")))} , m_finish{builder->get_widget("finish")} - , m_name{ADW_ENTRY_ROW(builder->get_widget("name")->gobj())} - , m_priority{ADW_SPIN_ROW(builder->get_widget("priority")->gobj())} + , m_name{ADW_ENTRY_ROW(Glib::unwrap(builder->get_widget("name")))} + , m_priority{ADW_SPIN_ROW(Glib::unwrap(builder->get_widget("priority")))} , m_disposition_factory{Gtk::SignalListItemFactory::create()} , m_disposition_model{Gtk::StringList::create()} , m_participant{obj} @@ -55,8 +56,8 @@ namespace turns::ui::windows m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &participant_editor::handle_item_bind)); m_disposition_factory->signal_setup().connect(sigc::mem_fun(*this, &participant_editor::handle_item_setup)); - adw_combo_row_set_factory(m_disposition, GTK_LIST_ITEM_FACTORY(m_disposition_factory->gobj())); - adw_combo_row_set_model(m_disposition, G_LIST_MODEL(m_disposition_model->gobj())); + adw_combo_row_set_factory(m_disposition, GTK_LIST_ITEM_FACTORY(Glib::unwrap(m_disposition_factory))); + adw_combo_row_set_model(m_disposition, G_LIST_MODEL(Glib::unwrap(m_disposition_model))); if (m_participant) { @@ -68,7 +69,7 @@ namespace turns::ui::windows auto participant_editor::present(Gtk::Widget * parent) -> void { - adw_dialog_present(m_adw, parent->gobj()); + adw_dialog_present(m_adw, Glib::unwrap(parent)); } auto participant_editor::signal_finished() -> signal_finished_type diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp index 9da2e0c..3210089 100644 --- a/ui/src/windows/tracker/actions.cpp +++ b/ui/src/windows/tracker/actions.cpp @@ -11,6 +11,7 @@ #include #include #include +#include #include @@ -115,7 +116,7 @@ namespace turns::ui::windows adw_alert_dialog_set_close_response(dialog, "cancel"); adw_alert_dialog_set_default_response(dialog, "cancel"); adw_alert_dialog_choose(dialog, - GTK_WIDGET(this->gobj()), + GTK_WIDGET(Glib::unwrap(this)), nullptr, reinterpret_cast(stop_dialog_callback), m_turn_order.get()); diff --git a/ui/tests/windows/participant_editor.cpp b/ui/tests/windows/participant_editor.cpp index 2b3f5da..b721018 100644 --- a/ui/tests/windows/participant_editor.cpp +++ b/ui/tests/windows/participant_editor.cpp @@ -9,6 +9,7 @@ #include #include +#include #include #include @@ -38,25 +39,25 @@ namespace turns::ui::windows::tests SECTION("has a non-empty title") { - auto widget = ADW_DIALOG(instance->gobj()); + auto widget = ADW_DIALOG(Glib::unwrap(instance)); REQUIRE(adw_dialog_get_title(widget)); } SECTION("has its title set according to the active language") { - auto widget = ADW_DIALOG(instance->gobj()); + auto widget = ADW_DIALOG(Glib::unwrap(instance)); REQUIRE(adw_dialog_get_title(widget) == Glib::ustring{_(lang::add_participant)}); } SECTION("has an empty name field") { - auto widget = GTK_EDITABLE(builder->get_widget("name")->gobj()); + auto widget = GTK_EDITABLE(Glib::unwrap(builder->get_widget("name"))); REQUIRE(Glib::ustring{gtk_editable_get_text(widget)}.empty()); } SECTION("has a zero priority field") { - auto widget = ADW_SPIN_ROW(builder->get_widget("priority")->gobj()); + auto widget = ADW_SPIN_ROW(Glib::unwrap(builder->get_widget("priority"))); REQUIRE(adw_spin_row_get_value(widget) == 0); } @@ -83,25 +84,25 @@ namespace turns::ui::windows::tests SECTION("has a non-empty title") { - auto widget = ADW_DIALOG(instance->gobj()); + auto widget = ADW_DIALOG(Glib::unwrap(instance)); REQUIRE(adw_dialog_get_title(widget)); } SECTION("has its title set according to the active language") { - auto widget = ADW_DIALOG(instance->gobj()); + auto widget = ADW_DIALOG(Glib::unwrap(instance)); REQUIRE(adw_dialog_get_title(widget) == Glib::ustring{_(lang::edit_participant)}); } SECTION("has its name field set according to its participant") { - auto widget = GTK_EDITABLE(builder->get_widget("name")->gobj()); + auto widget = GTK_EDITABLE(Glib::unwrap(builder->get_widget("name"))); REQUIRE(gtk_editable_get_text(widget) == participant->name().get_value()); } SECTION("has its priority field set according to its participant") { - auto widget = ADW_SPIN_ROW(builder->get_widget("priority")->gobj()); + auto widget = ADW_SPIN_ROW(Glib::unwrap(builder->get_widget("priority"))); REQUIRE(adw_spin_row_get_value(widget) == participant->priority()); } diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp index 1fedd03..236dad0 100644 --- a/ui/tests/windows/tracker.cpp +++ b/ui/tests/windows/tracker.cpp @@ -7,6 +7,7 @@ #include #include +#include #include #include @@ -36,28 +37,28 @@ namespace turns::ui::windows::tests SECTION("has a non-empty subtitle") { auto widget = builder->get_widget("title"); - auto adw = ADW_WINDOW_TITLE(widget->gobj()); + auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget)); REQUIRE(adw_window_title_get_subtitle(adw)); } SECTION("has its subtitle set according to the active language") { auto widget = builder->get_widget("title"); - auto adw = ADW_WINDOW_TITLE(widget->gobj()); + auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget)); REQUIRE(adw_window_title_get_subtitle(adw) == Glib::ustring{_(lang::no_active_turn_order)}); } SECTION("has a non-empty title") { auto widget = builder->get_widget("title"); - auto adw = ADW_WINDOW_TITLE(widget->gobj()); + auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget)); REQUIRE(adw_window_title_get_title(adw)); } SECTION("has its title set according to the active language") { auto widget = builder->get_widget("title"); - auto adw = ADW_WINDOW_TITLE(widget->gobj()); + auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget)); REQUIRE(adw_window_title_get_title(adw) == Glib::ustring{_(lang::turns)}); } -- cgit v1.2.3