diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2024-08-15 11:43:20 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2024-08-15 11:43:20 +0200 |
| commit | 6b839ff6e2cf8a2b0e885a16e6876415f5ba1425 (patch) | |
| tree | 5a26fa8cd66eba290146cbdbb1364fa9d2407d96 /ui/src | |
| parent | b6252045a1340a42a39426dfbb877d2a1f357b7f (diff) | |
| download | turns-6b839ff6e2cf8a2b0e885a16e6876415f5ba1425.tar.xz turns-6b839ff6e2cf8a2b0e885a16e6876415f5ba1425.zip | |
turns: use Glib::unwrap where appropriate
Diffstat (limited to 'ui/src')
| -rw-r--r-- | ui/src/windows/participant_editor.cpp | 15 | ||||
| -rw-r--r-- | ui/src/windows/tracker/actions.cpp | 3 |
2 files changed, 10 insertions, 8 deletions
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 <glibmm/i18n.h> #include <glibmm/refptr.h> +#include <glibmm/wrap.h> #include <gtkmm/builder.h> #include <gtkmm/button.h> @@ -34,11 +35,11 @@ namespace turns::ui::windows participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj) : Gtk::Widget{base} - , m_adw{ADW_DIALOG(gobj())} - , m_disposition{ADW_COMBO_ROW(builder->get_widget<Gtk::ListBoxRow>("disposition")->gobj())} + , m_adw{ADW_DIALOG(Glib::unwrap(this))} + , m_disposition{ADW_COMBO_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("disposition")))} , m_finish{builder->get_widget<Gtk::Button>("finish")} - , m_name{ADW_ENTRY_ROW(builder->get_widget<Gtk::ListBoxRow>("name")->gobj())} - , m_priority{ADW_SPIN_ROW(builder->get_widget<Gtk::ListBoxRow>("priority")->gobj())} + , m_name{ADW_ENTRY_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("name")))} + , m_priority{ADW_SPIN_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("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 <glibmm/refptr.h> #include <glibmm/ustring.h> #include <glibmm/variant.h> +#include <glibmm/wrap.h> #include <giomm/liststore.h> @@ -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<GAsyncReadyCallback>(stop_dialog_callback), m_turn_order.get()); |