Revert 38f4a6f

qgis · Mar 5, 2017 · 1d504ea · 1d504ea
1 parent 4d8f886
commit 1d504ea
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp
@@ -58,9 +58,9 @@ int QgsVectorLayerCache::cacheSize()
 
 void QgsVectorLayerCache::setCacheGeometry( bool cacheGeometry )
 {
-  bool shouldCache = cacheGeometry && mLayer->hasGeometryType();
-  bool mustInvalidate = shouldCache && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries
-  mCacheGeometry = shouldCache;
+  bool shouldCacheGeometry = cacheGeometry && mLayer->hasGeometryType();
+  bool mustInvalidate = shouldCacheGeometry && !mCacheGeometry; // going from no geometry -> geometry, so have to clear existing cache entries
+  mCacheGeometry = shouldCacheGeometry;
   if ( cacheGeometry )
   {
     connect( mLayer, &QgsVectorLayer::geometryChanged, this, &QgsVectorLayerCache::geometryChanged );
@@ -237,7 +237,6 @@ void QgsVectorLayerCache::attributeAdded( int field )
 {
   Q_UNUSED( field )
   mCachedAttributes.append( field );
-  mFullCache = false;
   mCache.clear();
 }
 
@@ -274,7 +273,6 @@ void QgsVectorLayerCache::layerDeleted()
 void QgsVectorLayerCache::invalidate()
 {
   mCache.clear();
-  mFullCache = false;
   emit invalidated();
 }
 

diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp
@@ -384,13 +384,6 @@ void TestVectorLayerCache::testCacheGeom()
   {
     QVERIFY( f.hasGeometry() );
   }
-
-  // another test...
-  cache.setCacheGeometry( false );
-  cache.setFullCache( true );
-  QVERIFY( cache.hasFullCache() );
-  cache.setCacheGeometry( true );
-  QVERIFY( !cache.hasFullCache() );
 }
 
 void TestVectorLayerCache::onCommittedFeaturesAdded( const QString &layerId, const QgsFeatureList &features )