mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-11 15:15:36 +00:00
68 lines
1.5 KiB
Diff
68 lines
1.5 KiB
Diff
Make kdebindings compile against sip-4.11, from KDE svn
|
|
Index: kdebindings/python/pykde4/sip/kdecore/typedefs.sip
|
|
===================================================================
|
|
--- kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170601)
|
|
+++ kdebindings/python/pykde4/sip/kdecore/typedefs.sip (revision 1170602)
|
|
@@ -733,61 +733,6 @@
|
|
};
|
|
|
|
|
|
-%MappedType QList<uint>
|
|
-{
|
|
-%TypeHeaderCode
|
|
-#include <qlist.h>
|
|
-%End
|
|
-
|
|
-%ConvertFromTypeCode
|
|
- // Create the list.
|
|
- PyObject *l;
|
|
-
|
|
- if ((l = PyList_New(sipCpp->size())) == NULL)
|
|
- return NULL;
|
|
-
|
|
- // Set the list elements.
|
|
- for (int i = 0; i < sipCpp->size(); ++i) {
|
|
- PyObject *pobj;
|
|
-
|
|
-#if PY_MAJOR_VERSION >= 3
|
|
- if ((pobj = PyLong_FromLong(sipCpp->value(i))) == NULL) {
|
|
-#else
|
|
- if ((pobj = PyInt_FromLong(sipCpp->value(i))) == NULL) {
|
|
-#endif
|
|
- Py_DECREF(l);
|
|
-
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- PyList_SET_ITEM(l, i, pobj);
|
|
- }
|
|
-
|
|
- return l;
|
|
-%End
|
|
-
|
|
-%ConvertToTypeCode
|
|
- // Check the type if that is all that is required.
|
|
- if (sipIsErr == NULL)
|
|
- return PyList_Check(sipPy);
|
|
-
|
|
- QList<uint> *ql = new QList<uint>;
|
|
-
|
|
- for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i) {
|
|
-#if PY_MAJOR_VERSION >= 3
|
|
- ql->append(PyLong_AsLong(PyList_GET_ITEM(sipPy, i)));
|
|
-#else
|
|
- ql->append(PyInt_AsLong(PyList_GET_ITEM(sipPy, i)));
|
|
-#endif
|
|
- }
|
|
-
|
|
- *sipCppPtr = ql;
|
|
-
|
|
- return sipGetState(sipTransferObj);
|
|
-%End
|
|
-};
|
|
-
|
|
-
|
|
template <TYPE*>
|
|
%MappedType QStack<TYPE*>
|
|
{
|