adw: extract class definitions

1 files changed, 6 insertions, 19 deletions

diff --git a/include/adwaitamm/stylemanager.hpp b/include/adwaitamm/stylemanager.hpp
index 3d370c3..15f0f0e 100644
--- a/include/adwaitamm/stylemanager.hpp
+++ b/include/adwaitamm/stylemanager.hpp
@@ -21,8 +21,6 @@
 #include <adw-style-manager.h>
 #undef _ADWAITA_INSIDE
 
-using AdwStyleManager = struct _AdwStyleManager;
-
 namespace Adwaita
 {
   enum struct AccentColor;
@@ -31,23 +29,10 @@ namespace Adwaita
   struct StyleManager final : Glib::Object,
                               helpers::gobj_mixin<StyleManager, AdwStyleManager>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GObjectClass;
-      using BaseClassType = AdwStyleManagerClass;
-      using BaseObjectType = AdwStyleManager;
-      using CppClassParent = struct Glib::Object_Class;
-      using CppObjectType = StyleManager;
-
-      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 = AdwStyleManager;
+    using BaseClassType = AdwStyleManagerClass;
+    using CppObjectType = StyleManager;
+    using CppClassType = struct StyleManager_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -77,6 +62,8 @@ namespace Adwaita
     auto set_color_scheme(ColorScheme value) -> void;
 
   protected:
+    friend StyleManager_Class;
+
     explicit StyleManager(Glib::ConstructParams const & params);
     explicit StyleManager(BaseObjectType * gobj);
     explicit StyleManager();