Use unique_ptr for mNumberSidesSpinBox

qgis · Oct 3, 2017 · b962828 · b962828
1 parent 3e8403b
commit b962828
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/app/qgsmaptooladdregularpolygon.cpp b/src/app/qgsmaptooladdregularpolygon.cpp
@@ -39,22 +39,21 @@ QgsMapToolAddRegularPolygon::~QgsMapToolAddRegularPolygon()
 void QgsMapToolAddRegularPolygon::createNumberSidesSpinBox()
 {
   deleteNumberSidesSpinBox();
-  mNumberSidesSpinBox = new QSpinBox();
+  mNumberSidesSpinBox = std::unique_ptr<QSpinBox>( new QSpinBox() );
   mNumberSidesSpinBox->setMaximum( 99999999 );
   mNumberSidesSpinBox->setMinimum( 3 );
   mNumberSidesSpinBox->setPrefix( tr( "Number of sides: " ) );
   mNumberSidesSpinBox->setValue( mNumberSides );
-  QgisApp::instance()->addUserInputWidget( mNumberSidesSpinBox );
+  QgisApp::instance()->addUserInputWidget( mNumberSidesSpinBox.get() );
   mNumberSidesSpinBox->setFocus( Qt::TabFocusReason );
 }
 
 void QgsMapToolAddRegularPolygon::deleteNumberSidesSpinBox()
 {
   if ( mNumberSidesSpinBox )
   {
-    QgisApp::instance()->statusBarIface()->removeWidget( mNumberSidesSpinBox );
-    delete mNumberSidesSpinBox;
-    mNumberSidesSpinBox = nullptr;
+    QgisApp::instance()->statusBarIface()->removeWidget( mNumberSidesSpinBox.get() );
+    mNumberSidesSpinBox.reset( nullptr );
   }
 }
 

diff --git a/src/app/qgsmaptooladdregularpolygon.h b/src/app/qgsmaptooladdregularpolygon.h
@@ -40,7 +40,7 @@ class QgsMapToolAddRegularPolygon: public QgsMapToolCapture
   protected:
     explicit QgsMapToolAddRegularPolygon( QgsMapCanvas *canvas ); //forbidden
 
-    QSpinBox *mNumberSidesSpinBox = nullptr;
+    std::unique_ptr<QSpinBox> mNumberSidesSpinBox;
     int mNumberSides;
 
     //! (re-)create the spin box to enter the number of sides