getter for handledFeatures in DeleteContext

signedav · signedav · commit d6a038b700ec · 2020-05-11T10:09:23.000+02:00
diff --git a/python/core/auto_generated/qgsvectorlayer.sip.in b/python/core/auto_generated/qgsvectorlayer.sip.in
@@ -374,15 +374,19 @@ Constructor for LayerOptions.
 
     };
 
-    struct DeleteContext
+    struct  DeleteContext
     {
 
       explicit DeleteContext( bool cascade = false );
 %Docstring
 Constructor for DeleteContext.
 %End
 
-      QMap<QgsVectorLayer *, QgsFeatureIds> handledFeatures;
+      QMap<QgsVectorLayer *, QgsFeatureIds> handledFeatures();
+%Docstring
+Returns all the layers on which features have been deleted
+%End
+
       bool cascade;
     };
 
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -3171,9 +3171,9 @@ bool QgsVectorLayer::deleteFeatureCascade( QgsFeatureId fid, QgsVectorLayer::Del
 
   if ( context && context->cascade )
   {
-    if ( context->handledFeatures.contains( this ) )
+    if ( context->mHandledFeatures.contains( this ) )
     {
-      QgsFeatureIds handledFeatureIds = context->handledFeatures.value( this );
+      QgsFeatureIds handledFeatureIds = context->mHandledFeatures.value( this );
       if ( handledFeatureIds.contains( fid ) )
       {
         // avoid endless recursion
@@ -3183,13 +3183,13 @@ bool QgsVectorLayer::deleteFeatureCascade( QgsFeatureId fid, QgsVectorLayer::Del
       {
         // add feature id
         handledFeatureIds << fid;
-        context->handledFeatures.insert( this, handledFeatureIds );
+        context->mHandledFeatures.insert( this, handledFeatureIds );
       }
     }
     else
     {
       // add layer and feature id
-      context->handledFeatures.insert( this, QgsFeatureIds() << fid );
+      context->mHandledFeatures.insert( this, QgsFeatureIds() << fid );
     }
 
     const QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( this );
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
@@ -508,16 +508,21 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
      * Context for deleting features
      * \since QGIS 3.14
      */
-    struct DeleteContext
+    struct  DeleteContext
     {
 
       /**
        * Constructor for DeleteContext.
        */
       explicit DeleteContext( bool cascade = false ): cascade( cascade ) {}
 
-      QMap<QgsVectorLayer *, QgsFeatureIds> handledFeatures;
-      bool cascade ;
+      /**
+       * Returns all the layers on which features have been deleted
+       */
+      QMap<QgsVectorLayer *, QgsFeatureIds> handledFeatures() { return mHandledFeatures; }
+
+      QMap<QgsVectorLayer *, QgsFeatureIds> mHandledFeatures SIP_SKIP;
+      bool cascade;
     };
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -3171,9 +3171,9 @@ bool QgsVectorLayer::deleteFeatureCascade( QgsFeatureId fid, QgsVectorLayer::Del`
`3171`	`3171`
`3172`	`3172`	`if ( context && context->cascade )`
`3173`	`3173`	`{`
`3174`		`- if ( context->handledFeatures.contains( this ) )`
	`3174`	`+ if ( context->mHandledFeatures.contains( this ) )`
`3175`	`3175`	`{`
`3176`		`- QgsFeatureIds handledFeatureIds = context->handledFeatures.value( this );`
	`3176`	`+ QgsFeatureIds handledFeatureIds = context->mHandledFeatures.value( this );`
`3177`	`3177`	`if ( handledFeatureIds.contains( fid ) )`
`3178`	`3178`	`{`
`3179`	`3179`	`// avoid endless recursion`
`@@ -3183,13 +3183,13 @@ bool QgsVectorLayer::deleteFeatureCascade( QgsFeatureId fid, QgsVectorLayer::Del`
`3183`	`3183`	`{`
`3184`	`3184`	`// add feature id`
`3185`	`3185`	`handledFeatureIds << fid;`
`3186`		`- context->handledFeatures.insert( this, handledFeatureIds );`
	`3186`	`+ context->mHandledFeatures.insert( this, handledFeatureIds );`
`3187`	`3187`	`}`
`3188`	`3188`	`}`
`3189`	`3189`	`else`
`3190`	`3190`	`{`
`3191`	`3191`	`// add layer and feature id`
`3192`		`- context->handledFeatures.insert( this, QgsFeatureIds() << fid );`
	`3192`	`+ context->mHandledFeatures.insert( this, QgsFeatureIds() << fid );`
`3193`	`3193`	`}`
`3194`	`3194`
`3195`	`3195`	`const QList<QgsRelation> relations = QgsProject::instance()->relationManager()->referencedRelations( this );`