Update python code

Author: m-kuhn

python/core/qgsfields.sip

@@ -157,9 +157,10 @@ class QgsFields
 %End
 
     /**
-     * Look up field's index from the field name.
+     * Get the field index from the field name.
      * This method takes is case sensitive and only matches the data source
      * name of the field.
+     * Alias for indexOf
      *
      * @param fieldName The name of the field.
      *
@@ -168,6 +169,19 @@ class QgsFields
      */
     int indexFromName( const QString& fieldName ) const;
 
+    /**
+     * Get the field index from the field name.
+     * This method takes is case sensitive and only matches the data source
+     * name of the field.
+     *
+     * @param fieldName The name of the field.
+     *
+     * @return The field index if found or -1 in case it cannot be found.
+     * @see lookupField For a more tolerant alternative.
+     * @note Added in QGIS 3.0
+     */
+    int indexOf( const QString& fieldName ) const;
+
     /**
      * Look up field's index from the field name.
      * This method matches in the following order:

python/plugins/processing/algs/qgis/BasicStatisticsStrings.py

@@ -86,7 +86,7 @@ def processAlgorithm(self, progress):
 
         outputFile = self.getOutputValue(self.OUTPUT_HTML_FILE)
 
-        index = layer.fieldNameIndex(fieldName)
+        index = layer.fields().lookupField(fieldName)
 
         sumValue = 0
         minValue = 0

python/plugins/processing/algs/qgis/Buffer.py

@@ -35,7 +35,7 @@ def buffering(progress, writer, distance, field, useField, layer, dissolve,
               segments, endCapStyle=1, joinStyle=1, mitreLimit=2):
 
     if useField:
-        field = layer.fieldNameIndex(field)
+        field = layer.fields().lookupField(field)
 
     outFeat = QgsFeature()
 

python/plugins/processing/algs/qgis/ConvexHull.py

@@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
 
         f = QgsField('value', QVariant.String, '', 255)
         if useField:
-            index = layer.fieldNameIndex(fieldName)
+            index = layer.fields().lookupField(fieldName)
             fType = layer.fields()[index].type()
             if fType in [QVariant.Int, QVariant.UInt, QVariant.LongLong, QVariant.ULongLong]:
                 f.setType(fType)

python/plugins/processing/algs/qgis/DeleteColumn.py

@@ -52,7 +52,7 @@ def defineCharacteristics(self):
     def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(
             self.getParameterValue(self.INPUT))
-        idx = layer.fieldNameIndex(self.getParameterValue(self.COLUMN))
+        idx = layer.fields().lookupField(self.getParameterValue(self.COLUMN))
 
         fields = layer.fields()
         fields.remove(idx)

python/plugins/processing/algs/qgis/Dissolve.py

@@ -127,7 +127,7 @@ def processAlgorithm(self, progress):
             outFeat.setAttributes(attrs)
             writer.addFeature(outFeat)
         else:
-            field_indexes = [vlayerA.fieldNameIndex(f) for f in field_names.split(';')]
+            field_indexes = [vlayerA.fields().lookupField(f) for f in field_names.split(';')]
 
             attribute_dict = {}
             geometry_dict = defaultdict(lambda: [])

python/plugins/processing/algs/qgis/EquivalentNumField.py

@@ -54,7 +54,7 @@ def processAlgorithm(self, progress):
         output = self.getOutputFromName(self.OUTPUT)
         vlayer = dataobjects.getObjectFromUri(
             self.getParameterValue(self.INPUT))
-        fieldindex = vlayer.fieldNameIndex(fieldname)
+        fieldindex = vlayer.fields().lookupField(fieldname)
         fields = vlayer.fields()
         fields.append(QgsField('NUM_FIELD', QVariant.Int))
         writer = output.getVectorWriter(fields, vlayer.wkbType(),

python/plugins/processing/algs/qgis/ExtractByAttribute.py

@@ -87,7 +87,7 @@ def processAlgorithm(self, progress):
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      layer.wkbType(), layer.crs())
 
-        idx = layer.fieldNameIndex(fieldName)
+        idx = layer.fields().lookupField(fieldName)
         fieldType = fields[idx].type()
 
         if fieldType != QVariant.String and operator in self.OPERATORS[-2:]:

python/plugins/processing/algs/qgis/JoinAttributes.py

@@ -70,10 +70,10 @@ def processAlgorithm(self, progress):
         field2 = self.getParameterValue(self.TABLE_FIELD_2)
 
         layer = dataobjects.getObjectFromUri(input)
-        joinField1Index = layer.fieldNameIndex(field)
+        joinField1Index = layer.fields().lookupField(field)
 
         layer2 = dataobjects.getObjectFromUri(input2)
-        joinField2Index = layer2.fieldNameIndex(field2)
+        joinField2Index = layer2.fields().lookupField(field2)
 
         outFields = vector.combineVectorFields(layer, layer2)
         writer = output.getVectorWriter(outFields, layer.wkbType(),

python/plugins/processing/algs/qgis/LinesIntersection.py

@@ -79,8 +79,8 @@ def processAlgorithm(self, progress):
         fieldA = self.getParameterValue(self.FIELD_A)
         fieldB = self.getParameterValue(self.FIELD_B)
 
-        idxA = layerA.fieldNameIndex(fieldA)
-        idxB = layerB.fieldNameIndex(fieldB)
+        idxA = layerA.fields().lookupField(fieldA)
+        idxB = layerB.fields().lookupField(fieldB)
 
         fieldList = [layerA.fields()[idxA],
                      layerB.fields()[idxB]]