use reference for fids in deleteFeatures and ensure that they exist until the end in qgsrelationeditorwidget

signedav · signedav · commit b9348302c44b · 2020-05-14T10:40:00.000+02:00
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -1974,7 +1974,7 @@ Deletes a feature from the layer (but does not commit it).
    changes can be discarded by calling rollBack().
 %End
 
-    bool deleteFeatures( const QgsFeatureIds fids, DeleteContext *context = 0 );
+    bool deleteFeatures( const QgsFeatureIds &fids, DeleteContext *context = 0 );
 %Docstring
 Deletes a set of features from the layer (but does not commit it)
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3240,7 +3240,7 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid, QgsVectorLayer::DeleteCont
   return res;
 }
 
-bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds fids, QgsVectorLayer::DeleteContext *context )
+bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids, QgsVectorLayer::DeleteContext *context )
 {
   bool res = true;
   const auto constFids = fids;
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -1858,7 +1858,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * to the underlying data provider until a commitChanges() call is made. Any uncommitted
      * changes can be discarded by calling rollBack().
      */
-    bool deleteFeatures( const QgsFeatureIds fids, DeleteContext *context = nullptr );
+    bool deleteFeatures( const QgsFeatureIds &fids, DeleteContext *context = nullptr );
 
     /**
      * Attempts to commit to the underlying data provider any buffered changes made since the
diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -652,7 +652,8 @@ void QgsRelationEditorWidget::deleteFeature( const QgsFeatureId featureid )
 
 void QgsRelationEditorWidget::deleteSelectedFeatures()
 {
-  deleteFeatures( mFeatureSelectionMgr->selectedFeatureIds() );
+  QgsFeatureIds selectedFids = mFeatureSelectionMgr->selectedFeatureIds();
+  deleteFeatures( selectedFids );
 }
 
 void QgsRelationEditorWidget::deleteFeatures( const QgsFeatureIds &featureids )

Original file line number	Diff line number	Diff line change
`@@ -3240,7 +3240,7 @@ bool QgsVectorLayer::deleteFeature( QgsFeatureId fid, QgsVectorLayer::DeleteCont`
`3240`	`3240`	`return res;`
`3241`	`3241`	`}`
`3242`	`3242`
`3243`		`-bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds fids, QgsVectorLayer::DeleteContext *context )`
	`3243`	`+bool QgsVectorLayer::deleteFeatures( const QgsFeatureIds &fids, QgsVectorLayer::DeleteContext *context )`
`3244`	`3244`	`{`
`3245`	`3245`	`bool res = true;`
`3246`	`3246`	`const auto constFids = fids;`
Original file line number	Diff line number	Diff line change
`@@ -652,7 +652,8 @@ void QgsRelationEditorWidget::deleteFeature( const QgsFeatureId featureid )`
`652`	`652`
`653`	`653`	`void QgsRelationEditorWidget::deleteSelectedFeatures()`
`654`	`654`	`{`
`655`		`- deleteFeatures( mFeatureSelectionMgr->selectedFeatureIds() );`
	`655`	`+ QgsFeatureIds selectedFids = mFeatureSelectionMgr->selectedFeatureIds();`
	`656`	`+ deleteFeatures( selectedFids );`
`656`	`657`	`}`
`657`	`658`
`658`	`659`	`void QgsRelationEditorWidget::deleteFeatures( const QgsFeatureIds &featureids )`