adapted to the return value as QgsGeometry()

luipir · luipir · commit ac1a579b4248 · 2017-06-12T17:38:26.000+02:00
diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp
@@ -324,8 +324,7 @@ bool QgsVectorLayerEditBuffer::commitChanges( QStringList &commitErrors )
              ( f.geometry().wkbType() == provider->wkbType() ) )
           continue;
 
-        std::unique_ptr<QgsGeometry> convertedGeom( provider->convertToProviderType( f.geometry() ) );
-        if ( ! convertedGeom )
+        if ( provider->convertToProviderType( f.geometry() ).isNull() )
         {
           commitErrors << tr( "ERROR: %n feature(s) not added - geometry type is not compatible with the current layer.", "not added features count", mAddedFeatures.size() );
           success = false;

Original file line number	Diff line number	Diff line change
`@@ -324,8 +324,7 @@ bool QgsVectorLayerEditBuffer::commitChanges( QStringList &commitErrors )`
`324`	`324`	`( f.geometry().wkbType() == provider->wkbType() ) )`
`325`	`325`	`continue;`
`326`	`326`
`327`		`- std::unique_ptr<QgsGeometry> convertedGeom( provider->convertToProviderType( f.geometry() ) );`
`328`		`- if ( ! convertedGeom )`
	`327`	`+ if ( provider->convertToProviderType( f.geometry() ).isNull() )`
`329`	`328`	`{`
`330`	`329`	`commitErrors << tr( "ERROR: %n feature(s) not added - geometry type is not compatible with the current layer.", "not added features count", mAddedFeatures.size() );`
`331`	`330`	`success = false;`