From 9d18485db854f4d430e7c45d9538330b21dd66c3 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 25 Apr 2025 11:56:28 +0200 Subject: adw: perform basic code cleanup --- adw/src/private/actionrow_p.cpp | 7 +++++- adw/src/private/alertdialog_p.cpp | 9 +++++--- adw/src/private/application_p.cpp | 9 +++++++- adw/src/private/applicationwindow_p.cpp | 9 +++++++- adw/src/private/breakpoint_p.cpp | 10 ++++++++ adw/src/private/dialog_p.cpp | 8 ++++++- adw/src/private/preferencesdialog_p.cpp | 9 +++++--- adw/src/private/preferencespage_p.cpp | 8 ++++++- adw/src/private/preferencesrow_p.cpp | 7 ++++++ adw/src/private/stylemanager_p.cpp | 9 ++++++++ adw/src/private/switch_row_p.cpp | 32 ------------------------- adw/src/private/switchrow_p.cpp | 41 +++++++++++++++++++++++++++++++++ adw/src/private/toast_p.cpp | 10 ++++++++ adw/src/private/toastoverlay_p.cpp | 7 +++++- 14 files changed, 131 insertions(+), 44 deletions(-) delete mode 100644 adw/src/private/switch_row_p.cpp create mode 100644 adw/src/private/switchrow_p.cpp (limited to 'adw/src/private') diff --git a/adw/src/private/actionrow_p.cpp b/adw/src/private/actionrow_p.cpp index 843c330..4a31bc8 100644 --- a/adw/src/private/actionrow_p.cpp +++ b/adw/src/private/actionrow_p.cpp @@ -1,7 +1,12 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/actionrow_p.hpp" #include "adwaitamm/actionrow.hpp" -#include "adwaitamm/private/preferencesrow_p.hpp" // IWYU pragma: keep - Required for CppClassParent:: #include #include diff --git a/adw/src/private/alertdialog_p.cpp b/adw/src/private/alertdialog_p.cpp index 524446f..51cba24 100644 --- a/adw/src/private/alertdialog_p.cpp +++ b/adw/src/private/alertdialog_p.cpp @@ -1,14 +1,17 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/alertdialog_p.hpp" #include "adwaitamm/alertdialog.hpp" #include -#include #include #include -#include -#include #include diff --git a/adw/src/private/application_p.cpp b/adw/src/private/application_p.cpp index 62a0b98..5b841a0 100644 --- a/adw/src/private/application_p.cpp +++ b/adw/src/private/application_p.cpp @@ -1,13 +1,20 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/application_p.hpp" #include "adwaitamm/application.hpp" #include -#include #include #include +#include + namespace Adwaita { auto Application_Class::init() -> Glib::Class const & diff --git a/adw/src/private/applicationwindow_p.cpp b/adw/src/private/applicationwindow_p.cpp index b2ba636..b5d2b19 100644 --- a/adw/src/private/applicationwindow_p.cpp +++ b/adw/src/private/applicationwindow_p.cpp @@ -1,13 +1,20 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/applicationwindow_p.hpp" #include "adwaitamm/applicationwindow.hpp" #include -#include #include #include +#include + namespace Adwaita { auto ApplicationWindow_Class::init() -> Glib::Class const & diff --git a/adw/src/private/breakpoint_p.cpp b/adw/src/private/breakpoint_p.cpp index 5a41a31..ed3dda6 100644 --- a/adw/src/private/breakpoint_p.cpp +++ b/adw/src/private/breakpoint_p.cpp @@ -1,11 +1,21 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/breakpoint_p.hpp" #include "adwaitamm/breakpoint.hpp" #include #include +#include + #include +#include + namespace Adwaita { auto Breakpoint_Class::init() -> Glib::Class const & diff --git a/adw/src/private/dialog_p.cpp b/adw/src/private/dialog_p.cpp index da19ddc..e6ac6cd 100644 --- a/adw/src/private/dialog_p.cpp +++ b/adw/src/private/dialog_p.cpp @@ -1,9 +1,15 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/dialog_p.hpp" #include "adwaitamm/dialog.hpp" #include -#include +#include #include #include diff --git a/adw/src/private/preferencesdialog_p.cpp b/adw/src/private/preferencesdialog_p.cpp index f114fa9..14e1aa7 100644 --- a/adw/src/private/preferencesdialog_p.cpp +++ b/adw/src/private/preferencesdialog_p.cpp @@ -1,14 +1,17 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/preferencesdialog_p.hpp" #include "adwaitamm/preferencesdialog.hpp" #include -#include #include #include -#include -#include #include diff --git a/adw/src/private/preferencespage_p.cpp b/adw/src/private/preferencespage_p.cpp index b9d9c59..0a7cd74 100644 --- a/adw/src/private/preferencespage_p.cpp +++ b/adw/src/private/preferencespage_p.cpp @@ -1,9 +1,15 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/preferencespage_p.hpp" #include "adwaitamm/preferencespage.hpp" #include -#include +#include #include #include diff --git a/adw/src/private/preferencesrow_p.cpp b/adw/src/private/preferencesrow_p.cpp index fd5909e..5823d7e 100644 --- a/adw/src/private/preferencesrow_p.cpp +++ b/adw/src/private/preferencesrow_p.cpp @@ -1,8 +1,15 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/preferencesrow_p.hpp" #include "adwaitamm/preferencesrow.hpp" #include +#include #include #include diff --git a/adw/src/private/stylemanager_p.cpp b/adw/src/private/stylemanager_p.cpp index f35c6da..336444a 100644 --- a/adw/src/private/stylemanager_p.cpp +++ b/adw/src/private/stylemanager_p.cpp @@ -1,9 +1,18 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/stylemanager_p.hpp" #include "adwaitamm/stylemanager.hpp" #include #include +#include + +#include namespace Adwaita { diff --git a/adw/src/private/switch_row_p.cpp b/adw/src/private/switch_row_p.cpp deleted file mode 100644 index 71fdf5b..0000000 --- a/adw/src/private/switch_row_p.cpp +++ /dev/null @@ -1,32 +0,0 @@ -#include "adwaitamm/private/switchrow_p.hpp" -#include "adwaitamm/switchrow.hpp" - -#include -#include -#include - -#include - -namespace Adwaita -{ - auto SwitchRow_Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - gtype_ = adw_switch_row_get_type(); - } - return *this; - } - - auto SwitchRow_Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto SwitchRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new SwitchRow(ADW_SWITCH_ROW(object))); - } -} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/switchrow_p.cpp b/adw/src/private/switchrow_p.cpp new file mode 100644 index 0000000..0f071c4 --- /dev/null +++ b/adw/src/private/switchrow_p.cpp @@ -0,0 +1,41 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + +#include "adwaitamm/private/switchrow_p.hpp" + +#include "adwaitamm/switchrow.hpp" + +#include +#include +#include + +#include + +#include + +namespace Adwaita +{ + auto SwitchRow_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + gtype_ = adw_switch_row_get_type(); + } + return *this; + } + + auto SwitchRow_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto SwitchRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new SwitchRow(ADW_SWITCH_ROW(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/toast_p.cpp b/adw/src/private/toast_p.cpp index 7138835..e83bc10 100644 --- a/adw/src/private/toast_p.cpp +++ b/adw/src/private/toast_p.cpp @@ -1,8 +1,18 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/toast_p.hpp" #include "adwaitamm/toast.hpp" #include +#include +#include + +#include namespace Adwaita { diff --git a/adw/src/private/toastoverlay_p.cpp b/adw/src/private/toastoverlay_p.cpp index 744f981..3834a1e 100644 --- a/adw/src/private/toastoverlay_p.cpp +++ b/adw/src/private/toastoverlay_p.cpp @@ -1,9 +1,14 @@ +/** + * @author Felix Morgner (felix.morgner@gmail.com) + * @copyright Copyright (c) 2025 + * SPDX-License-Identifier: LGPL-2.1-or-later + */ + #include "adwaitamm/private/toastoverlay_p.hpp" #include "adwaitamm/toastoverlay.hpp" #include -#include #include #include -- cgit v1.2.3