Fix removing composer legend items. Fix #7874 Fix #7464

qgis · May 28, 2013 · 1dc75dd64fcd4613379f9c28e161c1bd7afa22d1 · 1dc75dd
1 parent 34ef14a
commit 1dc75dd64fcd4613379f9c28e161c1bd7afa22d1
Unified Split

Showing with 6 additions and 4 deletions.

+6 −4 src/app/composer/qgscomposerlegendwidget.cpp
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -684,11 +684,13 @@ void QgsComposerLegendWidget::on_mRemoveToolButton_clicked()
     return;
   }
 
-  QModelIndexList selection = selectionModel->selectedIndexes();
-  for ( int i = selection.size() - 1; i >= 0; --i )
+  QList<QPersistentModelIndex> indexes;
+  foreach(const QModelIndex &index, selectionModel->selectedIndexes())
+      indexes << index;
+
+  foreach(const QPersistentModelIndex index, indexes)
   {
-    QModelIndex parentIndex = selection.at( i ).parent();
-    itemModel->removeRow( selection.at( i ).row(), parentIndex );
+      itemModel->removeRow( index.row(), index.parent() );
   }
 
   mLegend->adjustBoxSize();