diff options
20 files changed, 20 insertions, 180 deletions
diff --git a/giscanner/doctemplates/Gjs/signal.tmpl b/giscanner/doctemplates/Gjs/signal.tmpl index 994392ce..7d28cad5 100644 --- a/giscanner/doctemplates/Gjs/signal.tmpl +++ b/giscanner/doctemplates/Gjs/signal.tmpl @@ -9,7 +9,7 @@ function callback(${formatter.to_underscores(node.parent.name).lower()}, \ % for arg in formatter.get_parameters(node): ${arg.argname}:${formatter.format_type(arg.type)}, \ % endfor -user_param1, ...):${formatter.format_type(node.retval.type)}; +):${formatter.format_type(node.retval.type)}; </code></synopsis> </%block> <%block name="details"> @@ -24,14 +24,6 @@ user_param1, ...):${formatter.format_type(node.retval.type)}; ${formatter.format(node, arg.doc)} </item> % endfor -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> % if node.retval and \ node.retval.type.ctype != 'void' and \ node.retval.type.ctype is not None: diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page index 713f2fa9..f3ab0917 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-attribute-signal.page @@ -14,7 +14,7 @@ <title>Regress.AnnotationObject::attribute-signal</title> <synopsis><code mime="text/x-python"> -function callback(annotation_object, arg1:String, arg2:String, user_param1, ...):String; +function callback(annotation_object, arg1:String, arg2:String, ):String; </code></synopsis> @@ -37,14 +37,6 @@ function callback(annotation_object, arg1:String, arg2:String, user_param1, ...) <p>another value</p> </item> <item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> -<item> <title><code>Returns</code></title> <p>gchar* <p>the return value</p></p> </item> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page index 68a6b8f5..b6dc19fb 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-doc-empty-arg-parsing.page @@ -14,7 +14,7 @@ <title>Regress.AnnotationObject::doc-empty-arg-parsing</title> <synopsis><code mime="text/x-python"> -function callback(annotation_object, arg1:gpointer, user_param1, ...):void; +function callback(annotation_object, arg1:gpointer, ):void; </code></synopsis> @@ -32,14 +32,6 @@ function callback(annotation_object, arg1:gpointer, user_param1, ...):void; <title><code>arg1</code></title> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page index 3464bf78..d16187b2 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-list-signal.page @@ -14,7 +14,7 @@ <title>Regress.AnnotationObject::list-signal</title> <synopsis><code mime="text/x-python"> -function callback(annotation_object, list:[String], user_param1, ...):void; +function callback(annotation_object, list:[String], ):void; </code></synopsis> @@ -33,14 +33,6 @@ known by GObject as it's only marked as G_TYPE_POINTER</p> <title><code>list</code></title> <p>a list of strings</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page index 53124914..a900a0f9 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject-string-signal.page @@ -14,7 +14,7 @@ <title>Regress.AnnotationObject::string-signal</title> <synopsis><code mime="text/x-python"> -function callback(annotation_object, string:String, user_param1, ...):void; +function callback(annotation_object, string:String, ):void; </code></synopsis> @@ -34,14 +34,6 @@ it says it's pointer but it's actually a string.</p> <title><code>string</code></title> <p>a string</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page index d41290f6..72ffecca 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page @@ -14,7 +14,7 @@ <title>Regress.FooObject::signal</title> <synopsis><code mime="text/x-python"> -function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, ...):String; +function callback(foo_object, object:GObject.Object, p0:gpointer, ):String; </code></synopsis> @@ -37,14 +37,6 @@ function callback(foo_object, object:GObject.Object, p0:gpointer, user_param1, . </item> <item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> -<item> <title><code>Returns</code></title> <p>gchar* </p> </item> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page index a444574e..74893012 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-destroy-event.page @@ -14,7 +14,7 @@ <title>Regress.FooSubInterface::destroy-event</title> <synopsis><code mime="text/x-python"> -function callback(foo_sub_interface, user_param1, ...):void; +function callback(foo_sub_interface, ):void; </code></synopsis> @@ -28,14 +28,6 @@ function callback(foo_sub_interface, user_param1, ...):void; <title><code>foo_sub_interface</code></title> <p>instance of Regress.FooSubInterface that is emitting the signal</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page index f8d71322..7509a6da 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-all.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::all</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; </code></synopsis> @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <title><code>test_obj</code></title> <p>instance of Regress.TestObj that is emitting the signal</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page index 085c6987..a9e8b7e0 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-cleanup.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::cleanup</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; </code></synopsis> @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <title><code>test_obj</code></title> <p>instance of Regress.TestObj that is emitting the signal</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page index 1a521f97..599a26cd 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-first.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::first</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; </code></synopsis> @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <title><code>test_obj</code></title> <p>instance of Regress.TestObj that is emitting the signal</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page index afc914fa..9dd0dae1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-array-prop.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-array-prop</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, arr:[Number], user_param1, ...):void; +function callback(test_obj, arr:[Number], ):void; </code></synopsis> @@ -33,14 +33,6 @@ function callback(test_obj, arr:[Number], user_param1, ...):void; <title><code>arr</code></title> <p>numbers</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page index d79c6f78..7618f96d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-foreign-struct</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, cr:cairo.Context, user_param1, ...):void; +function callback(test_obj, cr:cairo.Context, ):void; </code></synopsis> @@ -32,14 +32,6 @@ function callback(test_obj, cr:cairo.Context, user_param1, ...):void; <title><code>cr</code></title> <p>A cairo context.</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page index ec5e4e1e..b6dbdf1a 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-hash-prop</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void; +function callback(test_obj, hash:{String: GObject.Value}, ):void; </code></synopsis> @@ -33,14 +33,6 @@ function callback(test_obj, hash:{String: GObject.Value}, user_param1, ...):void <title><code>hash</code></title> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page index 28d4cf96..f0e99bf4 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-int64-prop.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-int64-prop</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, user_param1, ...):Number; +function callback(test_obj, i:Number, ):Number; </code></synopsis> @@ -34,14 +34,6 @@ the introspection client langage.</p> <p>an integer</p> </item> <item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> -<item> <title><code>Returns</code></title> <p>gint64 </p> </item> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page index ef623d9f..bce2b0b1 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-intarray-ret.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-intarray-ret</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, user_param1, ...):[Number]; +function callback(test_obj, i:Number, ):[Number]; </code></synopsis> @@ -32,14 +32,6 @@ function callback(test_obj, i:Number, user_param1, ...):[Number]; <title><code>i</code></title> <p>an integer</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page index 470fe4d6..bb43e004 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-obj</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, obj:GObject.Object, user_param1, ...):void; +function callback(test_obj, obj:GObject.Object, ):void; </code></synopsis> @@ -33,14 +33,6 @@ Use with regress_test_obj_emit_sig_with_obj</p> <title><code>obj</code></title> <p>A newly created RegressTestObj</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page index 812891cc..9ef0cc27 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-strv.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-strv</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, strs:[String], user_param1, ...):void; +function callback(test_obj, strs:[String], ):void; </code></synopsis> @@ -32,14 +32,6 @@ function callback(test_obj, strs:[String], user_param1, ...):void; <title><code>strs</code></title> <p>strings</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page index 80e75635..d87cbb56 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-uint64-prop.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::sig-with-uint64-prop</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, i:Number, user_param1, ...):Number; +function callback(test_obj, i:Number, ):Number; </code></synopsis> @@ -34,14 +34,6 @@ the introspection client langage.</p> <p>an integer</p> </item> <item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> -<item> <title><code>Returns</code></title> <p>guint64 </p> </item> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page index ec06fff0..733de72d 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test-with-static-scope-arg.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::test-with-static-scope-arg</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):void; +function callback(test_obj, object:Regress.TestSimpleBoxedA, ):void; </code></synopsis> @@ -32,14 +32,6 @@ function callback(test_obj, object:Regress.TestSimpleBoxedA, user_param1, ...):v <title><code>object</code></title> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page index 604283d6..a5448f68 100644 --- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page +++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-test.page @@ -14,7 +14,7 @@ <title>Regress.TestObj::test</title> <synopsis><code mime="text/x-python"> -function callback(test_obj, user_param1, ...):void; +function callback(test_obj, ):void; </code></synopsis> @@ -28,14 +28,6 @@ function callback(test_obj, user_param1, ...):void; <title><code>test_obj</code></title> <p>instance of Regress.TestObj that is emitting the signal</p> </item> -<item> -<title><code>user_param1</code></title> -<p>first user parameter (if any) specified with the connect() method</p> -</item> -<item> -<title><code>...</code></title> -<p>additional user parameters (if any)</p> -</item> </terms> |