Blame 0003-Fix-build-with-sip-4.19.patch

Rex Dieter c6d8bf
From 2d1eadf5d0148c88cb4393993f0269e196cbe7b1 Mon Sep 17 00:00:00 2001
Rex Dieter c6d8bf
From: Johannes Huber <johu@gentoo.org>
Rex Dieter c6d8bf
Date: Mon, 9 Jan 2017 11:52:12 +0100
Rex Dieter c6d8bf
Subject: [PATCH 3/3] Fix build with sip 4.19
Rex Dieter c6d8bf
Rex Dieter c6d8bf
REVIEW: 129799
Rex Dieter c6d8bf
---
Rex Dieter c6d8bf
 sip/dnssd/remoteservice.sip       | 10 +++++-----
Rex Dieter c6d8bf
 sip/kdecore/kmimetype.sip         | 10 +++++-----
Rex Dieter c6d8bf
 sip/kdecore/ksharedconfig.sip     |  4 ++--
Rex Dieter c6d8bf
 sip/kdecore/ksycocaentry.sip      | 10 +++++-----
Rex Dieter c6d8bf
 sip/kdecore/typedefs.sip          | 30 +++++++++++++++---------------
Rex Dieter c6d8bf
 sip/kdeui/kcompletion.sip         | 10 +++++-----
Rex Dieter c6d8bf
 sip/kdeui/kxmlguibuilder.sip      |  4 ++--
Rex Dieter c6d8bf
 sip/kio/kservicegroup.sip         | 10 +++++-----
Rex Dieter c6d8bf
 sip/ktexteditor/markinterface.sip | 10 +++++-----
Rex Dieter c6d8bf
 sip/phonon/objectdescription.sip  | 10 +++++-----
Rex Dieter c6d8bf
 sip/soprano/pluginmanager.sip     | 30 +++++++++++++++---------------
Rex Dieter c6d8bf
 11 files changed, 69 insertions(+), 69 deletions(-)
Rex Dieter c6d8bf
Rex Dieter c6d8bf
diff --git a/sip/dnssd/remoteservice.sip b/sip/dnssd/remoteservice.sip
Rex Dieter c6d8bf
index 5c5397a..44db887 100644
Rex Dieter c6d8bf
--- a/sip/dnssd/remoteservice.sip
Rex Dieter c6d8bf
+++ b/sip/dnssd/remoteservice.sip
Rex Dieter c6d8bf
@@ -66,7 +66,7 @@ protected:
Rex Dieter c6d8bf
         DNSSD::RemoteService::Ptr *t = new DNSSD::RemoteService::Ptr (sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -88,7 +88,7 @@ protected:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -99,11 +99,11 @@ protected:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        DNSSD::RemoteService *t = reinterpret_cast<dnssd::remoteservice *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        DNSSD::RemoteService *t = reinterpret_cast<dnssd::remoteservice *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -113,7 +113,7 @@ protected:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         ql->append(*tptr);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
diff --git a/sip/kdecore/kmimetype.sip b/sip/kdecore/kmimetype.sip
Rex Dieter c6d8bf
index b2d21f7..2945210 100644
Rex Dieter c6d8bf
--- a/sip/kdecore/kmimetype.sip
Rex Dieter c6d8bf
+++ b/sip/kdecore/kmimetype.sip
Rex Dieter c6d8bf
@@ -100,7 +100,7 @@ public:
Rex Dieter c6d8bf
         KMimeType::Ptr *t = new KMimeType::Ptr (sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KMimeType, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KMimeType, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -122,7 +122,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -133,11 +133,11 @@ public:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        KMimeType *t = reinterpret_cast<kmimetype *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        KMimeType *t = reinterpret_cast<kmimetype *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_KMimeType, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_KMimeType, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -147,7 +147,7 @@ public:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         ql->append(*tptr);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_KMimeType, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_KMimeType, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
diff --git a/sip/kdecore/ksharedconfig.sip b/sip/kdecore/ksharedconfig.sip
Rex Dieter c6d8bf
index 54b1599..9442d80 100644
Rex Dieter c6d8bf
--- a/sip/kdecore/ksharedconfig.sip
Rex Dieter c6d8bf
+++ b/sip/kdecore/ksharedconfig.sip
Rex Dieter c6d8bf
@@ -65,7 +65,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
Rex Dieter c6d8bf
     KSharedConfigPtr kcpp = *sipCpp;
Rex Dieter c6d8bf
     KSharedConfig *ksc    = kcpp.data ();
Rex Dieter c6d8bf
     ksc->ref.ref();
Rex Dieter c6d8bf
-    PyObject *pyKsc       = sipConvertFromInstance(ksc, sipClass_KSharedConfig, sipTransferObj);
Rex Dieter c6d8bf
+    PyObject *pyKsc       = sipConvertFromType(ksc, sipType_KSharedConfig, sipTransferObj);
Rex Dieter c6d8bf
     return pyKsc;
Rex Dieter c6d8bf
 %End
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
@@ -74,7 +74,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
     int state;
Rex Dieter c6d8bf
-    KSharedConfig* ksc = (KSharedConfig *)sipConvertToInstance(sipPy, sipClass_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
Rex Dieter c6d8bf
+    KSharedConfig* ksc = (KSharedConfig *)sipConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
Rex Dieter c6d8bf
     *sipCppPtr = new KSharedConfigPtr (ksc);
Rex Dieter c6d8bf
     ksc->ref.deref();
Rex Dieter c6d8bf
     return sipGetState(sipTransferObj);
Rex Dieter c6d8bf
diff --git a/sip/kdecore/ksycocaentry.sip b/sip/kdecore/ksycocaentry.sip
Rex Dieter c6d8bf
index 4632e4a..ceb85fa 100644
Rex Dieter c6d8bf
--- a/sip/kdecore/ksycocaentry.sip
Rex Dieter c6d8bf
+++ b/sip/kdecore/ksycocaentry.sip
Rex Dieter c6d8bf
@@ -83,7 +83,7 @@ private:
Rex Dieter c6d8bf
         KSycocaEntry::Ptr *t = new KSycocaEntry::Ptr (sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KSycocaEntry, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KSycocaEntry, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -105,7 +105,7 @@ private:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -116,11 +116,11 @@ private:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        KSycocaEntry *t = reinterpret_cast<ksycocaentry *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        KSycocaEntry *t = reinterpret_cast<ksycocaentry *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_KSycocaEntry, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_KSycocaEntry, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -130,7 +130,7 @@ private:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         ql->append(*tptr);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_KSycocaEntry, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_KSycocaEntry, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
diff --git a/sip/kdecore/typedefs.sip b/sip/kdecore/typedefs.sip
Rex Dieter c6d8bf
index af53f85..23956b7 100644
Rex Dieter c6d8bf
--- a/sip/kdecore/typedefs.sip
Rex Dieter c6d8bf
+++ b/sip/kdecore/typedefs.sip
Rex Dieter c6d8bf
@@ -397,8 +397,8 @@ template <type1,type2>
Rex Dieter c6d8bf
         TYPE1 *t1 = new TYPE1(i.key());
Rex Dieter c6d8bf
         TYPE2 *t2 = new TYPE2(i.value());
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
Rex Dieter c6d8bf
-        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
Rex Dieter c6d8bf
+        PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
Rex Dieter c6d8bf
+        PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
@@ -438,10 +438,10 @@ template <type1,type2>
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
         } 
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
@@ -454,13 +454,13 @@ template <type1,type2>
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state1, state2;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        TYPE1 *t1 = reinterpret_cast<type1 *="">(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
Rex Dieter c6d8bf
-        TYPE2 *t2 = reinterpret_cast<type2 *="">(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
Rex Dieter c6d8bf
+        TYPE1 *t1 = reinterpret_cast<type1 *="">(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
Rex Dieter c6d8bf
+        TYPE2 *t2 = reinterpret_cast<type2 *="">(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t1, sipClass_TYPE1, state1);
Rex Dieter c6d8bf
-            sipReleaseInstance(t2, sipClass_TYPE2, state2);
Rex Dieter c6d8bf
+            sipReleaseType(t1, sipType_TYPE1, state1);
Rex Dieter c6d8bf
+            sipReleaseType(t2, sipType_TYPE2, state2);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete qm;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -468,8 +468,8 @@ template <type1,type2>
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         qm->insert(*t1, *t2);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t1, sipClass_TYPE1, state1);
Rex Dieter c6d8bf
-        sipReleaseInstance(t2, sipClass_TYPE2, state2);
Rex Dieter c6d8bf
+        sipReleaseType(t1, sipType_TYPE1, state1);
Rex Dieter c6d8bf
+        sipReleaseType(t2, sipType_TYPE2, state2);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = qm;
Rex Dieter c6d8bf
@@ -669,7 +669,7 @@ template <type*>
Rex Dieter c6d8bf
         TYPE *t = (TYPE *)(sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t, sipType_TYPE, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -691,7 +691,7 @@ template <type*>
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -702,11 +702,11 @@ template <type*>
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        TYPE *t = reinterpret_cast<type *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        TYPE *t = reinterpret_cast<type *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_TYPE, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_TYPE, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete qv;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -714,7 +714,7 @@ template <type*>
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         qv->append(t);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_TYPE, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_TYPE, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = qv;
Rex Dieter c6d8bf
diff --git a/sip/kdeui/kcompletion.sip b/sip/kdeui/kcompletion.sip
Rex Dieter c6d8bf
index f1d327f..938506a 100644
Rex Dieter c6d8bf
--- a/sip/kdeui/kcompletion.sip
Rex Dieter c6d8bf
+++ b/sip/kdeui/kcompletion.sip
Rex Dieter c6d8bf
@@ -176,7 +176,7 @@ public:
Rex Dieter c6d8bf
 #else
Rex Dieter c6d8bf
         PyObject *kobj = PyInt_FromLong((int)i.key());
Rex Dieter c6d8bf
 #endif
Rex Dieter c6d8bf
-        PyObject *tobj = sipConvertFromNewInstance(t, sipClass_KShortcut, sipTransferObj);
Rex Dieter c6d8bf
+        PyObject *tobj = sipConvertFromNewType(t, sipType_KShortcut, sipTransferObj);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         if (kobj == NULL || tobj == NULL || PyDict_SetItem(d, kobj, tobj) < 0)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
@@ -213,7 +213,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         while (PyDict_Next(sipPy, &i, &kobj, &tobj))
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(tobj, sipClass_KShortcut, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(tobj, sipType_KShortcut, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -229,11 +229,11 @@ public:
Rex Dieter c6d8bf
 #else
Rex Dieter c6d8bf
         int k = PyInt_AsLong(kobj);
Rex Dieter c6d8bf
 #endif
Rex Dieter c6d8bf
-        KShortcut *t = reinterpret_cast<kshortcut *="">(sipConvertToInstance(tobj, sipClass_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        KShortcut *t = reinterpret_cast<kshortcut *="">(sipConvertToType(tobj, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_KShortcut, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_KShortcut, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete qm;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -241,7 +241,7 @@ public:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         qm->insert((KCompletionBase::KeyBindingType)k, *t);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_KShortcut, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_KShortcut, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = qm;
Rex Dieter c6d8bf
diff --git a/sip/kdeui/kxmlguibuilder.sip b/sip/kdeui/kxmlguibuilder.sip
Rex Dieter c6d8bf
index 41ae2aa..e4cf187 100644
Rex Dieter c6d8bf
--- a/sip/kdeui/kxmlguibuilder.sip
Rex Dieter c6d8bf
+++ b/sip/kdeui/kxmlguibuilder.sip
Rex Dieter c6d8bf
@@ -49,10 +49,10 @@ QAction *containerAction;
Rex Dieter c6d8bf
     PyObject *pyWidget;
Rex Dieter c6d8bf
     PyObject *pyContainerAction;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-    if ((pyWidget = sipConvertFromNewInstance(res, sipClass_QWidget, NULL)) == NULL)
Rex Dieter c6d8bf
+    if ((pyWidget = sipConvertFromNewType(res, sipType_QWidget, NULL)) == NULL)
Rex Dieter c6d8bf
         return NULL;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-    if ((pyContainerAction = sipConvertFromNewInstance(containerAction, sipClass_QAction, NULL)) == NULL)
Rex Dieter c6d8bf
+    if ((pyContainerAction = sipConvertFromNewType(containerAction, sipType_QAction, NULL)) == NULL)
Rex Dieter c6d8bf
         return NULL;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
     sipRes = Py_BuildValue ("NN", pyWidget, pyContainerAction);
Rex Dieter c6d8bf
diff --git a/sip/kio/kservicegroup.sip b/sip/kio/kservicegroup.sip
Rex Dieter c6d8bf
index a1ef981..1ddce37 100644
Rex Dieter c6d8bf
--- a/sip/kio/kservicegroup.sip
Rex Dieter c6d8bf
+++ b/sip/kio/kservicegroup.sip
Rex Dieter c6d8bf
@@ -151,7 +151,7 @@ public:
Rex Dieter c6d8bf
         KServiceGroup::SPtr *t = new KServiceGroup::SPtr (sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceGroup, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceGroup, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -173,7 +173,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -184,11 +184,11 @@ public:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        KServiceGroup *t = reinterpret_cast<kservicegroup *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        KServiceGroup *t = reinterpret_cast<kservicegroup *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_KServiceGroup, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_KServiceGroup, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -198,7 +198,7 @@ public:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         ql->append(*tptr);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_KServiceGroup, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_KServiceGroup, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
diff --git a/sip/ktexteditor/markinterface.sip b/sip/ktexteditor/markinterface.sip
Rex Dieter c6d8bf
index d9b0ec9..888c506 100644
Rex Dieter c6d8bf
--- a/sip/ktexteditor/markinterface.sip
Rex Dieter c6d8bf
+++ b/sip/ktexteditor/markinterface.sip
Rex Dieter c6d8bf
@@ -158,7 +158,7 @@ signals:
Rex Dieter c6d8bf
 #else
Rex Dieter c6d8bf
         PyObject *t1obj = PyInt_FromLong ((long)t1);
Rex Dieter c6d8bf
 #endif
Rex Dieter c6d8bf
-        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_KTextEditor_Mark, sipTransferObj);
Rex Dieter c6d8bf
+        PyObject *t2obj = sipConvertFromNewType(t2, sipType_KTextEditor_Mark, sipTransferObj);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         if (t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
@@ -203,7 +203,7 @@ signals:
Rex Dieter c6d8bf
 #endif
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(t2obj, sipClass_KTextEditor_Mark, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(t2obj, sipType_KTextEditor_Mark, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
         } 
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
@@ -221,11 +221,11 @@ signals:
Rex Dieter c6d8bf
 #else
Rex Dieter c6d8bf
         int t1 = PyInt_AS_LONG (t1obj);
Rex Dieter c6d8bf
 #endif
Rex Dieter c6d8bf
-        KTextEditor::Mark *t2 = reinterpret_cast<ktexteditor::mark *="">(sipConvertToInstance(t2obj, sipClass_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
Rex Dieter c6d8bf
+        KTextEditor::Mark *t2 = reinterpret_cast<ktexteditor::mark *="">(sipConvertToType(t2obj, sipType_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
Rex Dieter c6d8bf
+            sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete qm;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -233,7 +233,7 @@ signals:
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         qm->insert(t1, t2);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
Rex Dieter c6d8bf
+        sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = qm;
Rex Dieter c6d8bf
diff --git a/sip/phonon/objectdescription.sip b/sip/phonon/objectdescription.sip
Rex Dieter c6d8bf
index 2b86d5e..015b2ef 100644
Rex Dieter c6d8bf
--- a/sip/phonon/objectdescription.sip
Rex Dieter c6d8bf
+++ b/sip/phonon/objectdescription.sip
Rex Dieter c6d8bf
@@ -116,7 +116,7 @@ void                    registerMetaTypes ();
Rex Dieter c6d8bf
         DNSSD::RemoteService::Ptr *t = new Phonon::ObjectDescription (sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             delete t;
Rex Dieter c6d8bf
@@ -138,7 +138,7 @@ void                    registerMetaTypes ();
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -149,11 +149,11 @@ void                    registerMetaTypes ();
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        DNSSD::RemoteService *t = reinterpret_cast<dnssd::remoteservice *="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        DNSSD::RemoteService *t = reinterpret_cast<dnssd::remoteservice *="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
+            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
@@ -163,7 +163,7 @@ void                    registerMetaTypes ();
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         ql->append(*tptr);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
+        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
diff --git a/sip/soprano/pluginmanager.sip b/sip/soprano/pluginmanager.sip
Rex Dieter c6d8bf
index c2be1c3..fe990f8 100644
Rex Dieter c6d8bf
--- a/sip/soprano/pluginmanager.sip
Rex Dieter c6d8bf
+++ b/sip/soprano/pluginmanager.sip
Rex Dieter c6d8bf
@@ -73,7 +73,7 @@ public:
Rex Dieter c6d8bf
         Soprano::Backend* t = const_cast<soprano::backend*>(sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Backend, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Backend, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             return NULL;
Rex Dieter c6d8bf
@@ -93,7 +93,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -104,18 +104,18 @@ public:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        const Soprano::Backend*t = reinterpret_cast<const soprano::backend*="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        const Soprano::Backend*t = reinterpret_cast<const soprano::backend*="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(const_cast<soprano::backend*>(t), sipClass_Soprano_Backend, state);
Rex Dieter c6d8bf
+            sipReleaseType(const_cast<soprano::backend*>(t), sipType_Soprano_Backend, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
         }
Rex Dieter c6d8bf
         ql->append(t);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(const_cast<soprano::backend*>(t), sipClass_Soprano_Backend, state);
Rex Dieter c6d8bf
+        sipReleaseType(const_cast<soprano::backend*>(t), sipType_Soprano_Backend, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
@@ -144,7 +144,7 @@ public:
Rex Dieter c6d8bf
         Soprano::Parser* t = const_cast<soprano::parser*>(sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Parser, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Parser, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             return NULL;
Rex Dieter c6d8bf
@@ -164,7 +164,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -175,18 +175,18 @@ public:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        const Soprano::Parser*t = reinterpret_cast<const soprano::parser*="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        const Soprano::Parser*t = reinterpret_cast<const soprano::parser*="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(const_cast<soprano::parser*>(t), sipClass_Soprano_Parser, state);
Rex Dieter c6d8bf
+            sipReleaseType(const_cast<soprano::parser*>(t), sipType_Soprano_Parser, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
         }
Rex Dieter c6d8bf
         ql->append(t);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(const_cast<soprano::parser*>(t), sipClass_Soprano_Parser, state);
Rex Dieter c6d8bf
+        sipReleaseType(const_cast<soprano::parser*>(t), sipType_Soprano_Parser, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
@@ -215,7 +215,7 @@ public:
Rex Dieter c6d8bf
         Soprano::Serializer* t = const_cast<soprano::serializer*>(sipCpp->at(i));
Rex Dieter c6d8bf
         PyObject *tobj;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Serializer, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
+        if ((tobj = sipConvertFromType(t, sipType_Soprano_Serializer, sipTransferObj)) == NULL)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
             Py_DECREF(l);
Rex Dieter c6d8bf
             return NULL;
Rex Dieter c6d8bf
@@ -235,7 +235,7 @@ public:
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
-            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, SIP_NOT_NONE))
Rex Dieter c6d8bf
+            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, SIP_NOT_NONE))
Rex Dieter c6d8bf
                 return 0;
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
         return 1;
Rex Dieter c6d8bf
@@ -246,18 +246,18 @@ public:
Rex Dieter c6d8bf
     for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
Rex Dieter c6d8bf
     {
Rex Dieter c6d8bf
         int state;
Rex Dieter c6d8bf
-        const Soprano::Serializer*t = reinterpret_cast<const soprano::serializer*="">(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
+        const Soprano::Serializer*t = reinterpret_cast<const soprano::serializer*="">(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
         if (*sipIsErr)
Rex Dieter c6d8bf
         {
Rex Dieter c6d8bf
-            sipReleaseInstance(const_cast<soprano::serializer*>(t), sipClass_Soprano_Serializer, state);
Rex Dieter c6d8bf
+            sipReleaseType(const_cast<soprano::serializer*>(t), sipType_Soprano_Serializer, state);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
             delete ql;
Rex Dieter c6d8bf
             return 0;
Rex Dieter c6d8bf
         }
Rex Dieter c6d8bf
         ql->append(t);
Rex Dieter c6d8bf
 
Rex Dieter c6d8bf
-        sipReleaseInstance(const_cast<soprano::serializer*>(t), sipClass_Soprano_Serializer, state);
Rex Dieter c6d8bf
+        sipReleaseType(const_cast<soprano::serializer*>(t), sipType_Soprano_Serializer, state);
Rex Dieter c6d8bf
     }
Rex Dieter c6d8bf
  
Rex Dieter c6d8bf
     *sipCppPtr = ql;
Rex Dieter c6d8bf
-- 
Rex Dieter c6d8bf
2.9.3
Rex Dieter c6d8bf