diff options
Diffstat (limited to 'tools/m4/convert_gio.m4')
| -rw-r--r-- | tools/m4/convert_gio.m4 | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/tools/m4/convert_gio.m4 b/tools/m4/convert_gio.m4 index b40c8167..54faac87 100644 --- a/tools/m4/convert_gio.m4 +++ b/tools/m4/convert_gio.m4 @@ -5,13 +5,13 @@ _CONV_ENUM(G,BusType) _CONV_ENUM(G,CredentialsType) _CONV_ENUM(G,DataStreamByteOrder) _CONV_ENUM(G,DataStreamNewlineType) -_CONV_ENUM(G,DBusCapabilityFlags) -_CONV_ENUM(G,DBusMessageFlags) -_CONV_ENUM(G,DBusMessageHeaderField) -_CONV_ENUM(G,DBusMessageType) -_CONV_ENUM(G,DBusProxyFlags) -_CONV_ENUM(G,DBusSendMessageFlags) -_CONV_ENUM(G,DBusServerFlags) +_CONV_ENUM(GDBus,CapabilityFlags) +_CONV_ENUM(GDBus,MessageFlags) +_CONV_ENUM(GDBus,MessageHeaderField) +_CONV_ENUM(GDBus,MessageType) +_CONV_ENUM(GDBus,ProxyFlags) +_CONV_ENUM(GDBus,SendMessageFlags) +_CONV_ENUM(GDBus,ServerFlags) _CONV_ENUM(G,DriveStartFlags) _CONV_ENUM(G,DriveStartFlags) _CONV_ENUM(G,DriveStartStopType) @@ -70,26 +70,26 @@ _CONVERSION(`GCredentials*',`Glib::RefPtr<Credentials>',`Glib::wrap($3)') _CONVERSION(`GCredentials*',`Glib::RefPtr<const Credentials>',`Glib::wrap($3)') # DBusConnection -_CONVERSION(`const Glib::RefPtr<DBusConnection>&',`GDBusConnection*',__CONVERT_REFPTR_TO_P) -_CONVERSION(`GDBusConnection*',`Glib::RefPtr<DBusConnection>',Glib::wrap($3)) -_CONVERSION(`GDBusConnection*',`Glib::RefPtr<const DBusConnection>',Glib::wrap($3)) +_CONVERSION(`const Glib::RefPtr<Connection>&',`GDBusConnection*',__CONVERT_REFPTR_TO_P) +_CONVERSION(`GDBusConnection*',`Glib::RefPtr<Connection>',Glib::wrap($3)) +_CONVERSION(`GDBusConnection*',`Glib::RefPtr<const Connection>',Glib::wrap($3)) # DBusMessage -_CONVERSION(`const Glib::RefPtr<DBusMessage>&',`GDBusMessage*',__CONVERT_REFPTR_TO_P) -_CONVERSION(`GDBusMessage*',`Glib::RefPtr<DBusMessage>',`Glib::wrap($3)') -_CONVERSION(`const Glib::RefPtr<const DBusMessage>&',`GDBusMessage*',__CONVERT_CONST_REFPTR_TO_P) +_CONVERSION(`const Glib::RefPtr<Message>&',`GDBusMessage*',__CONVERT_REFPTR_TO_P) +_CONVERSION(`GDBusMessage*',`Glib::RefPtr<Message>',`Glib::wrap($3)') +_CONVERSION(`const Glib::RefPtr<const Message>&',`GDBusMessage*',__CONVERT_CONST_REFPTR_TO_P) # DBus*Info -_CONVERSION(`GDBusMethodInfo*',`Glib::RefPtr<DBusMethodInfo>',`Glib::wrap($3)') -_CONVERSION(`GDBusSignalInfo*',`Glib::RefPtr<DBusSignalInfo>',`Glib::wrap($3)') -_CONVERSION(`GDBusPropertyInfo*',`Glib::RefPtr<DBusPropertyInfo>',`Glib::wrap($3)') -_CONVERSION(`GDBusNodeInfo*',`Glib::RefPtr<DBusNodeInfo>',`Glib::wrap($3)') -_CONVERSION(`GDBusInterfaceInfo*',`Glib::RefPtr<DBusInterfaceInfo>',`Glib::wrap($3)') -_CONVERSION(`const Glib::RefPtr<DBusInterfaceInfo>&',`GDBusInterfaceInfo*',`Glib::unwrap($3)') -_CONVERSION(`GDBusInterfaceInfo*',`const Glib::RefPtr<DBusInterfaceInfo>',`Glib::wrap($3)') +_CONVERSION(`GDBusMethodInfo*',`Glib::RefPtr<MethodInfo>',`Glib::wrap($3)') +_CONVERSION(`GDBusSignalInfo*',`Glib::RefPtr<SignalInfo>',`Glib::wrap($3)') +_CONVERSION(`GDBusPropertyInfo*',`Glib::RefPtr<PropertyInfo>',`Glib::wrap($3)') +_CONVERSION(`GDBusNodeInfo*',`Glib::RefPtr<NodeInfo>',`Glib::wrap($3)') +_CONVERSION(`GDBusInterfaceInfo*',`Glib::RefPtr<InterfaceInfo>',`Glib::wrap($3)') +_CONVERSION(`const Glib::RefPtr<InterfaceInfo>&',`GDBusInterfaceInfo*',`Glib::unwrap($3)') +_CONVERSION(`GDBusInterfaceInfo*',`const Glib::RefPtr<InterfaceInfo>',`Glib::wrap($3)') # DBusProxy -_CONVERSION(`GDBusProxy*',`Glib::RefPtr<DBusProxy>',`Glib::wrap($3)') +_CONVERSION(`GDBusProxy*',`Glib::RefPtr<Proxy>',`Glib::wrap($3)') # DesktopAppInfo _CONVERSION(`GDesktopAppInfo*', `Glib::RefPtr<DesktopAppInfo>', `Glib::wrap($3)') |