diff options
36 files changed, 120 insertions, 119 deletions
diff --git a/.vscode/settings.json b/.vscode/settings.json index bce475b..7d2f134 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -6,6 +6,7 @@ "cSpell.words": [ "activatable", + "Adwaita", "arknet", "gclass", "gobj", diff --git a/adw/include/adwaitamm/actionrow.hpp b/adw/include/adwaitamm/actionrow.hpp index 1859048..c7ff6c2 100644 --- a/adw/include/adwaitamm/actionrow.hpp +++ b/adw/include/adwaitamm/actionrow.hpp @@ -19,9 +19,9 @@ using AdwActionRow = struct _AdwActionRow; using AdwActionRowClass = struct _AdwActionRowClass; -namespace turns::adw +namespace Adwaita { - struct ActionRow : adw::PreferencesRow, + struct ActionRow : PreferencesRow, helpers::gobj_mixin<ActionRow, AdwActionRow> { struct Class : Glib::Class @@ -29,7 +29,7 @@ namespace turns::adw using BaseClassParent = AdwPreferencesRowClass; using BaseClassType = AdwActionRowClass; using BaseObjectType = AdwActionRow; - using CppClassParent = adw::PreferencesRow::Class; + using CppClassParent = PreferencesRow::Class; using CppObjectType = ActionRow; auto init() -> Glib::Class const &; @@ -85,11 +85,11 @@ namespace turns::adw explicit ActionRow(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwActionRow * object, bool copy = false) -> turns::adw::ActionRow *; + auto wrap(AdwActionRow * object, bool copy = false) -> Adwaita::ActionRow *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/application.hpp b/adw/include/adwaitamm/application.hpp index 18f703d..5242d50 100644 --- a/adw/include/adwaitamm/application.hpp +++ b/adw/include/adwaitamm/application.hpp @@ -14,7 +14,7 @@ using AdwApplication = struct _AdwApplication; using AdwApplicationClass = struct _AdwApplicationClass; -namespace turns::adw +namespace Adwaita { struct Application : Gtk::Application, helpers::gobj_mixin<Application, AdwApplication> @@ -60,11 +60,11 @@ namespace turns::adw private: Glib::Class const & custom_class_init(); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwApplication * object, bool copy = false) -> Glib::RefPtr<turns::adw::Application>; + auto wrap(AdwApplication * object, bool copy = false) -> Glib::RefPtr<Adwaita::Application>; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/applicationwindow.hpp b/adw/include/adwaitamm/applicationwindow.hpp index a8175df..310795e 100644 --- a/adw/include/adwaitamm/applicationwindow.hpp +++ b/adw/include/adwaitamm/applicationwindow.hpp @@ -14,7 +14,7 @@ using AdwApplicationWindow = struct _AdwApplicationWindow; using AdwApplicationWindowClass = struct _AdwApplicationWindowClass; -namespace turns::adw +namespace Adwaita { struct ApplicationWindow : Gtk::ApplicationWindow, helpers::gobj_mixin<ApplicationWindow, AdwApplicationWindow> @@ -54,11 +54,11 @@ namespace turns::adw explicit ApplicationWindow(Glib::ConstructParams const & params); explicit ApplicationWindow(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwApplicationWindow * object, bool copy = false) -> turns::adw::ApplicationWindow *; + auto wrap(AdwApplicationWindow * object, bool copy = false) -> Adwaita::ApplicationWindow *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/breakpoint.hpp b/adw/include/adwaitamm/breakpoint.hpp index 8a78abb..db17d27 100644 --- a/adw/include/adwaitamm/breakpoint.hpp +++ b/adw/include/adwaitamm/breakpoint.hpp @@ -19,7 +19,7 @@ #include <adw-breakpoint.h> #undef _ADWAITA_INSIDE -namespace turns::adw +namespace Adwaita { struct BreakpointCondition { @@ -102,11 +102,11 @@ namespace turns::adw explicit Breakpoint(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwBreakpoint * object, bool copy = false) -> Glib::RefPtr<turns::adw::Breakpoint>; + auto wrap(AdwBreakpoint * object, bool copy = false) -> Glib::RefPtr<Adwaita::Breakpoint>; } // namespace Glib diff --git a/adw/include/adwaitamm/dialog.hpp b/adw/include/adwaitamm/dialog.hpp index 5be01b9..23a864c 100644 --- a/adw/include/adwaitamm/dialog.hpp +++ b/adw/include/adwaitamm/dialog.hpp @@ -17,7 +17,7 @@ using AdwDialog = struct _AdwDialog; using AdwDialogClass = struct _AdwDialogClass; -namespace turns::adw +namespace Adwaita { struct Dialog_Class; @@ -72,11 +72,11 @@ namespace turns::adw explicit Dialog(Glib::ConstructParams const & params); explicit Dialog(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwDialog * object, bool copy = false) -> turns::adw::Dialog *; + auto wrap(AdwDialog * object, bool copy = false) -> Adwaita::Dialog *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/helpers/gobj_mixin.hpp b/adw/include/adwaitamm/helpers/gobj_mixin.hpp index 2a6aa37..fbdaa4e 100644 --- a/adw/include/adwaitamm/helpers/gobj_mixin.hpp +++ b/adw/include/adwaitamm/helpers/gobj_mixin.hpp @@ -5,7 +5,7 @@ #include <type_traits> -namespace turns::adw::helpers +namespace Adwaita::helpers { template<typename Type, typename AdwType> @@ -32,6 +32,6 @@ namespace turns::adw::helpers } }; -} // namespace turns::adw::helpers +} // namespace Adwaita::helpers #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/helpers/properties.hpp b/adw/include/adwaitamm/helpers/properties.hpp index 6a7f7aa..fad99d6 100644 --- a/adw/include/adwaitamm/helpers/properties.hpp +++ b/adw/include/adwaitamm/helpers/properties.hpp @@ -6,7 +6,7 @@ #include <type_traits> -namespace turns::adw::helpers +namespace Adwaita::helpers { template<typename ProxiedType, typename ObjectType> @@ -30,6 +30,6 @@ namespace turns::adw::helpers return deduced_property_proxy_t<ProxiedType, std::remove_reference_t<ObjectType>>{&object, property}; } -} // namespace turns::adw::helpers +} // namespace Adwaita::helpers #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/preferencesdialog.hpp b/adw/include/adwaitamm/preferencesdialog.hpp index d57e015..824a683 100644 --- a/adw/include/adwaitamm/preferencesdialog.hpp +++ b/adw/include/adwaitamm/preferencesdialog.hpp @@ -18,11 +18,11 @@ using AdwPreferencesDialog = struct _AdwPreferencesDialog; using AdwPreferencesDialogClass = struct _AdwPreferencesDialogClass; -namespace turns::adw +namespace Adwaita { struct PreferencesDialog_Class; - struct PreferencesDialog : adw::Dialog, + struct PreferencesDialog : Dialog, helpers::gobj_mixin<PreferencesDialog, AdwPreferencesDialog> { struct Class : Glib::Class @@ -30,7 +30,7 @@ namespace turns::adw using BaseClassParent = AdwDialogClass; using BaseClassType = AdwPreferencesDialogClass; using BaseObjectType = AdwPreferencesDialog; - using CppClassParent = adw::Dialog::Class; + using CppClassParent = Dialog::Class; using CppObjectType = PreferencesDialog; auto init() -> Glib::Class const &; @@ -56,17 +56,17 @@ namespace turns::adw auto static get_type() -> GType; auto static get_base_type() -> GType; - auto add(adw::PreferencesPage & page) -> void; + auto add(PreferencesPage & page) -> void; protected: explicit PreferencesDialog(Glib::ConstructParams const & params); explicit PreferencesDialog(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesDialog * object, bool copy = false) -> turns::adw::PreferencesDialog *; + auto wrap(AdwPreferencesDialog * object, bool copy = false) -> Adwaita::PreferencesDialog *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/preferencespage.hpp b/adw/include/adwaitamm/preferencespage.hpp index d6c4ca4..7e7e9ed 100644 --- a/adw/include/adwaitamm/preferencespage.hpp +++ b/adw/include/adwaitamm/preferencespage.hpp @@ -16,7 +16,7 @@ using AdwPreferencesPage = struct _AdwPreferencesPage; using AdwPreferencesPageClass = struct _AdwPreferencesPageClass; -namespace turns::adw +namespace Adwaita { struct PreferencesPage : Gtk::Widget, helpers::gobj_mixin<PreferencesPage, AdwPreferencesPage> @@ -56,11 +56,11 @@ namespace turns::adw explicit PreferencesPage(Glib::ConstructParams const & params); explicit PreferencesPage(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesPage * object, bool copy = false) -> turns::adw::PreferencesPage *; + auto wrap(AdwPreferencesPage * object, bool copy = false) -> Adwaita::PreferencesPage *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp index f98e125..b4fde1e 100644 --- a/adw/include/adwaitamm/preferencesrow.hpp +++ b/adw/include/adwaitamm/preferencesrow.hpp @@ -17,7 +17,7 @@ using AdwPreferencesRow = struct _AdwPreferencesRow; using AdwPreferencesRowClass = struct _AdwPreferencesRowClass; -namespace turns::adw +namespace Adwaita { struct PreferencesRow : Gtk::ListBoxRow, helpers::gobj_mixin<PreferencesRow, AdwPreferencesRow> @@ -113,11 +113,11 @@ namespace turns::adw return helpers::make_property_proxy<bool>(self, "use-underline"); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesRow * object, bool copy = false) -> turns::adw::PreferencesRow *; + auto wrap(AdwPreferencesRow * object, bool copy = false) -> Adwaita::PreferencesRow *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/switchrow.hpp b/adw/include/adwaitamm/switchrow.hpp index c13d534..37e2e05 100644 --- a/adw/include/adwaitamm/switchrow.hpp +++ b/adw/include/adwaitamm/switchrow.hpp @@ -21,9 +21,9 @@ using AdwSwitchRow = struct _AdwSwitchRow; -namespace turns::adw +namespace Adwaita { - struct SwitchRow final : adw::ActionRow, + struct SwitchRow final : ActionRow, helpers::gobj_mixin<SwitchRow, AdwSwitchRow> { struct Class : Glib::Class @@ -31,7 +31,7 @@ namespace turns::adw using BaseClassParent = AdwActionRowClass; using BaseClassType = AdwSwitchRowClass; using BaseObjectType = AdwSwitchRow; - using CppClassParent = adw::ActionRow::Class; + using CppClassParent = ActionRow::Class; using CppObjectType = SwitchRow; auto init() -> Glib::Class const &; @@ -78,11 +78,11 @@ namespace turns::adw return helpers::make_property_proxy<bool>(self, "active"); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwSwitchRow * object, bool copy = false) -> turns::adw::SwitchRow *; + auto wrap(AdwSwitchRow * object, bool copy = false) -> Adwaita::SwitchRow *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/toast.hpp b/adw/include/adwaitamm/toast.hpp index 88460f9..4f69c1e 100644 --- a/adw/include/adwaitamm/toast.hpp +++ b/adw/include/adwaitamm/toast.hpp @@ -22,7 +22,7 @@ using AdwToast = struct _AdwToast; -namespace turns::adw +namespace Adwaita { struct Toast final : Glib::Object, helpers::gobj_mixin<Toast, AdwToast> @@ -101,11 +101,11 @@ namespace turns::adw explicit Toast(BaseObjectType * gobj); }; -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwToast * object, bool copy = false) -> Glib::RefPtr<turns::adw::Toast>; + auto wrap(AdwToast * object, bool copy = false) -> Glib::RefPtr<Adwaita::Toast>; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/toastoverlay.hpp b/adw/include/adwaitamm/toastoverlay.hpp index 0ae8bcb..f4d54cb 100644 --- a/adw/include/adwaitamm/toastoverlay.hpp +++ b/adw/include/adwaitamm/toastoverlay.hpp @@ -17,7 +17,7 @@ #include <adw-toast-overlay.h> #undef _ADWAITA_INSIDE -namespace turns::adw +namespace Adwaita { struct ToastOverlay final : Gtk::Widget, helpers::gobj_mixin<ToastOverlay, AdwToastOverlay> @@ -67,11 +67,11 @@ namespace turns::adw return helpers::make_property_proxy<Gtk::Widget *>(self, "child"); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwToastOverlay * object, bool copy = false) -> turns::adw::ToastOverlay *; + auto wrap(AdwToastOverlay * object, bool copy = false) -> Adwaita::ToastOverlay *; } // namespace Glib #endif
\ No newline at end of file diff --git a/adw/include/adwaitamm/wrap_init.hpp b/adw/include/adwaitamm/wrap_init.hpp index 0e22a9b..98e40c3 100644 --- a/adw/include/adwaitamm/wrap_init.hpp +++ b/adw/include/adwaitamm/wrap_init.hpp @@ -1,9 +1,9 @@ #ifndef LIBADWAITAMM_WRAP_INIT_HPP #define LIBADWAITAMM_WRAP_INIT_HPP -namespace turns::adw +namespace Adwaita { auto wrap_init() -> void; -} // namespace turns::adw +} // namespace Adwaita #endif
\ No newline at end of file diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp index 48cee23..186cff8 100644 --- a/adw/src/actionrow.cpp +++ b/adw/src/actionrow.cpp @@ -23,7 +23,7 @@ #include <glib.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -63,17 +63,17 @@ namespace turns::adw ActionRow::ActionRow() : Glib::ObjectBase{nullptr} - , adw::PreferencesRow{Glib::ConstructParams{_class.init()}} + , PreferencesRow{Glib::ConstructParams{_class.init()}} { } ActionRow::ActionRow(Glib::ConstructParams const & params) - : adw::PreferencesRow{params} + : PreferencesRow{params} { } ActionRow::ActionRow(BaseObjectType * gobj) - : adw::PreferencesRow(ADW_PREFERENCES_ROW(gobj)) + : PreferencesRow(ADW_PREFERENCES_ROW(gobj)) { } @@ -197,12 +197,12 @@ namespace turns::adw return *this; } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwActionRow * object, bool copy) -> turns::adw::ActionRow * + auto wrap(AdwActionRow * object, bool copy) -> Adwaita::ActionRow * { - return dynamic_cast<turns::adw::ActionRow *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::ActionRow *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/application.cpp b/adw/src/application.cpp index 5da1a5c..57a0aaa 100644 --- a/adw/src/application.cpp +++ b/adw/src/application.cpp @@ -19,7 +19,7 @@ #include <gio/gio.h> #include <glib-object.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -69,7 +69,7 @@ namespace turns::adw if (!did_init) { Gtk::init_gtkmm_internals(); - adw::wrap_init(); + wrap_init(); } return _class.init(); @@ -92,12 +92,12 @@ namespace turns::adw adw_init(); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwApplication * object, bool copy) -> Glib::RefPtr<turns::adw::Application> + auto wrap(AdwApplication * object, bool copy) -> Glib::RefPtr<Adwaita::Application> { - return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::Application *>(Glib::wrap_auto(G_OBJECT(object), copy))); + return Glib::make_refptr_for_instance(dynamic_cast<Adwaita::Application *>(Glib::wrap_auto(G_OBJECT(object), copy))); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/applicationwindow.cpp b/adw/src/applicationwindow.cpp index 4e1aff1..f4de581 100644 --- a/adw/src/applicationwindow.cpp +++ b/adw/src/applicationwindow.cpp @@ -18,7 +18,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -72,12 +72,12 @@ namespace turns::adw { } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwApplicationWindow * object, bool copy) -> turns::adw::ApplicationWindow * + auto wrap(AdwApplicationWindow * object, bool copy) -> Adwaita::ApplicationWindow * { - return dynamic_cast<turns::adw::ApplicationWindow *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::ApplicationWindow *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/breakpoint.cpp b/adw/src/breakpoint.cpp index 4a9c4d5..a34fcf7 100644 --- a/adw/src/breakpoint.cpp +++ b/adw/src/breakpoint.cpp @@ -17,7 +17,7 @@ #include <optional> #include <utility> -namespace turns::adw +namespace Adwaita { static_assert(static_cast<int>(BreakpointCondition::LengthType::min_width) == ADW_BREAKPOINT_CONDITION_MIN_WIDTH); @@ -89,9 +89,9 @@ namespace turns::adw return std::nullopt; } -} // namespace turns::adw +} // namespace Adwaita -namespace turns::adw +namespace Adwaita { namespace { @@ -156,12 +156,12 @@ namespace turns::adw return helpers::make_property_proxy<BreakpointCondition *>(*this, "condition"); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwBreakpoint * object, bool copy) -> Glib::RefPtr<turns::adw::Breakpoint> + auto wrap(AdwBreakpoint * object, bool copy) -> Glib::RefPtr<Adwaita::Breakpoint> { - return Glib::make_refptr_for_instance(dynamic_cast<turns::adw::Breakpoint *>(Glib::wrap_auto(G_OBJECT(object), copy))); + return Glib::make_refptr_for_instance(dynamic_cast<Adwaita::Breakpoint *>(Glib::wrap_auto(G_OBJECT(object), copy))); } } // namespace Glib diff --git a/adw/src/dialog.cpp b/adw/src/dialog.cpp index f9fe48f..2634002 100644 --- a/adw/src/dialog.cpp +++ b/adw/src/dialog.cpp @@ -19,7 +19,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace @@ -135,12 +135,12 @@ namespace turns::adw adw_dialog_set_title(Glib::unwrap(this), Glib::c_str_or_nullptr(str)); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwDialog * object, bool copy) -> turns::adw::Dialog * + auto wrap(AdwDialog * object, bool copy) -> Adwaita::Dialog * { - return dynamic_cast<turns::adw::Dialog *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::Dialog *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/preferencesdialog.cpp b/adw/src/preferencesdialog.cpp index 701b253..2282419 100644 --- a/adw/src/preferencesdialog.cpp +++ b/adw/src/preferencesdialog.cpp @@ -20,7 +20,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -59,32 +59,32 @@ namespace turns::adw } PreferencesDialog::PreferencesDialog(Glib::ConstructParams const & params) - : adw::Dialog{params} + : Dialog{params} { } PreferencesDialog::PreferencesDialog(AdwPreferencesDialog * gobj) - : adw::Dialog(ADW_DIALOG(gobj)) + : Dialog(ADW_DIALOG(gobj)) { } PreferencesDialog::PreferencesDialog() : Glib::ObjectBase{nullptr} - , adw::Dialog{Glib::ConstructParams{_class.init()}} + , Dialog{Glib::ConstructParams{_class.init()}} { } - auto PreferencesDialog::add(adw::PreferencesPage & page) -> void + auto PreferencesDialog::add(PreferencesPage & page) -> void { adw_preferences_dialog_add(Glib::unwrap(this), Glib::unwrap(&page)); } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesDialog * object, bool copy) -> turns::adw::PreferencesDialog * + auto wrap(AdwPreferencesDialog * object, bool copy) -> Adwaita::PreferencesDialog * { - return dynamic_cast<turns::adw::PreferencesDialog *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::PreferencesDialog *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/preferencespage.cpp b/adw/src/preferencespage.cpp index 22ab639..e2b3e80 100644 --- a/adw/src/preferencespage.cpp +++ b/adw/src/preferencespage.cpp @@ -17,7 +17,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -71,12 +71,12 @@ namespace turns::adw { } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesPage * object, bool copy) -> turns::adw::PreferencesPage * + auto wrap(AdwPreferencesPage * object, bool copy) -> Adwaita::PreferencesPage * { - return dynamic_cast<turns::adw::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::PreferencesPage *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/preferencesrow.cpp b/adw/src/preferencesrow.cpp index 7bc330a..a586027 100644 --- a/adw/src/preferencesrow.cpp +++ b/adw/src/preferencesrow.cpp @@ -17,7 +17,7 @@ #include <glib-object.h> #include <gtk/gtk.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -95,12 +95,12 @@ namespace turns::adw { } -} // namespace turns::adw +} // namespace Adwaita namespace Glib { - auto wrap(AdwPreferencesRow * object, bool copy) -> turns::adw::PreferencesRow * + auto wrap(AdwPreferencesRow * object, bool copy) -> Adwaita::PreferencesRow * { - return dynamic_cast<turns::adw::PreferencesRow *>(Glib::wrap_auto(G_OBJECT(object), copy)); + return dynamic_cast<Adwaita::PreferencesRow *>(Glib::wrap_auto(G_OBJECT(object), copy)); } } // namespace Glib
\ No newline at end of file diff --git a/adw/src/switchrow.cpp b/adw/src/switchrow.cpp index 6596748..0aab454 100644 --- a/adw/src/switchrow.cpp +++ b/adw/src/switchrow.cpp @@ -14,7 +14,7 @@ #include <gio/gio.h> #include <glib-object.h> -namespace turns::adw +namespace Adwaita { namespace { @@ -44,7 +44,7 @@ namespace turns::adw SwitchRow::SwitchRow() : Glib::ObjectBase{nullptr} - , adw::ActionRow{Glib::ConstructParams{_class.init()}} + , ActionRow{Glib::ConstructParams{_class.init()}} { } @@ -59,21 +59,21 @@ namespace turns::adw } SwitchRow::SwitchRow(Glib::ConstructParams const & params) - : adw::ActionRow{params} + : ActionRow{params} { } SwitchRow::SwitchRow(BaseObjectType * gobj) - : adw::ActionRow(ADW_ACTION_ROW(gobj)) + : ActionRow(ADW_ACTION_ROW(gobj)) { |