diff options
author | Murray Cumming <murrayc@murrayc.com> | 2011-03-29 10:45:18 +0200 |
---|---|---|
committer | Murray Cumming <murrayc@murrayc.com> | 2011-03-29 10:45:18 +0200 |
commit | 9ee8e6c39f15a0c7731ae475313f51128df322d4 (patch) | |
tree | 9df239ab29b13040ed165dc062a6ec79615e6145 /glib/src/variant.ccg | |
parent | 07981769f4b9795b156b8f2bfddd916b4de6d6c3 (diff) | |
download | glibmm-9ee8e6c39f15a0c7731ae475313f51128df322d4.tar.gz |
Use the utility functions for creating strings.
* gio/src/dbuserrorutils.ccg:
* gio/src/dbusownname.ccg:
* gio/src/dbusutils.ccg:
* gio/src/dbuswatchname.ccg:
* glib/src/fileutils.ccg:
* glib/src/iochannel.ccg:
* glib/src/markup.ccg:
* glib/src/variant.ccg: Use convert_const_gchar_ptr_to_ustring() and
convert_const_gchar_ptr_to_stdstring(), simplifying code and sometimes
avoiding crashes with NULL const char*.
Diffstat (limited to 'glib/src/variant.ccg')
-rw-r--r-- | glib/src/variant.ccg | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glib/src/variant.ccg b/glib/src/variant.ccg index 39509f03..f18f03c6 100644 --- a/glib/src/variant.ccg +++ b/glib/src/variant.ccg @@ -223,7 +223,7 @@ Variant<Glib::ustring>::create(const Glib::ustring& data) Glib::ustring Variant<Glib::ustring>::get() const { - return Glib::ustring(g_variant_get_string(gobject_, 0)); + return convert_const_gchar_ptr_to_ustring(g_variant_get_string(gobject_, 0)); } // Variant<Glib::ustring> makes sense for multiple types. @@ -315,7 +315,7 @@ std::string Variant<std::string>::get() const else //g_variant_get_string() cna handle strings, object paths, and signatures. pch = g_variant_get_string(gobject_, 0); - return std::string(pch); + return convert_const_gchar_ptr_to_stdstring(pch); } typedef std::vector<Glib::ustring> type_vec_ustring; |