summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcelo Lira <marcelo.lira@openbossa.org>2011-09-21 16:59:51 -0300
committerMarcelo Lira <marcelo.lira@openbossa.org>2011-10-04 14:47:29 -0300
commit89be62d301d0d42a5ab166d8e1675eda5274ee3e (patch)
tree2cae0fa3b721041bd96a7bbafaccbdf05dc6cb7e
parentfe214749c467964c2039f0cf29e05ca2eba4eed1 (diff)
downloadpyside-89be62d301d0d42a5ab166d8e1675eda5274ee3e.tar.gz
pyside-89be62d301d0d42a5ab166d8e1675eda5274ee3e.tar.xz
pyside-89be62d301d0d42a5ab166d8e1675eda5274ee3e.zip
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>
-rw-r--r--PySide/QtDeclarative/typesystem_declarative.xml26
1 files changed, 25 insertions, 1 deletions
diff --git a/PySide/QtDeclarative/typesystem_declarative.xml b/PySide/QtDeclarative/typesystem_declarative.xml
index 56c774e..58bce2a 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, &amp;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" />