Followup 363336, fixing adding features to OGR data providers

(addFeature cannot be called directly - it must be called by addFeatures to ensure the various edition setup code is called)
qgis · May 3, 2017 · 75fa28f · 75fa28f
1 parent dc7198a
commit 75fa28f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1226,7 +1226,7 @@ OGRGeometryH QgsOgrProvider::ConvertGeometryIfNecessary( OGRGeometryH hGeom )
   return OGR_G_ForceTo( hGeom, layerGeomType, nullptr );
 }
 
-bool QgsOgrProvider::addFeature( QgsFeature &f )
+bool QgsOgrProvider::addFeaturePrivate( QgsFeature &f )
 {
   bool returnValue = true;
   OGRFeatureDefnH fdef = OGR_L_GetLayerDefn( ogrLayer );
@@ -1386,7 +1386,7 @@ bool QgsOgrProvider::addFeatures( QgsFeatureList &flist )
   bool returnvalue = true;
   for ( QgsFeatureList::iterator it = flist.begin(); it != flist.end(); ++it )
   {
-    if ( !addFeature( *it ) )
+    if ( !addFeaturePrivate( *it ) )
     {
       returnvalue = false;
     }

diff --git a/src/providers/ogr/qgsogrprovider.h b/src/providers/ogr/qgsogrprovider.h
@@ -225,7 +225,7 @@ class QgsOgrProvider : public QgsVectorDataProvider
 
     mutable QStringList mSubLayerList;
 
-    bool addFeature( QgsFeature &f ) override;
+    bool addFeaturePrivate( QgsFeature &f );
     //! Deletes one feature
     bool deleteFeature( QgsFeatureId id );