diff options
author | Colin Walters <walters@verbum.org> | 2009-02-20 22:34:20 (GMT) |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2009-02-25 22:31:49 (GMT) |
commit | 251de52b083d3e0e42f25cb164a46865c2c2b9a9 (patch) | |
tree | 99db442fd1bb299466f5d277561becfca4b220ee /tests/scanner/foo-1.0-expected.tgir | |
parent | 0b9dda0e725446882dca84b6a64688c8f0e5a4e3 (diff) |
Bug 572434 - Associate interfaces with their C structures
Similar to GObject class structs, we pair up GInterfaces with
their C structures.
Also, move some GLib-specific things into glibast.py, and make
the naming more generic.
Diffstat (limited to 'tests/scanner/foo-1.0-expected.tgir')
-rw-r--r-- | tests/scanner/foo-1.0-expected.tgir | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/scanner/foo-1.0-expected.tgir b/tests/scanner/foo-1.0-expected.tgir index dcd9789..f8e1ee5 100644 --- a/tests/scanner/foo-1.0-expected.tgir +++ b/tests/scanner/foo-1.0-expected.tgir @@ -71,7 +71,7 @@ </return-value> </method> </record> - <class name="Buffer" parent="GObject.Object" glib:class-struct="BufferClass" glib:type-name="FooBuffer" glib:get-type="foo_buffer_get_type"> + <class name="Buffer" parent="GObject.Object" glib:type-struct="BufferClass" glib:type-name="FooBuffer" glib:get-type="foo_buffer_get_type"> <implements name="Interface"/> <method name="some_method" c:identifier="foo_buffer_some_method"> <return-value transfer-ownership="none"> @@ -79,7 +79,7 @@ </return-value> </method> </class> - <record name="BufferClass" glib:is-class-struct="1"/> + <record name="BufferClass" glib:is-gtype-struct="1"/> <callback name="Callback"> <return-value transfer-ownership="none"> <type name="boolean"/> @@ -161,13 +161,13 @@ <member name="second" value="2"/> <member name="third" value="4"/> </bitfield> - <interface name="Interface" glib:type-name="FooInterface" glib:get-type="foo_interface_get_type"/> - <record name="InterfaceIface"> + <interface name="Interface" glib:type-name="FooInterface" glib:get-type="foo_interface_get_type" glib:type-struct="InterfaceIface"/> + <record name="InterfaceIface" glib:is-gtype-struct="1"> <field name="parent_iface"> <type name="GObject.TypeInterface"/> </field> </record> - <class name="Object" parent="GObject.Object" glib:class-struct="ObjectClass" glib:type-name="FooObject" glib:get-type="foo_object_get_type"> + <class name="Object" parent="GObject.Object" glib:type-struct="ObjectClass" glib:type-name="FooObject" glib:get-type="foo_object_get_type"> <implements name="Interface"/> <field name="parent_instance"> <type name="GObject.Object"/> @@ -272,7 +272,7 @@ </parameters> </glib:signal> </class> - <record name="ObjectClass" glib:is-class-struct="1"> + <record name="ObjectClass" glib:is-gtype-struct="1"> <field name="parent_class"> <type name="GObject.ObjectClass"/> </field> @@ -335,7 +335,7 @@ </field> </record> <record name="StructPrivate"/> - <interface name="SubInterface" glib:type-name="FooSubInterface" glib:get-type="foo_sub_interface_get_type"> + <interface name="SubInterface" glib:type-name="FooSubInterface" glib:get-type="foo_sub_interface_get_type" glib:type-struct="SubInterfaceIface"> <prerequisite name="Interface"/> <method name="do_bar" c:identifier="foo_sub_interface_do_bar"> <return-value transfer-ownership="none"> @@ -343,12 +343,12 @@ </return-value> </method> </interface> - <record name="SubInterfaceIface"> + <record name="SubInterfaceIface" glib:is-gtype-struct="1"> <field name="parent_iface"> <type name="GObject.TypeInterface"/> </field> </record> - <class name="Subobject" parent="Object" glib:class-struct="SubobjectClass" abstract="1" glib:type-name="FooSubobject" glib:get-type="foo_subobject_get_type"> + <class name="Subobject" parent="Object" glib:type-struct="SubobjectClass" abstract="1" glib:type-name="FooSubobject" glib:get-type="foo_subobject_get_type"> <implements name="Interface"/> <field name="parent_instance"> <type name="Object"/> @@ -359,7 +359,7 @@ </return-value> </constructor> </class> - <record name="SubobjectClass" glib:is-class-struct="1"> + <record name="SubobjectClass" glib:is-gtype-struct="1"> <field name="parent_class"> <type name="ObjectClass"/> </field> |