diff --git a/src/app/qgsmaptoolcircle3points.cpp b/src/app/qgsmaptoolcircle3points.cpp
index 19a5120649ac..3d184436a434 100644
--- 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
index 10c959ac3b47..501913a751c3 100644
--- 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
index 42f5b29fc7b2..04c105c38b78 100644
--- 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
index ce8d8f56474c..9a25d495570b 100644
--- 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 ) );
       }