Drop QgsVectorLayer::pendingAllAttributesList()

Use QgsVectorLayer::allAttributes() instead.
qgis · Jan 15, 2018 · 1da1790 · 1da1790
1 parent 068d51c
commit 1da1790
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 15 deletions.
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -2432,6 +2432,7 @@ displayExpression instead. For the map tip use mapTipTemplate() instead.
 - splitParts() now returns QgsGeometry::OperationResult enum, integer representation of returned values may have changed
 - splitFeatured() now returns QgsGeometry::OperationResult enum, integer representation of returned values may have changed
 - pendingFields() was dropped. Use fields() instead.
+- pendingAllAttributesList() was dropped. Use allAttributes() instead.
 
 
 QgsVectorLayerEditBuffer        {#qgis_api_break_3_0_QgsVectorLayerEditBuffer}

diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -1392,12 +1392,6 @@ Returns the list of fields of this layer.
 This also includes fields which have not yet been saved to the provider.
 
 :return: A list of fields
-%End
-
-    QgsAttributeList pendingAllAttributesList() const;
-%Docstring
-Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()
-Alias for attributeList()
 %End
 
     QgsAttributeList attributeList() const;

diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1302,12 +1302,6 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      */
     inline QgsFields fields() const override { return mFields; }
 
-    /**
-     * Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()
-     * Alias for attributeList()
-     */
-    inline QgsAttributeList pendingAllAttributesList() const { return mFields.allAttributesList(); }
-
     /**
      * Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()
      * Alias for attributeList()

diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
@@ -240,7 +240,7 @@ namespace QgsWfs
       QStringList propertyList = query.propertyList;
 
       //Using pending attributes and pending fields
-      QgsAttributeList attrIndexes = vlayer->pendingAllAttributesList();
+      QgsAttributeList attrIndexes = vlayer->attributeList();
       bool withGeom = true;
       if ( !propertyList.isEmpty() && propertyList.first() != QStringLiteral( "*" ) )
       {

diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py
@@ -937,7 +937,7 @@ def checkAfterOneDelete():
             self.assertEqual(len(flds), 2)
             self.assertEqual(flds[0].name(), "fldint")
             self.assertEqual(flds[1].name(), "flddouble")
-            self.assertEqual(layer.pendingAllAttributesList(), [0, 1])
+            self.assertEqual(layer.attributeList(), [0, 1])
 
             f = next(layer.getFeatures())
             attrs = f.attributes()
@@ -951,7 +951,7 @@ def checkAfterOneDelete():
         self.assertTrue(layer.deleteAttribute(0))
 
         def checkAfterTwoDeletes():
-            self.assertEqual(layer.pendingAllAttributesList(), [0])
+            self.assertEqual(layer.attributeList(), [0])
             flds = layer.fields()
             # for fld in flds: print "FLD", fld.name()
             self.assertEqual(len(flds), 1)