diff options
Diffstat (limited to 'tools/m4')
| -rw-r--r-- | tools/m4/convert_gio.m4 | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index cc1e59f7..ea8e3b4d 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -135,7 +135,6 @@ _CONVERSION(`GFileOutputStream*',`Glib::RefPtr<FileOutputStream>',`Glib::wrap($3 _CONVERSION(`GFileIOStream*',`Glib::RefPtr<FileIOStream>',`Glib::wrap($3)') - # Icon _CONVERSION(`GIcon*',`Glib::RefPtr<Icon>',`Glib::wrap($3)') _CONVERSION(`const Glib::RefPtr<Icon>&',`GIcon*',__CONVERT_CONST_REFPTR_TO_P) @@ -188,12 +187,6 @@ _CONVERSION(`const Glib::StringArrayHandle&',`const gchar*-const*',`($3).data()' _CONVERSION(`const Glib::RefPtr<SettingsBackend>&',`GSettingsBackend*',__CONVERT_REFPTR_TO_P) -#_CONVERSION(`GVariant*',`Glib::VariantBase',`Glib::wrap($3, true)') -_CONVERSION(`GVariant*',`VariantBase',`Glib::wrap($3, true)') -_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())') - #Socket _CONVERSION(`const Glib::RefPtr<Socket>&',`GSocket*',__CONVERT_CONST_REFPTR_TO_P) _CONVERSION(`GSocket*',`Glib::RefPtr<Socket>',`Glib::wrap($3)') @@ -221,6 +214,15 @@ _CONVERSION(`GTimeZoneMonitor*',`Glib::RefPtr<TimeZoneMonitor>',`Glib::wrap($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)') + #Volume _CONVERSION(`GVolume*',`Glib::RefPtr<Volume>',`Glib::wrap($3)') |