diff options
author | Marcelo Lira <marcelo.lira@openbossa.org> | 2011-08-18 17:32:33 -0300 |
---|---|---|
committer | Hugo Parente Lima <hugo.pl@gmail.com> | 2012-03-08 16:54:45 -0300 |
commit | bb68848f4aa21e3599ae93c0119c58d642231339 (patch) | |
tree | 92d603c1f17bdc2f95e199db08058a06e618458e /PySide | |
parent | 69d0627af36e882301900fbcab4cbfe43c7ab2c0 (diff) |
Fixed conversion rules for QWebPage.javaScriptPrompt method.
Diffstat (limited to 'PySide')
-rw-r--r-- | PySide/QtWebKit/typesystem_webkit.xml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/PySide/QtWebKit/typesystem_webkit.xml b/PySide/QtWebKit/typesystem_webkit.xml index 39326c7e2..bd32ccc49 100644 --- a/PySide/QtWebKit/typesystem_webkit.xml +++ b/PySide/QtWebKit/typesystem_webkit.xml @@ -141,20 +141,27 @@ </modify-function> <modify-function signature="javaScriptPrompt(QWebFrame*,const QString &,const QString &,QString*)"> - <modify-argument index="return"> - <replace-type modified-type="PyObject"/> - </modify-argument> <modify-argument index="4"> <remove-argument /> + <conversion-rule class="native"> + QString _local; + QString* %4 = &_local; + </conversion-rule> </modify-argument> <modify-argument index="return"> - <replace-type modified-type="(retval, result)"/> + <replace-type modified-type="PySequence"/> + <conversion-rule class="native"> + Shiboken::AutoDecRef pyRes(PySequence_GetItem(%PYARG_0, 0)); + Shiboken::AutoDecRef pyStr(PySequence_GetItem(%PYARG_0, 1)); + %RETURN_TYPE %out = %CONVERTTOCPP[%RETURN_TYPE](pyRes); + *%4 = %CONVERTTOCPP[QString](pyStr); + </conversion-rule> + <conversion-rule class="target"> + %PYARG_0 = PyTuple_New(2); + PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[%RETURN_TYPE](%0)); + PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QString](*%4)); + </conversion-rule> </modify-argument> - <inject-code class="target" position="end"> - QString str; - %RETURN_TYPE retval_ = %CPPSELF.%FUNCTION_NAME(%1, %2, %3, &str); - %PYARG_0 = Shiboken::makeTuple(retval_, str); - </inject-code> </modify-function> </object-type> <object-type name="QWebHistory"/> |