1 files changed, 13 insertions, 49 deletions

diff --git a/adw/include/adwaitamm/preferencesrow.hpp b/adw/include/adwaitamm/preferencesrow.hpp
index b4fde1e..6c1d6bb 100644
--- a/adw/include/adwaitamm/preferencesrow.hpp
+++ b/adw/include/adwaitamm/preferencesrow.hpp
@@ -2,11 +2,11 @@
 #define LIBADWAITAMM_PREFERENCES_ROW_HPP
 
 #include "helpers/gobj_mixin.hpp"
-#include "adwaitamm/helpers/properties.hpp"
 
 #include <glibmm/class.h>
 #include <glibmm/object.h>
 #include <glibmm/objectbase.h>
+#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 
@@ -53,66 +53,30 @@ namespace Adwaita
     auto static get_type() -> GType;
     auto static get_base_type() -> GType;
 
-    auto get_title(this auto && self);
-    auto get_title_selectable(this auto && self) noexcept;
-    auto get_use_markup(this auto && self) noexcept;
-    auto get_use_underline(this auto && self) noexcept;
+    auto get_title() const -> Glib::ustring;
+    auto get_title_selectable() const noexcept -> bool;
+    auto get_use_markup() const noexcept -> bool;
+    auto get_use_underline() const noexcept -> bool;
 
     auto set_title(Glib::ustring const & title) -> CppObjectType &;
     auto set_title_selectable(bool selectable) noexcept -> CppObjectType &;
     auto set_use_markup(bool use) noexcept -> CppObjectType &;
     auto set_use_underline(bool use) noexcept -> CppObjectType &;
 
-    auto property_title(this auto && self);
-    auto property_title_selectable(this auto && self);
-    auto property_use_markup(this auto && self);
-    auto property_use_underline(this auto && self);
+    auto property_title_selectable() -> Glib::PropertyProxy<bool>;
+    auto property_title_selectable() const -> Glib::PropertyProxy_ReadOnly<bool>;
+    auto property_title() -> Glib::PropertyProxy<Glib::ustring>;
+    auto property_title() const -> Glib::PropertyProxy_ReadOnly<Glib::ustring>;
+    auto property_use_markup() -> Glib::PropertyProxy<bool>;
+    auto property_use_markup() const -> Glib::PropertyProxy_ReadOnly<bool>;
+    auto property_use_underline() -> Glib::PropertyProxy<bool>;
+    auto property_use_underline() const -> Glib::PropertyProxy_ReadOnly<bool>;
 
   protected:
     explicit PreferencesRow(Glib::ConstructParams const & params);
     explicit PreferencesRow(BaseObjectType * gobj);
   };
 
-  auto PreferencesRow::get_title(this auto && self)
-  {
-    return self.property_title().value();
-  }
-
-  auto PreferencesRow::get_title_selectable(this auto && self) noexcept
-  {
-    return self.property_title_selectable().value();
-  }
-
-  auto PreferencesRow::get_use_markup(this auto && self) noexcept
-  {
-    return self.property_use_markup().value();
-  }
-
-  auto PreferencesRow::get_use_underline(this auto && self) noexcept
-  {
-    return self.property_use_underline().value();
-  }
-
-  auto PreferencesRow::property_title(this auto && self)
-  {
-    return helpers::make_property_proxy<Glib::ustring>(self, "title");
-  }
-
-  auto PreferencesRow::property_title_selectable(this auto && self)
-  {
-    return helpers::make_property_proxy<bool>(self, "title-selectable");
-  }
-
-  auto PreferencesRow::property_use_markup(this auto && self)
-  {
-    return helpers::make_property_proxy<bool>(self, "use-markup");
-  }
-
-  auto PreferencesRow::property_use_underline(this auto && self)
-  {
-    return helpers::make_property_proxy<bool>(self, "use-underline");
-  }
-
 }  // namespace Adwaita
 
 namespace Glib