Use unique_ptr

lbartoletti · lbartoletti · commit eee75771224a · 2017-09-06T22:06:57.000+02:00
diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp
@@ -68,10 +68,10 @@ void QgsMapToolCircle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
     {
       case 1:
       {
-        QgsLineString *line = new QgsLineString();
+        std::unique_ptr<QgsLineString> line( new QgsLineString() );
         line->addVertex( mPoints.at( 0 ) );
         line->addVertex( mapPoint );
-        mTempRubberBand->setGeometry( line );
+        mTempRubberBand->setGeometry( line.release() );
       }
       break;
       case 2:
diff --git a/src/app/qgsmaptoolellipsecenter2points.cpp b/src/app/qgsmaptoolellipsecenter2points.cpp
@@ -19,6 +19,7 @@
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
 #include <QMouseEvent>
+#include <memory>
 
 QgsMapToolEllipseCenter2Points::QgsMapToolEllipseCenter2Points( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )
@@ -69,10 +70,10 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
     {
       case 1:
       {
-        QgsLineString *line = new QgsLineString();
+        std::unique_ptr<QgsLineString> line( new QgsLineString() );
         line->addVertex( mPoints.at( 0 ) );
         line->addVertex( mapPoint );
-        mTempRubberBand->setGeometry( line );
+        mTempRubberBand->setGeometry( line.release() );
       }
       break;
       case 2:
diff --git a/src/app/qgsmaptoolellipsefoci.cpp b/src/app/qgsmaptoolellipsefoci.cpp
@@ -19,6 +19,7 @@
 #include "qgsmapcanvas.h"
 #include "qgspoint.h"
 #include <QMouseEvent>
+#include <memory>
 
 QgsMapToolEllipseFoci::QgsMapToolEllipseFoci( QgsMapToolCapture *parentTool,
     QgsMapCanvas *canvas, CaptureMode mode )
@@ -67,10 +68,10 @@ void QgsMapToolEllipseFoci::cadCanvasMoveEvent( QgsMapMouseEvent *e )
     {
       case 1:
       {
-        QgsLineString *line = new QgsLineString();
+        std::unique_ptr<QgsLineString> line( new QgsLineString() );
         line->addVertex( mPoints.at( 0 ) );
         line->addVertex( mapPoint );
-        mTempRubberBand->setGeometry( line );
+        mTempRubberBand->setGeometry( line.release() );
       }
       break;
       case 2:
diff --git a/src/app/qgsmaptoolrectangle3points.cpp b/src/app/qgsmaptoolrectangle3points.cpp
@@ -70,10 +70,10 @@ void QgsMapToolRectangle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )
     {
       case 1:
       {
-        QgsLineString *line = new QgsLineString();
+        std::unique_ptr<QgsLineString> line( new QgsLineString() );
         line->addVertex( mPoints.at( 0 ) );
         line->addVertex( mapPoint );
-        mTempRubberBand->setGeometry( line );
+        mTempRubberBand->setGeometry( line.release() );
         setAzimuth( mPoints.at( 0 ).azimuth( mapPoint ) );
         setDistance1( mPoints.at( 0 ).distance( mapPoint ) );
       }

Original file line number	Diff line number	Diff line change
`@@ -68,10 +68,10 @@ void QgsMapToolCircle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`68`	`68`	`{`
`69`	`69`	`case 1:`
`70`	`70`	`{`
`71`		`- QgsLineString *line = new QgsLineString();`
	`71`	`+ std::unique_ptr<QgsLineString> line( new QgsLineString() );`
`72`	`72`	`line->addVertex( mPoints.at( 0 ) );`
`73`	`73`	`line->addVertex( mapPoint );`
`74`		`- mTempRubberBand->setGeometry( line );`
	`74`	`+ mTempRubberBand->setGeometry( line.release() );`
`75`	`75`	`}`
`76`	`76`	`break;`
`77`	`77`	`case 2:`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`#include "qgsmapcanvas.h"`
`20`	`20`	`#include "qgspoint.h"`
`21`	`21`	`#include <QMouseEvent>`
	`22`	`+#include <memory>`
`22`	`23`
`23`	`24`	`QgsMapToolEllipseCenter2Points::QgsMapToolEllipseCenter2Points( QgsMapToolCapture *parentTool,`
`24`	`25`	`QgsMapCanvas *canvas, CaptureMode mode )`
`@@ -69,10 +70,10 @@ void QgsMapToolEllipseCenter2Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`69`	`70`	`{`
`70`	`71`	`case 1:`
`71`	`72`	`{`
`72`		`- QgsLineString *line = new QgsLineString();`
	`73`	`+ std::unique_ptr<QgsLineString> line( new QgsLineString() );`
`73`	`74`	`line->addVertex( mPoints.at( 0 ) );`
`74`	`75`	`line->addVertex( mapPoint );`
`75`		`- mTempRubberBand->setGeometry( line );`
	`76`	`+ mTempRubberBand->setGeometry( line.release() );`
`76`	`77`	`}`
`77`	`78`	`break;`
`78`	`79`	`case 2:`
Original file line number	Diff line number	Diff line change
`@@ -70,10 +70,10 @@ void QgsMapToolRectangle3Points::cadCanvasMoveEvent( QgsMapMouseEvent *e )`
`70`	`70`	`{`
`71`	`71`	`case 1:`
`72`	`72`	`{`
`73`		`- QgsLineString *line = new QgsLineString();`
	`73`	`+ std::unique_ptr<QgsLineString> line( new QgsLineString() );`
`74`	`74`	`line->addVertex( mPoints.at( 0 ) );`
`75`	`75`	`line->addVertex( mapPoint );`
`76`		`- mTempRubberBand->setGeometry( line );`
	`76`	`+ mTempRubberBand->setGeometry( line.release() );`
`77`	`77`	`setAzimuth( mPoints.at( 0 ).azimuth( mapPoint ) );`
`78`	`78`	`setDistance1( mPoints.at( 0 ).distance( mapPoint ) );`
`79`	`79`	`}`