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

m-kuhn · m-kuhn · commit d1768b85fcee · 2013-08-13T12:35:49.000+02:00
Removal of these deprecated calls is expected to improve stability
diff --git a/python/core/conversions.sip b/python/core/conversions.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;
         }
 
diff --git a/python/core/qgsfeatureiterator.sip b/python/core/qgsfeatureiterator.sip
@@ -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;
diff --git a/python/core/qgsfield.sip b/python/core/qgsfield.sip
@@ -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*/
 

Original file line number	Diff line number	Diff line change
`@@ -1017,7 +1017,7 @@ template<TYPE1, TYPE2>`
`1017`	`1017`	`if (!sipCanConvertToType(t1obj, sipType_TYPE1, SIP_NOT_NONE))`
`1018`	`1018`	`return 0;`
`1019`	`1019`
`1020`		`- if (!sipCanConvertToInstance(t2obj, sipClass_TYPE2, SIP_NOT_NONE))`
	`1020`	`+ if (!sipCanConvertToType(t2obj, sipType_TYPE2, SIP_NOT_NONE))`
`1021`	`1021`	`return 0;`
`1022`	`1022`	`}`
`1023`	`1023`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public:`
`41`	`41`	`%MethodCode`
`42`	`42`	`QgsFeature* f = new QgsFeature;`
`43`	`43`	`if (sipCpp->nextFeature(*f))`
`44`		`- sipRes = sipConvertFromInstance(f, sipClass_QgsFeature, Py_None);`
	`44`	`+ sipRes = sipConvertFromType(f, sipType_QgsFeature, Py_None);`
`45`	`45`	`else`
`46`	`46`	`{`
`47`	`47`	`delete f;`
Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,7 @@ class QgsFields`
`168`	`168`	`{`
`169`	`169`	`qDebug("__getitem__ %d", a0);`
`170`	`170`	`QgsField* fld = new QgsField(sipCpp->at(a0));`
`171`		`- sipRes = sipConvertFromInstance(fld, sipClass_QgsField, Py_None);`
	`171`	`+ sipRes = sipConvertFromType(fld, sipType_QgsField, Py_None);`
`172`	`172`	`}`
`173`	`173`	`%End*/`
`174`	`174`