QgsVectorLayer, QgsVectorDataProvider are QgsFeatureSources

nyalldawson · nyalldawson · commit 8bfeb8f73b4c · 2017-05-25T12:31:06.000+10:00
diff --git a/python/core/qgsvectordataprovider.sip b/python/core/qgsvectordataprovider.sip
@@ -13,7 +13,7 @@ typedef QHash<int, QString> QgsAttrPalIndexNameHash;
 
 
 
-class QgsVectorDataProvider : QgsDataProvider, QgsFeatureSink
+class QgsVectorDataProvider : QgsDataProvider, QgsFeatureSink, QgsFeatureSource
 {
 %Docstring
  This is the base class for vector data providers.
diff --git a/python/core/qgsvectorlayer.sip b/python/core/qgsvectorlayer.sip
@@ -17,7 +17,7 @@ typedef QList<int> QgsAttributeList;
 typedef QSet<int> QgsAttributeIds;
 
 
-class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSink
+class QgsVectorLayer : QgsMapLayer, QgsExpressionContextGenerator, QgsFeatureSink, QgsFeatureSource
 {
 %Docstring
  Represents a vector layer which manages a vector based data sets.
@@ -890,7 +890,8 @@ Return the provider type for this layer
  :rtype: str
 %End
 
-    QgsFeatureIterator getFeatures( const QgsFeatureRequest &request = QgsFeatureRequest() ) const;
+    virtual QgsFeatureIterator getFeatures( const QgsFeatureRequest &request = QgsFeatureRequest() ) const;
+
 %Docstring
  Query the layer for features specified in request.
  \param request feature request describing parameters of features to return
diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h
@@ -31,6 +31,7 @@ class QTextCodec;
 #include "qgsmaplayerdependency.h"
 #include "qgsrelation.h"
 #include "qgsfeaturesink.h"
+#include "qgsfeaturesource.h"
 
 typedef QList<int> QgsAttributeList SIP_SKIP;
 typedef QSet<int> QgsAttributeIds SIP_SKIP;
@@ -50,7 +51,7 @@ class QgsFeedback;
  *
  *
  */
-class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeatureSink
+class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeatureSink, public QgsFeatureSource
 {
     Q_OBJECT
 
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -31,6 +31,7 @@
 #include "qgsmaplayer.h"
 #include "qgsfeature.h"
 #include "qgsfeaturerequest.h"
+#include "qgsfeaturesource.h"
 #include "qgsfields.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorsimplifymethod.h"
@@ -346,7 +347,7 @@ typedef QSet<int> QgsAttributeIds;
  * TODO QGIS3: Remove virtual from non-inherited methods (like isModified)
  * \see QgsVectorLayerUtils()
  */
-class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionContextGenerator, public QgsFeatureSink
+class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionContextGenerator, public QgsFeatureSink, public QgsFeatureSource
 {
     Q_OBJECT
 
@@ -859,7 +860,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * \param request feature request describing parameters of features to return
      * \returns iterator for matching features from provider
      */
-    QgsFeatureIterator getFeatures( const QgsFeatureRequest &request = QgsFeatureRequest() ) const;
+    QgsFeatureIterator getFeatures( const QgsFeatureRequest &request = QgsFeatureRequest() ) const override;
 
     /**
      * Query the layer for features matching a given expression.

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ typedef QHash<int, QString> QgsAttrPalIndexNameHash;`
`13`	`13`
`14`	`14`
`15`	`15`
`16`		`-class QgsVectorDataProvider : QgsDataProvider, QgsFeatureSink`
	`16`	`+class QgsVectorDataProvider : QgsDataProvider, QgsFeatureSink, QgsFeatureSource`
`17`	`17`	`{`
`18`	`18`	`%Docstring`
`19`	`19`	`This is the base class for vector data providers.`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ class QTextCodec;`
`31`	`31`	`#include "qgsmaplayerdependency.h"`
`32`	`32`	`#include "qgsrelation.h"`
`33`	`33`	`#include "qgsfeaturesink.h"`
	`34`	`+#include "qgsfeaturesource.h"`
`34`	`35`
`35`	`36`	`typedef QList<int> QgsAttributeList SIP_SKIP;`
`36`	`37`	`typedef QSet<int> QgsAttributeIds SIP_SKIP;`
`@@ -50,7 +51,7 @@ class QgsFeedback;`
`50`	`51`	`*`
`51`	`52`	`*`
`52`	`53`	`*/`
`53`		`-class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeatureSink`
	`54`	`+class CORE_EXPORT QgsVectorDataProvider : public QgsDataProvider, public QgsFeatureSink, public QgsFeatureSource`
`54`	`55`	`{`
`55`	`56`	`Q_OBJECT`
`56`	`57`