Merge pull request #7845 from m-kuhn/apiCleanup

m-kuhn · web-flow · commit 7a5a52b1623f · 2018-09-11T08:16:39.000+02:00
Naming changes for QgsFeaturePool
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsfeaturepool.cpp
@@ -37,7 +37,7 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, c
 
 }
 
-bool QgsFeaturePool::get( QgsFeatureId id, QgsFeature &feature )
+bool QgsFeaturePool::getFeature( QgsFeatureId id, QgsFeature &feature )
 {
   QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );
   QgsFeature *cachedFeature = mFeatureCache.object( id );
@@ -63,7 +63,7 @@ bool QgsFeaturePool::get( QgsFeatureId id, QgsFeature &feature )
   return true;
 }
 
-QgsFeatureIds QgsFeaturePool::getFeatureIds() const
+QgsFeatureIds QgsFeaturePool::allFeatureIds() const
 {
   return mFeatureIds;
 }
@@ -97,14 +97,14 @@ void QgsFeaturePool::refreshCache( const QgsFeature &feature )
   locker.unlock();
 
   QgsFeature tempFeature;
-  get( feature.id(), tempFeature );
+  getFeature( feature.id(), tempFeature );
 }
 
 void QgsFeaturePool::removeFeature( const QgsFeatureId featureId )
 {
   QgsFeature origFeature;
   QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Unlocked );
-  if ( get( featureId, origFeature ) )
+  if ( getFeature( featureId, origFeature ) )
   {
     locker.changeMode( QgsReadWriteLocker::Write );
     mIndex.deleteFeature( origFeature );
diff --git a/src/analysis/vector/geometry_checker/qgsfeaturepool.h b/src/analysis/vector/geometry_checker/qgsfeaturepool.h
@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink
      * It will be retrieved from the cache or from the underlying layer if unavailable.
      * If the feature is neither available from the cache nor from the layer it will return false.
      */
-    bool get( QgsFeatureId id, QgsFeature &feature );
+    bool getFeature( QgsFeatureId id, QgsFeature &feature );
 
     /**
      * Updates a feature in this pool.
@@ -64,7 +64,7 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink
      * Returns the complete set of feature ids in this pool.
      * Note that this concerns the features governed by this pool, which are not necessarily all cached.
      */
-    QgsFeatureIds getFeatureIds() const;
+    QgsFeatureIds allFeatureIds() const;
 
     /**
      * Get all feature ids in the bounding box \a rect. It will use a spatial index to
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp
@@ -67,7 +67,7 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError *error, int method,
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp
@@ -42,7 +42,7 @@ void QgsGeometryAreaCheck::fixError( QgsGeometryCheckError *error, int method, c
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
@@ -118,7 +118,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature
   for ( QgsFeatureId testId : intersects )
   {
     QgsFeature testFeature;
-    if ( !featurePool->get( testId, testFeature ) )
+    if ( !featurePool->getFeature( testId, testFeature ) )
     {
       continue;
     }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheck.cpp
@@ -149,7 +149,7 @@ QMap<QString, QgsFeatureIds> QgsGeometryCheck::allLayerFeatureIds() const
   QMap<QString, QgsFeatureIds> featureIds;
   for ( QgsFeaturePool *pool : mContext->featurePools )
   {
-    featureIds.insert( pool->layerId(), pool->getFeatureIds() );
+    featureIds.insert( pool->layerId(), pool->allFeatureIds() );
   }
   return featureIds;
 }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -68,7 +68,7 @@ QFuture<void> QgsGeometryChecker::execute( int *totalSteps )
       {
         if ( check->checkType() <= QgsGeometryCheck::FeatureCheck )
         {
-          *totalSteps += check->isCompatible( it.value()->layer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;
+          *totalSteps += check->isCompatible( it.value()->layer()->geometryType() ) ? it.value()->allFeatureIds().size() : 0;
         }
         else
         {
@@ -160,7 +160,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
       if ( !removed )
       {
         QgsFeature f;
-        if ( featurePool->get( layerChangeIt.key(), f ) )
+        if ( featurePool->getFeature( layerChangeIt.key(), f ) )
         {
           recheckFeatures[it.key()].insert( layerChangeIt.key() );
           recheckArea.combineExtentWith( t.transformBoundingBox( f.geometry().boundingBox() ) );
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -141,7 +141,7 @@ namespace QgsGeometryCheckerUtils
       if ( mParent->mProgressCounter )
         mParent->mProgressCounter->fetchAndAddRelaxed( 1 );
       QgsFeature feature;
-      if ( featurePool->get( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )
+      if ( featurePool->getFeature( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )
       {
         delete mCurrentFeature;
         mCurrentFeature = new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mUseMapCrs );
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp
@@ -67,8 +67,8 @@ void QgsGeometryContainedCheck::fixError( QgsGeometryCheckError *error, int meth
 
   QgsFeature featureA;
   QgsFeature featureB;
-  if ( !featurePoolA->get( error->featureId(), featureA ) ||
-       !featurePoolB->get( containerError->containingFeature().second, featureB ) )
+  if ( !featurePoolA->getFeature( error->featureId(), featureA ) ||
+       !featurePoolB->getFeature( containerError->containingFeature().second, featureB ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp
@@ -41,7 +41,7 @@ void QgsGeometryDegeneratePolygonCheck::fixError( QgsGeometryCheckError *error,
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
@@ -88,7 +88,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth
 {
   QgsFeaturePool *featurePoolA = mContext->featurePools[ error->layerId() ];
   QgsFeature featureA;
-  if ( !featurePoolA->get( error->featureId(), featureA ) )
+  if ( !featurePoolA->getFeature( error->featureId(), featureA ) )
   {
     error->setObsolete();
     return;
@@ -110,7 +110,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth
       for ( QgsFeatureId idB : duplicateError->duplicates()[layerIdB] )
       {
         QgsFeature featureB;
-        if ( !featurePoolB->get( idB, featureB ) )
+        if ( !featurePoolB->getFeature( idB, featureB ) )
         {
           continue;
         }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp
@@ -49,7 +49,7 @@ void QgsGeometryDuplicateNodesCheck::fixError( QgsGeometryCheckError *error, int
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrygapcheck.cpp
@@ -163,7 +163,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError *err, Chan
     for ( QgsFeatureId testId : featureIds )
     {
       QgsFeature testFeature;
-      if ( !featurePool->get( testId, testFeature ) )
+      if ( !featurePool->getFeature( testId, testFeature ) )
       {
         continue;
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryholecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryholecheck.cpp
@@ -47,7 +47,7 @@ void QgsGeometryHoleCheck::fixError( QgsGeometryCheckError *error, int method, c
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrymultipartcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrymultipartcheck.cpp
@@ -35,7 +35,7 @@ void QgsGeometryMultipartCheck::fixError( QgsGeometryCheckError *error, int meth
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryoverlapcheck.cpp
@@ -81,8 +81,8 @@ void QgsGeometryOverlapCheck::fixError( QgsGeometryCheckError *error, int method
   QgsFeaturePool *featurePoolB = mContext->featurePools[ overlapError->overlappedFeature().first ];
   QgsFeature featureA;
   QgsFeature featureB;
-  if ( !featurePoolA->get( overlapError->featureId(), featureA ) ||
-       !featurePoolB->get( overlapError->overlappedFeature().second, featureB ) )
+  if ( !featurePoolA->getFeature( overlapError->featureId(), featureA ) ||
+       !featurePoolB->getFeature( overlapError->overlappedFeature().second, featureB ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp
@@ -58,7 +58,7 @@ void QgsGeometrySegmentLengthCheck::fixError( QgsGeometryCheckError *error, int
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryselfintersectioncheck.cpp
@@ -84,7 +84,7 @@ void QgsGeometrySelfIntersectionCheck::fixError( QgsGeometryCheckError *error, i
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrytypecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrytypecheck.cpp
@@ -42,7 +42,7 @@ void QgsGeometryTypeCheck::fixError( QgsGeometryCheckError *error, int method, c
 {
   QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
   QgsFeature feature;
-  if ( !featurePool->get( error->featureId(), feature ) )
+  if ( !featurePool->getFeature( error->featureId(), feature ) )
   {
     error->setObsolete();
     return;
diff --git a/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp
@@ -144,7 +144,7 @@ bool QgsVectorDataProviderFeaturePool::addFeatures( QgsFeatureList &features, Qg
 void QgsVectorDataProviderFeaturePool::updateFeature( QgsFeature &feature )
 {
   QgsFeature origFeature;
-  get( feature.id(), origFeature );
+  getFeature( feature.id(), origFeature );
 
   QgsGeometryMap geometryMap;
   geometryMap.insert( feature.id(), feature.geometry() );
diff --git a/tests/src/geometry_checker/testqgsgeometrychecks.cpp b/tests/src/geometry_checker/testqgsgeometrychecks.cpp

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, c`
`37`	`37`
`38`	`38`	`}`
`39`	`39`
`40`		`-bool QgsFeaturePool::get( QgsFeatureId id, QgsFeature &feature )`
	`40`	`+bool QgsFeaturePool::getFeature( QgsFeatureId id, QgsFeature &feature )`
`41`	`41`	`{`
`42`	`42`	`QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );`
`43`	`43`	`QgsFeature *cachedFeature = mFeatureCache.object( id );`
`@@ -63,7 +63,7 @@ bool QgsFeaturePool::get( QgsFeatureId id, QgsFeature &feature )`
`63`	`63`	`return true;`
`64`	`64`	`}`
`65`	`65`
`66`		`-QgsFeatureIds QgsFeaturePool::getFeatureIds() const`
	`66`	`+QgsFeatureIds QgsFeaturePool::allFeatureIds() const`
`67`	`67`	`{`
`68`	`68`	`return mFeatureIds;`
`69`	`69`	`}`
`@@ -97,14 +97,14 @@ void QgsFeaturePool::refreshCache( const QgsFeature &feature )`
`97`	`97`	`locker.unlock();`
`98`	`98`
`99`	`99`	`QgsFeature tempFeature;`
`100`		`- get( feature.id(), tempFeature );`
	`100`	`+ getFeature( feature.id(), tempFeature );`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`void QgsFeaturePool::removeFeature( const QgsFeatureId featureId )`
`104`	`104`	`{`
`105`	`105`	`QgsFeature origFeature;`
`106`	`106`	`QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Unlocked );`
`107`		`- if ( get( featureId, origFeature ) )`
	`107`	`+ if ( getFeature( featureId, origFeature ) )`
`108`	`108`	`{`
`109`	`109`	`locker.changeMode( QgsReadWriteLocker::Write );`
`110`	`110`	`mIndex.deleteFeature( origFeature );`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError *error, int method,`
`67`	`67`	`{`
`68`	`68`	`QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];`
`69`	`69`	`QgsFeature feature;`
`70`		`- if ( !featurePool->get( error->featureId(), feature ) )`
	`70`	`+ if ( !featurePool->getFeature( error->featureId(), feature ) )`
`71`	`71`	`{`
`72`	`72`	`error->setObsolete();`
`73`	`73`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ void QgsGeometryAreaCheck::fixError( QgsGeometryCheckError *error, int method, c`
`42`	`42`	`{`
`43`	`43`	`QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];`
`44`	`44`	`QgsFeature feature;`
`45`		`- if ( !featurePool->get( error->featureId(), feature ) )`
	`45`	`+ if ( !featurePool->getFeature( error->featureId(), feature ) )`
`46`	`46`	`{`
`47`	`47`	`error->setObsolete();`
`48`	`48`	`return;`
`@@ -118,7 +118,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature`
`118`	`118`	`for ( QgsFeatureId testId : intersects )`
`119`	`119`	`{`
`120`	`120`	`QgsFeature testFeature;`
`121`		`- if ( !featurePool->get( testId, testFeature ) )`
	`121`	`+ if ( !featurePool->getFeature( testId, testFeature ) )`
`122`	`122`	`{`
`123`	`123`	`continue;`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ QMap<QString, QgsFeatureIds> QgsGeometryCheck::allLayerFeatureIds() const`
`149`	`149`	`QMap<QString, QgsFeatureIds> featureIds;`
`150`	`150`	`for ( QgsFeaturePool *pool : mContext->featurePools )`
`151`	`151`	`{`
`152`		`- featureIds.insert( pool->layerId(), pool->getFeatureIds() );`
	`152`	`+ featureIds.insert( pool->layerId(), pool->allFeatureIds() );`
`153`	`153`	`}`
`154`	`154`	`return featureIds;`
`155`	`155`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ QFuture<void> QgsGeometryChecker::execute( int *totalSteps )`
`68`	`68`	`{`
`69`	`69`	`if ( check->checkType() <= QgsGeometryCheck::FeatureCheck )`
`70`	`70`	`{`
`71`		`- *totalSteps += check->isCompatible( it.value()->layer()->geometryType() ) ? it.value()->getFeatureIds().size() : 0;`
	`71`	`+ *totalSteps += check->isCompatible( it.value()->layer()->geometryType() ) ? it.value()->allFeatureIds().size() : 0;`
`72`	`72`	`}`
`73`	`73`	`else`
`74`	`74`	`{`
`@@ -160,7 +160,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`160`	`160`	`if ( !removed )`
`161`	`161`	`{`
`162`	`162`	`QgsFeature f;`
`163`		`- if ( featurePool->get( layerChangeIt.key(), f ) )`
	`163`	`+ if ( featurePool->getFeature( layerChangeIt.key(), f ) )`
`164`	`164`	`{`
`165`	`165`	`recheckFeatures[it.key()].insert( layerChangeIt.key() );`
`166`	`166`	`recheckArea.combineExtentWith( t.transformBoundingBox( f.geometry().boundingBox() ) );`
Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ namespace QgsGeometryCheckerUtils`
`141`	`141`	`if ( mParent->mProgressCounter )`
`142`	`142`	`mParent->mProgressCounter->fetchAndAddRelaxed( 1 );`
`143`	`143`	`QgsFeature feature;`
`144`		`- if ( featurePool->get( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )`
	`144`	`+ if ( featurePool->getFeature( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )`
`145`	`145`	`{`
`146`	`146`	`delete mCurrentFeature;`
`147`	`147`	`mCurrentFeature = new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mUseMapCrs );`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void QgsGeometryDegeneratePolygonCheck::fixError( QgsGeometryCheckError *error,`
`41`	`41`	`{`
`42`	`42`	`QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];`
`43`	`43`	`QgsFeature feature;`
`44`		`- if ( !featurePool->get( error->featureId(), feature ) )`
	`44`	`+ if ( !featurePool->getFeature( error->featureId(), feature ) )`
`45`	`45`	`{`
`46`	`46`	`error->setObsolete();`
`47`	`47`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth`
`88`	`88`	`{`
`89`	`89`	`QgsFeaturePool *featurePoolA = mContext->featurePools[ error->layerId() ];`
`90`	`90`	`QgsFeature featureA;`
`91`		`- if ( !featurePoolA->get( error->featureId(), featureA ) )`
	`91`	`+ if ( !featurePoolA->getFeature( error->featureId(), featureA ) )`
`92`	`92`	`{`
`93`	`93`	`error->setObsolete();`
`94`	`94`	`return;`
`@@ -110,7 +110,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth`
`110`	`110`	`for ( QgsFeatureId idB : duplicateError->duplicates()[layerIdB] )`
`111`	`111`	`{`
`112`	`112`	`QgsFeature featureB;`
`113`		`- if ( !featurePoolB->get( idB, featureB ) )`
	`113`	`+ if ( !featurePoolB->getFeature( idB, featureB ) )`
`114`	`114`	`{`
`115`	`115`	`continue;`
`116`	`116`	`}`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ void QgsGeometryDuplicateNodesCheck::fixError( QgsGeometryCheckError *error, int`
`49`	`49`	`{`
`50`	`50`	`QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];`
`51`	`51`	`QgsFeature feature;`
`52`		`- if ( !featurePool->get( error->featureId(), feature ) )`
	`52`	`+ if ( !featurePool->getFeature( error->featureId(), feature ) )`
`53`	`53`	`{`
`54`	`54`	`error->setObsolete();`
`55`	`55`	`return;`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ bool QgsGeometryGapCheck::mergeWithNeighbor( QgsGeometryGapCheckError *err, Chan`
`163`	`163`	`for ( QgsFeatureId testId : featureIds )`
`164`	`164`	`{`
`165`	`165`	`QgsFeature testFeature;`
`166`		`- if ( !featurePool->get( testId, testFeature ) )`
	`166`	`+ if ( !featurePool->getFeature( testId, testFeature ) )`
`167`	`167`	`{`
`168`	`168`	`continue;`
`169`	`169`	`}`