devel/py-pykde4/files/patch-git_2d1eadf5

   1 Fixes the build with SIP 4.19.6 (possibly earlier but > 4.19.2).
   2
   3 From 2d1eadf5d0148c88cb4393993f0269e196cbe7b1 Mon Sep 17 00:00:00 2001
   4 From: Johannes Huber <johu@gentoo.org>
   5 Date: Mon, 9 Jan 2017 11:52:12 +0100
   6 Subject: [PATCH] Fix build with sip 4.19
   7
   8 REVIEW: 129799
   9
  10 --- sip/dnssd/remoteservice.sip
  11 +++ sip/dnssd/remoteservice.sip
  12 @@ -66,7 +66,7 @@ protected:
  13          DNSSD::RemoteService::Ptr *t = new DNSSD::RemoteService::Ptr (sipCpp->at(i));
  14          PyObject *tobj;
  15
  16 -        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
  17 +        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
  18          {
  19              Py_DECREF(l);
  20              delete t;
  21 @@ -88,7 +88,7 @@ protected:
  22              return 0;
  23
  24          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
  25 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
  26 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
  27                  return 0;
  28
  29          return 1;
  30 @@ -99,11 +99,11 @@ protected:
  31      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
  32      {
  33          int state;
  34 -        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
  35 +        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
  36
  37          if (*sipIsErr)
  38          {
  39 -            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
  40 +            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
  41
  42              delete ql;
  43              return 0;
  44 @@ -113,7 +113,7 @@ protected:
  45
  46          ql->append(*tptr);
  47
  48 -        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
  49 +        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
  50      }
  51
  52      *sipCppPtr = ql;
  53 --- sip/kdecore/kmimetype.sip
  54 +++ sip/kdecore/kmimetype.sip
  55 @@ -100,7 +100,7 @@ public:
  56          KMimeType::Ptr *t = new KMimeType::Ptr (sipCpp->at(i));
  57          PyObject *tobj;
  58
  59 -        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KMimeType, sipTransferObj)) == NULL)
  60 +        if ((tobj = sipConvertFromNewType(t->data(), sipType_KMimeType, sipTransferObj)) == NULL)
  61          {
  62              Py_DECREF(l);
  63              delete t;
  64 @@ -122,7 +122,7 @@ public:
  65              return 0;
  66
  67          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
  68 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, SIP_NOT_NONE))
  69 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, SIP_NOT_NONE))
  70                  return 0;
  71
  72          return 1;
  73 @@ -133,11 +133,11 @@ public:
  74      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
  75      {
  76          int state;
  77 -        KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
  78 +        KMimeType *t = reinterpret_cast<KMimeType *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KMimeType, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
  79
  80          if (*sipIsErr)
  81          {
  82 -            sipReleaseInstance(t, sipClass_KMimeType, state);
  83 +            sipReleaseType(t, sipType_KMimeType, state);
  84
  85              delete ql;
  86              return 0;
  87 @@ -147,7 +147,7 @@ public:
  88
  89          ql->append(*tptr);
  90
  91 -        sipReleaseInstance(t, sipClass_KMimeType, state);
  92 +        sipReleaseType(t, sipType_KMimeType, state);
  93      }
  94
  95      *sipCppPtr = ql;
  96 --- sip/kdecore/ksharedconfig.sip
  97 +++ sip/kdecore/ksharedconfig.sip
  98 @@ -65,7 +65,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
  99      KSharedConfigPtr kcpp = *sipCpp;
 100      KSharedConfig *ksc    = kcpp.data ();
 101      ksc->ref.ref();
 102 -    PyObject *pyKsc       = sipConvertFromInstance(ksc, sipClass_KSharedConfig, sipTransferObj);
 103 +    PyObject *pyKsc       = sipConvertFromType(ksc, sipType_KSharedConfig, sipTransferObj);
 104      return pyKsc;
 105  %End
 106
 107 @@ -74,7 +74,7 @@ typedef KSharedConfig::Ptr KSharedConfigPtr;
 108          return 1;
 109
 110      int state;
 111 -    KSharedConfig* ksc = (KSharedConfig *)sipConvertToInstance(sipPy, sipClass_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
 112 +    KSharedConfig* ksc = (KSharedConfig *)sipConvertToType(sipPy, sipType_KSharedConfig, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr);
 113      *sipCppPtr = new KSharedConfigPtr (ksc);
 114      ksc->ref.deref();
 115      return sipGetState(sipTransferObj);
 116 --- sip/kdecore/ksycocaentry.sip
 117 +++ sip/kdecore/ksycocaentry.sip
 118 @@ -83,7 +83,7 @@ private:
 119          KSycocaEntry::Ptr *t = new KSycocaEntry::Ptr (sipCpp->at(i));
 120          PyObject *tobj;
 121
 122 -        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KSycocaEntry, sipTransferObj)) == NULL)
 123 +        if ((tobj = sipConvertFromNewType(t->data(), sipType_KSycocaEntry, sipTransferObj)) == NULL)
 124          {
 125              Py_DECREF(l);
 126              delete t;
 127 @@ -105,7 +105,7 @@ private:
 128              return 0;
 129
 130          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 131 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, SIP_NOT_NONE))
 132 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, SIP_NOT_NONE))
 133                  return 0;
 134
 135          return 1;
 136 @@ -116,11 +116,11 @@ private:
 137      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 138      {
 139          int state;
 140 -        KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 141 +        KSycocaEntry *t = reinterpret_cast<KSycocaEntry *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KSycocaEntry, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 142
 143          if (*sipIsErr)
 144          {
 145 -            sipReleaseInstance(t, sipClass_KSycocaEntry, state);
 146 +            sipReleaseType(t, sipType_KSycocaEntry, state);
 147
 148              delete ql;
 149              return 0;
 150 @@ -130,7 +130,7 @@ private:
 151
 152          ql->append(*tptr);
 153
 154 -        sipReleaseInstance(t, sipClass_KSycocaEntry, state);
 155 +        sipReleaseType(t, sipType_KSycocaEntry, state);
 156      }
 157
 158      *sipCppPtr = ql;
 159 --- sip/kdecore/typedefs.sip
 160 +++ sip/kdecore/typedefs.sip
 161 @@ -397,8 +397,8 @@ template <TYPE1,TYPE2>
 162          TYPE1 *t1 = new TYPE1(i.key());
 163          TYPE2 *t2 = new TYPE2(i.value());
 164
 165 -        PyObject *t1obj = sipConvertFromNewInstance(t1, sipClass_TYPE1, sipTransferObj);
 166 -        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_TYPE2, sipTransferObj);
 167 +        PyObject *t1obj = sipConvertFromNewType(t1, sipType_TYPE1, sipTransferObj);
 168 +        PyObject *t2obj = sipConvertFromNewType(t2, sipType_TYPE2, sipTransferObj);
 169
 170          if (t1obj == NULL || t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
 171          {
 172 @@ -438,10 +438,10 @@ template <TYPE1,TYPE2>
 173
 174          while (PyDict_Next(sipPy, &i, &t1obj, &t2obj))
 175          {
 176 -            if (!sipCanConvertToInstance(t1obj, sipClass_TYPE1, SIP_NOT_NONE))
 177 +            if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))
 178                  return 0;
 179
 180 -            if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))
 181 +            if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))
 182                  return 0;
 183          }
 184
 185 @@ -454,13 +454,13 @@ template <TYPE1,TYPE2>
 186      {
 187          int state1, state2;
 188
 189 -        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToInstance(t1obj, sipClass_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
 190 -        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToInstance(t2obj, sipClass_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
 191 +        TYPE1 *t1 = reinterpret_cast<TYPE1 *>(sipConvertToType(t1obj, sipType_TYPE1, sipTransferObj, SIP_NOT_NONE, &state1, sipIsErr));
 192 +        TYPE2 *t2 = reinterpret_cast<TYPE2 *>(sipConvertToType(t2obj, sipType_TYPE2, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
 193
 194          if (*sipIsErr)
 195          {
 196 -            sipReleaseInstance(t1, sipClass_TYPE1, state1);
 197 -            sipReleaseInstance(t2, sipClass_TYPE2, state2);
 198 +            sipReleaseType(t1, sipType_TYPE1, state1);
 199 +            sipReleaseType(t2, sipType_TYPE2, state2);
 200
 201              delete qm;
 202              return 0;
 203 @@ -468,8 +468,8 @@ template <TYPE1,TYPE2>
 204
 205          qm->insert(*t1, *t2);
 206
 207 -        sipReleaseInstance(t1, sipClass_TYPE1, state1);
 208 -        sipReleaseInstance(t2, sipClass_TYPE2, state2);
 209 +        sipReleaseType(t1, sipType_TYPE1, state1);
 210 +        sipReleaseType(t2, sipType_TYPE2, state2);
 211      }
 212
 213      *sipCppPtr = qm;
 214 @@ -669,7 +669,7 @@ template <TYPE*>
 215          TYPE *t = (TYPE *)(sipCpp->at(i));
 216          PyObject *tobj;
 217
 218 -        if ((tobj = sipConvertFromNewInstance(t, sipClass_TYPE, sipTransferObj)) == NULL)
 219 +        if ((tobj = sipConvertFromNewType(t, sipType_TYPE, sipTransferObj)) == NULL)
 220          {
 221              Py_DECREF(l);
 222              delete t;
 223 @@ -691,7 +691,7 @@ template <TYPE*>
 224              return 0;
 225
 226          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 227 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, SIP_NOT_NONE))
 228 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, SIP_NOT_NONE))
 229                  return 0;
 230
 231          return 1;
 232 @@ -702,11 +702,11 @@ template <TYPE*>
 233      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 234      {
 235          int state;
 236 -        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 237 +        TYPE *t = reinterpret_cast<TYPE *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_TYPE, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 238
 239          if (*sipIsErr)
 240          {
 241 -            sipReleaseInstance(t, sipClass_TYPE, state);
 242 +            sipReleaseType(t, sipType_TYPE, state);
 243
 244              delete qv;
 245              return 0;
 246 @@ -714,7 +714,7 @@ template <TYPE*>
 247
 248          qv->append(t);
 249
 250 -        sipReleaseInstance(t, sipClass_TYPE, state);
 251 +        sipReleaseType(t, sipType_TYPE, state);
 252      }
 253
 254      *sipCppPtr = qv;
 255 --- sip/kdeui/kcompletion.sip
 256 +++ sip/kdeui/kcompletion.sip
 257 @@ -176,7 +176,7 @@ public:
 258  #else
 259          PyObject *kobj = PyInt_FromLong((int)i.key());
 260  #endif
 261 -        PyObject *tobj = sipConvertFromNewInstance(t, sipClass_KShortcut, sipTransferObj);
 262 +        PyObject *tobj = sipConvertFromNewType(t, sipType_KShortcut, sipTransferObj);
 263
 264          if (kobj == NULL || tobj == NULL || PyDict_SetItem(d, kobj, tobj) < 0)
 265          {
 266 @@ -213,7 +213,7 @@ public:
 267              return 0;
 268
 269          while (PyDict_Next(sipPy, &i, &kobj, &tobj))
 270 -            if (!sipCanConvertToInstance(tobj, sipClass_KShortcut, SIP_NOT_NONE))
 271 +            if (!sipCanConvertToType(tobj, sipType_KShortcut, SIP_NOT_NONE))
 272                  return 0;
 273
 274          return 1;
 275 @@ -229,11 +229,11 @@ public:
 276  #else
 277          int k = PyInt_AsLong(kobj);
 278  #endif
 279 -        KShortcut *t = reinterpret_cast<KShortcut *>(sipConvertToInstance(tobj, sipClass_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 280 +        KShortcut *t = reinterpret_cast<KShortcut *>(sipConvertToType(tobj, sipType_KShortcut, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 281
 282          if (*sipIsErr)
 283          {
 284 -            sipReleaseInstance(t, sipClass_KShortcut, state);
 285 +            sipReleaseType(t, sipType_KShortcut, state);
 286
 287              delete qm;
 288              return 0;
 289 @@ -241,7 +241,7 @@ public:
 290
 291          qm->insert((KCompletionBase::KeyBindingType)k, *t);
 292
 293 -        sipReleaseInstance(t, sipClass_KShortcut, state);
 294 +        sipReleaseType(t, sipType_KShortcut, state);
 295      }
 296
 297      *sipCppPtr = qm;
 298 --- sip/kdeui/kxmlguibuilder.sip
 299 +++ sip/kdeui/kxmlguibuilder.sip
 300 @@ -49,10 +49,10 @@ QAction *containerAction;
 301      PyObject *pyWidget;
 302      PyObject *pyContainerAction;
 303
 304 -    if ((pyWidget = sipConvertFromNewInstance(res, sipClass_QWidget, NULL)) == NULL)
 305 +    if ((pyWidget = sipConvertFromNewType(res, sipType_QWidget, NULL)) == NULL)
 306          return NULL;
 307
 308 -    if ((pyContainerAction = sipConvertFromNewInstance(containerAction, sipClass_QAction, NULL)) == NULL)
 309 +    if ((pyContainerAction = sipConvertFromNewType(containerAction, sipType_QAction, NULL)) == NULL)
 310          return NULL;
 311
 312      sipRes = Py_BuildValue ("NN", pyWidget, pyContainerAction);
 313 --- sip/kio/kservicegroup.sip
 314 +++ sip/kio/kservicegroup.sip
 315 @@ -151,7 +151,7 @@ public:
 316          KServiceGroup::SPtr *t = new KServiceGroup::SPtr (sipCpp->at(i));
 317          PyObject *tobj;
 318
 319 -        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_KServiceGroup, sipTransferObj)) == NULL)
 320 +        if ((tobj = sipConvertFromNewType(t->data(), sipType_KServiceGroup, sipTransferObj)) == NULL)
 321          {
 322              Py_DECREF(l);
 323              delete t;
 324 @@ -173,7 +173,7 @@ public:
 325              return 0;
 326
 327          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 328 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, SIP_NOT_NONE))
 329 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, SIP_NOT_NONE))
 330                  return 0;
 331
 332          return 1;
 333 @@ -184,11 +184,11 @@ public:
 334      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 335      {
 336          int state;
 337 -        KServiceGroup *t = reinterpret_cast<KServiceGroup *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 338 +        KServiceGroup *t = reinterpret_cast<KServiceGroup *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_KServiceGroup, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 339
 340          if (*sipIsErr)
 341          {
 342 -            sipReleaseInstance(t, sipClass_KServiceGroup, state);
 343 +            sipReleaseType(t, sipType_KServiceGroup, state);
 344
 345              delete ql;
 346              return 0;
 347 @@ -198,7 +198,7 @@ public:
 348
 349          ql->append(*tptr);
 350
 351 -        sipReleaseInstance(t, sipClass_KServiceGroup, state);
 352 +        sipReleaseType(t, sipType_KServiceGroup, state);
 353      }
 354
 355      *sipCppPtr = ql;
 356 --- sip/ktexteditor/markinterface.sip
 357 +++ sip/ktexteditor/markinterface.sip
 358 @@ -158,7 +158,7 @@ signals:
 359  #else
 360          PyObject *t1obj = PyInt_FromLong ((long)t1);
 361  #endif
 362 -        PyObject *t2obj = sipConvertFromNewInstance(t2, sipClass_KTextEditor_Mark, sipTransferObj);
 363 +        PyObject *t2obj = sipConvertFromNewType(t2, sipType_KTextEditor_Mark, sipTransferObj);
 364
 365          if (t2obj == NULL || PyDict_SetItem(d, t1obj, t2obj) < 0)
 366          {
 367 @@ -203,7 +203,7 @@ signals:
 368  #endif
 369                  return 0;
 370
 371 -            if (!sipCanConvertToInstance(t2obj, sipClass_KTextEditor_Mark, SIP_NOT_NONE))
 372 +            if (!sipCanConvertToType(t2obj, sipType_KTextEditor_Mark, SIP_NOT_NONE))
 373                  return 0;
 374          }
 375
 376 @@ -221,11 +221,11 @@ signals:
 377  #else
 378          int t1 = PyInt_AS_LONG (t1obj);
 379  #endif
 380 -        KTextEditor::Mark *t2 = reinterpret_cast<KTextEditor::Mark *>(sipConvertToInstance(t2obj, sipClass_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
 381 +        KTextEditor::Mark *t2 = reinterpret_cast<KTextEditor::Mark *>(sipConvertToType(t2obj, sipType_KTextEditor_Mark, sipTransferObj, SIP_NOT_NONE, &state2, sipIsErr));
 382
 383          if (*sipIsErr)
 384          {
 385 -            sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
 386 +            sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
 387
 388              delete qm;
 389              return 0;
 390 @@ -233,7 +233,7 @@ signals:
 391
 392          qm->insert(t1, t2);
 393
 394 -        sipReleaseInstance(t2, sipClass_KTextEditor_Mark, state2);
 395 +        sipReleaseType(t2, sipType_KTextEditor_Mark, state2);
 396      }
 397
 398      *sipCppPtr = qm;
 399 --- sip/phonon/objectdescription.sip
 400 +++ sip/phonon/objectdescription.sip
 401 @@ -116,7 +116,7 @@ void                    registerMetaTypes ();
 402          DNSSD::RemoteService::Ptr *t = new Phonon::ObjectDescription (sipCpp->at(i));
 403          PyObject *tobj;
 404
 405 -        if ((tobj = sipConvertFromNewInstance(t->data(), sipClass_DNSSD_RemoteService, sipTransferObj)) == NULL)
 406 +        if ((tobj = sipConvertFromNewType(t->data(), sipType_DNSSD_RemoteService, sipTransferObj)) == NULL)
 407          {
 408              Py_DECREF(l);
 409              delete t;
 410 @@ -138,7 +138,7 @@ void                    registerMetaTypes ();
 411              return 0;
 412
 413          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 414 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, SIP_NOT_NONE))
 415 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, SIP_NOT_NONE))
 416                  return 0;
 417
 418          return 1;
 419 @@ -149,11 +149,11 @@ void                    registerMetaTypes ();
 420      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 421      {
 422          int state;
 423 -        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 424 +        DNSSD::RemoteService *t = reinterpret_cast<DNSSD::RemoteService *>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_DNSSD_RemoteService, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 425
 426          if (*sipIsErr)
 427          {
 428 -            sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
 429 +            sipReleaseType(t, sipType_DNSSD_RemoteService, state);
 430
 431              delete ql;
 432              return 0;
 433 @@ -163,7 +163,7 @@ void                    registerMetaTypes ();
 434
 435          ql->append(*tptr);
 436
 437 -        sipReleaseInstance(t, sipClass_DNSSD_RemoteService, state);
 438 +        sipReleaseType(t, sipType_DNSSD_RemoteService, state);
 439      }
 440
 441      *sipCppPtr = ql;
 442 --- sip/soprano/pluginmanager.sip
 443 +++ sip/soprano/pluginmanager.sip
 444 @@ -73,7 +73,7 @@ public:
 445          Soprano::Backend* t = const_cast<Soprano::Backend*>(sipCpp->at(i));
 446          PyObject *tobj;
 447
 448 -        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Backend, sipTransferObj)) == NULL)
 449 +        if ((tobj = sipConvertFromType(t, sipType_Soprano_Backend, sipTransferObj)) == NULL)
 450          {
 451              Py_DECREF(l);
 452              return NULL;
 453 @@ -93,7 +93,7 @@ public:
 454              return 0;
 455
 456          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 457 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, SIP_NOT_NONE))
 458 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, SIP_NOT_NONE))
 459                  return 0;
 460
 461          return 1;
 462 @@ -104,18 +104,18 @@ public:
 463      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 464      {
 465          int state;
 466 -        const Soprano::Backend*t = reinterpret_cast<const Soprano::Backend*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 467 +        const Soprano::Backend*t = reinterpret_cast<const Soprano::Backend*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Backend, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 468
 469          if (*sipIsErr)
 470          {
 471 -            sipReleaseInstance(const_cast<Soprano::Backend*>(t), sipClass_Soprano_Backend, state);
 472 +            sipReleaseType(const_cast<Soprano::Backend*>(t), sipType_Soprano_Backend, state);
 473
 474              delete ql;
 475              return 0;
 476          }
 477          ql->append(t);
 478
 479 -        sipReleaseInstance(const_cast<Soprano::Backend*>(t), sipClass_Soprano_Backend, state);
 480 +        sipReleaseType(const_cast<Soprano::Backend*>(t), sipType_Soprano_Backend, state);
 481      }
 482
 483      *sipCppPtr = ql;
 484 @@ -144,7 +144,7 @@ public:
 485          Soprano::Parser* t = const_cast<Soprano::Parser*>(sipCpp->at(i));
 486          PyObject *tobj;
 487
 488 -        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Parser, sipTransferObj)) == NULL)
 489 +        if ((tobj = sipConvertFromType(t, sipType_Soprano_Parser, sipTransferObj)) == NULL)
 490          {
 491              Py_DECREF(l);
 492              return NULL;
 493 @@ -164,7 +164,7 @@ public:
 494              return 0;
 495
 496          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 497 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, SIP_NOT_NONE))
 498 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, SIP_NOT_NONE))
 499                  return 0;
 500
 501          return 1;
 502 @@ -175,18 +175,18 @@ public:
 503      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 504      {
 505          int state;
 506 -        const Soprano::Parser*t = reinterpret_cast<const Soprano::Parser*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 507 +        const Soprano::Parser*t = reinterpret_cast<const Soprano::Parser*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Parser, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 508
 509          if (*sipIsErr)
 510          {
 511 -            sipReleaseInstance(const_cast<Soprano::Parser*>(t), sipClass_Soprano_Parser, state);
 512 +            sipReleaseType(const_cast<Soprano::Parser*>(t), sipType_Soprano_Parser, state);
 513
 514              delete ql;
 515              return 0;
 516          }
 517          ql->append(t);
 518
 519 -        sipReleaseInstance(const_cast<Soprano::Parser*>(t), sipClass_Soprano_Parser, state);
 520 +        sipReleaseType(const_cast<Soprano::Parser*>(t), sipType_Soprano_Parser, state);
 521      }
 522
 523      *sipCppPtr = ql;
 524 @@ -215,7 +215,7 @@ public:
 525          Soprano::Serializer* t = const_cast<Soprano::Serializer*>(sipCpp->at(i));
 526          PyObject *tobj;
 527
 528 -        if ((tobj = sipConvertFromInstance(t, sipClass_Soprano_Serializer, sipTransferObj)) == NULL)
 529 +        if ((tobj = sipConvertFromType(t, sipType_Soprano_Serializer, sipTransferObj)) == NULL)
 530          {
 531              Py_DECREF(l);
 532              return NULL;
 533 @@ -235,7 +235,7 @@ public:
 534              return 0;
 535
 536          for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 537 -            if (!sipCanConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, SIP_NOT_NONE))
 538 +            if (!sipCanConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, SIP_NOT_NONE))
 539                  return 0;
 540
 541          return 1;
 542 @@ -246,18 +246,18 @@ public:
 543      for (int i = 0; i < PyList_GET_SIZE(sipPy); ++i)
 544      {
 545          int state;
 546 -        const Soprano::Serializer*t = reinterpret_cast<const Soprano::Serializer*>(sipConvertToInstance(PyList_GET_ITEM(sipPy, i), sipClass_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 547 +        const Soprano::Serializer*t = reinterpret_cast<const Soprano::Serializer*>(sipConvertToType(PyList_GET_ITEM(sipPy, i), sipType_Soprano_Serializer, sipTransferObj, SIP_NOT_NONE, &state, sipIsErr));
 548
 549          if (*sipIsErr)
 550          {
 551 -            sipReleaseInstance(const_cast<Soprano::Serializer*>(t), sipClass_Soprano_Serializer, state);
 552 +            sipReleaseType(const_cast<Soprano::Serializer*>(t), sipType_Soprano_Serializer, state);
 553
 554              delete ql;
 555              return 0;
 556          }
 557          ql->append(t);
 558
 559 -        sipReleaseInstance(const_cast<Soprano::Serializer*>(t), sipClass_Soprano_Serializer, state);
 560 +        sipReleaseType(const_cast<Soprano::Serializer*>(t), sipType_Soprano_Serializer, state);
 561      }
 562
 563      *sipCppPtr = ql;