adw: extract class definitions

1 files changed, 6 insertions, 17 deletions

diff --git a/adw/include/adwaitamm/actionrow.hpp b/adw/include/adwaitamm/actionrow.hpp
index 5b99ab7..6a34e15 100644
--- a/adw/include/adwaitamm/actionrow.hpp
+++ b/adw/include/adwaitamm/actionrow.hpp
@@ -24,23 +24,10 @@ namespace Adwaita
   struct ActionRow : PreferencesRow,
                      helpers::gobj_mixin<ActionRow, AdwActionRow>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = AdwPreferencesRowClass;
-      using BaseClassType = AdwActionRowClass;
-      using BaseObjectType = AdwActionRow;
-      using CppClassParent = PreferencesRow::Class;
-      using CppObjectType = ActionRow;
-
-      auto init() -> Glib::Class const &;
-      auto static class_init_function(void * gclass, void * data) -> void;
-      auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
-    };
-
-    using BaseObjectType = Class::BaseObjectType;
-    using BaseClassType = Class::BaseClassType;
-    using CppObjectType = Class::CppObjectType;
-    using CppClassType = Class;
+    using BaseObjectType = AdwActionRow;
+    using BaseClassType = AdwActionRowClass;
+    using CppObjectType = ActionRow;
+    using CppClassType = struct ActionRow_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -87,6 +74,8 @@ namespace Adwaita
     auto property_title_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>;
 
   protected:
+    friend struct ActionRow_Class;
+
     explicit ActionRow(Glib::ConstructParams const & params);
     explicit ActionRow(BaseObjectType * gobj);
   };