ui: remove adwaita C-API usage

1 files changed, 11 insertions, 16 deletions

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();