[processing] pendingFields() -> fields()

Does the same thing, but pendingFields() is ugly
qgis · Aug 4, 2016 · c1649eb
1 parent 06c4b07
commit c1649eb
Show file tree

Hide file tree

Showing 38 changed files with 42 additions and 42 deletions.
diff --git a/python/plugins/processing/algs/qgis/ConvexHull.py b/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)
-            fType = layer.pendingFields()[index].type()
+            fType = layer.fields()[index].type()
             if fType in [QVariant.Int, QVariant.UInt, QVariant.LongLong, QVariant.ULongLong]:
                 f.setType(fType)
                 f.setLength(20)

diff --git a/python/plugins/processing/algs/qgis/DeleteColumn.py b/python/plugins/processing/algs/qgis/DeleteColumn.py
@@ -54,7 +54,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT))
         idx = layer.fieldNameIndex(self.getParameterValue(self.COLUMN))
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
         fields.remove(idx)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,

diff --git a/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py b/python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py
@@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(
             self.getParameterValue(self.INPUT))
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      layer.wkbType(), layer.crs())

diff --git a/python/plugins/processing/algs/qgis/DeleteHoles.py b/python/plugins/processing/algs/qgis/DeleteHoles.py
@@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields(),
+            layer.fields(),
             layer.wkbType(),
             layer.crs())
 

diff --git a/python/plugins/processing/algs/qgis/DensifyGeometries.py b/python/plugins/processing/algs/qgis/DensifyGeometries.py
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
         isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry
 
         writer = self.getOutputFromName(
-            self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
+            self.OUTPUT).getVectorWriter(layer.fields().toList(),
                                          layer.wkbType(), layer.crs())
 
         features = vector.features(layer)

diff --git a/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py b/python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
         isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry
 
         writer = self.getOutputFromName(
-            self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
+            self.OUTPUT).getVectorWriter(layer.fields().toList(),
                                          layer.wkbType(), layer.crs())
 
         features = vector.features(layer)

diff --git a/python/plugins/processing/algs/qgis/Difference.py b/python/plugins/processing/algs/qgis/Difference.py
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
 
         geomType = layerA.wkbType()
         writer = self.getOutputFromName(
-            Difference.OUTPUT).getVectorWriter(layerA.pendingFields(),
+            Difference.OUTPUT).getVectorWriter(layerA.fields(),
                                                geomType,
                                                layerA.crs())
 

diff --git a/python/plugins/processing/algs/qgis/ExecuteSQL.py b/python/plugins/processing/algs/qgis/ExecuteSQL.py
@@ -131,7 +131,7 @@ def processAlgorithm(self, progress):
             raise GeoAlgorithmExecutionException(vLayer.dataProvider().error().message())
 
         writer = self.getOutputFromName(self.OUTPUT_LAYER).getVectorWriter(
-            vLayer.pendingFields().toList(),
+            vLayer.fields().toList(),
             # Create a point layer (without any points) if 'no geometry' is chosen
             vLayer.wkbType() if geometry_type != 1 else 1,
             vLayer.crs())

diff --git a/python/plugins/processing/algs/qgis/ExportGeometryInfo.py b/python/plugins/processing/algs/qgis/ExportGeometryInfo.py
@@ -72,7 +72,7 @@ def processAlgorithm(self, progress):
         method = self.getParameterValue(self.METHOD)
 
         geometryType = layer.geometryType()
-        fields = layer.pendingFields()
+        fields = layer.fields()
 
         if geometryType == QgsWkbTypes.PolygonGeometry:
             areaName = vector.createUniqueFieldName('area', fields)

diff --git a/python/plugins/processing/algs/qgis/ExtractByAttribute.py b/python/plugins/processing/algs/qgis/ExtractByAttribute.py
@@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
         operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
         value = self.getParameterValue(self.VALUE)
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
                                                                      layer.wkbType(), layer.crs())
 

diff --git a/python/plugins/processing/algs/qgis/ExtractByLocation.py b/python/plugins/processing/algs/qgis/ExtractByLocation.py
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
         index = vector.spatialindex(layer)
 
         output = self.getOutputFromName(self.OUTPUT)
-        writer = output.getVectorWriter(layer.pendingFields(),
+        writer = output.getVectorWriter(layer.fields(),
                                         layer.wkbType(), layer.crs())
 
         if 'disjoint' in predicates:

diff --git a/python/plugins/processing/algs/qgis/ExtractNodes.py b/python/plugins/processing/algs/qgis/ExtractNodes.py
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
             self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QgsWkbTypes.Point, layer.crs())
+            layer.fields().toList(), QgsWkbTypes.Point, layer.crs())
 
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

diff --git a/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py b/python/plugins/processing/algs/qgis/FixedDistanceBuffer.py
@@ -75,7 +75,7 @@ def processAlgorithm(self, progress):
         segments = int(self.getParameterValue(self.SEGMENTS))
 
         writer = self.getOutputFromName(
-            self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
+            self.OUTPUT).getVectorWriter(layer.fields().toList(),
                                          QgsWkbTypes.Polygon, layer.crs())
 
         buff.buffering(progress, writer, distance, None, False, layer,

diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py
@@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
             newType = QgsWkbTypes.Point
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields(), newType, layer.crs())
+            layer.fields(), newType, layer.crs())
 
         features = vector.features(layer)
         total = 100.0 / len(features)

diff --git a/python/plugins/processing/algs/qgis/Gridify.py b/python/plugins/processing/algs/qgis/Gridify.py
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
                 self.tr('Invalid grid spacing: %s/%s' % (hSpacing, vSpacing)))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields(), layer.wkbType(), layer.crs())
+            layer.fields(), layer.wkbType(), layer.crs())
 
         features = vector.features(layer)
         total = 100.0 / len(features)

diff --git a/python/plugins/processing/algs/qgis/HubDistance.py b/python/plugins/processing/algs/qgis/HubDistance.py
@@ -99,7 +99,7 @@ def processAlgorithm(self, progress):
         if addLines:
             geomType = QgsWkbTypes.LineString
 
-        fields = layerPoints.pendingFields()
+        fields = layerPoints.fields()
         fields.append(QgsField('HubName', QVariant.String))
         fields.append(QgsField('HubDist', QVariant.Double))
 

diff --git a/python/plugins/processing/algs/qgis/HubLines.py b/python/plugins/processing/algs/qgis/HubLines.py
@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
                 self.tr('Same layer given for both hubs and spokes'))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layerSpoke.pendingFields(), QgsWkbTypes.LineString, layerSpoke.crs())
+            layerSpoke.fields(), QgsWkbTypes.LineString, layerSpoke.crs())
 
         spokes = vector.features(layerSpoke)
         hubs = vector.features(layerHub)

diff --git a/python/plugins/processing/algs/qgis/LinesIntersection.py b/python/plugins/processing/algs/qgis/LinesIntersection.py
@@ -82,8 +82,8 @@ def processAlgorithm(self, progress):
         idxA = layerA.fieldNameIndex(fieldA)
         idxB = layerB.fieldNameIndex(fieldB)
 
-        fieldList = [layerA.pendingFields()[idxA],
-                     layerB.pendingFields()[idxB]]
+        fieldList = [layerA.fields()[idxA],
+                     layerB.fields()[idxB]]
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
                                                                      QgsWkbTypes.Point, layerA.crs())

diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py
@@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs()
+            layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs()
         )
 
         outFeat = QgsFeature()

diff --git a/python/plugins/processing/algs/qgis/MultipartToSingleparts.py b/python/plugins/processing/algs/qgis/MultipartToSingleparts.py
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
         geomType = self.multiToSingleGeom(layer.wkbType())
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), geomType, layer.crs())
+            layer.fields().toList(), geomType, layer.crs())
 
         features = vector.features(layer)
         total = 100.0 / len(features)

diff --git a/python/plugins/processing/algs/qgis/PointsInPolygonUnique.py b/python/plugins/processing/algs/qgis/PointsInPolygonUnique.py
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
 
         classFieldIndex = pointLayer.fieldNameIndex(classFieldName)
         (idxCount, fieldList) = vector.findOrCreateField(polyLayer,
-                                                         polyLayer.pendingFields(), fieldName)
+                                                         polyLayer.fields(), fieldName)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
             fields.toList(), polyLayer.wkbType(), polyLayer.crs())

diff --git a/python/plugins/processing/algs/qgis/PolygonsToLines.py b/python/plugins/processing/algs/qgis/PolygonsToLines.py
@@ -60,7 +60,7 @@ def processAlgorithm(self, progress):
         layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QgsWkbTypes.LineString, layer.crs())
+            layer.fields().toList(), QgsWkbTypes.LineString, layer.crs())
 
         outFeat = QgsFeature()
         inGeom = QgsGeometry()

diff --git a/python/plugins/processing/algs/qgis/RandomExtract.py b/python/plugins/processing/algs/qgis/RandomExtract.py
@@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
         selran = random.sample(xrange(featureCount), value)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), layer.wkbType(), layer.crs())
+            layer.fields().toList(), layer.wkbType(), layer.crs())
 
         total = 100.0 / featureCount
         for i, feat in enumerate(features):

diff --git a/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py b/python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py
@@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
             value = value / 100.0
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), layer.wkbType(), layer.crs())
+            layer.fields().toList(), layer.wkbType(), layer.crs())
 
         selran = []
         current = 0

diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes, QgsWkbTypes
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
 
         writer = self.getOutputFromName(
             self.OUTPUT_LAYER).getVectorWriter(
-                layer.pendingFields().toList(),
+                layer.fields().toList(),
                 QgsWkbTypes.Polygon,
                 layer.crs())
 

diff --git a/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py b/python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py
@@ -30,7 +30,7 @@
 
 from qgis.PyQt.QtGui import QIcon
 
-from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes
+from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
 
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.core.ProcessingLog import ProcessingLog
@@ -97,8 +97,8 @@ def processAlgorithm(self, progress):
 
         writer = self.getOutputFromName(
             self.OUTPUT_LAYER).getVectorWriter(
-                layer.pendingFields().toList(),
-                QgsWkbTypes.Polygon,
+                layer.fields().toList(),
+                Qgis.WKBPolygon,
                 layer.crs())
 
         outFeat = QgsFeature()

diff --git a/python/plugins/processing/algs/qgis/ReprojectLayer.py b/python/plugins/processing/algs/qgis/ReprojectLayer.py
@@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
         targetCrs.createFromUserInput(crsId)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), layer.wkbType(), targetCrs)
+            layer.fields().toList(), layer.wkbType(), targetCrs)
 
         layerCrs = layer.crs()
         crsTransform = QgsCoordinateTransform(layerCrs, targetCrs)

diff --git a/python/plugins/processing/algs/qgis/SelectByAttribute.py b/python/plugins/processing/algs/qgis/SelectByAttribute.py
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
         operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
         value = self.getParameterValue(self.VALUE)
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
 
         idx = layer.fieldNameIndex(fieldName)
         fieldType = fields[idx].type()

diff --git a/python/plugins/processing/algs/qgis/SimplifyGeometries.py b/python/plugins/processing/algs/qgis/SimplifyGeometries.py
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
         pointsAfter = 0
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), layer.wkbType(), layer.crs())
+            layer.fields().toList(), layer.wkbType(), layer.crs())
 
         features = vector.features(layer)
         total = 100.0 / len(features)

diff --git a/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py b/python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
         geomType = self.singleToMultiGeom(layer.wkbType())
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), geomType, layer.crs())
+            layer.fields().toList(), geomType, layer.crs())
 
         inFeat = QgsFeature()
         outFeat = QgsFeature()

diff --git a/python/plugins/processing/algs/qgis/SplitLinesWithLines.py b/python/plugins/processing/algs/qgis/SplitLinesWithLines.py
@@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
         layerB = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT_B))
 
         sameLayer = self.getParameterValue(self.INPUT_A) == self.getParameterValue(self.INPUT_B)
-        fieldList = layerA.pendingFields()
+        fieldList = layerA.fields()
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
                                                                      QgsWkbTypes.LineString, layerA.crs())

diff --git a/python/plugins/processing/algs/qgis/TextToFloat.py b/python/plugins/processing/algs/qgis/TextToFloat.py
@@ -55,7 +55,7 @@ def processAlgorithm(self, progress):
         fieldName = self.getParameterValue(self.FIELD)
         idx = layer.fieldNameIndex(fieldName)
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
         fields[idx] = QgsField(fieldName, QVariant.Double, '', 24, 15)
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,

diff --git a/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py b/python/plugins/processing/algs/qgis/VariableDistanceBuffer.py
@@ -76,7 +76,7 @@ def processAlgorithm(self, progress):
         segments = int(self.getParameterValue(self.SEGMENTS))
 
         writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
-            layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs())
+            layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs())
 
         buff.buffering(progress, writer, 0, field, True, layer, dissolve,
                        segments)
diff --git a/python/plugins/processing/algs/qgis/VectorSplit.py b/python/plugins/processing/algs/qgis/VectorSplit.py
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
         uniqueValues = vector.uniqueValues(layer, fieldIndex)
         baseName = os.path.join(directory, '{0}_{1}'.format(layer.name(), fieldName))
 
-        fields = layer.pendingFields()
+        fields = layer.fields()
         crs = layer.crs()
         geomType = layer.wkbType()