aboutsummaryrefslogtreecommitdiffstats
path: root/sources/pyside2/PySide2/templates
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-01 15:56:15 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2019-02-04 10:20:44 +0000
commit295061d00be3dedf60d8adc97bd14ff46931ef4c (patch)
tree140cacc83e3c5857a04260b66089c8d8124b1e2a /sources/pyside2/PySide2/templates
parent12e8f4774edd430d9d2c6ec5b8e0e40a25ad0a24 (diff)
PySide2/QtSxcml: Support bool *ok in some of the models' evaluateTo() functions
Add yet another version of the fix_args,arg,bool template, fixing: There's no user provided way (conversion rule, argument removal, custom code, etc) to handle the primitive type 'bool *' of argument 2 in function 'QScxmlDataModel::evaluateToBool(int id, bool * ok)'. 'QScxmlDataModel::evaluateToString(int id, bool * ok)'. 'QScxmlDataModel::evaluateToVariant(int id, bool * ok)'. 'QScxmlEcmaScriptDataModel::evaluateToBool(int id, bool * ok)'. 'QScxmlEcmaScriptDataModel::evaluateToString(int id, bool * ok)'. 'QScxmlEcmaScriptDataModel::evaluateToVariant(int id, bool * ok)'. 'QScxmlEcmaScriptDataModel::evaluateToVoid(int id, bool * ok)'. 'QScxmlNullDataModel::evaluateToString(int id, bool * ok)'. 'QScxmlNullDataModel::evaluateToVariant(int id, bool * ok)'. Change-Id: Idfda2adc0875a4626797a92240fa5267016d04bb Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'sources/pyside2/PySide2/templates')
-rw-r--r--sources/pyside2/PySide2/templates/core_common.xml8
1 files changed, 8 insertions, 0 deletions
diff --git a/sources/pyside2/PySide2/templates/core_common.xml b/sources/pyside2/PySide2/templates/core_common.xml
index 96a9be620..7c2ae3a77 100644
--- a/sources/pyside2/PySide2/templates/core_common.xml
+++ b/sources/pyside2/PySide2/templates/core_common.xml
@@ -86,6 +86,14 @@
<insert-template name="tuple_retval_ok"/>
</template>
+ <template name="fix_args,arg,bool*">
+ bool ok_;
+ %BEGIN_ALLOW_THREADS
+ %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, &amp;ok_);
+ %END_ALLOW_THREADS
+ <insert-template name="tuple_retval_ok"/>
+ </template>
+
<template name="fix_arg,bool*,arg">
bool ok_;
%BEGIN_ALLOW_THREADS