Skip to content

Commit c1649eb

Browse files
committedAug 4, 2016
[processing] pendingFields() -> fields()
Does the same thing, but pendingFields() is ugly
1 parent 06c4b07 commit c1649eb

38 files changed

+42
-42
lines changed
 

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
7878
f = QgsField('value', QVariant.String, '', 255)
7979
if useField:
8080
index = layer.fieldNameIndex(fieldName)
81-
fType = layer.pendingFields()[index].type()
81+
fType = layer.fields()[index].type()
8282
if fType in [QVariant.Int, QVariant.UInt, QVariant.LongLong, QVariant.ULongLong]:
8383
f.setType(fType)
8484
f.setLength(20)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ def processAlgorithm(self, progress):
5454
self.getParameterValue(self.INPUT))
5555
idx = layer.fieldNameIndex(self.getParameterValue(self.COLUMN))
5656

57-
fields = layer.pendingFields()
57+
fields = layer.fields()
5858
fields.remove(idx)
5959

6060
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,

‎python/plugins/processing/algs/qgis/DeleteDuplicateGeometries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
4949
layer = dataobjects.getObjectFromUri(
5050
self.getParameterValue(self.INPUT))
5151

52-
fields = layer.pendingFields()
52+
fields = layer.fields()
5353

5454
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
5555
layer.wkbType(), layer.crs())

‎python/plugins/processing/algs/qgis/DeleteHoles.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def processAlgorithm(self, progress):
4949
self.getParameterValue(self.INPUT))
5050

5151
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
52-
layer.pendingFields(),
52+
layer.fields(),
5353
layer.wkbType(),
5454
layer.crs())
5555

‎python/plugins/processing/algs/qgis/DensifyGeometries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
6565
isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry
6666

6767
writer = self.getOutputFromName(
68-
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
68+
self.OUTPUT).getVectorWriter(layer.fields().toList(),
6969
layer.wkbType(), layer.crs())
7070

7171
features = vector.features(layer)

‎python/plugins/processing/algs/qgis/DensifyGeometriesInterval.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
6262
isPolygon = layer.geometryType() == QgsWkbTypes.PolygonGeometry
6363

6464
writer = self.getOutputFromName(
65-
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
65+
self.OUTPUT).getVectorWriter(layer.fields().toList(),
6666
layer.wkbType(), layer.crs())
6767

6868
features = vector.features(layer)

‎python/plugins/processing/algs/qgis/Difference.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
7070

7171
geomType = layerA.wkbType()
7272
writer = self.getOutputFromName(
73-
Difference.OUTPUT).getVectorWriter(layerA.pendingFields(),
73+
Difference.OUTPUT).getVectorWriter(layerA.fields(),
7474
geomType,
7575
layerA.crs())
7676

‎python/plugins/processing/algs/qgis/ExecuteSQL.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ def processAlgorithm(self, progress):
131131
raise GeoAlgorithmExecutionException(vLayer.dataProvider().error().message())
132132

133133
writer = self.getOutputFromName(self.OUTPUT_LAYER).getVectorWriter(
134-
vLayer.pendingFields().toList(),
134+
vLayer.fields().toList(),
135135
# Create a point layer (without any points) if 'no geometry' is chosen
136136
vLayer.wkbType() if geometry_type != 1 else 1,
137137
vLayer.crs())

‎python/plugins/processing/algs/qgis/ExportGeometryInfo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ def processAlgorithm(self, progress):
7272
method = self.getParameterValue(self.METHOD)
7373

7474
geometryType = layer.geometryType()
75-
fields = layer.pendingFields()
75+
fields = layer.fields()
7676

7777
if geometryType == QgsWkbTypes.PolygonGeometry:
7878
areaName = vector.createUniqueFieldName('area', fields)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
8383
operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
8484
value = self.getParameterValue(self.VALUE)
8585

86-
fields = layer.pendingFields()
86+
fields = layer.fields()
8787
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,
8888
layer.wkbType(), layer.crs())
8989

‎python/plugins/processing/algs/qgis/ExtractByLocation.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
7070
index = vector.spatialindex(layer)
7171

7272
output = self.getOutputFromName(self.OUTPUT)
73-
writer = output.getVectorWriter(layer.pendingFields(),
73+
writer = output.getVectorWriter(layer.fields(),
7474
layer.wkbType(), layer.crs())
7575

7676
if 'disjoint' in predicates:

‎python/plugins/processing/algs/qgis/ExtractNodes.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ def processAlgorithm(self, progress):
6262
self.getParameterValue(self.INPUT))
6363

6464
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
65-
layer.pendingFields().toList(), QgsWkbTypes.Point, layer.crs())
65+
layer.fields().toList(), QgsWkbTypes.Point, layer.crs())
6666

6767
outFeat = QgsFeature()
6868
inGeom = QgsGeometry()

‎python/plugins/processing/algs/qgis/FixedDistanceBuffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ def processAlgorithm(self, progress):
7575
segments = int(self.getParameterValue(self.SEGMENTS))
7676

7777
writer = self.getOutputFromName(
78-
self.OUTPUT).getVectorWriter(layer.pendingFields().toList(),
78+
self.OUTPUT).getVectorWriter(layer.fields().toList(),
7979
QgsWkbTypes.Polygon, layer.crs())
8080

8181
buff.buffering(progress, writer, distance, None, False, layer,

‎python/plugins/processing/algs/qgis/GeometryConvert.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def processAlgorithm(self, progress):
7878
newType = QgsWkbTypes.Point
7979

8080
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
81-
layer.pendingFields(), newType, layer.crs())
81+
layer.fields(), newType, layer.crs())
8282

8383
features = vector.features(layer)
8484
total = 100.0 / len(features)

‎python/plugins/processing/algs/qgis/Gridify.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def processAlgorithm(self, progress):
6565
self.tr('Invalid grid spacing: %s/%s' % (hSpacing, vSpacing)))
6666

6767
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
68-
layer.pendingFields(), layer.wkbType(), layer.crs())
68+
layer.fields(), layer.wkbType(), layer.crs())
6969

7070
features = vector.features(layer)
7171
total = 100.0 / len(features)

‎python/plugins/processing/algs/qgis/HubDistance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ def processAlgorithm(self, progress):
9999
if addLines:
100100
geomType = QgsWkbTypes.LineString
101101

102-
fields = layerPoints.pendingFields()
102+
fields = layerPoints.fields()
103103
fields.append(QgsField('HubName', QVariant.String))
104104
fields.append(QgsField('HubDist', QVariant.Double))
105105

‎python/plugins/processing/algs/qgis/HubLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def processAlgorithm(self, progress):
7171
self.tr('Same layer given for both hubs and spokes'))
7272

7373
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
74-
layerSpoke.pendingFields(), QgsWkbTypes.LineString, layerSpoke.crs())
74+
layerSpoke.fields(), QgsWkbTypes.LineString, layerSpoke.crs())
7575

7676
spokes = vector.features(layerSpoke)
7777
hubs = vector.features(layerHub)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,8 @@ def processAlgorithm(self, progress):
8282
idxA = layerA.fieldNameIndex(fieldA)
8383
idxB = layerB.fieldNameIndex(fieldB)
8484

85-
fieldList = [layerA.pendingFields()[idxA],
86-
layerB.pendingFields()[idxB]]
85+
fieldList = [layerA.fields()[idxA],
86+
layerB.fields()[idxB]]
8787

8888
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
8989
QgsWkbTypes.Point, layerA.crs())

‎python/plugins/processing/algs/qgis/LinesToPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def processAlgorithm(self, progress):
5959
layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
6060

6161
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
62-
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs()
62+
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs()
6363
)
6464

6565
outFeat = QgsFeature()

‎python/plugins/processing/algs/qgis/MultipartToSingleparts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def processAlgorithm(self, progress):
6161
geomType = self.multiToSingleGeom(layer.wkbType())
6262

6363
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
64-
layer.pendingFields().toList(), geomType, layer.crs())
64+
layer.fields().toList(), geomType, layer.crs())
6565

6666
features = vector.features(layer)
6767
total = 100.0 / len(features)

‎python/plugins/processing/algs/qgis/PointsInPolygonUnique.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
6767

6868
classFieldIndex = pointLayer.fieldNameIndex(classFieldName)
6969
(idxCount, fieldList) = vector.findOrCreateField(polyLayer,
70-
polyLayer.pendingFields(), fieldName)
70+
polyLayer.fields(), fieldName)
7171

7272
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
7373
fields.toList(), polyLayer.wkbType(), polyLayer.crs())

‎python/plugins/processing/algs/qgis/PolygonsToLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ def processAlgorithm(self, progress):
6060
layer = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT))
6161

6262
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
63-
layer.pendingFields().toList(), QgsWkbTypes.LineString, layer.crs())
63+
layer.fields().toList(), QgsWkbTypes.LineString, layer.crs())
6464

6565
outFeat = QgsFeature()
6666
inGeom = QgsGeometry()

‎python/plugins/processing/algs/qgis/RandomExtract.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def processAlgorithm(self, progress):
8383
selran = random.sample(xrange(featureCount), value)
8484

8585
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
86-
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
86+
layer.fields().toList(), layer.wkbType(), layer.crs())
8787

8888
total = 100.0 / featureCount
8989
for i, feat in enumerate(features):

‎python/plugins/processing/algs/qgis/RandomExtractWithinSubsets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
8989
value = value / 100.0
9090

9191
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
92-
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
92+
layer.fields().toList(), layer.wkbType(), layer.crs())
9393

9494
selran = []
9595
current = 0

‎python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsFixed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from qgis.PyQt.QtGui import QIcon
3232

33-
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes, QgsWkbTypes
33+
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes
3434

3535
from processing.core.GeoAlgorithm import GeoAlgorithm
3636
from processing.core.ProcessingLog import ProcessingLog
@@ -89,7 +89,7 @@ def processAlgorithm(self, progress):
8989

9090
writer = self.getOutputFromName(
9191
self.OUTPUT_LAYER).getVectorWriter(
92-
layer.pendingFields().toList(),
92+
layer.fields().toList(),
9393
QgsWkbTypes.Polygon,
9494
layer.crs())
9595

‎python/plugins/processing/algs/qgis/RectanglesOvalsDiamondsVariable.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
from qgis.PyQt.QtGui import QIcon
3232

33-
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint, QgsWkbTypes
33+
from qgis.core import Qgis, QgsFeature, QgsGeometry, QgsPoint
3434

3535
from processing.core.GeoAlgorithm import GeoAlgorithm
3636
from processing.core.ProcessingLog import ProcessingLog
@@ -97,8 +97,8 @@ def processAlgorithm(self, progress):
9797

9898
writer = self.getOutputFromName(
9999
self.OUTPUT_LAYER).getVectorWriter(
100-
layer.pendingFields().toList(),
101-
QgsWkbTypes.Polygon,
100+
layer.fields().toList(),
101+
Qgis.WKBPolygon,
102102
layer.crs())
103103

104104
outFeat = QgsFeature()

‎python/plugins/processing/algs/qgis/ReprojectLayer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
5757
targetCrs.createFromUserInput(crsId)
5858

5959
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
60-
layer.pendingFields().toList(), layer.wkbType(), targetCrs)
60+
layer.fields().toList(), layer.wkbType(), targetCrs)
6161

6262
layerCrs = layer.crs()
6363
crsTransform = QgsCoordinateTransform(layerCrs, targetCrs)

‎python/plugins/processing/algs/qgis/SelectByAttribute.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def processAlgorithm(self, progress):
8484
operator = self.OPERATORS[self.getParameterValue(self.OPERATOR)]
8585
value = self.getParameterValue(self.VALUE)
8686

87-
fields = layer.pendingFields()
87+
fields = layer.fields()
8888

8989
idx = layer.fieldNameIndex(fieldName)
9090
fieldType = fields[idx].type()

‎python/plugins/processing/algs/qgis/SimplifyGeometries.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
7070
pointsAfter = 0
7171

7272
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
73-
layer.pendingFields().toList(), layer.wkbType(), layer.crs())
73+
layer.fields().toList(), layer.wkbType(), layer.crs())
7474

7575
features = vector.features(layer)
7676
total = 100.0 / len(features)

‎python/plugins/processing/algs/qgis/SinglePartsToMultiparts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ def processAlgorithm(self, progress):
6767
geomType = self.singleToMultiGeom(layer.wkbType())
6868

6969
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
70-
layer.pendingFields().toList(), geomType, layer.crs())
70+
layer.fields().toList(), geomType, layer.crs())
7171

7272
inFeat = QgsFeature()
7373
outFeat = QgsFeature()

‎python/plugins/processing/algs/qgis/SplitLinesWithLines.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def processAlgorithm(self, progress):
5757
layerB = dataobjects.getObjectFromUri(self.getParameterValue(self.INPUT_B))
5858

5959
sameLayer = self.getParameterValue(self.INPUT_A) == self.getParameterValue(self.INPUT_B)
60-
fieldList = layerA.pendingFields()
60+
fieldList = layerA.fields()
6161

6262
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fieldList,
6363
QgsWkbTypes.LineString, layerA.crs())

‎python/plugins/processing/algs/qgis/TextToFloat.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def processAlgorithm(self, progress):
5555
fieldName = self.getParameterValue(self.FIELD)
5656
idx = layer.fieldNameIndex(fieldName)
5757

58-
fields = layer.pendingFields()
58+
fields = layer.fields()
5959
fields[idx] = QgsField(fieldName, QVariant.Double, '', 24, 15)
6060

6161
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(fields,

‎python/plugins/processing/algs/qgis/VariableDistanceBuffer.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def processAlgorithm(self, progress):
7676
segments = int(self.getParameterValue(self.SEGMENTS))
7777

7878
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
79-
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs())
79+
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs())
8080

8181
buff.buffering(progress, writer, 0, field, True, layer, dissolve,
8282
segments)

‎python/plugins/processing/algs/qgis/VectorSplit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def processAlgorithm(self, progress):
7070
uniqueValues = vector.uniqueValues(layer, fieldIndex)
7171
baseName = os.path.join(directory, '{0}_{1}'.format(layer.name(), fieldName))
7272

73-
fields = layer.pendingFields()
73+
fields = layer.fields()
7474
crs = layer.crs()
7575
geomType = layer.wkbType()
7676

‎python/plugins/processing/algs/qgis/VoronoiPolygons.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def processAlgorithm(self, progress):
6969
buf = self.getParameterValue(self.BUFFER)
7070

7171
writer = self.getOutputFromName(self.OUTPUT).getVectorWriter(
72-
layer.pendingFields().toList(), QgsWkbTypes.Polygon, layer.crs())
72+
layer.fields().toList(), QgsWkbTypes.Polygon, layer.crs())
7373

7474
outFeat = QgsFeature()
7575
extent = layer.extent()

‎python/plugins/processing/algs/qgis/ZonalStatistics.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def processAlgorithm(self, progress):
132132
memVectorDriver = ogr.GetDriverByName('Memory')
133133
memRasterDriver = gdal.GetDriverByName('MEM')
134134

135-
fields = layer.pendingFields()
135+
fields = layer.fields()
136136
(idxMin, fields) = vector.findOrCreateField(layer, fields,
137137
columnPrefix + 'min', 21, 6)
138138
(idxMax, fields) = vector.findOrCreateField(layer, fields,

‎python/plugins/processing/algs/qgis/scripts/Frequency_analysis.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
99

1010
layer = processing.getObject(Input)
11-
inputFields = layer.pendingFields()
11+
inputFields = layer.fields()
1212
fieldIdxs = []
1313
fields = Fields.split(',')
1414
for f in fields:

‎python/plugins/processing/algs/qgis/ui/FieldsCalculatorDialog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ def populateFields(self):
172172
if self.layer is None:
173173
return
174174

175-
fields = self.layer.pendingFields()
175+
fields = self.layer.fields()
176176
for f in fields:
177177
self.mExistingFieldComboBox.addItem(f.name())
178178

0 commit comments

Comments
 (0)
Please sign in to comment.