VLCache takes ownership of index

Author: m-kuhn

src/core/qgsvectorlayercache.cpp

@@ -39,6 +39,12 @@ QgsVectorLayerCache::QgsVectorLayerCache( QgsVectorLayer* layer, int cacheSize,
   connect( mLayer, SIGNAL( attributeValueChanged( QgsFeatureId, int, const QVariant& ) ), SLOT( onAttributeValueChanged( QgsFeatureId, int, const QVariant& ) ) );
 }
 
+QgsVectorLayerCache::~QgsVectorLayerCache()
+{
+  qDeleteAll( mCacheIndices );
+  mCacheIndices.clear();
+}
+
 void QgsVectorLayerCache::setCacheSize( int cacheSize )
 {
   mCache.setMaxCost( cacheSize );
@@ -178,7 +184,7 @@ void QgsVectorLayerCache::requestCompleted( QgsFeatureRequest featureRequest, Qg
 
 void QgsVectorLayerCache::featureRemoved( QgsFeatureId fid )
 {
-  foreach ( QgsAbstractCacheIndex* idx, mCacheIndices )
+  Q_FOREACH( QgsAbstractCacheIndex* idx, mCacheIndices )
   {
     idx->flushFeature( fid );
   }

src/core/qgsvectorlayercache.h

@@ -86,6 +86,9 @@ class CORE_EXPORT QgsVectorLayerCache : public QObject
      *
      * @param cacheSize indicates the maximum number of features to keep in the cache
      */
+
+    ~QgsVectorLayerCache();
+
     void setCacheSize( int cacheSize );
 
     /**
@@ -136,6 +139,7 @@ class CORE_EXPORT QgsVectorLayerCache : public QObject
      * @brief
      * Adds a {@link QgsAbstractCacheIndex} to this cache. Cache indices know about features present
      * in this cache and decide, if enough information is present in the cache to respond to a {@link QgsFeatureRequest}.
+     * The layer cache will take ownership of the index.
      *
      * @param cacheIndex  The cache index to add.
      */