[glibmm] Gio::ThemedIcon::get_names(): Use _WRAP_METHOD
- From: Kjell Ahlstedt <kjellahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glibmm] Gio::ThemedIcon::get_names(): Use _WRAP_METHOD
- Date: Mon, 9 Dec 2013 17:36:33 +0000 (UTC)
commit 5fac90a1573b92acbdb2572023f31c4e3f34847b
Author: Kjell Ahlstedt <kjell ahlstedt bredband net>
Date: Mon Dec 9 18:25:36 2013 +0100
Gio::ThemedIcon::get_names(): Use _WRAP_METHOD
* gio/src/themedicon.[hg|ccg]: Use _WRAP_METHOD instead of hand-written
code. gmmproc does not complain.
gio/src/themedicon.ccg | 8 --------
gio/src/themedicon.hg | 9 ++-------
2 files changed, 2 insertions(+), 15 deletions(-)
---
diff --git a/gio/src/themedicon.ccg b/gio/src/themedicon.ccg
index 5f471ef..3a6d540 100644
--- a/gio/src/themedicon.ccg
+++ b/gio/src/themedicon.ccg
@@ -27,12 +27,4 @@ ThemedIcon::ThemedIcon(const std::string& iconname, bool use_default_callbacks)
_CONSTRUCT("name", iconname.c_str(), "use-default-fallbacks", gboolean(use_default_callbacks))
{}
-Glib::StringArrayHandle ThemedIcon::get_names() const
-{
- return Glib::StringArrayHandle(
- g_themed_icon_get_names(const_cast<GThemedIcon*>(gobj())),
- Glib::OWNERSHIP_DEEP);
-
-}
-
} //namespace Gio
diff --git a/gio/src/themedicon.hg b/gio/src/themedicon.hg
index 44aa2cf..d5a0ea2 100644
--- a/gio/src/themedicon.hg
+++ b/gio/src/themedicon.hg
@@ -68,13 +68,8 @@ public:
_WRAP_METHOD(void prepend_name(const std::string& iconname), g_themed_icon_prepend_name)
_WRAP_METHOD(void append_name(const std::string& iconname), g_themed_icon_append_name)
- //TODO: Use _WRAP_METHOD() instead, but:
- //#m4 _CONVERSION(`const char*const*',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3,
Glib::OWNERSHIP_DEEP)')
- //TODO: gmmproc complains about the wrong number of arguments, but I can't see why. murrayc.
- //_WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names)
- Glib::StringArrayHandle get_names() const;
- _IGNORE(g_themed_icon_get_names)
-
+ #m4 _CONVERSION(`const gchar* const*',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3,
Glib::OWNERSHIP_DEEP)')
+ _WRAP_METHOD(Glib::StringArrayHandle get_names() const, g_themed_icon_get_names)
//There are no signals.
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]