unique_str for QgsRubberBand

qgis · Aug 28, 2018 · e72879e · e72879e
1 parent 87fb27f
commit e72879e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/app/qgsmaptoolreverseline.cpp b/src/app/qgsmaptoolreverseline.cpp
@@ -37,7 +37,6 @@ QgsMapToolReverseLine::QgsMapToolReverseLine( QgsMapCanvas *canvas )
 
 QgsMapToolReverseLine::~QgsMapToolReverseLine()
 {
-  delete mRubberBand;
 }
 
 void QgsMapToolReverseLine::canvasMoveEvent( QgsMapMouseEvent *e )
@@ -50,8 +49,6 @@ void QgsMapToolReverseLine::canvasPressEvent( QgsMapMouseEvent *e )
 {
   mPressedFid = -1;
   mPressedPartNum = -1;
-  delete mRubberBand;
-  mRubberBand = nullptr;
 
   QgsMapLayer *currentLayer = mCanvas->currentLayer();
   if ( !currentLayer )
@@ -74,7 +71,7 @@ void QgsMapToolReverseLine::canvasPressEvent( QgsMapMouseEvent *e )
 
   if ( mPressedFid != -1 )
   {
-    mRubberBand = createRubberBand( vlayer->geometryType() );
+    mRubberBand.reset( createRubberBand( vlayer->geometryType() ) );
 
     mRubberBand->setToGeometry( geomPart, vlayer );
     mRubberBand->show();
@@ -86,9 +83,6 @@ void QgsMapToolReverseLine::canvasReleaseEvent( QgsMapMouseEvent *e )
 {
   Q_UNUSED( e );
 
-  delete mRubberBand;
-  mRubberBand = nullptr;
-
   if ( !vlayer || !vlayer->isEditable() )
   {
     return;

diff --git a/src/app/qgsmaptoolreverseline.h b/src/app/qgsmaptoolreverseline.h
@@ -44,8 +44,8 @@ class APP_EXPORT QgsMapToolReverseLine: public QgsMapToolEdit
 
     QgsGeometry partUnderPoint( QPoint p, QgsFeatureId &fid, int &partNum );
 
-    /* Rubberband that shows the part being deleted*/
-    QgsRubberBand *mRubberBand = nullptr;
+    /* Rubberband that shows the part being reversed*/
+    std::unique_ptr<QgsRubberBand>mRubberBand;
 
     //The feature and part where the mouse cursor was pressed
     //This is used to check whether we are still in the same part at cursor release