Update sip bindings

m-kuhn · m-kuhn · commit c1c81eae94e8 · 2014-09-22T18:38:36.000+02:00
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -372,6 +372,18 @@ class QgsVectorLayer : QgsMapLayer
      */
     QgsFeatureList selectedFeatures();
 
+    /**
+     * Get an iterator of the selected features
+     *
+     * @param request You may specify a request, e.g. to limit the set of requested attributes.
+     *                Any filter on the request will be discarded.
+     *
+     * @return Iterator over the selected features
+     *
+     * @see    selectedFeaturesIds()
+     */
+    QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() );
+
     /**
      * Return reference to identifiers of selected features
      *
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2296,7 +2296,6 @@ const QgsFeatureIds& QgsVectorLayer::selectedFeaturesIds() const
   return mSelectedFeatureIds;
 }
 
-
 QgsFeatureList QgsVectorLayer::selectedFeatures()
 {
   QgsFeatureList features;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -731,6 +731,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      * @return A list of { @link QgsFeature } 's
      *
      * @see    selectedFeaturesIds()
+     * @see    selectedFeaturesIterator() which is more memory friendly when handling large selections
      */
     QgsFeatureList selectedFeatures();
 
@@ -743,6 +744,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      * @return Iterator over the selected features
      *
      * @see    selectedFeaturesIds()
+     * @see    selectedFeatures()
      */
     QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() );
 

Original file line number	Diff line number	Diff line change
`@@ -2296,7 +2296,6 @@ const QgsFeatureIds& QgsVectorLayer::selectedFeaturesIds() const`
`2296`	`2296`	`return mSelectedFeatureIds;`
`2297`	`2297`	`}`
`2298`	`2298`
`2299`		`-`
`2300`	`2299`	`QgsFeatureList QgsVectorLayer::selectedFeatures()`
`2301`	`2300`	`{`
`2302`	`2301`	`QgsFeatureList features;`
Original file line number	Diff line number	Diff line change
`@@ -731,6 +731,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer`
`731`	`731`	`* @return A list of { @link QgsFeature } 's`
`732`	`732`	`*`
`733`	`733`	`* @see selectedFeaturesIds()`
	`734`	`+ * @see selectedFeaturesIterator() which is more memory friendly when handling large selections`
`734`	`735`	`*/`
`735`	`736`	`QgsFeatureList selectedFeatures();`
`736`	`737`
`@@ -743,6 +744,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer`
`743`	`744`	`* @return Iterator over the selected features`
`744`	`745`	`*`
`745`	`746`	`* @see selectedFeaturesIds()`
	`747`	`+ * @see selectedFeatures()`
`746`	`748`	`*/`
`747`	`749`	`QgsFeatureIterator selectedFeaturesIterator( QgsFeatureRequest request = QgsFeatureRequest() );`
`748`	`750`