adw: prepare files for extraction

10 files changed, 30 insertions, 17 deletions

diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt
index 844460a..ed27699 100644
--- a/ui/CMakeLists.txt
+++ b/ui/CMakeLists.txt
@@ -27,9 +27,10 @@ target_include_directories("ui" PUBLIC
 )
 
 target_link_libraries("ui" PUBLIC
-  "turns::adw"
   "turns::core"
   "turns::lang"
+ 
+  "adwaitamm::adwaitamm"
   "PkgConfig::gtkmm"
 )
 
diff --git a/ui/include/turns/ui/widgets/preferences.hpp b/ui/include/turns/ui/widgets/preferences.hpp
index 449957d..1768d30 100644
--- a/ui/include/turns/ui/widgets/preferences.hpp
+++ b/ui/include/turns/ui/widgets/preferences.hpp
@@ -1,8 +1,6 @@
 #ifndef TURNS_UI_WIDGETS_PREFERENCES_HPP
 #define TURNS_UI_WIDGETS_PREFERENCES_HPP
 
-#include "turns/adw/preferencespage.hpp"
-#include "turns/adw/switchrow.hpp"
 #include "turns/ui/widgets/template_widget.hpp"
 
 #include <glibmm/refptr.h>
@@ -13,6 +11,9 @@
 #include <gtkmm/button.h>
 #include <gtkmm/colordialogbutton.h>
 
+#include <adwaitamm/preferencespage.hpp>
+#include <adwaitamm/switchrow.hpp>
+
 #include <array>
 
 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 508038a..a62e58a 100644
--- a/ui/include/turns/ui/windows/participant_editor.hpp
+++ b/ui/include/turns/ui/windows/participant_editor.hpp
@@ -1,7 +1,6 @@
 #ifndef TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP
 #define TURNS_UI_WINDOWS_PARTICIPANT_EDITOR_HPP
 
-#include "turns/adw/dialog.hpp"
 #include "turns/core/fwd.hpp"
 
 #include <sigc++/signal.h>
@@ -16,6 +15,8 @@
 #include <gtkmm/stringlist.h>
 #include <gtkmm/widget.h>
 
+#include <adwaitamm/dialog.hpp>
+
 #include <adwaita.h>
 
 namespace turns::ui::windows
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp
index da302ce..bce7a22 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/windows/tracker.hpp
@@ -1,8 +1,6 @@
 #ifndef TURNS_UI_WINDOWS_TRACKER_HPP
 #define TURNS_UI_WINDOWS_TRACKER_HPP
 
-#include "turns/adw/applicationwindow.hpp"
-#include "turns/adw/toastoverlay.hpp"
 #include "turns/core/turn_order.hpp"
 #include "turns/ui/widgets/turn_order_view.hpp"
 
@@ -24,6 +22,9 @@
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
 
+#include <adwaitamm/applicationwindow.hpp>
+#include <adwaitamm/toastoverlay.hpp>
+
 #include <adwaita.h>
 
 #include <exception>
diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp
index 0a2a3b6..367870a 100644
--- a/ui/src/widgets/participant_row.cpp
+++ b/ui/src/widgets/participant_row.cpp
@@ -88,9 +88,10 @@ namespace turns::ui::widgets
     {
       Glib::Binding::bind_property(participant->property_name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE);
 
-      Glib::Binding::bind_property(participant->property_priority(), m_subtitle->property_label(), Glib::Binding::Flags::SYNC_CREATE, [](auto n) {
-        return std::vformat(_(lang::priority_number), std::make_format_args(n));
-      });
+      Glib::Binding::bind_property(participant->property_priority(),
+                                   m_subtitle->property_label(),
+                                   Glib::Binding::Flags::SYNC_CREATE,
+                                   [](auto n) { return std::vformat(_(lang::priority_number), std::make_format_args(n)); });
 
       Glib::Binding::bind_property(participant->property_disposition(),
                                    m_toggle_defeated->property_css_classes(),
@@ -105,7 +106,10 @@ namespace turns::ui::widgets
         return classes;
       });
 
-      Glib::Binding::bind_property(participant->property_is_active(), property_css_classes(), Glib::Binding::Flags::SYNC_CREATE, [this](auto value) {
+      Glib::Binding::bind_property(participant->property_is_active(),
+                                   property_css_classes(),
+                                   Glib::Binding::Flags::SYNC_CREATE,
+                                   [this](auto value) {
         auto classes = get_css_classes();
         if (!value)
         {
diff --git a/ui/src/widgets/preferences.cpp b/ui/src/widgets/preferences.cpp
index 6960dcc..7032423 100644
--- a/ui/src/widgets/preferences.cpp
+++ b/ui/src/widgets/preferences.cpp
@@ -1,6 +1,5 @@
 #include "turns/ui/widgets/preferences.hpp"
 
-#include "turns/adw/switchrow.hpp"
 #include "turns/core/settings.hpp"
 #include "turns/ui/widgets/template_widget.hpp"
 
@@ -20,6 +19,8 @@
 #include <gtkmm/colordialogbutton.h>
 #include <gtkmm/enums.h>
 
+#include <adwaitamm/switchrow.hpp>
+
 #include <gdkmm/rgba.h>
 
 namespace turns::ui::widgets
diff --git a/ui/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp
index ddae0b2..9afb15c 100644
--- a/ui/src/windows/participant_editor.cpp
+++ b/ui/src/windows/participant_editor.cpp
@@ -1,6 +1,5 @@
 #include "turns/ui/windows/participant_editor.hpp"
 
-#include "turns/adw/dialog.hpp"
 #include "turns/core/disposition.hpp"
 #include "turns/core/participant.hpp"
 #include "turns/lang/messages.hpp"
@@ -23,6 +22,8 @@
 #include <gtkmm/stringobject.h>
 #include <gtkmm/widget.h>
 
+#include <adwaitamm/dialog.hpp>
+
 #include <adwaita.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp
index 9adbb07..cf7ea44 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/windows/tracker.cpp
@@ -1,8 +1,5 @@
 #include "turns/ui/windows/tracker.hpp"
 
-#include "turns/adw/applicationwindow.hpp"
-#include "turns/adw/toast.hpp"
-#include "turns/adw/toastoverlay.hpp"
 #include "turns/core/turn_order.hpp"
 #include "turns/lang/messages.hpp"
 #include "turns/ui/widgets/turn_order_view.hpp"
@@ -34,6 +31,10 @@
 #include <gtkmm/styleprovider.h>
 #include <gtkmm/widget.h>
 
+#include <adwaitamm/applicationwindow.hpp>
+#include <adwaitamm/toast.hpp>
+#include <adwaitamm/toastoverlay.hpp>
+
 #include <gtk/gtk.h>
 #include <nlohmann/json.hpp>
 
diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp
index c26afbf..80a7ea7 100644
--- a/ui/src/windows/tracker/actions.cpp
+++ b/ui/src/windows/tracker/actions.cpp
@@ -1,4 +1,3 @@
-#include "turns/adw/preferencesdialog.hpp"
 #include "turns/core/participant.hpp"
 #include "turns/core/turn_order.hpp"
 #include "turns/lang/messages.hpp"
@@ -23,6 +22,8 @@
 #include <gtkmm/filefilter.h>
 #include <gtkmm/object.h>
 
+#include <adwaitamm/preferencesdialog.hpp>
+
 #include <adwaita.h>
 #include <gio/gio.h>
 #include <gtk/gtk.h>
diff --git a/ui/tests/gtk_test_init.cpp b/ui/tests/gtk_test_init.cpp
index 1509569..bed2ca5 100644
--- a/ui/tests/gtk_test_init.cpp
+++ b/ui/tests/gtk_test_init.cpp
@@ -1,4 +1,3 @@
-#include "turns/adw/wrap_init.hpp"
 #include "turns/core/init.hpp"
 #include "turns/ui/init.hpp"
 
@@ -9,6 +8,8 @@
 
 #include <gtkmm/init.h>
 
+#include <adwaitamm/wrap_init.hpp>
+
 #include <adwaita.h>
 #include <libintl.h>