adw: extract class definitions

1 files changed, 6 insertions, 17 deletions

diff --git a/include/adwaitamm/breakpoint.hpp b/include/adwaitamm/breakpoint.hpp
index 13e9f1e..7bcb2d9 100644
--- a/include/adwaitamm/breakpoint.hpp
+++ b/include/adwaitamm/breakpoint.hpp
@@ -52,23 +52,10 @@ namespace Adwaita
                             Gtk::Buildable,
                             helpers::gobj_mixin<Breakpoint, AdwBreakpoint>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GObjectClass;
-      using BaseClassType = AdwBreakpointClass;
-      using BaseObjectType = AdwBreakpoint;
-      using CppClassParent = struct Glib::Object_Class;
-      using CppObjectType = Breakpoint;
-
-      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 = AdwBreakpoint;
+    using BaseClassType = AdwBreakpointClass;
+    using CppObjectType = Breakpoint;
+    using CppClassType = struct Breakpoint_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -87,6 +74,8 @@ namespace Adwaita
     auto property_condition() const -> Glib::PropertyProxy_ReadOnly<BreakpointCondition *>;
 
   protected:
+    friend Breakpoint_Class;
+
     explicit Breakpoint(BreakpointCondition & condition);
     explicit Breakpoint(Glib::ConstructParams const & params);
     explicit Breakpoint(BaseObjectType * gobj);