From dff2f80ddc8f742b8181409d6feeca33e856112e Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Mon, 28 Apr 2025 13:34:43 +0200
Subject: ui: remove adwaita C-API usage

---
 ui/include/turns/ui/windows/participant_editor.hpp | 11 ++++++-----
 ui/include/turns/ui/windows/tracker.hpp            |  5 ++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'ui/include')

diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp
index fb80594..81ea3e1 100644
--- a/ui/include/turns/ui/windows/participant_editor.hpp
+++ b/ui/include/turns/ui/windows/participant_editor.hpp
@@ -15,9 +15,10 @@
 #include <gtkmm/stringlist.h>
 #include <gtkmm/widget.h>
 
+#include <adwaitamm/comborow.hpp>
 #include <adwaitamm/dialog.hpp>
-
-#include <adwaita.h>
+#include <adwaitamm/entryrow.hpp>
+#include <adwaitamm/spinrow.hpp>
 
 namespace turns::ui::windows
 {
@@ -35,10 +36,10 @@ namespace turns::ui::windows
     auto handle_item_bind(Glib::RefPtr<Gtk::ListItem> item) -> void;
     auto handle_item_setup(Glib::RefPtr<Gtk::ListItem> item) -> void;
 
-    AdwComboRow * m_disposition;
+    Adwaita::ComboRow * m_disposition;
     Gtk::Button * m_finish;
-    AdwEntryRow * m_name;
-    AdwSpinRow * m_priority;
+    Adwaita::EntryRow * m_name;
+    Adwaita::SpinRow * m_priority;
 
     Glib::RefPtr<Gtk::SignalListItemFactory> m_disposition_factory;
     Glib::RefPtr<Gtk::StringList> m_disposition_model;
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp
index be4019e..495f825 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/windows/tracker.hpp
@@ -24,8 +24,7 @@
 
 #include <adwaitamm/applicationwindow.hpp>
 #include <adwaitamm/toastoverlay.hpp>
-
-#include <adwaita.h>
+#include <adwaitamm/windowtitle.hpp>
 
 #include <exception>
 #include <string>
@@ -72,7 +71,7 @@ namespace turns::ui::windows
     Adwaita::ToastOverlay * m_overlay;
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
-    Gtk::Widget * m_title;
+    Adwaita::WindowTitle * m_title;
     Glib::RefPtr<core::turn_order> m_turn_order;
     widgets::turn_order_view * m_turn_order_view;
     Glib::RefPtr<Gio::Settings> m_settings{};
-- 
cgit v1.2.3