ui: remove adwaita C-API usage

4 files changed, 26 insertions, 36 deletions

diff --git a/ui/tests/gtk_test_init.cpp b/ui/tests/gtk_test_init.cpp
index 47bc27a..bfa885f 100644
--- a/ui/tests/gtk_test_init.cpp
+++ b/ui/tests/gtk_test_init.cpp
@@ -11,7 +11,6 @@
 #include <adwaitamm/application.hpp>
 #include <adwaitamm/wrap_init.hpp>
 
-#include <adwaita.h>
 #include <libintl.h>
 
 #include <clocale>
diff --git a/ui/tests/windows/participant_editor.cpp b/ui/tests/windows/participant_editor.cpp
index 46c9b58..3bc5cf4 100644
--- a/ui/tests/windows/participant_editor.cpp
+++ b/ui/tests/windows/participant_editor.cpp
@@ -15,7 +15,9 @@
 #include <gtkmm/listboxrow.h>
 #include <gtkmm/window.h>
 
-#include <adwaita.h>
+#include <adwaitamm/entryrow.hpp>
+#include <adwaitamm/spinrow.hpp>
+
 #include <gtk/gtk.h>
 
 #include <clocale>
@@ -39,26 +41,24 @@ namespace turns::ui::windows::tests
 
     SECTION("has a non-empty title")
     {
-      auto widget = ADW_DIALOG(Glib::unwrap(instance));
-      REQUIRE(adw_dialog_get_title(widget));
+      REQUIRE_FALSE(instance->get_title().empty());
     }
 
     SECTION("has its title set according to the active language")
     {
-      auto widget = ADW_DIALOG(Glib::unwrap(instance));
-      REQUIRE(adw_dialog_get_title(widget) == Glib::ustring{_(lang::add_participant)});
+      REQUIRE(instance->get_title() == _(lang::add_participant));
     }
 
     SECTION("has an empty name field")
     {
-      auto widget = GTK_EDITABLE(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("name")));
-      REQUIRE(Glib::ustring{gtk_editable_get_text(widget)}.empty());
+      auto widget = builder->get_widget<Adwaita::EntryRow>("name");
+      REQUIRE(widget->get_text().empty());
     }
 
     SECTION("has a zero priority field")
     {
-      auto widget = ADW_SPIN_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("priority")));
-      REQUIRE(adw_spin_row_get_value(widget) == 0);
+      auto widget = builder->get_widget<Adwaita::SpinRow>("priority");
+      REQUIRE(widget->get_value() == 0);
     }
 
     SECTION("allows binding to the finished signal")
@@ -84,26 +84,24 @@ namespace turns::ui::windows::tests
 
     SECTION("has a non-empty title")
     {
-      auto widget = ADW_DIALOG(Glib::unwrap(instance));
-      REQUIRE(adw_dialog_get_title(widget));
+      REQUIRE_FALSE(instance->get_title().empty());
     }
 
     SECTION("has its title set according to the active language")
     {
-      auto widget = ADW_DIALOG(Glib::unwrap(instance));
-      REQUIRE(adw_dialog_get_title(widget) == Glib::ustring{_(lang::edit_participant)});
+      REQUIRE(instance->get_title() == _(lang::edit_participant));
     }
 
     SECTION("has its name field set according to its participant")
     {
-      auto widget = GTK_EDITABLE(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("name")));
-      REQUIRE(gtk_editable_get_text(widget) == participant->property_name().get_value());
+      auto widget = builder->get_widget<Adwaita::EntryRow>("name");
+      REQUIRE(widget->get_text() == participant->property_name().get_value());
     }
 
     SECTION("has its priority field set according to its participant")
     {
-      auto widget = ADW_SPIN_ROW(Glib::unwrap(builder->get_widget<Gtk::ListBoxRow>("priority")));
-      REQUIRE(adw_spin_row_get_value(widget) == participant->property_priority());
+      auto widget = builder->get_widget<Adwaita::SpinRow>("priority");
+      REQUIRE(widget->get_value() == participant->property_priority());
     }
 
     SECTION("allows binding to the finished signal")
diff --git a/ui/tests/windows/resources.cpp b/ui/tests/windows/resources.cpp
index 86db03e..eb1fce4 100644
--- a/ui/tests/windows/resources.cpp
+++ b/ui/tests/windows/resources.cpp
@@ -3,8 +3,6 @@
 #include <gtkmm/builder.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
-
 TEST_CASE("GResource for tracker")
 {
   auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui");
diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp
index 4af1dcd..384d7f1 100644
--- a/ui/tests/windows/tracker.cpp
+++ b/ui/tests/windows/tracker.cpp
@@ -7,7 +7,6 @@
 #include <catch2/generators/catch_generators.hpp>
 
 #include <glibmm/i18n.h>
-#include <glibmm/ustring.h>
 #include <glibmm/wrap.h>
 
 #include <gtkmm/builder.h>
@@ -15,7 +14,7 @@
 #include <gtkmm/menubutton.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
+#include <adwaitamm/windowtitle.hpp>
 
 #include <clocale>
 
@@ -37,42 +36,38 @@ namespace turns::ui::windows::tests
 
     SECTION("has a non-empty subtitle")
     {
-      auto widget = builder->get_widget<Gtk::Widget>("title");
-      auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget));
-      REQUIRE(adw_window_title_get_subtitle(adw));
+      auto widget = builder->get_widget<Adwaita::WindowTitle>("title");
+      REQUIRE_FALSE(widget->get_subtitle().empty());
     }
 
     SECTION("has its subtitle set according to the active language")
     {
-      auto widget = builder->get_widget<Gtk::Widget>("title");
-      auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget));
-      REQUIRE(adw_window_title_get_subtitle(adw) == Glib::ustring{_(lang::no_active_turn_order)});
+      auto widget = builder->get_widget<Adwaita::WindowTitle>("title");
+      REQUIRE(widget->get_subtitle() == _(lang::no_active_turn_order));
     }
 
     SECTION("has a non-empty title")
     {
-      auto widget = builder->get_widget<Gtk::Widget>("title");
-      auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget));
-      REQUIRE(adw_window_title_get_title(adw));
+      auto widget = builder->get_widget<Adwaita::WindowTitle>("title");
+      REQUIRE_FALSE(widget->get_title().empty());
     }
 
     SECTION("has its title set according to the active language")
     {
-      auto widget = builder->get_widget<Gtk::Widget>("title");
-      auto adw = ADW_WINDOW_TITLE(Glib::unwrap(widget));
-      REQUIRE(adw_window_title_get_title(adw) == Glib::ustring{_(lang::turns)});
+      auto widget = builder->get_widget<Adwaita::WindowTitle>("title");
+      REQUIRE(widget->get_title() == _(lang::turns));
     }
 
     SECTION("has its add_participant button's tooltip set according to the active language")
     {
       auto widget = builder->get_widget<Gtk::Button>("add_participant");
-      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(lang::add_participant)});
+      REQUIRE(widget->get_tooltip_text() == _(lang::add_participant));
     }
 
     SECTION("as its open_main_menu button's tooltip set according to the active language")
     {
       auto widget = builder->get_widget<Gtk::MenuButton>("open_main_menu");
-      REQUIRE(widget->get_tooltip_text() == Glib::ustring{_(lang::main_menu)});
+      REQUIRE(widget->get_tooltip_text() == _(lang::main_menu));
     }
 
     instance->destroy();