inline and virtual are no good friends

qgis · Sep 18, 2018 · ddaa8ea · ddaa8ea
1 parent 9f407d0
commit ddaa8ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
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()