From 95dc7e43a23300b3eacbb7e1e0a9d4f31a8bd5a0 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Thu, 24 Apr 2025 20:12:26 +0200 Subject: adw: extract class definitions --- adw/src/actionrow.cpp | 24 ++------------------- adw/src/alertdialog.cpp | 24 ++------------------- adw/src/application.cpp | 24 ++------------------- adw/src/applicationwindow.cpp | 25 +++------------------- adw/src/breakpoint.cpp | 25 ++-------------------- adw/src/dialog.cpp | 25 ++-------------------- adw/src/preferencesdialog.cpp | 24 ++------------------- adw/src/preferencespage.cpp | 25 +++------------------- adw/src/preferencesrow.cpp | 25 +++------------------- adw/src/private/actionrow_p.cpp | 35 +++++++++++++++++++++++++++++++ adw/src/private/alertdialog_p.cpp | 37 +++++++++++++++++++++++++++++++++ adw/src/private/application_p.cpp | 33 +++++++++++++++++++++++++++++ adw/src/private/applicationwindow_p.cpp | 33 +++++++++++++++++++++++++++++ adw/src/private/breakpoint_p.cpp | 32 ++++++++++++++++++++++++++++ adw/src/private/dialog_p.cpp | 37 +++++++++++++++++++++++++++++++++ adw/src/private/preferencesdialog_p.cpp | 37 +++++++++++++++++++++++++++++++++ adw/src/private/preferencespage_p.cpp | 35 +++++++++++++++++++++++++++++++ adw/src/private/preferencesrow_p.cpp | 34 ++++++++++++++++++++++++++++++ adw/src/private/stylemanager_p.cpp | 30 ++++++++++++++++++++++++++ adw/src/private/switch_row_p.cpp | 32 ++++++++++++++++++++++++++++ adw/src/private/toast_p.cpp | 29 ++++++++++++++++++++++++++ adw/src/private/toastoverlay_p.cpp | 37 +++++++++++++++++++++++++++++++++ adw/src/stylemanager.cpp | 24 ++------------------- adw/src/switchrow.cpp | 24 ++------------------- adw/src/toast.cpp | 24 ++------------------- adw/src/toastoverlay.cpp | 24 ++------------------- adw/src/wrap_init.cpp | 15 ++++++++++++- 27 files changed, 484 insertions(+), 289 deletions(-) create mode 100644 adw/src/private/actionrow_p.cpp create mode 100644 adw/src/private/alertdialog_p.cpp create mode 100644 adw/src/private/application_p.cpp create mode 100644 adw/src/private/applicationwindow_p.cpp create mode 100644 adw/src/private/breakpoint_p.cpp create mode 100644 adw/src/private/dialog_p.cpp create mode 100644 adw/src/private/preferencesdialog_p.cpp create mode 100644 adw/src/private/preferencespage_p.cpp create mode 100644 adw/src/private/preferencesrow_p.cpp create mode 100644 adw/src/private/stylemanager_p.cpp create mode 100644 adw/src/private/switch_row_p.cpp create mode 100644 adw/src/private/toast_p.cpp create mode 100644 adw/src/private/toastoverlay_p.cpp (limited to 'adw/src') diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp index 297cefc..8242a6e 100644 --- a/adw/src/actionrow.cpp +++ b/adw/src/actionrow.cpp @@ -1,4 +1,5 @@ #include "adwaitamm/actionrow.hpp" +#include "adwaitamm/private/actionrow_p.hpp" #include "adwaitamm/preferencesrow.hpp" @@ -26,30 +27,9 @@ namespace Adwaita { namespace { - auto constinit _class = ActionRow::Class{}; + auto constinit _class = ActionRow_Class{}; } // namespace - auto ActionRow::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_action_row_get_type()); - } - return *this; - } - - auto ActionRow::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto ActionRow::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new ActionRow(ADW_ACTION_ROW(object))); - } - auto ActionRow::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/alertdialog.cpp b/adw/src/alertdialog.cpp index 585d9e8..24c5705 100644 --- a/adw/src/alertdialog.cpp +++ b/adw/src/alertdialog.cpp @@ -1,4 +1,5 @@ #include "adwaitamm/alertdialog.hpp" +#include "adwaitamm/private/alertdialog_p.hpp" #include "adwaitamm/dialog.hpp" @@ -31,30 +32,9 @@ namespace Adwaita namespace { - auto constinit _class = AlertDialog::Class{}; + auto constinit _class = AlertDialog_Class{}; } // namespace - auto AlertDialog::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_alert_dialog_get_type()); - } - return *this; - } - - auto AlertDialog::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto AlertDialog::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new AlertDialog(ADW_ALERT_DIALOG(object))); - } - auto AlertDialog::create(Glib::ustring heading, Glib::ustring body) -> Glib::RefPtr { return Glib::RefPtr{new AlertDialog(heading, body)}; diff --git a/adw/src/application.cpp b/adw/src/application.cpp index 57a0aaa..55caff5 100644 --- a/adw/src/application.cpp +++ b/adw/src/application.cpp @@ -1,4 +1,5 @@ #include "adwaitamm/application.hpp" +#include "adwaitamm/private/application_p.hpp" #include "adwaitamm/wrap_init.hpp" @@ -23,30 +24,9 @@ namespace Adwaita { namespace { - auto constinit _class = Application::Class{}; + auto constinit _class = Application_Class{}; } // namespace - auto Application::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &Application::Class::class_init_function; - register_derived_type(adw_application_get_type()); - } - return *this; - } - - auto Application::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - Gtk::Application_Class::class_init_function(klass, data); - } - - auto Application::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return new Application(ADW_APPLICATION(object)); - } - auto Application::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/applicationwindow.cpp b/adw/src/applicationwindow.cpp index f4de581..50817d2 100644 --- a/adw/src/applicationwindow.cpp +++ b/adw/src/applicationwindow.cpp @@ -1,5 +1,7 @@ #include "adwaitamm/applicationwindow.hpp" +#include "adwaitamm/private/applicationwindow_p.hpp" + #include #include #include @@ -22,30 +24,9 @@ namespace Adwaita { namespace { - auto constinit _class = ApplicationWindow::Class{}; + auto constinit _class = ApplicationWindow_Class{}; } // namespace - auto ApplicationWindow::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_application_window_get_type()); - } - return *this; - } - - auto ApplicationWindow::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto ApplicationWindow::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return new ApplicationWindow(ADW_APPLICATION_WINDOW(object)); - } - auto ApplicationWindow::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/breakpoint.cpp b/adw/src/breakpoint.cpp index 01e68ca..e19db41 100644 --- a/adw/src/breakpoint.cpp +++ b/adw/src/breakpoint.cpp @@ -1,4 +1,5 @@ #include "adwaitamm/breakpoint.hpp" +#include "adwaitamm/private/breakpoint_p.hpp" #include "adwaitamm/enums.hpp" @@ -88,31 +89,9 @@ namespace Adwaita { namespace { - auto constinit _class = Breakpoint::Class{}; + auto constinit _class = Breakpoint_Class{}; } // namespace - auto Breakpoint::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - gtype_ = adw_breakpoint_get_type(); - Gtk::Buildable::add_interface(get_type()); - } - return *this; - } - - auto Breakpoint::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto Breakpoint::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return new Breakpoint{ADW_BREAKPOINT(object)}; - } - Breakpoint::Breakpoint(BreakpointCondition & condition) : Glib::ObjectBase{nullptr} , Glib::Object{Glib::ConstructParams{_class.init(), "condition", condition.m_object, nullptr}} diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp index e240d7f..6f34d3d 100644 --- a/adw/src/dialog.cpp +++ b/adw/src/dialog.cpp @@ -1,6 +1,7 @@ #include "adwaitamm/dialog.hpp" #include "adwaitamm/breakpoint.hpp" +#include "adwaitamm/private/dialog_p.hpp" #include #include @@ -25,31 +26,9 @@ namespace Adwaita namespace { - auto constinit _class = Dialog::Class{}; + auto constinit _class = Dialog_Class{}; } // namespace - auto Dialog::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_dialog_get_type()); - Gtk::ShortcutManager::add_interface(get_type()); - } - return *this; - } - - auto Dialog::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto Dialog::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new Dialog(ADW_DIALOG(object))); - } - auto Dialog::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/preferencesdialog.cpp b/adw/src/preferencesdialog.cpp index 8c69fef..19c9e35 100644 --- a/adw/src/preferencesdialog.cpp +++ b/adw/src/preferencesdialog.cpp @@ -2,6 +2,7 @@ #include "adwaitamm/dialog.hpp" #include "adwaitamm/preferencespage.hpp" +#include "adwaitamm/private/preferencesdialog_p.hpp" #include #include @@ -24,30 +25,9 @@ namespace Adwaita { namespace { - auto constinit _class = PreferencesDialog::Class{}; + auto constinit _class = PreferencesDialog_Class{}; } // namespace - auto PreferencesDialog::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_preferences_dialog_get_type()); - } - return *this; - } - - auto PreferencesDialog::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto PreferencesDialog::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new PreferencesDialog(ADW_PREFERENCES_DIALOG(object))); - } - auto PreferencesDialog::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp index e2b3e80..0c10d97 100644 --- a/adw/src/preferencespage.cpp +++ b/adw/src/preferencespage.cpp @@ -1,5 +1,7 @@ #include "adwaitamm/preferencespage.hpp" +#include "adwaitamm/private/preferencespage_p.hpp" + #include #include #include @@ -21,30 +23,9 @@ namespace Adwaita { namespace { - auto constinit _class = PreferencesPage::Class{}; + auto constinit _class = PreferencesPage_Class{}; } // namespace - auto PreferencesPage::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_preferences_page_get_type()); - } - return *this; - } - - auto PreferencesPage::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto PreferencesPage::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new PreferencesPage(ADW_PREFERENCES_PAGE(object))); - } - auto PreferencesPage::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/preferencesrow.cpp b/adw/src/preferencesrow.cpp index fe6410f..e54bebe 100644 --- a/adw/src/preferencesrow.cpp +++ b/adw/src/preferencesrow.cpp @@ -1,5 +1,7 @@ #include "adwaitamm/preferencesrow.hpp" +#include "adwaitamm/private/preferencesrow_p.hpp" + #include #include #include @@ -22,30 +24,9 @@ namespace Adwaita { namespace { - auto constinit _class = PreferencesRow::Class{}; + auto constinit _class = PreferencesRow_Class{}; } // namespace - auto PreferencesRow::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(adw_preferences_row_get_type()); - } - return *this; - } - - auto PreferencesRow::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto PreferencesRow::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new PreferencesRow(ADW_PREFERENCES_ROW(object))); - } - auto PreferencesRow::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/private/actionrow_p.cpp b/adw/src/private/actionrow_p.cpp new file mode 100644 index 0000000..843c330 --- /dev/null +++ b/adw/src/private/actionrow_p.cpp @@ -0,0 +1,35 @@ +#include "adwaitamm/private/actionrow_p.hpp" + +#include "adwaitamm/actionrow.hpp" +#include "adwaitamm/private/preferencesrow_p.hpp" // IWYU pragma: keep - Required for CppClassParent:: + +#include +#include + +#include + +#include + +namespace Adwaita +{ + auto ActionRow_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_action_row_get_type()); + } + return *this; + } + + auto ActionRow_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto ActionRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new ActionRow(ADW_ACTION_ROW(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/alertdialog_p.cpp b/adw/src/private/alertdialog_p.cpp new file mode 100644 index 0000000..524446f --- /dev/null +++ b/adw/src/private/alertdialog_p.cpp @@ -0,0 +1,37 @@ +#include "adwaitamm/private/alertdialog_p.hpp" + +#include "adwaitamm/alertdialog.hpp" + +#include +#include +#include + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto AlertDialog_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_alert_dialog_get_type()); + } + return *this; + } + + auto AlertDialog_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto AlertDialog_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new AlertDialog(ADW_ALERT_DIALOG(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/application_p.cpp b/adw/src/private/application_p.cpp new file mode 100644 index 0000000..62a0b98 --- /dev/null +++ b/adw/src/private/application_p.cpp @@ -0,0 +1,33 @@ +#include "adwaitamm/private/application_p.hpp" + +#include "adwaitamm/application.hpp" + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto Application_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_application_get_type()); + } + return *this; + } + + auto Application_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto Application_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new Application(ADW_APPLICATION(object)); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/applicationwindow_p.cpp b/adw/src/private/applicationwindow_p.cpp new file mode 100644 index 0000000..b2ba636 --- /dev/null +++ b/adw/src/private/applicationwindow_p.cpp @@ -0,0 +1,33 @@ +#include "adwaitamm/private/applicationwindow_p.hpp" + +#include "adwaitamm/applicationwindow.hpp" + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto ApplicationWindow_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_application_window_get_type()); + } + return *this; + } + + auto ApplicationWindow_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto ApplicationWindow_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new ApplicationWindow(ADW_APPLICATION_WINDOW(object)); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/breakpoint_p.cpp b/adw/src/private/breakpoint_p.cpp new file mode 100644 index 0000000..5a41a31 --- /dev/null +++ b/adw/src/private/breakpoint_p.cpp @@ -0,0 +1,32 @@ +#include "adwaitamm/private/breakpoint_p.hpp" + +#include "adwaitamm/breakpoint.hpp" + +#include +#include +#include + +namespace Adwaita +{ + auto Breakpoint_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + gtype_ = adw_breakpoint_get_type(); + Gtk::Buildable::add_interface(get_type()); + } + return *this; + } + + auto Breakpoint_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto Breakpoint_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new Breakpoint(ADW_BREAKPOINT(object)); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/dialog_p.cpp b/adw/src/private/dialog_p.cpp new file mode 100644 index 0000000..da19ddc --- /dev/null +++ b/adw/src/private/dialog_p.cpp @@ -0,0 +1,37 @@ +#include "adwaitamm/private/dialog_p.hpp" + +#include "adwaitamm/dialog.hpp" + +#include +#include + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto Dialog_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_dialog_get_type()); + Gtk::ShortcutManager::add_interface(get_type()); + } + return *this; + } + + auto Dialog_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto Dialog_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new Dialog(ADW_DIALOG(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/preferencesdialog_p.cpp b/adw/src/private/preferencesdialog_p.cpp new file mode 100644 index 0000000..f114fa9 --- /dev/null +++ b/adw/src/private/preferencesdialog_p.cpp @@ -0,0 +1,37 @@ +#include "adwaitamm/private/preferencesdialog_p.hpp" + +#include "adwaitamm/preferencesdialog.hpp" + +#include +#include +#include + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto PreferencesDialog_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_preferences_dialog_get_type()); + } + return *this; + } + + auto PreferencesDialog_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto PreferencesDialog_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new PreferencesDialog(ADW_PREFERENCES_DIALOG(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/preferencespage_p.cpp b/adw/src/private/preferencespage_p.cpp new file mode 100644 index 0000000..b9d9c59 --- /dev/null +++ b/adw/src/private/preferencespage_p.cpp @@ -0,0 +1,35 @@ +#include "adwaitamm/private/preferencespage_p.hpp" + +#include "adwaitamm/preferencespage.hpp" + +#include +#include + +#include +#include + +#include + +namespace Adwaita +{ + auto PreferencesPage_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_preferences_page_get_type()); + } + return *this; + } + + auto PreferencesPage_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto PreferencesPage_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new PreferencesPage(ADW_PREFERENCES_PAGE(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/preferencesrow_p.cpp b/adw/src/private/preferencesrow_p.cpp new file mode 100644 index 0000000..fd5909e --- /dev/null +++ b/adw/src/private/preferencesrow_p.cpp @@ -0,0 +1,34 @@ +#include "adwaitamm/private/preferencesrow_p.hpp" + +#include "adwaitamm/preferencesrow.hpp" + +#include + +#include +#include + +#include + +namespace Adwaita +{ + auto PreferencesRow_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_preferences_row_get_type()); + } + return *this; + } + + auto PreferencesRow_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto PreferencesRow_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new PreferencesRow(ADW_PREFERENCES_ROW(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/stylemanager_p.cpp b/adw/src/private/stylemanager_p.cpp new file mode 100644 index 0000000..f35c6da --- /dev/null +++ b/adw/src/private/stylemanager_p.cpp @@ -0,0 +1,30 @@ +#include "adwaitamm/private/stylemanager_p.hpp" + +#include "adwaitamm/stylemanager.hpp" + +#include +#include + +namespace Adwaita +{ + auto StyleManager_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + gtype_ = adw_style_manager_get_type(); + } + return *this; + } + + auto StyleManager_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto StyleManager_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new StyleManager(ADW_STYLE_MANAGER(object)); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/switch_row_p.cpp b/adw/src/private/switch_row_p.cpp new file mode 100644 index 0000000..71fdf5b --- /dev/null +++ b/adw/src/private/switch_row_p.cpp @@ -0,0 +1,32 @@ +#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/toast_p.cpp b/adw/src/private/toast_p.cpp new file mode 100644 index 0000000..7138835 --- /dev/null +++ b/adw/src/private/toast_p.cpp @@ -0,0 +1,29 @@ +#include "adwaitamm/private/toast_p.hpp" + +#include "adwaitamm/toast.hpp" + +#include + +namespace Adwaita +{ + auto Toast_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + gtype_ = adw_toast_get_type(); + } + return *this; + } + + auto Toast_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto Toast_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return new Toast(ADW_TOAST(object)); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/private/toastoverlay_p.cpp b/adw/src/private/toastoverlay_p.cpp new file mode 100644 index 0000000..744f981 --- /dev/null +++ b/adw/src/private/toastoverlay_p.cpp @@ -0,0 +1,37 @@ +#include "adwaitamm/private/toastoverlay_p.hpp" + +#include "adwaitamm/toastoverlay.hpp" + +#include +#include +#include + +#include +#include +#include + +#include + +namespace Adwaita +{ + auto ToastOverlay_Class::init() -> Glib::Class const & + { + if (!gtype_) + { + class_init_func_ = &class_init_function; + register_derived_type(adw_toast_overlay_get_type()); + } + return *this; + } + + auto ToastOverlay_Class::class_init_function(void * gclass, void * data) -> void + { + auto const klass = static_cast(gclass); + CppClassParent::class_init_function(klass, data); + } + + auto ToastOverlay_Class::wrap_new(GObject * object) -> Glib::ObjectBase * + { + return Gtk::manage(new ToastOverlay(ADW_TOAST_OVERLAY(object))); + } +} // namespace Adwaita \ No newline at end of file diff --git a/adw/src/stylemanager.cpp b/adw/src/stylemanager.cpp index 09a966c..f62a162 100644 --- a/adw/src/stylemanager.cpp +++ b/adw/src/stylemanager.cpp @@ -1,4 +1,5 @@ #include "adwaitamm/stylemanager.hpp" +#include "adwaitamm/private/stylemanager_p.hpp" #include "adwaitamm/enums.hpp" @@ -25,30 +26,9 @@ namespace Adwaita { namespace { - auto constinit _class = StyleManager::Class{}; + auto constinit _class = StyleManager_Class{}; } // namespace - auto StyleManager::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &StyleManager::Class::class_init_function; - gtype_ = adw_style_manager_get_type(); - } - return *this; - } - - auto StyleManager::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - Glib::Object_Class::class_init_function(klass, data); - } - - auto StyleManager::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return new StyleManager(ADW_STYLE_MANAGER(object)); - } - auto StyleManager::get_default() -> StyleManager * { return Glib::wrap(adw_style_manager_get_default()); diff --git a/adw/src/switchrow.cpp b/adw/src/switchrow.cpp index 9c0245e..010c133 100644 --- a/adw/src/switchrow.cpp +++ b/adw/src/switchrow.cpp @@ -1,6 +1,7 @@ #include "adwaitamm/switchrow.hpp" #include "adwaitamm/actionrow.hpp" +#include "adwaitamm/private/switchrow_p.hpp" #include #include @@ -19,30 +20,9 @@ namespace Adwaita { namespace { - auto constinit _class = SwitchRow::Class{}; + auto constinit _class = SwitchRow_Class{}; } // namespace - auto SwitchRow::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - register_derived_type(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))); - } - SwitchRow::SwitchRow() : Glib::ObjectBase{nullptr} , ActionRow{Glib::ConstructParams{_class.init()}} diff --git a/adw/src/toast.cpp b/adw/src/toast.cpp index 4d66c93..b5cc12c 100644 --- a/adw/src/toast.cpp +++ b/adw/src/toast.cpp @@ -1,6 +1,7 @@ #include "adwaitamm/toast.hpp" #include "adwaitamm/enums.hpp" +#include "adwaitamm/private/toast_p.hpp" #include #include @@ -25,7 +26,7 @@ namespace Adwaita { namespace { - auto constinit _class = Toast::Class{}; + auto constinit _class = Toast_Class{}; static const Glib::SignalProxyInfo Toast_signal_button_clicked_info = {"button-clicked", (GCallback)&Glib::SignalProxyNormal::slot0_void_callback, @@ -37,27 +38,6 @@ namespace Adwaita } // namespace - auto Toast::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - gtype_ = adw_toast_get_type(); - } - return *this; - } - - auto Toast::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto Toast::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return new Toast(ADW_TOAST(object)); - } - Toast::Toast(Glib::ustring const & title) : Glib::ObjectBase{nullptr} , Glib::Object{Glib::ConstructParams{_class.init(), "title", Glib::c_str_or_nullptr(title), nullptr}} diff --git a/adw/src/toastoverlay.cpp b/adw/src/toastoverlay.cpp index e59ba62..c4e248f 100644 --- a/adw/src/toastoverlay.cpp +++ b/adw/src/toastoverlay.cpp @@ -1,5 +1,6 @@ #include "adwaitamm/toastoverlay.hpp" +#include "adwaitamm/private/toastoverlay_p.hpp" #include "adwaitamm/toast.hpp" #include @@ -24,30 +25,9 @@ namespace Adwaita { namespace { - auto constinit _class = ToastOverlay::Class{}; + auto constinit _class = ToastOverlay_Class{}; } // namespace - auto ToastOverlay::Class::init() -> Glib::Class const & - { - if (!gtype_) - { - class_init_func_ = &class_init_function; - gtype_ = adw_toast_overlay_get_type(); - } - return *this; - } - - auto ToastOverlay::Class::class_init_function(void * gclass, void * data) -> void - { - auto const klass = static_cast(gclass); - CppClassParent::class_init_function(klass, data); - } - - auto ToastOverlay::Class::wrap_new(GObject * object) -> Glib::ObjectBase * - { - return Gtk::manage(new ToastOverlay(ADW_TOAST_OVERLAY(object))); - } - auto ToastOverlay::get_type() -> GType { return _class.init().get_type(); diff --git a/adw/src/wrap_init.cpp b/adw/src/wrap_init.cpp index f048633..d00105c 100644 --- a/adw/src/wrap_init.cpp +++ b/adw/src/wrap_init.cpp @@ -9,6 +9,19 @@ #include "adwaitamm/preferencesdialog.hpp" #include "adwaitamm/preferencespage.hpp" #include "adwaitamm/preferencesrow.hpp" +#include "adwaitamm/private/actionrow_p.hpp" +#include "adwaitamm/private/alertdialog_p.hpp" +#include "adwaitamm/private/application_p.hpp" +#include "adwaitamm/private/applicationwindow_p.hpp" +#include "adwaitamm/private/breakpoint_p.hpp" +#include "adwaitamm/private/dialog_p.hpp" +#include "adwaitamm/private/preferencesdialog_p.hpp" +#include "adwaitamm/private/preferencespage_p.hpp" +#include "adwaitamm/private/preferencesrow_p.hpp" +#include "adwaitamm/private/stylemanager_p.hpp" +#include "adwaitamm/private/switchrow_p.hpp" +#include "adwaitamm/private/toast_p.hpp" +#include "adwaitamm/private/toastoverlay_p.hpp" #include "adwaitamm/stylemanager.hpp" #include "adwaitamm/switchrow.hpp" #include "adwaitamm/toast.hpp" @@ -19,7 +32,7 @@ #include #include -#define WRAP_CLASS(Name, name) Glib::wrap_register(adw_##name##_get_type(), &Name::Class::wrap_new) +#define WRAP_CLASS(Name, name) Glib::wrap_register(adw_##name##_get_type(), &Name##_Class::wrap_new) #define ENSURE_TYPE(Name) g_type_ensure(Name::get_type()) namespace Adwaita -- cgit v1.2.3