use getter methods of DeleteContext in gui functions

qgis · May 11, 2020 · 74b5c09 · 74b5c09
1 parent f5d35dd
commit 74b5c09
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 15 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -9032,16 +9032,16 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
   }
   else
   {
+    const auto contextLayers = context.handledLayers();
     //if it effected more than one layer, print feedback for all descendants
-    if ( context.mHandledFeatures.size() > 1 )
+    if ( contextLayers.size() > 1 )
     {
       deletedCount = 0;
       QString feedbackMessage;
-      QMap<QgsVectorLayer *, QgsFeatureIds>::const_iterator i;
-      for ( i = context.mHandledFeatures.begin(); i != context.mHandledFeatures.end(); ++i )
+      for ( QgsVectorLayer *contextLayer : contextLayers )
       {
-        feedbackMessage += tr( " %1 on layer %2." ).arg( i.value().size() ).arg( i.key()->name() );
-        deletedCount += i.value().size();
+        feedbackMessage += tr( " %1 on layer %2." ).arg( context.handledFeatures( contextLayer ).size() ).arg( contextLayer->name() );
+        deletedCount += context.handledFeatures( contextLayer ).size();
       }
       visibleMessageBar()->pushMessage( tr( "%1 features deleted: %2" ).arg( deletedCount ).arg( feedbackMessage ), Qgis::Success );
     }

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -887,16 +887,17 @@ void QgsAttributeTableDialog::deleteFeature( const QgsFeatureId fid )
 
   QgsVectorLayer::DeleteContext context { true };
   mLayer->deleteFeature( fid, &context );
+
+  const auto contextLayers = context.handledLayers();
   //if it effected more than one layer, print feedback for all descendants
-  if ( context.mHandledFeatures.size() > 1 )
+  if ( contextLayers.size() > 1 )
   {
     int deletedCount = 0;
     QString feedbackMessage;
-    QMap<QgsVectorLayer *, QgsFeatureIds>::const_iterator i;
-    for ( i = context.mHandledFeatures.begin(); i != context.mHandledFeatures.end(); ++i )
+    for ( QgsVectorLayer *contextLayer : contextLayers )
     {
-      feedbackMessage += tr( " %1 on layer %2." ).arg( i.value().size() ).arg( i.key()->name() );
-      deletedCount += i.value().size();
+      feedbackMessage += tr( " %1 on layer %2." ).arg( context.handledFeatures( contextLayer ).size() ).arg( contextLayer->name() );
+      deletedCount += context.handledFeatures( contextLayer ).size();
     }
     QgisApp::instance()->messageBar()->pushMessage( tr( "%1 features deleted: %2" ).arg( deletedCount ).arg( feedbackMessage ), Qgis::Success );
   }

diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp
@@ -752,18 +752,19 @@ void QgsRelationEditorWidget::deleteFeatures( const QgsFeatureIds &featureids )
   {
     QgsVectorLayer::DeleteContext context { true };
     layer->deleteFeatures( featureids, &context );
-    if ( context.mHandledFeatures.size() > 1 )
+    const auto contextLayers = context.handledLayers();
+    if ( contextLayers.size() > 1 )
     {
       int deletedCount = 0;
       QString feedbackMessage;
-      QMap<QgsVectorLayer *, QgsFeatureIds>::const_iterator i;
-      for ( i = context.mHandledFeatures.begin(); i != context.mHandledFeatures.end(); ++i )
+      for ( QgsVectorLayer *contextLayer : contextLayers )
       {
-        feedbackMessage += tr( " %1 on layer %2." ).arg( i.value().size() ).arg( i.key()->name() );
-        deletedCount += i.value().size();
+        feedbackMessage += tr( " %1 on layer %2." ).arg( context.handledFeatures( contextLayer ).size() ).arg( contextLayer->name() );
+        deletedCount += context.handledFeatures( contextLayer ).size();
       }
       mEditorContext.mainMessageBar()->pushMessage( tr( "%1 features deleted: %2" ).arg( deletedCount ).arg( feedbackMessage ), Qgis::Success );
     }
+
     updateUi();
   }
 }