adw: clean up property definitions

1 files changed, 59 insertions, 39 deletions

diff --git a/adw/src/actionrow.cpp b/adw/src/actionrow.cpp
index 186cff8..297cefc 100644
--- a/adw/src/actionrow.cpp
+++ b/adw/src/actionrow.cpp
@@ -1,6 +1,5 @@
 #include "adwaitamm/actionrow.hpp"
 
-#include "adwaitamm/helpers/properties.hpp"
 #include "adwaitamm/preferencesrow.hpp"
 
 #include <glibmm/class.h>
@@ -77,22 +76,19 @@ namespace Adwaita
   {
   }
 
-  auto ActionRow::add_prefix(Gtk::Widget & widget) -> ActionRow &
+  auto ActionRow::add_prefix(Gtk::Widget & widget) -> void
   {
     adw_action_row_add_prefix(Glib::unwrap(this), Glib::unwrap(&widget));
-    return *this;
   }
 
-  auto ActionRow::add_suffix(Gtk::Widget & widget) -> ActionRow &
+  auto ActionRow::add_suffix(Gtk::Widget & widget) -> void
   {
     adw_action_row_add_suffix(Glib::unwrap(this), Glib::unwrap(&widget));
-    return *this;
   }
 
-  auto ActionRow::remove(Gtk::Widget & widget) -> ActionRow &
+  auto ActionRow::remove(Gtk::Widget & widget) -> void
   {
     adw_action_row_remove(Glib::unwrap(this), Glib::unwrap(&widget));
-    return *this;
   }
 
   auto ActionRow::get_activatable_widget() const noexcept -> Glib::RefPtr<Gtk::Widget>
@@ -128,73 +124,97 @@ namespace Adwaita
     return adw_action_row_get_title_lines(const_cast<BaseObjectType *>(Glib::unwrap(this)));
   }
 
+  auto ActionRow::set_activatable_widget(Gtk::Widget & widget) noexcept -> void
+  {
+    adw_action_row_set_activatable_widget(Glib::unwrap(this), Glib::unwrap(&widget));
+  }
+
+  auto ActionRow::set_icon_name(Glib::ustring const & name) -> void
+  {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+    adw_action_row_set_icon_name(Glib::unwrap(this), name.c_str());
+#pragma GCC diagnostic pop
+  }
+
+  auto ActionRow::set_subtitle(Glib::ustring const & subtitle) -> void
+  {
+    adw_action_row_set_subtitle(Glib::unwrap(this), subtitle.c_str());
+  }
+
+  auto ActionRow::set_subtitle_lines(int subtitle_lines) noexcept -> void
+  {
+    adw_action_row_set_subtitle_lines(Glib::unwrap(this), subtitle_lines);
+  }
+
+  auto ActionRow::set_subtitle_selectable(bool subtitle_selectable) noexcept -> void
+  {
+    adw_action_row_set_subtitle_selectable(Glib::unwrap(this), static_cast<gboolean>(subtitle_selectable));
+  }
+
+  auto ActionRow::set_title_lines(int title_lines) noexcept -> void
+  {
+    adw_action_row_set_title_lines(Glib::unwrap(this), title_lines);
+  }
+
   auto ActionRow::property_activatable_widget() noexcept -> Glib::PropertyProxy<Gtk::Widget *>
   {
-    return helpers::make_property_proxy<Gtk::Widget *>(*this, "activatable-widget");
+    return Glib::PropertyProxy<Gtk::Widget *>(this, "activatable-widget");
   }
 
-  auto ActionRow::property_icon_name() noexcept -> Glib::PropertyProxy<Glib::ustring>
+  auto ActionRow::property_activatable_widget() const noexcept -> Glib::PropertyProxy_ReadOnly<Gtk::Widget *>
   {
-    return helpers::make_property_proxy<Glib::ustring>(*this, "icon-name");
+    return Glib::PropertyProxy_ReadOnly<Gtk::Widget *>(this, "activatable-widget");
   }
 
-  auto ActionRow::property_subtitle() noexcept -> Glib::PropertyProxy<Glib::ustring>
+  auto ActionRow::property_icon_name() noexcept -> Glib::PropertyProxy<Glib::ustring>
   {
-    return helpers::make_property_proxy<Glib::ustring>(*this, "subtitle");
+    return Glib::PropertyProxy<Glib::ustring>(this, "icon-name");
   }
 
-  auto ActionRow::property_subtitle_lines() noexcept -> Glib::PropertyProxy<int>
+  auto ActionRow::property_icon_name() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>
   {
-    return helpers::make_property_proxy<int>(*this, "subtitle-lines");
+    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "icon-name");
   }
 
-  auto ActionRow::property_subtitle_selectable() noexcept -> Glib::PropertyProxy<bool>
+  auto ActionRow::property_subtitle() noexcept -> Glib::PropertyProxy<Glib::ustring>
   {
-    return helpers::make_property_proxy<bool>(*this, "subtitle-selectable");
+    return Glib::PropertyProxy<Glib::ustring>(this, "subtitle");
   }
 
-  auto ActionRow::property_title_lines() noexcept -> Glib::PropertyProxy<int>
+  auto ActionRow::property_subtitle() const noexcept -> Glib::PropertyProxy_ReadOnly<Glib::ustring>
   {
-    return helpers::make_property_proxy<int>(*this, "title-lines");
+    return Glib::PropertyProxy_ReadOnly<Glib::ustring>(this, "subtitle");
   }
 
-  auto ActionRow::set_activatable_widget(Gtk::Widget & widget) noexcept -> CppObjectType &
+  auto ActionRow::property_subtitle_lines() noexcept -> Glib::PropertyProxy<int>
   {
-    adw_action_row_set_activatable_widget(Glib::unwrap(this), Glib::unwrap(&widget));
-    return *this;
+    return Glib::PropertyProxy<int>(this, "subtitle-lines");
   }
 
-  auto ActionRow::set_icon_name(Glib::ustring const & name) -> CppObjectType &
+  auto ActionRow::property_subtitle_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>
   {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    adw_action_row_set_icon_name(Glib::unwrap(this), name.c_str());
-#pragma GCC diagnostic pop
-    return *this;
+    return Glib::PropertyProxy_ReadOnly<int>(this, "subtitle-lines");
   }
 
-  auto ActionRow::set_subtitle(Glib::ustring const & subtitle) -> CppObjectType &
+  auto ActionRow::property_subtitle_selectable() noexcept -> Glib::PropertyProxy<bool>
   {
-    adw_action_row_set_subtitle(Glib::unwrap(this), subtitle.c_str());
-    return *this;
+    return Glib::PropertyProxy<bool>(this, "subtitle-selectable");
   }
 
-  auto ActionRow::set_subtitle_lines(int subtitle_lines) noexcept -> CppObjectType &
+  auto ActionRow::property_subtitle_selectable() const noexcept -> Glib::PropertyProxy_ReadOnly<bool>
   {
-    adw_action_row_set_subtitle_lines(Glib::unwrap(this), subtitle_lines);
-    return *this;
+    return Glib::PropertyProxy_ReadOnly<bool>(this, "subtitle-selectable");
   }
 
-  auto ActionRow::set_subtitle_selectable(bool subtitle_selectable) noexcept -> CppObjectType &
+  auto ActionRow::property_title_lines() noexcept -> Glib::PropertyProxy<int>
   {
-    adw_action_row_set_subtitle_selectable(Glib::unwrap(this), static_cast<gboolean>(subtitle_selectable));
-    return *this;
+    return Glib::PropertyProxy<int>(this, "title-lines");
   }
 
-  auto ActionRow::set_title_lines(int title_lines) noexcept -> CppObjectType &
+  auto ActionRow::property_title_lines() const noexcept -> Glib::PropertyProxy_ReadOnly<int>
   {
-    adw_action_row_set_title_lines(Glib::unwrap(this), title_lines);
-    return *this;
+    return Glib::PropertyProxy_ReadOnly<int>(this, "title-lines");
   }
 
 }  // namespace Adwaita