jyapayne/PySide
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed custom code for QScriptValueIterator.__next__ function.

Browse source 
It must not use the convenience method Shiboken::makeTuple, for it makes
use of the old template based converters.
This commit is contained in:
Marcelo Lira 2011-11-30 16:00:57 -03:00 • committed by Hugo Parente Lima
commit 770c8bda73
1 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

16
PySide/QtScript/typesystem_script.xml
View file

@ -98,12 +98,16 @@
</add-function> </add-function>
<add-function signature="__next__()" return-type="PyObject*"> <add-function signature="__next__()" return-type="PyObject*">
<inject-code> <inject-code>
if (%CPPSELF.hasNext()) { if (%CPPSELF.hasNext()) {
%CPPSELF.next(); %CPPSELF.next();
%PYARG_0 = Shiboken::makeTuple(%CPPSELF.name(), %CPPSELF.value().toVariant()); QString name = %CPPSELF.name();
} else { QVariant value = %CPPSELF.value().toVariant();
PyErr_SetNone(PyExc_StopIteration); %PYARG_0 = PyTuple_New(2);
} PyTuple_SET_ITEM(%PYARG_0, 0, %CONVERTTOPYTHON[QString](name));
PyTuple_SET_ITEM(%PYARG_0, 1, %CONVERTTOPYTHON[QVariant](value));
} else {
PyErr_SetNone(PyExc_StopIteration);
}
</inject-code> </inject-code>
</add-function> </add-function>
</object-type> </object-type>