From e0b53e79cb640bbfb8d281238af9f0e02d17403b Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 4 Apr 2025 07:18:13 +0200 Subject: adw: rename namespace to Adwaita --- ui/include/turns/ui/widgets/preferences.hpp | 4 ++-- ui/include/turns/ui/windows/participant_editor.hpp | 2 +- ui/include/turns/ui/windows/tracker.hpp | 4 ++-- ui/src/widgets/preferences.cpp | 2 +- ui/src/windows/participant_editor.cpp | 2 +- ui/src/windows/tracker.cpp | 6 +++--- ui/src/windows/tracker/actions.cpp | 2 +- ui/tests/gtk_test_init.cpp | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'ui') diff --git a/ui/include/turns/ui/widgets/preferences.hpp b/ui/include/turns/ui/widgets/preferences.hpp index 1768d30..2a56f0b 100644 --- a/ui/include/turns/ui/widgets/preferences.hpp +++ b/ui/include/turns/ui/widgets/preferences.hpp @@ -18,7 +18,7 @@ namespace turns::ui::widgets { - struct preferences : template_widget + struct preferences : template_widget { auto constexpr inline static children = std::array{ @@ -46,7 +46,7 @@ namespace turns::ui::widgets Gtk::ColorDialogButton * m_friendly_color_button{}; Gtk::ColorDialogButton * m_hostile_color_button{}; Gtk::ColorDialogButton * m_secret_color_button{}; - adw::SwitchRow * m_skip_defeated{}; + Adwaita::SwitchRow * m_skip_defeated{}; }; } // namespace turns::ui::widgets diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp index a62e58a..fb80594 100644 --- a/ui/include/turns/ui/windows/participant_editor.hpp +++ b/ui/include/turns/ui/windows/participant_editor.hpp @@ -22,7 +22,7 @@ namespace turns::ui::windows { - struct participant_editor : adw::Dialog + struct participant_editor : Adwaita::Dialog { using signal_finished_type = sigc::signal; diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp index bce7a22..be4019e 100644 --- a/ui/include/turns/ui/windows/tracker.hpp +++ b/ui/include/turns/ui/windows/tracker.hpp @@ -33,7 +33,7 @@ namespace turns::ui::windows { - struct tracker : adw::ApplicationWindow + struct tracker : Adwaita::ApplicationWindow { tracker(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr settings); @@ -69,7 +69,7 @@ namespace turns::ui::windows Gtk::Revealer * m_controls; Gtk::Widget * m_empty; - adw::ToastOverlay * m_overlay; + Adwaita::ToastOverlay * m_overlay; Gtk::Stack * m_stack; Gtk::Button * m_start; Gtk::Widget * m_title; diff --git a/ui/src/widgets/preferences.cpp b/ui/src/widgets/preferences.cpp index 7032423..e9dde1e 100644 --- a/ui/src/widgets/preferences.cpp +++ b/ui/src/widgets/preferences.cpp @@ -41,7 +41,7 @@ namespace turns::ui::widgets , m_friendly_color_button{get_widget("friendly_color_button")} , m_hostile_color_button{get_widget("hostile_color_button")} , m_secret_color_button{get_widget("secret_color_button")} - , m_skip_defeated{get_widget("skip_defeated")} + , m_skip_defeated{get_widget("skip_defeated")} { if (!m_settings) { diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp index 9afb15c..7cfe766 100644 --- a/ui/src/windows/participant_editor.cpp +++ b/ui/src/windows/participant_editor.cpp @@ -36,7 +36,7 @@ namespace turns::ui::windows { participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr obj) - : adw::Dialog{base} + : Dialog{base} , m_disposition{ADW_COMBO_ROW(Glib::unwrap(builder->get_widget("disposition")))} , m_finish{builder->get_widget("finish")} , m_name{ADW_ENTRY_ROW(Glib::unwrap(builder->get_widget("name")))} diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp index cf7ea44..71ad630 100644 --- a/ui/src/windows/tracker.cpp +++ b/ui/src/windows/tracker.cpp @@ -48,10 +48,10 @@ namespace turns::ui::windows { tracker::tracker(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr settings) - : adw::ApplicationWindow{base} + : ApplicationWindow{base} , m_controls{builder->get_widget("controls")} , m_empty{builder->get_widget("empty")} - , m_overlay{builder->get_widget("overlay")} + , m_overlay{builder->get_widget("overlay")} , m_stack{builder->get_widget("stack")} , m_start{builder->get_widget("start")} , m_title{builder->get_widget("title")} @@ -197,7 +197,7 @@ namespace turns::ui::windows auto tracker::show_toast(std::string const & message) -> void { - m_overlay->add(adw::Toast::create(message)); + m_overlay->add(Adwaita::Toast::create(message)); } auto tracker::update_colors() -> void diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp index 80a7ea7..3fcf448 100644 --- a/ui/src/windows/tracker/actions.cpp +++ b/ui/src/windows/tracker/actions.cpp @@ -97,7 +97,7 @@ namespace turns::ui::windows auto tracker::preferences() -> void { auto preferences = Gtk::make_managed(m_settings); - auto dialog = Gtk::make_managed(); + auto dialog = Gtk::make_managed(); dialog->add(*preferences); adw_preferences_dialog_set_visible_page(Glib::unwrap(dialog), Glib::unwrap(preferences)); dialog->present(this); diff --git a/ui/tests/gtk_test_init.cpp b/ui/tests/gtk_test_init.cpp index bed2ca5..d6cbb4e 100644 --- a/ui/tests/gtk_test_init.cpp +++ b/ui/tests/gtk_test_init.cpp @@ -30,7 +30,7 @@ namespace turns::ui::tests textdomain("turns"); Gtk::init_gtkmm_internals(); - turns::adw::wrap_init(); + Adwaita::wrap_init(); core::register_types(); ui::register_types(); -- cgit v1.2.3