diff options
| author | Renato Filho <renato.filho@openbossa.org> | 2010-02-11 12:52:37 -0300 |
|---|---|---|
| committer | Marcelo Lira <marcelo.lira@openbossa.org> | 2010-02-11 13:03:02 -0300 |
| commit | 8b35d247f8649c6b3f64d27ac6a43a8c54e640fd (patch) | |
| tree | e051e1b2f2230e9c558787ace162ae38f0b5cc63 /PySide/QtGui | |
| parent | aae49f8f9b679d8c0e74e3f5e00c6a8a88791b64 (diff) | |
Fixed QMatrix4x4 inject code.
Now QMatrix4x4 constructor supports any PySequence object.
Created unit test for QMatrix4x4 injectcode.
Reviewed by Marcelo Lira <marcelo.lira@openbossa.org>
Diffstat (limited to 'PySide/QtGui')
| -rw-r--r-- | PySide/QtGui/typesystem_gui_common.xml | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/PySide/QtGui/typesystem_gui_common.xml b/PySide/QtGui/typesystem_gui_common.xml index 971363e5b..415ff012d 100644 --- a/PySide/QtGui/typesystem_gui_common.xml +++ b/PySide/QtGui/typesystem_gui_common.xml @@ -4451,17 +4451,16 @@ <value-type name="QMatrix4x3"/> <value-type name="QMatrix4x4"> <modify-function signature="QMatrix4x4(const qreal*,int,int)" remove="all"/> - <modify-function signature="copyDataTo(qreal*)const" remove="all"/> <modify-function signature="QMatrix4x4(const qreal*)"> <modify-argument index="1"> - <replace-type modified-type="PyTuple" /> + <replace-type modified-type="PySequence" /> </modify-argument> <inject-code class="target" position="beginning"> - if (PyTuple_Size(%PYARG_1) == 16) { + if (PySequence_Size(%PYARG_1) == 16) { qreal values[16]; for(int i=0; i < 16; i++) { - PyObject *pv = PyTuple_GetItem(%PYARG_1, i); + PyObject *pv = PySequence_Fast_GET_ITEM(%PYARG_1, i); values[i] = PyFloat_AsDouble(pv); } @@ -4473,7 +4472,7 @@ </inject-code> </modify-function> - <modify-function signature="data() const"> + <modify-function signature="constData() const" rename="data"> <modify-argument index="return"> <replace-type modified-type="PyTupleObject*"/> </modify-argument> @@ -4497,11 +4496,11 @@ <inject-code class="target" position="beginning"> qreal values[16]; - %CPPSELF.copyDataTo(values); + %CPPSELF.%FUNCTION_NAME(values); %PYARG_0 = PyTuple_New(16); for(int i=0; i < 16; i++) { PyObject *v = PyFloat_FromDouble(values[i]); - PyTuple_SET_ITEM(%PYARG_0, v); + PyTuple_SET_ITEM(%PYARG_0, i, v); } </inject-code> </modify-function> @@ -4509,7 +4508,7 @@ <modify-function signature="operator()(int, int)" remove="all"/> <modify-function signature="operator()(int, int)const" remove="all"/> <modify-function signature="data()" remove="all"/> - <modify-function signature="constData()const" remove="all"/> + <modify-function signature="data() const" remove="all"/> </value-type> <object-type name="QGesture"/> |