Topology checker: No double-delete of rubberbands (Fix #8095)

qgis · Jul 2, 2013 · ce1a9a8 · ce1a9a8
1 parent 5020441
commit ce1a9a8
Showing 1 changed file with 3 additions and 16 deletions.
diff --git a/src/plugins/topology/checkDock.cpp b/src/plugins/topology/checkDock.cpp
@@ -150,14 +150,8 @@ void checkDock::deleteErrors()
   mErrorList.clear();
   mErrorListModel->resetModel();
 
-  QList<QgsRubberBand*>::const_iterator rit;
-
-  for ( rit = mRbErrorMarkers.begin(); rit != mRbErrorMarkers.end(); ++rit )
-  {
-    QgsRubberBand* rb = *rit;
-    rb->reset();
-    delete rb;
-  }
+  qDeleteAll( mRbErrorMarkers );
+  mRbErrorMarkers.clear();
 }
 
 void checkDock::parseErrorListByLayer( QString layerId )
@@ -397,14 +391,7 @@ void checkDock::validate( ValidateType type )
 {
   mErrorList.clear();
 
-  QList<QgsRubberBand*>::const_iterator it;
-  for ( it = mRbErrorMarkers.begin(); it != mRbErrorMarkers.end(); ++it )
-  {
-    QgsRubberBand* rb = *it;
-    rb->reset();
-    delete rb;
-  }
-
+  qDeleteAll( mRbErrorMarkers );
   mRbErrorMarkers.clear();
 
   runTests( type );