diff options
Diffstat (limited to 'tests')
15 files changed, 32 insertions, 33 deletions
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page index 2366f205..446729b7 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject-tab-property.page @@ -15,7 +15,7 @@ - <p>This is a property regress_annotation intentionally indented with a mix + <p>This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</p> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page index 80e25466..80d4339e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.page @@ -14,7 +14,7 @@ - <p>This is an object used to test regress_annotations.</p> + <p>This is an object used to test annotations.</p> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page index 5de06c0c..1fe2080c 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page @@ -42,7 +42,7 @@ void regress_annotation_object_watch_full (RegressAnnotationObject* object, </code></synopsis> - <p>Test overriding via the "Rename To" regress_annotation.</p> + <p>Test overriding via the "Rename To" annotation.</p> diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page index 8e08a23b..2a474a5e 100644 --- a/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-C-expected/Regress.annotation_custom_destroy.page @@ -38,7 +38,7 @@ void regress_annotation_custom_destroy (RegressAnnotationCallback callback, <p>Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.</p> +detection, and fixing it via annotations.</p> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page index 9c797278..c2444fa4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-tab-property.page @@ -18,7 +18,7 @@ </code></synopsis> - <p>This is a property regress_annotation intentionally indented with a mix + <p>This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</p> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page index 95675a60..f4f01301 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.page @@ -23,7 +23,7 @@ let annotation_object = new Regress.AnnotationObject({ </code></synopsis> - <p>This is an object used to test regress_annotations.</p> + <p>This is an object used to test annotations.</p> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page index a5ccad47..99bfaf1b 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page @@ -29,7 +29,7 @@ function watch_full(func:Regress.AnnotationForeachFunc):void { </code></synopsis> - <p>Test overriding via the "Rename To" regress_annotation.</p> + <p>Test overriding via the "Rename To" annotation.</p> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page index 4cc018c0..c3e96530 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_custom_destroy.page @@ -30,7 +30,7 @@ function annotation_custom_destroy(callback:Regress.AnnotationCallback):void { <p>Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.</p> +detection, and fixing it via annotations.</p> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page index ed219fe5..c417d1ee 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject-tab-property.page @@ -18,7 +18,7 @@ </code></synopsis> - <p>This is a property regress_annotation intentionally indented with a mix + <p>This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</p> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page index ec6a11f8..006766fc 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.page @@ -18,7 +18,7 @@ from gi.repository import Regress annotation_object = Regress.AnnotationObject(<link xref='Regress.AnnotationObject-function-property'>function_property</link>=value, <link xref='Regress.AnnotationObject-string-property'>string_property</link>=value, <link xref='Regress.AnnotationObject-tab-property'>tab_property</link>=value) </code></synopsis> - <p>This is an object used to test regress_annotations.</p> + <p>This is an object used to test annotations.</p> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page index 28ca71af..66a53d54 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page @@ -42,7 +42,7 @@ def watch_full(self, func, user_data, destroy): </code></synopsis> - <p>Test overriding via the "Rename To" regress_annotation.</p> + <p>Test overriding via the "Rename To" annotation.</p> diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page index 7afb97ce..860107f1 100644 --- a/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page +++ b/tests/scanner/Regress-1.0-Python-expected/Regress.annotation_custom_destroy.page @@ -39,7 +39,7 @@ def annotation_custom_destroy(callback, destroy, data): <p>Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.</p> +detection, and fixing it via annotations.</p> diff --git a/tests/scanner/Regress-1.0-expected.gir b/tests/scanner/Regress-1.0-expected.gir index 53773cae..48b4ef7a 100644 --- a/tests/scanner/Regress-1.0-expected.gir +++ b/tests/scanner/Regress-1.0-expected.gir @@ -143,7 +143,7 @@ and/or use gtk-doc annotations. --> glib:get-type="regress_annotation_object_get_type" glib:type-struct="AnnotationObjectClass"> <attribute name="org.example.Test" value="cows"/> - <doc xml:whitespace="preserve">This is an object used to test regress_annotations.</doc> + <doc xml:whitespace="preserve">This is an object used to test annotations.</doc> <method name="allow_none" c:identifier="regress_annotation_object_allow_none"> <return-value transfer-ownership="none"> @@ -689,7 +689,7 @@ regress_annotation_object_watch_full().</doc> <method name="watch_full" c:identifier="regress_annotation_object_watch_full" shadows="watch"> - <doc xml:whitespace="preserve">Test overriding via the "Rename To" regress_annotation.</doc> + <doc xml:whitespace="preserve">Test overriding via the "Rename To" annotation.</doc> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> @@ -753,7 +753,7 @@ regress_annotation_object_watch_full().</doc> writable="1" construct="1" transfer-ownership="none"> - <doc xml:whitespace="preserve">This is a property regress_annotation intentionally indented with a mix + <doc xml:whitespace="preserve">This is a property annotation intentionally indented with a mix of tabs and strings to test the tab handling capabilities of the scanner.</doc> <type name="utf8" c:type="gchar*"/> </property> @@ -763,18 +763,18 @@ of tabs and strings to test the tab handling capabilities of the scanner.</doc> <glib:signal name="attribute-signal" when="last"> <doc xml:whitespace="preserve">This signal tests a signal with attributes.</doc> <return-value transfer-ownership="full"> - <attribute name="some.regress_annotation.foo3" value="val3"/> + <attribute name="some.annotation.foo3" value="val3"/> <doc xml:whitespace="preserve">the return value</doc> <type name="utf8" c:type="gchar*"/> </return-value> <parameters> <parameter name="arg1" transfer-ownership="none"> - <attribute name="some.regress_annotation.foo1" value="val1"/> + <attribute name="some.annotation.foo1" value="val1"/> <doc xml:whitespace="preserve">a value</doc> <type name="utf8" c:type="gchar*"/> </parameter> <parameter name="arg2" transfer-ownership="none"> - <attribute name="some.regress_annotation.foo2" value="val2"/> + <attribute name="some.annotation.foo2" value="val2"/> <doc xml:whitespace="preserve">another value</doc> <type name="utf8" c:type="gchar*"/> </parameter> @@ -3996,9 +3996,8 @@ the introspection client langage.</doc> <function name="annotation_attribute_func" c:identifier="regress_annotation_attribute_func"> <return-value transfer-ownership="none"> - <attribute name="some.other.regress_annotation" value="value2"/> - <attribute name="yet.another.regress_annotation" - value="another_value"/> + <attribute name="some.other.annotation" value="value2"/> + <attribute name="yet.another.annotation" value="another_value"/> <doc xml:whitespace="preserve">The return value.</doc> <type name="gint" c:type="gint"/> </return-value> @@ -4008,8 +4007,8 @@ the introspection client langage.</doc> <type name="AnnotationObject" c:type="RegressAnnotationObject*"/> </parameter> <parameter name="data" transfer-ownership="none"> - <attribute name="some.regress_annotation" value="value"/> - <attribute name="another.regress_annotation" value="blahvalue"/> + <attribute name="some.annotation" value="value"/> + <attribute name="another.annotation" value="blahvalue"/> <doc xml:whitespace="preserve">Some data.</doc> <type name="utf8" c:type="const gchar*"/> </parameter> @@ -4018,7 +4017,7 @@ the introspection client langage.</doc> <function name="annotation_custom_destroy" c:identifier="regress_annotation_custom_destroy"> <doc xml:whitespace="preserve">Test messing up the heuristic of closure/destroy-notification -detection, and fixing it via regress_annotations.</doc> +detection, and fixing it via annotations.</doc> <return-value transfer-ownership="none"> <type name="none" c:type="void"/> </return-value> diff --git a/tests/scanner/annotation.c b/tests/scanner/annotation.c index 7d74b702..0a92d3a1 100644 --- a/tests/scanner/annotation.c +++ b/tests/scanner/annotation.c @@ -128,12 +128,12 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) /** * RegressAnnotationObject::attribute-signal: * @regress_annotation: the regress_annotation object - * @arg1: (attribute some.regress_annotation.foo1 val1): a value - * @arg2: (attribute some.regress_annotation.foo2 val2): another value + * @arg1: (attribute some.annotation.foo1 val1): a value + * @arg2: (attribute some.annotation.foo2 val2): another value * * This signal tests a signal with attributes. * - * Returns: (attribute some.regress_annotation.foo3 val3): the return value + * Returns: (attribute some.annotation.foo3 val3): the return value */ regress_annotation_object_signals[ATTRIBUTE_SIGNAL] = g_signal_new ("attribute-signal", @@ -177,7 +177,7 @@ regress_annotation_object_class_init (RegressAnnotationObjectClass *klass) /** * RegressAnnotationObject:tab-property: * - * This is a property regress_annotation intentionally indented with a mix + * This is a property annotation intentionally indented with a mix * of tabs and strings to test the tab handling capabilities of the scanner. * * Since: 1.2 @@ -622,7 +622,7 @@ regress_annotation_object_watch (RegressAnnotationObject *object, * @user_data: The callback data * @destroy: Destroy notification * - * Test overriding via the "Rename To" regress_annotation. + * Test overriding via the "Rename To" annotation. * * Rename to: regress_annotation_object_watch */ @@ -721,7 +721,7 @@ regress_annotation_object_extra_annos (RegressAnnotationObject *object) * @callback: (destroy destroy) (closure data): Destroy notification * * Test messing up the heuristic of closure/destroy-notification - * detection, and fixing it via regress_annotations. + * detection, and fixing it via annotations. */ void regress_annotation_custom_destroy (RegressAnnotationCallback callback, @@ -763,9 +763,9 @@ regress_annotation_ptr_array (GPtrArray *array) /** * regress_annotation_attribute_func: * @object: A #RegressAnnotationObject. - * @data: (attribute some.regress_annotation value) (attribute another.regress_annotation blahvalue): Some data. + * @data: (attribute some.annotation value) (attribute another.annotation blahvalue): Some data. * - * Returns: (attribute some.other.regress_annotation value2) (attribute yet.another.regress_annotation another_value): The return value. + * Returns: (attribute some.other.annotation value2) (attribute yet.another.annotation another_value): The return value. */ gint regress_annotation_attribute_func (RegressAnnotationObject *object, diff --git a/tests/scanner/annotation.h b/tests/scanner/annotation.h index 154b0d88..66470cbb 100644 --- a/tests/scanner/annotation.h +++ b/tests/scanner/annotation.h @@ -39,7 +39,7 @@ typedef void (*RegressAnnotationNotifyFunc) (gpointer data); /** * RegressAnnotationObject: * - * This is an object used to test regress_annotations. + * This is an object used to test annotations. * * Attributes: (org.example.Test cows) */ |