diff options
| author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-09-21 16:59:51 -0300 |
|---|---|---|
| committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:52 -0300 |
| commit | 009aef9f1ba14570c7febc80a9ad21ba2113bc33 (patch) | |
| tree | 51437b4e1e3ebb37580368cda3199598f82213d6 /PySide | |
| parent | 9e8916e111c14e48a1abfd80eb756428943c4f78 (diff) | |
Fixes argument and return type of a couple of QtDeclarative methods.
The methods are:
* QDeclarativeEngine::importPlugin(QString,QString,QString*)
* QDeclarativeExpression::evaluate(bool*)
Reviewed by Luciano Wolf <luciano.wolf@openbossa.org>
Reviewed by Renato Araújo <renato.filho@openbossa.org>
Diffstat (limited to 'PySide')
| -rw-r--r-- | PySide/QtDeclarative/typesystem_declarative.xml | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml index 56c774eca..58bce2ac0 100644 --- a/PySide/QtDeclarative/typesystem_declarative.xml +++ b/PySide/QtDeclarative/typesystem_declarative.xml @@ -92,9 +92,33 @@ <parent index="this" action="add" /> </modify-argument> </modify-function> + <modify-function signature="importPlugin(QString,QString,QString*)"> + <modify-argument index="3"> + <remove-argument/> + </modify-argument> + <modify-argument index="return"> + <replace-type modified-type="(ok, errorString)" /> + </modify-argument> + <inject-code class="target" position="beginning"> + QString errorString; + %BEGIN_ALLOW_THREADS + %RETURN_TYPE ok_ = %CPPSELF.%FUNCTION_NAME(%1, %2, &errorString); + %END_ALLOW_THREADS + %PYARG_0 = Shiboken::makeTuple(ok_, errorString); + </inject-code> + </modify-function> </object-type> <value-type name="QDeclarativeError" /> - <object-type name="QDeclarativeExpression" /> + <object-type name="QDeclarativeExpression"> + <modify-function signature="evaluate(bool*)"> + <modify-argument index="1"> + <remove-argument/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*"/> + </inject-code> + </modify-function> + </object-type> <object-type name="QDeclarativeExtensionPlugin" /> <object-type name="QDeclarativeImageProvider"> <enum-type name="ImageType" /> |