adw: extract class definitions

1 files changed, 6 insertions, 17 deletions

diff --git a/adw/include/adwaitamm/toastoverlay.hpp b/adw/include/adwaitamm/toastoverlay.hpp
index 5e2742d..581d14b 100644
--- a/adw/include/adwaitamm/toastoverlay.hpp
+++ b/adw/include/adwaitamm/toastoverlay.hpp
@@ -22,23 +22,10 @@ namespace Adwaita
   struct ToastOverlay final : Gtk::Widget,
                               helpers::gobj_mixin<ToastOverlay, AdwToastOverlay>
   {
-    struct Class : Glib::Class
-    {
-      using BaseClassParent = GtkWidgetClass;
-      using BaseClassType = AdwToastOverlayClass;
-      using BaseObjectType = AdwToastOverlay;
-      using CppClassParent = struct Gtk::Widget_Class;
-      using CppObjectType = ToastOverlay;
-
-      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 = AdwToastOverlay;
+    using BaseClassType = AdwToastOverlayClass;
+    using CppObjectType = ToastOverlay;
+    using CppClassType = struct ToastOverlay_Class;
 
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj;
     using helpers::gobj_mixin<CppObjectType, BaseObjectType>::gobj_copy;
@@ -62,6 +49,8 @@ namespace Adwaita
     auto property_child() const -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>;
 
   protected:
+    friend ToastOverlay_Class;
+
     explicit ToastOverlay(Glib::ConstructParams const & params);
     explicit ToastOverlay(BaseObjectType * gobj);
   };