Modernize code, fix potential leak

qgis · Jul 21, 2018 · 7b36737 · 7b36737
1 parent 8fac4d8
commit 7b36737
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 18 deletions.
diff --git a/src/core/qgspointlocator.cpp b/src/core/qgspointlocator.cpp
@@ -621,8 +621,7 @@ class QgsPointLocator_DumpTree : public SpatialIndex::IQueryStrategy
 
 
 QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateReferenceSystem &destCRS, const QgsCoordinateTransformContext &transformContext, const QgsRectangle *extent )
-  : mIsEmptyLayer( false )
-  , mLayer( layer )
+  : mLayer( layer )
 {
   if ( destCRS.isValid() )
   {
@@ -631,7 +630,7 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe
 
   setExtent( extent );
 
-  mStorage = StorageManager::createNewMemoryStorageManager();
+  mStorage.reset( StorageManager::createNewMemoryStorageManager() );
 
   connect( mLayer, &QgsVectorLayer::featureAdded, this, &QgsPointLocator::onFeatureAdded );
   connect( mLayer, &QgsVectorLayer::featureDeleted, this, &QgsPointLocator::onFeatureDeleted );
@@ -644,8 +643,6 @@ QgsPointLocator::QgsPointLocator( QgsVectorLayer *layer, const QgsCoordinateRefe
 QgsPointLocator::~QgsPointLocator()
 {
   destroyIndex();
-  delete mStorage;
-  delete mExtent;
 }
 
 QgsCoordinateReferenceSystem QgsPointLocator::destinationCrs() const
@@ -655,10 +652,7 @@ QgsCoordinateReferenceSystem QgsPointLocator::destinationCrs() const
 
 void QgsPointLocator::setExtent( const QgsRectangle *extent )
 {
-  if ( extent )
-  {
-    mExtent = new QgsRectangle( *extent );
-  }
+  mExtent.reset( extent ? new QgsRectangle( *extent ) : nullptr );
 
   destroyIndex();
 }
@@ -803,8 +797,8 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
   }
 
   QgsPointLocator_Stream stream( dataList );
-  mRTree = RTree::createAndBulkLoadNewRTree( RTree::BLM_STR, stream, *mStorage, fillFactor, indexCapacity,
-           leafCapacity, dimension, variant, indexId );
+  mRTree.reset( RTree::createAndBulkLoadNewRTree( RTree::BLM_STR, stream, *mStorage, fillFactor, indexCapacity,
+                leafCapacity, dimension, variant, indexId ) );
 
   if ( ctx && renderer )
   {
@@ -816,8 +810,7 @@ bool QgsPointLocator::rebuildIndex( int maxFeaturesToIndex )
 
 void QgsPointLocator::destroyIndex()
 {
-  delete mRTree;
-  mRTree = nullptr;
+  mRTree.reset();
 
   mIsEmptyLayer = false;
 

diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
@@ -87,7 +87,7 @@ class CORE_EXPORT QgsPointLocator : public QObject
      * Gets extent of the area point locator covers - if null then it caches the whole layer
      * \since QGIS 2.14
      */
-    const QgsRectangle *extent() const { return mExtent; }
+    const QgsRectangle *extent() const { return mExtent.get(); }
 
     /**
      * Configure extent - if not null, it will index only that area
@@ -278,19 +278,19 @@ class CORE_EXPORT QgsPointLocator : public QObject
 
   private:
     //! Storage manager
-    SpatialIndex::IStorageManager *mStorage = nullptr;
+    std::unique_ptr< SpatialIndex::IStorageManager > mStorage;
 
     QHash<QgsFeatureId, QgsGeometry *> mGeoms;
-    SpatialIndex::ISpatialIndex *mRTree = nullptr;
+    std::unique_ptr< SpatialIndex::ISpatialIndex > mRTree;
 
     //! flag whether the layer is currently empty (i.e. mRTree is null but it is not necessary to rebuild it)
-    bool mIsEmptyLayer;
+    bool mIsEmptyLayer = false;
 
 
     //! R-tree containing spatial index
     QgsCoordinateTransform mTransform;
     QgsVectorLayer *mLayer = nullptr;
-    QgsRectangle *mExtent = nullptr;
+    std::unique_ptr< QgsRectangle > mExtent;
 
     std::unique_ptr<QgsRenderContext> mContext;