diff options
| author | Murray Cumming <murrayc@murrayc.com> | 2014-04-03 10:56:31 +0200 |
|---|---|---|
| committer | Murray Cumming <murrayc@murrayc.com> | 2014-04-03 10:56:31 +0200 |
| commit | ca67c931dd24a27bb5bb9de56abb6cf6fcb28018 (patch) | |
| tree | 1ee83cc254ffa85a98fb51403d4b4a6689d37ccf /tools/m4/convert_gio.m4 | |
| parent | b1952db2640f12817eb11266eedb640e29c0c399 (diff) | |
| download | glibmm-ca67c931dd24a27bb5bb9de56abb6cf6fcb28018.tar.gz | |
Add Glib::VariantDict, needed for GApplication.
* glib/src/filelist.am:
* glib/src/variantdict.[hg|ccg]: Add it as a generic refcounted
type, with templated lookup_value() and insert_value() methods,
though these are completely untested so far.
* glib/src/variant.hg: Ignore a g_variant_dict_* function that
gmmproc thinks is part of Variant.
* tools/m4/convert_gio.m4:
* tools/m4/convert_glib.m4: Move all Variant* conversion to the
glib conversions and add a necessary one.
* glib/glibmm.h: Include variantdict.h.
Diffstat (limited to 'tools/m4/convert_gio.m4')
| -rw-r--r-- | tools/m4/convert_gio.m4 | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index a6f04a3e..c0e404aa 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -302,16 +302,6 @@ _CONVERSION(`const Glib::RefPtr<TlsPassword>&',`GTlsPassword*',`Glib::unwrap($3) _CONVERSION(`GUnixFDList*',`Glib::RefPtr<UnixFDList>',`Glib::wrap($3)') _CONVERSION(`const Glib::RefPtr<UnixFDList>&',`GUnixFDList*',`Glib::unwrap($3)') -#Variant -_CONVERSION(`GVariant*',`Glib::VariantBase',`Glib::wrap($3, false)') -_CONVERSION(`GVariant*',`Glib::VariantContainerBase',`Glib::VariantContainerBase($3, false)') -_CONVERSION(`const Glib::VariantBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') -_CONVERSION(`const Glib::VariantContainerBase&',`GVariant*',`const_cast<GVariant*>(($3).gobj())') - -#VariantType -_CONVERSION(`const GVariantType*',`Glib::VariantType',`Glib::wrap(const_cast<GVariantType*>($3), true)') -_CONVERSION(`const Glib::VariantType&',`const GVariantType*',`$3.gobj()') - #Volume _CONVERSION(`GVolume*',`Glib::RefPtr<Volume>',`Glib::wrap($3)') |