inline and virtual are no good friends

m-kuhn · m-kuhn · commit ddaa8ea4afb7 · 2018-09-18T18:53:48.000+02:00
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -1450,7 +1450,7 @@ Returns new instance of QgsMapLayerRenderer that will be used for rendering of g
     QgsRectangle extent() const final;
     QgsRectangle sourceExtent() const final;
 
-    QgsFields fields() const;
+    QgsFields fields() const final;
 %Docstring
 Returns the list of fields of this layer.
 This also includes fields which have not yet been saved to the provider.
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -2877,6 +2877,11 @@ bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids )
   return res;
 }
 
+QgsFields QgsVectorLayer::fields() const
+{
+  return mFields;
+}
+
 QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const
 {
   QgsAttributeList pkAttributesList;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1369,7 +1369,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      *
      * \returns A list of fields
      */
-    inline QgsFields fields() const { return mFields; }
+    QgsFields fields() const final;
 
     /**
      * Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()

Original file line number	Diff line number	Diff line change
`@@ -2877,6 +2877,11 @@ bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids )`
`2877`	`2877`	`return res;`
`2878`	`2878`	`}`
`2879`	`2879`
	`2880`	`+QgsFields QgsVectorLayer::fields() const`
	`2881`	`+{`
	`2882`	`+ return mFields;`
	`2883`	`+}`
	`2884`	`+`
`2880`	`2885`	`QgsAttributeList QgsVectorLayer::primaryKeyAttributes() const`
`2881`	`2886`	`{`
`2882`	`2887`	`QgsAttributeList pkAttributesList;`
Original file line number	Diff line number	Diff line change
`@@ -1369,7 +1369,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte`
`1369`	`1369`	`*`
`1370`	`1370`	`* \returns A list of fields`
`1371`	`1371`	`*/`
`1372`		`- inline QgsFields fields() const { return mFields; }`
	`1372`	`+ QgsFields fields() const final;`
`1373`	`1373`
`1374`	`1374`	`/**`
`1375`	`1375`	`* Returns list of attribute indexes. i.e. a list from 0 ... fieldCount()`