adw: extract class definitions

1 files changed, 6 insertions, 17 deletions

diff --git a/adw/include/adwaitamm/switchrow.hpp b/adw/include/adwaitamm/switchrow.hpp
index 622b58a..c95544e 100644
--- a/adw/include/adwaitamm/switchrow.hpp
+++ b/adw/include/adwaitamm/switchrow.hpp
@@ -26,23 +26,10 @@ namespace Adwaita
   struct SwitchRow final : ActionRow,
                            helpers::gobj_mixin<SwitchRow, AdwSwitchRow>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = AdwActionRowClass;
-      using BaseClassType = AdwSwitchRowClass;
-      using BaseObjectType = AdwSwitchRow;
-      using CppClassParent = ActionRow::Class;
-      using CppObjectType = SwitchRow;
-
-      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 = AdwSwitchRow;
+    using BaseClassType = AdwSwitchRowClass;
+    using CppObjectType = struct SwitchRow;
+    using CppClassType = struct SwitchRow_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -64,6 +51,8 @@ namespace Adwaita
     auto property_active() const -> Glib::PropertyProxy_ReadOnly<bool>;
 
   protected:
+    friend SwitchRow_Class;
+
     explicit SwitchRow(Glib::ConstructParams const & params);
     explicit SwitchRow(BaseObjectType * gobj);
   };