1 files changed, 8 insertions, 11 deletions
diff --git a/adw/src/toastoverlay.cpp b/adw/src/toastoverlay.cpp
index ca877a6..27e0824 100644
--- a/adw/src/toastoverlay.cpp
+++ b/adw/src/toastoverlay.cpp
@@ -19,13 +19,12 @@
 
 namespace turns::adw
 {
-  struct ToastOverlay_Class : Glib::Class
+  namespace
   {
-    auto init() -> Glib::Class const &;
-    auto static wrap_new(GObject * object) -> Glib::ObjectBase *;
-  };
+    auto constinit _class = ToastOverlay::Class{};
+  }  // namespace
 
-  auto ToastOverlay_Class::init() -> Glib::Class const &
+  auto ToastOverlay::Class::init() -> Glib::Class const &
   {
     if (!gtype_)
     {
@@ -34,16 +33,14 @@ namespace turns::adw
     return *this;
   }
 
-  auto ToastOverlay_Class::wrap_new(GObject * object) -> Glib::ObjectBase *
+  auto ToastOverlay::Class::wrap_new(GObject * object) -> Glib::ObjectBase *
   {
     return new ToastOverlay(ADW_TOAST_OVERLAY(object));
   }
 
-  ToastOverlay_Class ToastOverlay::s_class{};
-
   auto ToastOverlay::get_type() -> GType
   {
-    return s_class.init().get_type();
+    return _class.init().get_type();
   }
 
   auto ToastOverlay::get_base_type() -> GType
@@ -61,7 +58,7 @@ namespace turns::adw
   {
   }
 
-  ToastOverlay::ToastOverlay(AdwToastOverlay * gobj)
+  ToastOverlay::ToastOverlay(BaseObjectType * gobj)
       : Glib::ObjectBase{nullptr}
       , Gtk::Widget((GtkWidget *)gobj)
   {
@@ -69,7 +66,7 @@ namespace turns::adw
 
   ToastOverlay::ToastOverlay()
       : Glib::ObjectBase{nullptr}
-      , Gtk::Widget{Glib::ConstructParams{s_class.init()}}
+      , Gtk::Widget{Glib::ConstructParams{_class.init()}}
   {
   }