summaryrefslogtreecommitdiff
path: root/gio/src/settings.hg
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2017-03-17 10:12:38 +0100
committerMurray Cumming <murrayc@murrayc.com>2017-03-17 10:39:10 +0100
commit42b07b10b55fd6c1aba3b908889ca6ecab0b8992 (patch)
tree22b5f086b2e47ec5832cff6c619a79255d25ea33 /gio/src/settings.hg
parentb84a5d62528db68b67f17a8d4b4650f6d6226beb (diff)
downloadglibmm-42b07b10b55fd6c1aba3b908889ca6ecab0b8992.tar.gz
Use std::vector<> instead of Glib::StringArrayHandle.
Using Glib::ArrayHandler<>::vector_to_array() and Glib::ArrayHandler<>::array_to_vector() instead, and only in the implementatoin instead of in the API.
Diffstat (limited to 'gio/src/settings.hg')
-rw-r--r--gio/src/settings.hg7
1 files changed, 3 insertions, 4 deletions
diff --git a/gio/src/settings.hg b/gio/src/settings.hg
index 4fc2d8da..7be35e3f 100644
--- a/gio/src/settings.hg
+++ b/gio/src/settings.hg
@@ -17,7 +17,6 @@
_CONFIGINCLUDE(giommconfig.h)
-#include <glibmm/arrayhandle.h>
#include <glibmm/object.h>
#include <glibmm/variant.h>
#include <giomm/action.h>
@@ -149,10 +148,10 @@ public:
_WRAP_METHOD(double get_double(const Glib::ustring& key) const, g_settings_get_double)
_WRAP_METHOD(void set_double(const Glib::ustring& key, double value), g_settings_set_double)
- #m4 _CONVERSION(`gchar**',`Glib::StringArrayHandle',`Glib::StringArrayHandle($3, Glib::OWNERSHIP_DEEP)')
- _WRAP_METHOD(Glib::StringArrayHandle get_string_array(const Glib::ustring& key) const, g_settings_get_strv)
+ #m4 _CONVERSION(`gchar**',`std::vector<Glib::ustring>',`Glib::ArrayHandler<Glib::ustring>::array_to_vector($3, Glib::OWNERSHIP_DEEP)')
+ _WRAP_METHOD(std::vector<Glib::ustring> get_string_array(const Glib::ustring& key) const, g_settings_get_strv)
- _WRAP_METHOD(bool set_string_array(const Glib::ustring& key, const Glib::StringArrayHandle& value), g_settings_set_strv)
+ _WRAP_METHOD(bool set_string_array(const Glib::ustring& key, const std::vector<Glib::ustring>& value), g_settings_set_strv)
_WRAP_METHOD(int get_enum(const Glib::ustring& key) const, g_settings_get_enum)
_WRAP_METHOD(bool set_enum(const Glib::ustring& key, int value), g_settings_set_enum)