adw: perform basic code cleanup

13 files changed, 96 insertions, 73 deletions

diff --git a/adw/include/adwaitamm/private/actionrow_p.hpp b/adw/include/adwaitamm/private/actionrow_p.hpp
index 5ccce02..b8a24eb 100644
--- a/adw/include/adwaitamm/private/actionrow_p.hpp
+++ b/adw/include/adwaitamm/private/actionrow_p.hpp
@@ -1,20 +1,23 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_ACTION_ROW_P_HPP
 #define LIBADWAITAMM_PRIVATE_ACTION_ROW_P_HPP
 
-#include <sigc++/signal.h>
+#include "adwaitamm/private/preferencesrow_p.hpp"
 
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
 
-#include <glib-object.h>
-
-using AdwActionRow = struct _AdwActionRow;
-using AdwActionRowClass = struct _AdwActionRowClass;
-using AdwPreferencesRowClass = struct _AdwPreferencesRowClass;
+#define _ADWAITA_INSIDE
+#include <adw-action-row.h>
+#undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-
   struct ActionRow_Class : Glib::Class
   {
     using BaseClassParent = AdwPreferencesRowClass;
@@ -27,7 +30,6 @@ namespace Adwaita
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/alertdialog_p.hpp b/adw/include/adwaitamm/private/alertdialog_p.hpp
index 949b4b8..e9a648b 100644
--- a/adw/include/adwaitamm/private/alertdialog_p.hpp
+++ b/adw/include/adwaitamm/private/alertdialog_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later 
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_ALERT_DIALOG_P_HPP
 #define LIBADWAITAMM_PRIVATE_ALERT_DIALOG_P_HPP
 
@@ -6,10 +12,6 @@
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
 
-#include <gtkmm/widget.h>
-
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-alert-dialog.h>
 #undef _ADWAITA_INSIDE
diff --git a/adw/include/adwaitamm/private/application_p.hpp b/adw/include/adwaitamm/private/application_p.hpp
index b9ac5f6..effb8ad 100644
--- a/adw/include/adwaitamm/private/application_p.hpp
+++ b/adw/include/adwaitamm/private/application_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later 
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_APPLICATION_P_HPP
 #define LIBADWAITAMM_PRIVATE_APPLICATION_P_HPP
 
@@ -6,23 +12,19 @@
 
 #include <gtkmm/application.h>
 
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-application.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct Application;
-
   struct Application_Class : Glib::Class
   {
     using BaseClassParent = GtkApplicationClass;
     using BaseClassType = AdwApplicationClass;
     using BaseObjectType = AdwApplication;
     using CppClassParent = Gtk::Application_Class;
-    using CppObjectType = Application;
+    using CppObjectType = struct Application;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
diff --git a/adw/include/adwaitamm/private/applicationwindow_p.hpp b/adw/include/adwaitamm/private/applicationwindow_p.hpp
index d44629e..f96cebd 100644
--- a/adw/include/adwaitamm/private/applicationwindow_p.hpp
+++ b/adw/include/adwaitamm/private/applicationwindow_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later 
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_APPLICATION_WINDOW_P_HPP
 #define LIBADWAITAMM_PRIVATE_APPLICATION_WINDOW_P_HPP
 
@@ -6,23 +12,19 @@
 
 #include <gtkmm/applicationwindow.h>
 
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-application-window.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct ApplicationWindow;
-
   struct ApplicationWindow_Class : Glib::Class
   {
     using BaseClassParent = GtkApplicationWindowClass;
     using BaseClassType = AdwApplicationWindowClass;
     using BaseObjectType = AdwApplicationWindow;
     using CppClassParent = Gtk::ApplicationWindow_Class;
-    using CppObjectType = ApplicationWindow;
+    using CppObjectType = struct ApplicationWindow;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
diff --git a/adw/include/adwaitamm/private/breakpoint_p.hpp b/adw/include/adwaitamm/private/breakpoint_p.hpp
index b4f6bc4..37e745f 100644
--- a/adw/include/adwaitamm/private/breakpoint_p.hpp
+++ b/adw/include/adwaitamm/private/breakpoint_p.hpp
@@ -1,11 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_BREAKPOINT_P_HPP
 #define LIBADWAITAMM_PRIVATE_BREAKPOINT_P_HPP
 
-#include <sigc++/signal.h>
-
 #include <glibmm/class.h>
+#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/private/object_p.h>
 
 #include <glib-object.h>
 
@@ -15,7 +19,6 @@
 
 namespace Adwaita
 {
-
   struct Breakpoint_Class : Glib::Class
   {
     using BaseClassParent = GObjectClass;
@@ -28,7 +31,6 @@ namespace Adwaita
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/dialog_p.hpp b/adw/include/adwaitamm/private/dialog_p.hpp
index 5f02dba..a8be388 100644
--- a/adw/include/adwaitamm/private/dialog_p.hpp
+++ b/adw/include/adwaitamm/private/dialog_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_DIALOG_P_HPP
 #define LIBADWAITAMM_PRIVATE_DIALOG_P_HPP
 
@@ -6,23 +12,19 @@
 
 #include <gtkmm/widget.h>
 
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-dialog.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct Dialog;
-
   struct Dialog_Class : Glib::Class
   {
     using BaseClassParent = GtkWidgetClass;
     using BaseClassType = AdwDialogClass;
     using BaseObjectType = AdwDialog;
     using CppClassParent = Gtk::Widget_Class;
-    using CppObjectType = Dialog;
+    using CppObjectType = struct Dialog;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
diff --git a/adw/include/adwaitamm/private/preferencesdialog_p.hpp b/adw/include/adwaitamm/private/preferencesdialog_p.hpp
index 14f1038..b146ea6 100644
--- a/adw/include/adwaitamm/private/preferencesdialog_p.hpp
+++ b/adw/include/adwaitamm/private/preferencesdialog_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_PREFERENCES_DIALOG_P_HPP
 #define LIBADWAITAMM_PRIVATE_PREFERENCES_DIALOG_P_HPP
 
@@ -6,10 +12,6 @@
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
 
-#include <gtkmm/widget.h>
-
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-preferences-dialog.h>
 #undef _ADWAITA_INSIDE
diff --git a/adw/include/adwaitamm/private/preferencespage_p.hpp b/adw/include/adwaitamm/private/preferencespage_p.hpp
index 0a84a99..adc297e 100644
--- a/adw/include/adwaitamm/private/preferencespage_p.hpp
+++ b/adw/include/adwaitamm/private/preferencespage_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_PREFERENCES_PAGE_P_HPP
 #define LIBADWAITAMM_PRIVATE_PREFERENCES_PAGE_P_HPP
 
@@ -6,23 +12,19 @@
 
 #include <gtkmm/widget.h>
 
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-preferences-page.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct PreferencesPage;
-
   struct PreferencesPage_Class : Glib::Class
   {
     using BaseClassParent = GtkWidgetClass;
     using BaseClassType = AdwPreferencesPageClass;
     using BaseObjectType = AdwPreferencesPage;
     using CppClassParent = Gtk::Widget_Class;
-    using CppObjectType = PreferencesPage;
+    using CppObjectType = struct PreferencesPage;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
diff --git a/adw/include/adwaitamm/private/preferencesrow_p.hpp b/adw/include/adwaitamm/private/preferencesrow_p.hpp
index be0b25b..fd6c22b 100644
--- a/adw/include/adwaitamm/private/preferencesrow_p.hpp
+++ b/adw/include/adwaitamm/private/preferencesrow_p.hpp
@@ -1,36 +1,35 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_PREFERENCES_ROW_P_HPP
 #define LIBADWAITAMM_PRIVATE_PREFERENCES_ROW_P_HPP
 
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
 
-#include <gtk/gtk.h>
-
-using AdwPreferencesRow = struct _AdwPreferencesRow;
-using AdwPreferencesRowClass = struct _AdwPreferencesRowClass;
+#include <gtkmm/listboxrow.h>
 
-namespace Gtk
-{
-  struct ListBoxRow_Class;
-}  // namespace Gtk
+#define _ADWAITA_INSIDE
+#include <adw-preferences-row.h>
+#undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct PreferencesRow;
-
   struct PreferencesRow_Class : Glib::Class
   {
     using BaseClassParent = GtkListBoxRowClass;
     using BaseClassType = AdwPreferencesRowClass;
     using BaseObjectType = AdwPreferencesRow;
     using CppClassParent = Gtk::ListBoxRow_Class;
-    using CppObjectType = PreferencesRow;
+    using CppObjectType = struct PreferencesRow;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/stylemanager_p.hpp b/adw/include/adwaitamm/private/stylemanager_p.hpp
index a37eedd..52bf7a5 100644
--- a/adw/include/adwaitamm/private/stylemanager_p.hpp
+++ b/adw/include/adwaitamm/private/stylemanager_p.hpp
@@ -1,9 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_STYLE_MANAGER_P_HPP
 #define LIBADWAITAMM_PRIVATE_STYLE_MANAGER_P_HPP
 
 #include <glibmm/class.h>
+#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/private/object_p.h>
 
 #include <glib-object.h>
 
@@ -13,7 +19,6 @@
 
 namespace Adwaita
 {
-
   struct StyleManager_Class : Glib::Class
   {
     using BaseClassParent = GObjectClass;
@@ -26,7 +31,6 @@ namespace Adwaita
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/switchrow_p.hpp b/adw/include/adwaitamm/private/switchrow_p.hpp
index 7c2288b..b1eecc5 100644
--- a/adw/include/adwaitamm/private/switchrow_p.hpp
+++ b/adw/include/adwaitamm/private/switchrow_p.hpp
@@ -1,22 +1,23 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_SWITCH_ROW_P_HPP
 #define LIBADWAITAMM_PRIVATE_SWITCH_ROW_P_HPP
 
 #include "adwaitamm/private/actionrow_p.hpp"
 
-#include <sigc++/signal.h>
-
 #include <glibmm/class.h>
 #include <glibmm/objectbase.h>
 
-#include <glib-object.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-switch-row.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-
   struct SwitchRow_Class : Glib::Class
   {
     using BaseClassParent = AdwActionRowClass;
@@ -29,7 +30,6 @@ namespace Adwaita
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/toast_p.hpp b/adw/include/adwaitamm/private/toast_p.hpp
index 2431b32..2f2b420 100644
--- a/adw/include/adwaitamm/private/toast_p.hpp
+++ b/adw/include/adwaitamm/private/toast_p.hpp
@@ -1,11 +1,15 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_TOAST_P_HPP
 #define LIBADWAITAMM_PRIVATE_TOAST_P_HPP
 
-#include <sigc++/signal.h>
-
 #include <glibmm/class.h>
+#include <glibmm/object.h>
 #include <glibmm/objectbase.h>
-#include <glibmm/private/object_p.h>
 
 #include <glib-object.h>
 
@@ -15,20 +19,18 @@
 
 namespace Adwaita
 {
-
   struct Toast_Class : Glib::Class
   {
     using BaseClassParent = GObjectClass;
     using BaseClassType = AdwToastClass;
     using BaseObjectType = AdwToast;
-    using CppClassParent = struct Glib::Object_Class;
+    using CppClassParent = Glib::Object_Class;
     using CppObjectType = struct Toast;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;
     auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
   };
-
 }  // namespace Adwaita
 
 #endif
\ No newline at end of file
diff --git a/adw/include/adwaitamm/private/toastoverlay_p.hpp b/adw/include/adwaitamm/private/toastoverlay_p.hpp
index 3fa651b..d19ba8e 100644
--- a/adw/include/adwaitamm/private/toastoverlay_p.hpp
+++ b/adw/include/adwaitamm/private/toastoverlay_p.hpp
@@ -1,3 +1,9 @@
+/**
+ * @author Felix Morgner (felix.morgner@gmail.com)
+ * @copyright Copyright (c) 2025
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #ifndef LIBADWAITAMM_PRIVATE_TOAST_OVERLAY_P_HPP
 #define LIBADWAITAMM_PRIVATE_TOAST_OVERLAY_P_HPP
 
@@ -6,23 +12,19 @@
 
 #include <gtkmm/widget.h>
 
-#include <gtk/gtk.h>
-
 #define _ADWAITA_INSIDE
 #include <adw-toast-overlay.h>
 #undef _ADWAITA_INSIDE
 
 namespace Adwaita
 {
-  struct ToastOverlay;
-
   struct ToastOverlay_Class : Glib::Class
   {
     using BaseClassParent = GtkWidgetClass;
     using BaseClassType = AdwToastOverlayClass;
     using BaseObjectType = AdwToastOverlay;
     using CppClassParent = Gtk::Widget_Class;
-    using CppObjectType = ToastOverlay;
+    using CppObjectType = struct ToastOverlay;
 
     auto init() -> Glib::Class const &;
     auto static class_init_function(void * gclass, void * data) -> void;