RAII

qgis · Mar 9, 2019 · e41766e · e41766e
1 parent 785dd7f
commit e41766e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 13 deletions.
diff --git a/src/core/qgsvectorlayerlabelprovider.cpp b/src/core/qgsvectorlayerlabelprovider.cpp
@@ -47,13 +47,7 @@ QgsVectorLayerLabelProvider::QgsVectorLayerLabelProvider( QgsVectorLayer *layer,
 
   if ( withFeatureLoop )
   {
-    mSource = new QgsVectorLayerFeatureSource( layer );
-    mOwnsSource = true;
-  }
-  else
-  {
-    mSource = nullptr;
-    mOwnsSource = false;
+    mSource = qgis::make_unique<QgsVectorLayerFeatureSource>( layer );
   }
 
   init();
@@ -94,9 +88,6 @@ void QgsVectorLayerLabelProvider::init()
 QgsVectorLayerLabelProvider::~QgsVectorLayerLabelProvider()
 {
   qDeleteAll( mLabels );
-
-  if ( mOwnsSource )
-    delete mSource;
 }
 
 

diff --git a/src/core/qgsvectorlayerlabelprovider.h b/src/core/qgsvectorlayerlabelprovider.h
@@ -108,9 +108,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
     //! Layer's CRS
     QgsCoordinateReferenceSystem mCrs;
     //! Layer's feature source
-    QgsAbstractFeatureSource *mSource = nullptr;
-    //! Whether layer's feature source is owned
-    bool mOwnsSource;
+    std::unique_ptr<QgsAbstractFeatureSource> mSource;
 
     //! List of generated
     QList<QgsLabelFeature *> mLabels;