adw: extract class definitions

1 files changed, 6 insertions, 17 deletions

diff --git a/adw/include/adwaitamm/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp
index 6c1d6bb..3bbaaec 100644
--- a/adw/include/adwaitamm/preferencesrow.hpp
+++ b/adw/include/adwaitamm/preferencesrow.hpp
@@ -22,23 +22,10 @@ namespace Adwaita
   struct PreferencesRow : Gtk::ListBoxRow,
                           helpers::gobj_mixin<PreferencesRow, AdwPreferencesRow>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GtkListBoxRowClass;
-      using BaseClassType = AdwPreferencesRowClass;
-      using BaseObjectType = AdwPreferencesRow;
-      using CppClassParent = struct Gtk::ListBoxRow_Class;
-      using CppObjectType = PreferencesRow;
-
-      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 = AdwPreferencesRow;
+    using BaseClassType = AdwPreferencesRowClass;
+    using CppObjectType = PreferencesRow;
+    using CppClassType = struct PreferencesRow_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -73,6 +60,8 @@ namespace Adwaita
     auto property_use_underline() const -> Glib::PropertyProxy_ReadOnly<bool>;
 
   protected:
+    friend PreferencesRow_Class;
+
     explicit PreferencesRow(Glib::ConstructParams const & params);
     explicit PreferencesRow(BaseObjectType * gobj);
   };