diff options
| author | Colin Walters <walters@verbum.org> | 2009-02-26 21:52:42 (GMT) |
|---|---|---|
| committer | Colin Walters <walters@verbum.org> | 2009-02-26 21:52:42 (GMT) |
| commit | ca21c1ce6f2fa9f8be9307121ce27a46cc9c0ed0 (patch) | |
| tree | be25649d977e3daa4d461a5359b7cef677c94975 /tests/scanner/foo-1.0-expected.gir | |
| parent | e49a883d0997127cd3a0ad7e522666f30190e792 (diff) | |
Revert "Bug 557383 - Virtual function support"
This reverts commit 4470a24e8cf3827efaddcfe240c3271cf1a0d6c0.
Needs more work as it turns out, we need to figure out the binding
story.
Diffstat (limited to 'tests/scanner/foo-1.0-expected.gir')
| -rw-r--r-- | tests/scanner/foo-1.0-expected.gir | 35 |
1 files changed, 16 insertions, 19 deletions
diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 38bde58..0f6b1f1 100644 --- a/tests/scanner/foo-1.0-expected.gir +++ b/tests/scanner/foo-1.0-expected.gir @@ -232,16 +232,16 @@ and/or use gtk-doc annotations. --> glib:type-name="FooInterface" glib:get-type="foo_interface_get_type" glib:type-struct="InterfaceIface"> - <vfunc name="do_foo" c:identifier="foo_interface_do_foo"> + <callback name="do_foo" c:type="do_foo"> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="x" transfer-ownership="none"> - <type name="int" c:type="int"/> + <parameter name="self" transfer-ownership="none"> + <type name="Interface" c:type="FooInterface*"/> </parameter> </parameters> - </vfunc> + </callback> </interface> <record name="InterfaceIface" c:type="FooInterfaceIface" @@ -257,9 +257,6 @@ and/or use gtk-doc annotations. --> <parameter name="self" transfer-ownership="none"> <type name="Interface" c:type="FooInterface*"/> </parameter> - <parameter name="x" transfer-ownership="none"> - <type name="int" c:type="int"/> - </parameter> </parameters> </callback> </record> @@ -362,16 +359,6 @@ and/or use gtk-doc annotations. --> </parameter> </parameters> </method> - <vfunc name="virtual_method" c:identifier="foo_object_virtual_method"> - <return-value transfer-ownership="none"> - <type name="none" c:type="void"/> - </return-value> - <parameters> - <parameter name="first_param" transfer-ownership="none"> - <type name="int" c:type="int"/> - </parameter> - </parameters> - </vfunc> <property name="string" writable="1" construct="1"> <type name="utf8" c:type="gchararray"/> </property> @@ -480,11 +467,21 @@ and/or use gtk-doc annotations. --> glib:get-type="foo_sub_interface_get_type" glib:type-struct="SubInterfaceIface"> <prerequisite name="Interface"/> - <vfunc name="do_bar" c:identifier="foo_sub_interface_do_bar"> + <method name="do_bar" c:identifier="foo_sub_interface_do_bar"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + </method> + <callback name="do_bar" c:type="do_bar"> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> - </vfunc> + <parameters> + <parameter name="self" transfer-ownership="none"> + <type name="SubInterface" c:type="FooSubInterface*"/> + </parameter> + </parameters> + </callback> </interface> <record name="SubInterfaceIface" c:type="FooSubInterfaceIface" |