Make fields() available in QgsVectorLayerFeatureSource

qgis · May 11, 2017 · f264370 · f264370
1 parent 5888d22
commit f264370
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/python/core/qgsvectorlayerfeatureiterator.sip b/python/core/qgsvectorlayerfeatureiterator.sip
@@ -17,6 +17,7 @@ class QgsVectorLayerFeatureSource : QgsAbstractFeatureSource
     ~QgsVectorLayerFeatureSource();
 
     virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest &request = QgsFeatureRequest() );
+    QgsFields fields();
 };
 
 class QgsVectorLayerFeatureIterator : QgsAbstractFeatureIterator

diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -93,6 +93,11 @@ QgsFeatureIterator QgsVectorLayerFeatureSource::getFeatures( const QgsFeatureReq
   return QgsFeatureIterator( new QgsVectorLayerFeatureIterator( this, false, request ) );
 }
 
+QgsFields QgsVectorLayerFeatureSource::fields()
+{
+  return mFields;
+}
+
 
 QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayerFeatureSource *source, bool ownSource, const QgsFeatureRequest &request )
   : QgsAbstractFeatureIteratorFromSource<QgsVectorLayerFeatureSource>( source, ownSource, request )

diff --git a/src/core/qgsvectorlayerfeatureiterator.h b/src/core/qgsvectorlayerfeatureiterator.h
@@ -53,6 +53,14 @@ class CORE_EXPORT QgsVectorLayerFeatureSource : public QgsAbstractFeatureSource
 
     friend class QgsVectorLayerFeatureIterator;
 
+    /**
+     * Returns the fields that will be available for features that are retrieved from
+     * this source.
+     *
+     * \since QGIS 3.0
+     */
+    QgsFields fields();
+
   protected:
 
     QgsAbstractFeatureSource *mProviderFeatureSource = nullptr;