diff options
author | Colin Walters <walters@verbum.org> | 2009-02-25 23:43:14 (GMT) |
---|---|---|
committer | Colin Walters <walters@verbum.org> | 2009-02-26 19:07:21 (GMT) |
commit | 4470a24e8cf3827efaddcfe240c3271cf1a0d6c0 (patch) | |
tree | 4bbcd76c1c325c403ec0408a81489ab97c5465f0 /tests/scanner/foo-1.0-expected.gir | |
parent | 251de52b083d3e0e42f25cb164a46865c2c2b9a9 (diff) |
Bug 557383 - Virtual function support
In order to determine whether a method is virtual, by default we look
at the class table to find a callback field. This should be fairly reliable,
but we may also later need annotations to more finely control this
in the case of a name clash with a signal.
Diffstat (limited to 'tests/scanner/foo-1.0-expected.gir')
-rw-r--r-- | tests/scanner/foo-1.0-expected.gir | 35 |
1 files changed, 19 insertions, 16 deletions
diff --git a/tests/scanner/foo-1.0-expected.gir b/tests/scanner/foo-1.0-expected.gir index 0f6b1f1..38bde58 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"> - <callback name="do_foo" c:type="do_foo"> + <vfunc name="do_foo" c:identifier="foo_interface_do_foo"> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> <parameters> - <parameter name="self" transfer-ownership="none"> - <type name="Interface" c:type="FooInterface*"/> + <parameter name="x" transfer-ownership="none"> + <type name="int" c:type="int"/> </parameter> </parameters> - </callback> + </vfunc> </interface> <record name="InterfaceIface" c:type="FooInterfaceIface" @@ -257,6 +257,9 @@ 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> @@ -359,6 +362,16 @@ 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> @@ -467,21 +480,11 @@ and/or use gtk-doc annotations. --> 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"> - <type name="none" c:type="void"/> - </return-value> - </method> - <callback name="do_bar" c:type="do_bar"> + <vfunc name="do_bar" c:identifier="foo_sub_interface_do_bar"> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> - <parameters> - <parameter name="self" transfer-ownership="none"> - <type name="SubInterface" c:type="FooSubInterface*"/> - </parameter> - </parameters> - </callback> + </vfunc> </interface> <record name="SubInterfaceIface" c:type="FooSubInterfaceIface" |