Skip to content

Commit e0926e4

Browse files
committed
Rename get() to getFeature()
1 parent 85ff90f commit e0926e4

19 files changed

+55
-55
lines changed

src/analysis/vector/geometry_checker/qgsfeaturepool.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ QgsFeaturePool::QgsFeaturePool( QgsVectorLayer *layer, double layerToMapUnits, c
3737

3838
}
3939

40-
bool QgsFeaturePool::get( QgsFeatureId id, QgsFeature &feature )
40+
bool QgsFeaturePool::getFeature( QgsFeatureId id, QgsFeature &feature )
4141
{
4242
QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Read );
4343
QgsFeature *cachedFeature = mFeatureCache.object( id );
@@ -97,14 +97,14 @@ void QgsFeaturePool::refreshCache( const QgsFeature &feature )
9797
locker.unlock();
9898

9999
QgsFeature tempFeature;
100-
get( feature.id(), tempFeature );
100+
getFeature( feature.id(), tempFeature );
101101
}
102102

103103
void QgsFeaturePool::removeFeature( const QgsFeatureId featureId )
104104
{
105105
QgsFeature origFeature;
106106
QgsReadWriteLocker locker( mCacheLock, QgsReadWriteLocker::Unlocked );
107-
if ( get( featureId, origFeature ) )
107+
if ( getFeature( featureId, origFeature ) )
108108
{
109109
locker.changeMode( QgsReadWriteLocker::Write );
110110
mIndex.deleteFeature( origFeature );

src/analysis/vector/geometry_checker/qgsfeaturepool.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class ANALYSIS_EXPORT QgsFeaturePool : public QgsFeatureSink
4646
* It will be retrieved from the cache or from the underlying layer if unavailable.
4747
* If the feature is neither available from the cache nor from the layer it will return false.
4848
*/
49-
bool get( QgsFeatureId id, QgsFeature &feature );
49+
bool getFeature( QgsFeatureId id, QgsFeature &feature );
5050

5151
/**
5252
* Updates a feature in this pool.

src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void QgsGeometryAngleCheck::fixError( QgsGeometryCheckError *error, int method,
6767
{
6868
QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
6969
QgsFeature feature;
70-
if ( !featurePool->get( error->featureId(), feature ) )
70+
if ( !featurePool->getFeature( error->featureId(), feature ) )
7171
{
7272
error->setObsolete();
7373
return;

src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ void QgsGeometryAreaCheck::fixError( QgsGeometryCheckError *error, int method, c
4242
{
4343
QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
4444
QgsFeature feature;
45-
if ( !featurePool->get( error->featureId(), feature ) )
45+
if ( !featurePool->getFeature( error->featureId(), feature ) )
4646
{
4747
error->setObsolete();
4848
return;
@@ -118,7 +118,7 @@ bool QgsGeometryAreaCheck::mergeWithNeighbor( const QString &layerId, QgsFeature
118118
for ( QgsFeatureId testId : intersects )
119119
{
120120
QgsFeature testFeature;
121-
if ( !featurePool->get( testId, testFeature ) )
121+
if ( !featurePool->getFeature( testId, testFeature ) )
122122
{
123123
continue;
124124
}

src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
160160
if ( !removed )
161161
{
162162
QgsFeature f;
163-
if ( featurePool->get( layerChangeIt.key(), f ) )
163+
if ( featurePool->getFeature( layerChangeIt.key(), f ) )
164164
{
165165
recheckFeatures[it.key()].insert( layerChangeIt.key() );
166166
recheckArea.combineExtentWith( t.transformBoundingBox( f.geometry().boundingBox() ) );

src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ namespace QgsGeometryCheckerUtils
141141
if ( mParent->mProgressCounter )
142142
mParent->mProgressCounter->fetchAndAddRelaxed( 1 );
143143
QgsFeature feature;
144-
if ( featurePool->get( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )
144+
if ( featurePool->getFeature( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )
145145
{
146146
delete mCurrentFeature;
147147
mCurrentFeature = new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mUseMapCrs );

src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ void QgsGeometryContainedCheck::fixError( QgsGeometryCheckError *error, int meth
6767

6868
QgsFeature featureA;
6969
QgsFeature featureB;
70-
if ( !featurePoolA->get( error->featureId(), featureA ) ||
71-
!featurePoolB->get( containerError->containingFeature().second, featureB ) )
70+
if ( !featurePoolA->getFeature( error->featureId(), featureA ) ||
71+
!featurePoolB->getFeature( containerError->containingFeature().second, featureB ) )
7272
{
7373
error->setObsolete();
7474
return;

src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ void QgsGeometryDegeneratePolygonCheck::fixError( QgsGeometryCheckError *error,
4141
{
4242
QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
4343
QgsFeature feature;
44-
if ( !featurePool->get( error->featureId(), feature ) )
44+
if ( !featurePool->getFeature( error->featureId(), feature ) )
4545
{
4646
error->setObsolete();
4747
return;

src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth
8888
{
8989
QgsFeaturePool *featurePoolA = mContext->featurePools[ error->layerId() ];
9090
QgsFeature featureA;
91-
if ( !featurePoolA->get( error->featureId(), featureA ) )
91+
if ( !featurePoolA->getFeature( error->featureId(), featureA ) )
9292
{
9393
error->setObsolete();
9494
return;
@@ -110,7 +110,7 @@ void QgsGeometryDuplicateCheck::fixError( QgsGeometryCheckError *error, int meth
110110
for ( QgsFeatureId idB : duplicateError->duplicates()[layerIdB] )
111111
{
112112
QgsFeature featureB;
113-
if ( !featurePoolB->get( idB, featureB ) )
113+
if ( !featurePoolB->getFeature( idB, featureB ) )
114114
{
115115
continue;
116116
}

src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ void QgsGeometryDuplicateNodesCheck::fixError( QgsGeometryCheckError *error, int
4949
{
5050
QgsFeaturePool *featurePool = mContext->featurePools[ error->layerId() ];
5151
QgsFeature feature;
52-
if ( !featurePool->get( error->featureId(), feature ) )
52+
if ( !featurePool->getFeature( error->featureId(), feature ) )
5353
{
5454
error->setObsolete();
5555
return;

0 commit comments

Comments
 (0)