diff options
59 files changed, 442 insertions, 248 deletions
diff --git a/.clang-format b/.clang-format index 4947366..187d49c 100644 --- a/.clang-format +++ b/.clang-format @@ -80,10 +80,13 @@ IncludeCategories: # Giomm Headers - Regex: '^<giomm/[[:alnum:]_/]+\.h(pp)?' Priority: 360 - # Gtk Headers + # Gdkmm Headers + - Regex: '^<gdkmm/[[:alnum:]_/]+\.h(pp)?' + Priority: 365 + # Gtkmm Headers - Regex: '^<gtkmm/[[:alnum:]_/]+\.h(pp)?' Priority: 370 - # Gtk Headers + # Adwaitamm Headers - Regex: '^<adwaitamm/[[:alnum:]_/]+\.hpp?' Priority: 380 # General System Headers diff --git a/.vscode/settings.json b/.vscode/settings.json index 7d2f134..8ffa765 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -8,10 +8,14 @@ "activatable", "Adwaita", "arknet", + "gboolean", "gclass", "gobj", + "gtkmm", "gtype", "klass", + "LIBADWAITAMM", + "Morgner", "refptr", "sigc", "ustring", diff --git a/adw/include/adwaitamm/actionrow.hpp b/adw/include/adwaitamm/actionrow.hpp index 6a34e15..b6507b7 100644 --- a/adw/include/adwaitamm/actionrow.hpp +++ b/adw/include/adwaitamm/actionrow.hpp @@ -1,8 +1,14 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_ACTION_ROW_HPP #define LIBADWAITAMM_ACTION_ROW_HPP +#include "adwaitamm/helpers/gobj_mixin.hpp" #include "adwaitamm/preferencesrow.hpp" -#include "helpers/gobj_mixin.hpp" #include <glibmm/class.h> #include <glibmm/object.h> @@ -16,8 +22,9 @@ #include <glib-object.h> #include <glib.h> -using AdwActionRow = struct _AdwActionRow; -using AdwActionRowClass = struct _AdwActionRowClass; +#define _ADWAITA_INSIDE +#include <adw-action-row.h> +#undef _ADWAITA_INSIDE namespace Adwaita { diff --git a/adw/include/adwaitamm/alertdialog.hpp b/adw/include/adwaitamm/alertdialog.hpp index fb0d88f..367512d 100644 --- a/adw/include/adwaitamm/alertdialog.hpp +++ b/adw/include/adwaitamm/alertdialog.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_ALERT_DIALOG_HPP #define LIBADWAITAMM_ALERT_DIALOG_HPP diff --git a/adw/include/adwaitamm/application.hpp b/adw/include/adwaitamm/application.hpp index 0cbc24f..0da9427 100644 --- a/adw/include/adwaitamm/application.hpp +++ b/adw/include/adwaitamm/application.hpp @@ -1,9 +1,14 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_APPLICATION_HPP #define LIBADWAITAMM_APPLICATION_HPP #include "adwaitamm/helpers/gobj_mixin.hpp" -#include <glibmm/class.h> #include <glibmm/object.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> diff --git a/adw/include/adwaitamm/applicationwindow.hpp b/adw/include/adwaitamm/applicationwindow.hpp index 454fad5..c2fa0d1 100644 --- a/adw/include/adwaitamm/applicationwindow.hpp +++ b/adw/include/adwaitamm/applicationwindow.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_APPLICATION_WINDOW_HPP #define LIBADWAITAMM_APPLICATION_WINDOW_HPP diff --git a/adw/include/adwaitamm/breakpoint.hpp b/adw/include/adwaitamm/breakpoint.hpp index 7bcb2d9..4b40574 100644 --- a/adw/include/adwaitamm/breakpoint.hpp +++ b/adw/include/adwaitamm/breakpoint.hpp @@ -1,10 +1,15 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_BREAKPOINT_HPP #define LIBADWAITAMM_BREAKPOINT_HPP #include "adwaitamm/helpers/gobj_mixin.hpp" #include <glibmm/object.h> -#include <glibmm/objectbase.h> #include <glibmm/propertyproxy.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> @@ -88,5 +93,4 @@ namespace Glib auto wrap(AdwBreakpoint * object, bool copy = false) -> Glib::RefPtr<Adwaita::Breakpoint>; } // namespace Glib - #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/dialog.hpp b/adw/include/adwaitamm/dialog.hpp index eeaeda1..de6af0c 100644 --- a/adw/include/adwaitamm/dialog.hpp +++ b/adw/include/adwaitamm/dialog.hpp @@ -1,12 +1,16 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_DIALOG_HPP #define LIBADWAITAMM_DIALOG_HPP #include "adwaitamm/breakpoint.hpp" #include "helpers/gobj_mixin.hpp" -#include <glibmm/class.h> #include <glibmm/object.h> -#include <glibmm/objectbase.h> #include <glibmm/refptr.h> #include <glibmm/ustring.h> diff --git a/adw/include/adwaitamm/enums.hpp b/adw/include/adwaitamm/enums.hpp index 03f5dc9..8cae39d 100644 --- a/adw/include/adwaitamm/enums.hpp +++ b/adw/include/adwaitamm/enums.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_ENUMS_HPP #define LIBADWAITAMM_ENUMS_HPP diff --git a/adw/include/adwaitamm/preferencesdialog.hpp b/adw/include/adwaitamm/preferencesdialog.hpp index 080651f..cdc1444 100644 --- a/adw/include/adwaitamm/preferencesdialog.hpp +++ b/adw/include/adwaitamm/preferencesdialog.hpp @@ -1,17 +1,17 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_PREFERENCES_DIALOG_HPP #define LIBADWAITAMM_PREFERENCES_DIALOG_HPP +#include "adwaitamm/dialog.hpp" #include "adwaitamm/preferencespage.hpp" -#include "dialog.hpp" #include "helpers/gobj_mixin.hpp" -#include <glibmm/class.h> #include <glibmm/object.h> -#include <glibmm/objectbase.h> -#include <glibmm/refptr.h> -#include <glibmm/ustring.h> - -#include <gtkmm/widget.h> #include <glib-object.h> diff --git a/adw/include/adwaitamm/preferencespage.hpp b/adw/include/adwaitamm/preferencespage.hpp index 311796f..16ef88a 100644 --- a/adw/include/adwaitamm/preferencespage.hpp +++ b/adw/include/adwaitamm/preferencespage.hpp @@ -1,13 +1,15 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_PREFERENCES_PAGE_HPP #define LIBADWAITAMM_PREFERENCES_PAGE_HPP #include "helpers/gobj_mixin.hpp" -#include <glibmm/class.h> #include <glibmm/object.h> -#include <glibmm/objectbase.h> -#include <glibmm/refptr.h> -#include <glibmm/ustring.h> #include <gtkmm/widget.h> diff --git a/adw/include/adwaitamm/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp index 3bbaaec..523d3ae 100644 --- a/adw/include/adwaitamm/preferencesrow.hpp +++ b/adw/include/adwaitamm/preferencesrow.hpp @@ -1,21 +1,25 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #ifndef LIBADWAITAMM_PREFERENCES_ROW_HPP #define LIBADWAITAMM_PREFERENCES_ROW_HPP #include "helpers/gobj_mixin.hpp" -#include <glibmm/class.h> #include <glibmm/object.h> -#include <glibmm/objectbase.h> #include <glibmm/propertyproxy.h> -#include <glibmm/refptr.h> #include <glibmm/ustring.h> #include <gtkmm/listboxrow.h> #include <glib-object.h> -using AdwPreferencesRow = struct _AdwPreferencesRow; -using AdwPreferencesRowClass = struct _AdwPreferencesRowClass; +#define _ADWAITA_INSIDE +#include <adw-preferences-row.h> +#undef _ADWAITA_INSIDE namespace Adwaita { 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 Mor |