Hello community,
here is the log from the commit of package kdebindings4 for openSUSE:Factory
checked in at Sun Sep 27 00:07:06 CEST 2009.
--------
--- KDE/kdebindings4/kdebindings4.changes 2009-08-28 13:56:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/kdebindings4/kdebindings4.changes 2009-09-24 19:27:14.000000000 +0200
@@ -1,0 +2,5 @@
+Thu Sep 24 17:24:02 UTC 2009 - beineri@opensuse.org
+
+- update 4_3_BRANCH.diff
+
+-------------------------------------------------------------------
mono-kde4.changes: same change
python-kde4.changes: same change
ruby-kde4.changes: same change
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kdebindings4.spec ++++++
--- /var/tmp/diff_new_pack.Zvt93Z/_old 2009-09-27 00:06:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Zvt93Z/_new 2009-09-27 00:06:40.000000000 +0200
@@ -30,7 +30,7 @@
Group: Development/Libraries/KDE
Summary: Bindings for KDE 4.x libraries
Version: 4.3.1
-Release: 1
+Release: 2
Source0: kdebindings-%version.tar.bz2
Patch0: 4_3_BRANCH.diff
Patch1: plasma_no_examples.diff
mono-kde4.spec: same change
python-kde4.spec: same change
ruby-kde4.spec: same change
++++++ 4_3_BRANCH.diff ++++++
--- /var/tmp/diff_new_pack.Zvt93Z/_old 2009-09-27 00:06:40.000000000 +0200
+++ /var/tmp/diff_new_pack.Zvt93Z/_new 2009-09-27 00:06:40.000000000 +0200
@@ -1,7 +1,485 @@
-package: kdelibs-4.1.80.tar.bz2
-kdemod: kdelibs
+package: kdebindings-4.3.1.tar.bz2
+kdemod: kdebindings
--- BRANCH_STATUS
+++ BRANCH_STATUS
@@ -0,0 +1,2 @@
-+current HEAD: 887052
-+svn di between //tags/KDE/4.1.80/kdelibs and //trunk/KDE/kdelibs
++current HEAD: 1027747
++svn di between //tags/KDE/4.3.1/kdebindings and //branches/KDE/4.3/kdebindings
+--- ruby/korundum/ChangeLog
++++ ruby/korundum/ChangeLog
+@@ -1,3 +1,7 @@
++2009-09-22 Richard Dale
++ * Fix broken KDE::ConfigGroup.readEntry method. Thanks to Paulo Capriotti
++ for reporting the bug
++
+ 2009-08-04 Richard Dale
+ * Enable KDE::ConfigGroup.read_entry() and write_entry() methods to
+ automatically convert args to Qt::Variants as well as the camel case
+--- ruby/korundum/src/lib/KDE/korundum4.rb
++++ ruby/korundum/src/lib/KDE/korundum4.rb
+@@ -318,16 +318,18 @@
+ method_missing(:name, *args)
+ end
+
+- def readEntry(key, default = nil)
+- if default.kind_of?(String) || default.kind_of?(Qt::Variant)
+- return super(key, default)
+- else
+- return super(key, Qt::Variant.new(default)).value
+- end
+- end
++ def readEntry(*args)
++ if args.length < 2
++ return super(*args)
++ elsif args[1].kind_of?(String) || args[1].kind_of?(Qt::Variant)
++ return super(*args)
++ else
++ return super(args[0], Qt::Variant.new(args[1])).value
++ end
++ end
+
+- def read_entry(key, default = nil)
+- readEntry(key, default)
++ def read_entry(*args)
++ readEntry(*args)
+ end
+
+ def writeEntry(key, value, pFlags = KDE::ConfigBase::Normal)
+--- python/pykde4/sip/kio/global.sip
++++ python/pykde4/sip/kio/global.sip
+@@ -210,8 +210,8 @@
+ QString bcpp = it.value ();
+ PyObject *ainst = 0;
+ PyObject *binst = 0;
+- if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipClass_QString)) == NULL)
+- || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipClass_QString)) == NULL)
++ if (((ainst = sipBuildResult (NULL, "N", new QString (acpp), sipType_QString)) == NULL)
++ || ((binst = sipBuildResult (NULL, "N", new QString (bcpp), sipType_QString)) == NULL)
+ || (PyDict_SetItem (dict, ainst, binst) < 0))
+ {
+ Py_XDECREF (ainst);
+@@ -243,8 +243,8 @@
+ {
+ int iserr = 0;
+
+- acpp = (QString *)sipForceConvertToInstance(aelem, sipClass_QString, NULL, 0, NULL, &iserr);
+- bcpp = (QString *)sipForceConvertToInstance(belem, sipClass_QString, NULL, 0, NULL, &iserr);
++ acpp = (QString *)sipForceConvertToType(aelem, sipType_QString, NULL, 0, NULL, &iserr);
++ bcpp = (QString *)sipForceConvertToType(belem, sipType_QString, NULL, 0, NULL, &iserr);
+
+ if (iserr)
+ {
+--- python/pykde4/sip/kio/kacl.sip
++++ python/pykde4/sip/kio/kacl.sip
+@@ -116,7 +116,7 @@
+ {
+ QString s = (*it).first;
+ ushort u = (*it).second;
+- PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipClass_QString);
++ PyObject *pys = sipBuildResult (NULL, "N", new QString (s), sipType_QString);
+ if ((pys == NULL) || ((inst = Py_BuildValue ("Ni", pys, u)) == NULL)
+ || PyList_Append (pylist, inst) < 0)
+ {
+@@ -144,7 +144,7 @@
+ {
+ PyObject *elem = PyList_GET_ITEM (sipPy, i);
+ PyObject *pyp1 = PyTuple_GET_ITEM (elem, 0);
+- p1 = *(QString *)sipForceConvertToInstance(pyp1, sipClass_QString, NULL, 0, NULL, &iserr);
++ p1 = *(QString *)sipForceConvertToType(pyp1, sipType_QString, NULL, 0, NULL, &iserr);
+ if (iserr)
+ {
+ *sipIsErr = 1;
+--- python/pykde4/sip/kdecore/typedefs.sip
++++ python/pykde4/sip/kdecore/typedefs.sip
+@@ -134,8 +134,8 @@
+ TYPE1 *t1 = new TYPE1(i.key());
+ TYPE2 *t2 = new TYPE2(i.value());
+
+- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
+- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
++ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
++ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
+
+ if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
+ {
+@@ -175,10 +175,10 @@
+
+ while (PyDict_Next(sipPy, &i, &t1obj, *t2obj))
+ {
+- if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
+ return 0;
+
+- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
+ return 0;
+ }
+
+@@ -191,13 +191,13 @@
+ {
+ int state1, state2;
+
+- TYPE1 *t1 = reinterpret_cast(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+- TYPE2 *t2 = reinterpret_cast(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
++ TYPE1 *t1 = reinterpret_cast(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
++ TYPE2 *t2 = reinterpret_cast(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+
+ delete qm;
+ return 0;
+@@ -205,8 +205,8 @@
+
+ qm->insert(*t1, t2);
+
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+ }
+
+ *sipCppPtr = qm;
+@@ -232,7 +232,7 @@
+
+ KSharedPtr<TYPE> *cPtr = new KSharedPtr<TYPE> (*(KSharedPtr<TYPE> *)sipCpp);
+ TYPE *cpp = cPtr->data ();
+- PyObject *obj = sipConvertFromInstance (cpp, sipClass_TYPE, sipTransferObj);
++ PyObject *obj = sipConvertFromType(cpp, sipType_TYPE, sipTransferObj);
+
+ return obj;
+ %End
+@@ -244,7 +244,7 @@
+ return PyInstance_Check(sipPy);
+
+ int iserr = 0;
+- TYPE *cpp = (TYPE *)sipForceConvertToInstance(sipPy, sipClass_TYPE, NULL, 0, NULL, &iserr);
++ TYPE *cpp = (TYPE *)sipForceConvertToType(sipPy, sipType_TYPE, NULL, 0, NULL, &iserr);
+
+ if (iserr)
+ {
+@@ -385,8 +385,8 @@
+ TYPE1 *t1 = new TYPE1(i.key());
+ TYPE2 *t2 = i.value();
+
+- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
+- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
++ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
++ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
+
+ if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
+ {
+@@ -426,10 +426,10 @@
+
+ while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
+ {
+- if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
+ return 0;
+
+- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
+ return 0;
+ }
+
+@@ -442,13 +442,13 @@
+ {
+ int state1, state2;
+
+- TYPE1 *t1 = reinterpret_cast(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+- TYPE2 *t2 = reinterpret_cast(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
++ TYPE1 *t1 = reinterpret_cast(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
++ TYPE2 *t2 = reinterpret_cast(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+
+ delete qm;
+ return 0;
+@@ -456,8 +456,8 @@
+
+ qm->insert(*t1, t2);
+
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+ }
+
+ *sipCppPtr = qm;
+@@ -486,7 +486,7 @@
+ int i = 0;
+ foreach ((TYPE *)value, set)
+ {
+- PyObject *obj = sipConvertFromNewInstance(value, sipClass_TYPE, sipTransferObj);
++ PyObject *obj = sipConvertFromNewType(value, sipType_TYPE, sipTransferObj);
+ if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+ {
+ Py_DECREF(l);
+@@ -519,7 +519,7 @@
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+ return 0;
+ }
+
+@@ -529,11 +529,11 @@
+ {
+ int state;
+
+- TYPE *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM (l, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ TYPE *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM (l, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, sipType_TYPE, state);
+
+ delete qs;
+ return 0;
+@@ -541,7 +541,7 @@
+
+ *qs << t;
+
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, sipType_TYPE, state);
+ }
+
+ *sipCppPtr = qs;
+@@ -570,7 +570,7 @@
+ int i = 0;
+ foreach (TYPE value, set)
+ {
+- PyObject *obj = sipConvertFromNewInstance(&value, sipClass_TYPE, sipTransferObj);
++ PyObject *obj = sipConvertFromNewType(&value, sipType_TYPE, sipTransferObj);
+ if (obj == NULL || PyList_SET_ITEM (l, i, obj) < 0)
+ {
+ Py_DECREF(l);
+@@ -603,7 +603,7 @@
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, SIP_NOT_NONE))
+ return 0;
+ }
+
+@@ -613,11 +613,11 @@
+ {
+ int state;
+
+- TYPE *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM (sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ TYPE *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM (sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, sipType_TYPE, state);
+
+ delete qs;
+ return 0;
+@@ -625,7 +625,7 @@
+
+ *qs << *t;
+
+- sipReleaseInstance(t, sipClass_TYPE, state);
++ sipReleaseType(t, sipType_TYPE, state);
+ }
+
+ *sipCppPtr = qs;
+@@ -647,8 +647,8 @@
+ TYPE1 *t1 = new TYPE1(sipCpp->first);
+ TYPE2 *t2 = new TYPE2(sipCpp->second);
+
+- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
+- PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
++ PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
++ PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
+
+ if (t1obj == NULL || t2obj == NULL)
+ {
+@@ -679,13 +679,13 @@
+ PyObject *t1obj = PyTuple_GET_ITEM(sipPy, 0);
+ PyObject *t2obj = PyTuple_GET_ITEM(sipPy, 1);
+
+- TYPE1 *t1 = reinterpret_cast(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+- TYPE2 *t2 = reinterpret_cast(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
++ TYPE1 *t1 = reinterpret_cast(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
++ TYPE2 *t2 = reinterpret_cast(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t1, sipClass_TYPE1, state1);
+- sipReleaseInstance(t2, sipClass_TYPE2, state2);
++ sipReleaseType(t1, sipType_TYPE1, state1);
++ sipReleaseType(t2, sipType_TYPE2, state2);
+
+ return 0;
+ }
+--- python/pykde4/sip/kdecore/klocalizedstring.sip
++++ python/pykde4/sip/kdecore/klocalizedstring.sip
+@@ -89,14 +89,14 @@
+
+ } else {
+ int state = 0;
+- arg = (QString *)sipForceConvertToInstance(pyarg, sipClass_QString, NULL, SIP_NOT_NONE, &state, &iserr);
++ arg = (QString *)sipForceConvertToType(pyarg, sipType_QString, NULL, SIP_NOT_NONE, &state, &iserr);
+ if (iserr) {
+ *sipIsErr = 1;
+ return QString();
+ }
+
+ result = result.subs(*arg);
+- sipReleaseInstance(arg,sipClass_QString,state);
++ sipReleaseType(arg,sipType_QString,state);
+ arg = 0;
+ }
+ }
+--- python/pykde4/sip/kdecore/kservice.sip
++++ python/pykde4/sip/kdecore/kservice.sip
+@@ -115,7 +115,7 @@
+ KService::Ptr *t = new KService::Ptr (sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KService, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromNewType(t->data(), sipType_KService, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -137,7 +137,7 @@
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -148,11 +148,11 @@
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ int state;
+- KService *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ KService *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_KService, state);
++ sipReleaseType(t, sipType_KService, state);
+
+ delete ql;
+ return 0;
+@@ -162,7 +162,7 @@
+
+ ql->append(*tptr);
+
+- sipReleaseInstance(t, sipClass_KService, state);
++ sipReleaseType(t, sipType_KService, state);
+ }
+
+ *sipCppPtr = ql;
+--- python/pykde4/sip/kdecore/kservicetype.sip
++++ python/pykde4/sip/kdecore/kservicetype.sip
+@@ -74,7 +74,7 @@
+ KServiceType::Ptr *t = new KServiceType::Ptr (sipCpp->at(i));
+ PyObject *tobj;
+
+- if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceType, sipTransferObj)) == NULL)
++ if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceType, sipTransferObj)) == NULL)
+ {
+ Py_DECREF(l);
+ delete t;
+@@ -96,7 +96,7 @@
+ return 0;
+
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+- if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, SIP_NOT_NONE))
++ if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, SIP_NOT_NONE))
+ return 0;
+
+ return 1;
+@@ -107,11 +107,11 @@
+ for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
+ {
+ int state;
+- KServiceType *t = reinterpret_cast(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
++ KServiceType *t = reinterpret_cast(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t, sipClass_KServiceType, state);
++ sipReleaseType(t, sipType_KServiceType, state);
+
+ delete ql;
+ return 0;
+@@ -121,7 +121,7 @@
+
+ ql->append(*tptr);
+
+- sipReleaseInstance(t, sipClass_KServiceType, state);
++ sipReleaseType(t, sipType_KServiceType, state);
+ }
+
+ *sipCppPtr = ql;
+@@ -152,7 +152,7 @@
+ QString *t1 = new QString (i.key());
+ QVariant::Type t2 = (QVariant::Type) (i.value());
+
+- PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_QString, sipTransferObj);
++ PyObject *t1obj = sipConvertFromNewType(t1, sipType_QString, sipTransferObj);
+ PyObject *t2obj = PyInt_FromLong ((long) t2);
+
+ if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
+@@ -191,7 +191,7 @@
+
+ while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
+ {
+- if (!sipCanConvertToInstance(t1obj, sipClass_QString, SIP_NOT_NONE))
++ if (!sipCanConvertToType(t1obj, sipType_QString, SIP_NOT_NONE))
+ return 0;
+
+ if (!PyInt_Check (t2obj))
+@@ -207,12 +207,12 @@
+ {
+ int state1;
+
+- QString *t1 = reinterpret_cast(sipConvertToInstance(t1obj, sipClass_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
++ QString *t1 = reinterpret_cast(sipConvertToType(t1obj, sipType_QString, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
+ QVariant::Type t2 = (QVariant::Type)PyInt_AS_LONG (t2obj);
+
+ if (*sipIsErr)
+ {
+- sipReleaseInstance(t1, sipClass_QString, state1);
++ sipReleaseType(t1, sipType_QString, state1);
+
+ delete qm;
+ return 0;
+@@ -220,7 +220,7 @@
+
+ qm->insert(*t1, t2);
+
+- sipReleaseInstance(t1, sipClass_QString, state1);
++ sipReleaseType(t1, sipType_QString, state1);
+ }
+
+ *sipCppPtr = qm;
+--- python/krosspython/cxx/Objects.hxx
++++ python/krosspython/cxx/Objects.hxx
+@@ -49,6 +49,7 @@
+ #include <iterator>
+ #include <utility>
+ #include <typeinfo>
++#include <algorithm>
+
+ namespace Py
+ {
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org