Annotation of /trunk/kdebindings4/patches/kdebindings4-4.5.1-pyqt4.patch
Parent Directory
| 
Revision Log
Revision 1171 -
(hide annotations)
(download)
Mon Oct 11 19:37:37 2010 UTC (13 years, 7 months ago) by niro
File size: 1557 byte(s)
Mon Oct 11 19:37:37 2010 UTC (13 years, 7 months ago) by niro
File size: 1557 byte(s)
fixed patches
| 1 | niro | 1170 | diff -Naur kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip kdebindings-4.5.1-magellan/python/pykde4/sip/kdecore/typedefs.sip |
| 2 | --- kdebindings-4.5.1/python/pykde4/sip/kdecore/typedefs.sip 2010-01-20 17:25:59.000000000 +0100 | ||
| 3 | +++ kdebindings-4.5.1-magellan/python/pykde4/sip/kdecore/typedefs.sip 2010-10-11 20:59:48.000000000 +0200 | ||
| 4 | @@ -733,61 +733,6 @@ | ||
| 5 | }; | ||
| 6 | |||
| 7 | |||
| 8 | -%MappedType QList<uint> | ||
| 9 | -{ | ||
| 10 | -%TypeHeaderCode | ||
| 11 | -#include <qlist.h> | ||
| 12 | -%End | ||
| 13 | - | ||
| 14 | -%ConvertFromTypeCode | ||
| 15 | - // Create the list. | ||
| 16 | - PyObject *l; | ||
| 17 | - | ||
| 18 | - if ((l = PyList_New(sipCpp->size())) == NULL) | ||
| 19 | - return NULL; | ||
| 20 | - | ||
| 21 | - // Set the list elements. | ||
| 22 | - for (int i = 0; i < sipCpp->size(); ++i) { | ||
| 23 | - PyObject *pobj; | ||
| 24 | - | ||
| 25 | -#if PY_MAJOR_VERSION >= 3 | ||
| 26 | - if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) { | ||
| 27 | -#else | ||
| 28 | - if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) { | ||
| 29 | -#endif | ||
| 30 | - Py_DECREF(l); | ||
| 31 | - | ||
| 32 | - return NULL; | ||
| 33 | - } | ||
| 34 | - | ||
| 35 | - PyList_SET_ITEM(l, i, pobj); | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | - return l; | ||
| 39 | -%End | ||
| 40 | - | ||
| 41 | -%ConvertToTypeCode | ||
| 42 | - // Check the type if that is all that is required. | ||
| 43 | - if (sipIsErr == NULL) | ||
| 44 | - return PyList_Check(sipPy); | ||
| 45 | - | ||
| 46 | - QList<uint> *ql = new QList<uint>; | ||
| 47 | - | ||
| 48 | - for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) { | ||
| 49 | -#if PY_MAJOR_VERSION >= 3 | ||
| 50 | - ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i))); | ||
| 51 | -#else | ||
| 52 | - ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i))); | ||
| 53 | -#endif | ||
| 54 | - } | ||
| 55 | - | ||
| 56 | - *sipCppPtr = ql; | ||
| 57 | - | ||
| 58 | - return sipGetState(sipTransferObj); | ||
| 59 | -%End | ||
| 60 | -}; | ||
| 61 | - | ||
| 62 | - | ||
| 63 | template <TYPE*> | ||
| 64 | %MappedType QStack<TYPE*> | ||
| 65 | { |