diff options
| author |   Bart Vanhauwaert <bart.vanhauwaert@grafitroniks.fr> | 2016-11-22 21:29:12 +0100 |
|---|---|---|
| committer | Bart Vanhauwaert <bart.vanhauwaert@grafitroniks.fr> | 2016-11-23 11:40:19 +0100 |
| commit | d60c1b22b77cf8c873d8a4f73831a1a35eb99e06 (patch) | |
| tree | 8bd9e23d3f135e7a182346ec9d44d8389a53f8b1 | |
| parent | Remove QMetaFunctionHelper::Create wrapper (diff) | |
| download | qtscriptgenerator-d60c1b22b77cf8c873d8a4f73831a1a35eb99e06.tar.xz qtscriptgenerator-d60c1b22b77cf8c873d8a4f73831a1a35eb99e06.zip | |
Correctly deal with removed bool* arguments
When a bool* is removed, we need to insert the template to pass a dummy
bool* instead of trying to convert it from one of the script parameter
arguments
Also, clean up some whitespace
| -rw-r--r-- | generator/typesystem_gui.xml | 23 | ||||
| -rw-r--r-- | generator/typesystem_xml.xml | 6 |
2 files changed, 22 insertions, 7 deletions
diff --git a/generator/typesystem_gui.xml b/generator/typesystem_gui.xml index 1e35fdb..2c08220 100644 --- a/generator/typesystem_gui.xml +++ b/generator/typesystem_gui.xml @@ -543,6 +543,9 @@ <modify-function signature="inverted(bool*)const"> <modify-argument index="1"> <remove-argument/> + <conversion-rule class="native"> + <insert-template name="core.prepare_removed_bool*_argument"/> + </conversion-rule> </modify-argument> </modify-function> </value-type> @@ -933,6 +936,9 @@ <access modifier="private"/> <modify-argument index="1"> <!-- <remove-default-expression/> --> + <conversion-rule class="native"> + <insert-template name="core.prepare_removed_bool*_argument"/> + </conversion-rule> </modify-argument> </modify-function> @@ -968,6 +974,9 @@ <modify-function signature="inverted(bool*)const"> <modify-argument index="1"> <remove-argument/> + <conversion-rule class="native"> + <insert-template name="core.prepare_removed_bool*_argument"/> + </conversion-rule> </modify-argument> </modify-function> </value-type> @@ -1720,7 +1729,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -1734,7 +1743,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -1748,7 +1757,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -3051,7 +3060,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -3065,7 +3074,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -3079,7 +3088,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> @@ -3093,7 +3102,7 @@ <remove-argument/> <conversion-rule class="native"> <insert-template name="core.prepare_removed_bool*_argument"/> - </conversion-rule> + </conversion-rule> </modify-argument> <modify-argument index="return"> <conversion-rule class="native"> diff --git a/generator/typesystem_xml.xml b/generator/typesystem_xml.xml index 7f34c24..2c0787e 100644 --- a/generator/typesystem_xml.xml +++ b/generator/typesystem_xml.xml @@ -305,11 +305,17 @@ <modify-function signature="feature(QString,bool*)const"> <modify-argument index="2"> <remove-argument/> + <conversion-rule class="native"> + <insert-template name="core.prepare_removed_bool*_argument"/> + </conversion-rule> </modify-argument> </modify-function> <modify-function signature="property(QString,bool*)const"> <modify-argument index="2"> <remove-argument/> + <conversion-rule class="native"> + <insert-template name="core.prepare_removed_bool*_argument"/> + </conversion-rule> </modify-argument> </modify-function> </object-type> |