Skip to content

Commit 0b64a83

Browse files
signedavsignedav
committedMay 8, 2020
docs
·
ltr-3_40final-3_14_0
1 parent 013b935 commit 0b64a83

File tree

5 files changed

+11
-7
lines changed

5 files changed

+11
-7
lines changed
 

‎python/core/auto_generated/qgsvectorlayer.sip.in

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1276,7 +1276,7 @@ Deletes a vertex from a feature.
12761276
Deletes the selected features
12771277

12781278
:param deleteCount: The number of successfully deleted features
1279-
:param cascade: If the decendants of the feature should be deleted as well
1279+
:param context: The chain of features who will be deleted for feedback and to avoid endless recursions
12801280

12811281
:return: ``True`` in case of success and ``False`` otherwise
12821282
%End
@@ -1961,7 +1961,7 @@ Deletes a list of attribute fields (but does not commit it)
19611961
Deletes a feature from the layer (but does not commit it).
19621962

19631963
:param fid: The feature id to delete
1964-
:param cascade: If the decendants of the feature should be deleted as well
1964+
:param context: The chain of features who will be deleted for feedback and to avoid endless recursions
19651965

19661966
.. note::
19671967

@@ -1976,7 +1976,7 @@ Deletes a feature from the layer (but does not commit it).
19761976
Deletes a set of features from the layer (but does not commit it)
19771977

19781978
:param fids: The feature ids to delete
1979-
:param cascade: If the decendants of the feature should be deleted as well
1979+
:param context: The chain of features who will be deleted for feedback and to avoid endless recursions
19801980

19811981
:return: ``False`` if the layer is not in edit mode or does not support deleting
19821982
in case of an active transaction depends on the provider implementation

‎python/core/auto_generated/qgsvectorlayerjoinbuffer.sip.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ Deletes a feature from joined layers. The feature id given in
213213
parameter is the one coming from the target layer.
214214

215215
:param fid: The feature id from the target layer to delete
216+
:param context: The chain of features who will be deleted for feedback and to avoid endless recursions
216217

217218
:return: ``False`` if an error happened, ``True`` otherwise
218219

@@ -226,6 +227,7 @@ Deletes a list of features from joined layers. Feature ids given
226227
in a parameter are those coming from the target layer.
227228

228229
:param fids: Feature ids from the target layer to delete
230+
:param context: The chain of features who will be deleted for feedback and to avoid endless recursions
229231

230232
:return: ``False`` if an error happened, ``True`` otherwise
231233

‎src/core/qgsvectorlayer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3176,7 +3176,7 @@ bool QgsVectorLayer::deleteFeatureCascade( QgsFeatureId fid, QgsVectorLayer::Del
31763176
QgsFeatureIds handledFeatureIds = context->handledFeatures.value( this );
31773177
if ( handledFeatureIds.contains( fid ) )
31783178
{
3179-
// break recursion
3179+
// avoid endless recursion
31803180
return false;
31813181
}
31823182
else

‎src/core/qgsvectorlayer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1295,7 +1295,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
12951295
/**
12961296
* Deletes the selected features
12971297
* \param deleteCount The number of successfully deleted features
1298-
* \param cascade If the decendants of the feature should be deleted as well
1298+
* \param context The chain of features who will be deleted for feedback and to avoid endless recursions
12991299
*
13001300
* \returns TRUE in case of success and FALSE otherwise
13011301
*/
@@ -1832,7 +1832,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
18321832
/**
18331833
* Deletes a feature from the layer (but does not commit it).
18341834
* \param fid The feature id to delete
1835-
* \param cascade If the decendants of the feature should be deleted as well
1835+
* \param context The chain of features who will be deleted for feedback and to avoid endless recursions
18361836
*
18371837
* \note Calls to deleteFeature() are only valid for layers in which edits have been enabled
18381838
* by a call to startEditing(). Changes made to features using this method are not committed
@@ -1844,7 +1844,7 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer, public QgsExpressionConte
18441844
/**
18451845
* Deletes a set of features from the layer (but does not commit it)
18461846
* \param fids The feature ids to delete
1847-
* \param cascade If the decendants of the feature should be deleted as well
1847+
* \param context The chain of features who will be deleted for feedback and to avoid endless recursions
18481848
*
18491849
* \returns FALSE if the layer is not in edit mode or does not support deleting
18501850
* in case of an active transaction depends on the provider implementation

‎src/core/qgsvectorlayerjoinbuffer.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@ class CORE_EXPORT QgsVectorLayerJoinBuffer : public QObject, public QgsFeatureSi
197197
* parameter is the one coming from the target layer.
198198
*
199199
* \param fid The feature id from the target layer to delete
200+
* \param context The chain of features who will be deleted for feedback and to avoid endless recursions
200201
*
201202
* \returns FALSE if an error happened, TRUE otherwise
202203
*
@@ -209,6 +210,7 @@ class CORE_EXPORT QgsVectorLayerJoinBuffer : public QObject, public QgsFeatureSi
209210
* in a parameter are those coming from the target layer.
210211
*
211212
* \param fids Feature ids from the target layer to delete
213+
* \param context The chain of features who will be deleted for feedback and to avoid endless recursions
212214
*
213215
* \returns FALSE if an error happened, TRUE otherwise
214216
*

0 commit comments

Comments
 (0)
Please sign in to comment.