Skip to content
Permalink
Browse files

[SIP] Change all occurences of convert[From|To]Instance to convert[Fr…

…om|To]Type

Removal of these deprecated calls is expected to improve stability
  • Loading branch information
m-kuhn committed Aug 13, 2013
1 parent db07f2f commit d1768b85fceec4a147b743c57b7b9cdb1efe579b
Showing with 3 additions and 3 deletions.
  1. +1 −1 python/core/conversions.sip
  2. +1 −1 python/core/qgsfeatureiterator.sip
  3. +1 −1 python/core/qgsfield.sip
@@ -1017,7 +1017,7 @@ template<TYPE1, TYPE2>
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;
}

@@ -41,7 +41,7 @@ public:
%MethodCode
QgsFeature* f = new QgsFeature;
if (sipCpp->nextFeature(*f))
sipRes = sipConvertFromInstance(f, sipClass_QgsFeature, Py_None);
sipRes = sipConvertFromType(f, sipType_QgsFeature, Py_None);
else
{
delete f;
@@ -168,7 +168,7 @@ class QgsFields
{
qDebug("__getitem__ %d", a0);
QgsField* fld = new QgsField(sipCpp->at(a0));
sipRes = sipConvertFromInstance(fld, sipClass_QgsField, Py_None);
sipRes = sipConvertFromType(fld, sipType_QgsField, Py_None);
}
%End*/

0 comments on commit d1768b8

Please sign in to comment.
You can’t perform that action at this time.