Skip to content

Commit

Permalink
use QgsFeatureRequest::setNoAttributes (#8332)
Browse files Browse the repository at this point in the history
  • Loading branch information
@3nids
3nids committed Oct 25, 2018
1 parent bf5537e commit 6fc36dc
Show file tree
Hide file tree
Showing 48 changed files with 86 additions and 86 deletions.
8 changes: 4 additions & 4 deletions src/3d/symbols/qgspoint3dsymbol_p.cpp
View file
Expand Up @@ -153,7 +153,7 @@ void QgsPoint3DSymbolInstancedEntityFactory::addEntityForSelectedPoints( const Q
QgsFeatureRequest req;
req.setDestinationCrs( map.crs(), map.transformContext() );
req.setFilterFids( layer->selectedFeatureIds() );
req.setSubsetOfAttributes( QgsAttributeList() );
req.setNoAttributes();

// build the entity
QgsPoint3DSymbolInstancedEntityNode *entity = new QgsPoint3DSymbolInstancedEntityNode( map, layer, symbol, req );
Expand All @@ -169,7 +169,7 @@ void QgsPoint3DSymbolInstancedEntityFactory::addEntityForNotSelectedPoints( cons
// build the feature request to select features
QgsFeatureRequest req;
req.setDestinationCrs( map.crs(), map.transformContext() );
req.setSubsetOfAttributes( QgsAttributeList() );
req.setNoAttributes();

QgsFeatureIds notSelected = layer->allFeatureIds();
notSelected.subtract( layer->selectedFeatureIds() );
Expand Down Expand Up @@ -328,7 +328,7 @@ void QgsPoint3DSymbolModelEntityFactory::addEntitiesForSelectedPoints( const Qgs
{
QgsFeatureRequest req;
req.setDestinationCrs( map.crs(), map.transformContext() );
req.setSubsetOfAttributes( QgsAttributeList() );
req.setNoAttributes();
req.setFilterFids( layer->selectedFeatureIds() );

addMeshEntities( map, layer, req, symbol, parent, true );
Expand All @@ -341,7 +341,7 @@ void QgsPoint3DSymbolModelEntityFactory::addEntitiesForNotSelectedPoints( const
// build the feature request to select features
QgsFeatureRequest req;
req.setDestinationCrs( map.crs(), map.transformContext() );
req.setSubsetOfAttributes( QgsAttributeList() );
req.setNoAttributes();
QgsFeatureIds notSelected = layer->allFeatureIds();
notSelected.subtract( layer->selectedFeatureIds() );
req.setFilterFids( notSelected );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/network/qgsvectorlayerdirector.cpp
View file
Expand Up @@ -203,7 +203,7 @@ void QgsVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, const
};

// first iteration - get all nodes from network, and snap additional points to network
QgsFeatureIterator fit = mSource->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = mSource->getFeatures( QgsFeatureRequest().setNoAttributes() );
QgsFeature feature;
while ( fit.nextFeature( feature ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmdbscanclustering.cpp
View file
Expand Up @@ -133,7 +133,7 @@ QVariantMap QgsDbscanClusteringAlgorithm::processAlgorithm( const QVariantMap &p
feedback->pushInfo( QObject::tr( "Analysing clusters" ) );
std::unordered_map< QgsFeatureId, int> idToCluster;
idToCluster.reserve( index.size() );
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setNoAttributes() );
const long featureCount = source->featureCount();

int clusterCount = 0;
Expand Down
6 changes: 3 additions & 3 deletions src/analysis/processing/qgsalgorithmextractbylocation.cpp
View file
Expand Up @@ -96,7 +96,7 @@ void QgsLocationBasedAlgorithm::process( const QgsProcessingContext &context, Qg
disjointSet = targetSource->allFeatureIds();

QgsFeatureIds foundSet;
QgsFeatureRequest request = QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ).setDestinationCrs( targetSource->sourceCrs(), context.transformContext() );
QgsFeatureRequest request = QgsFeatureRequest().setNoAttributes().setDestinationCrs( targetSource->sourceCrs(), context.transformContext() );
QgsFeatureIterator fIt = intersectSource->getFeatures( request );
double step = intersectSource->featureCount() > 0 ? 100.0 / intersectSource->featureCount() : 1;
int current = 0;
Expand All @@ -115,7 +115,7 @@ void QgsLocationBasedAlgorithm::process( const QgsProcessingContext &context, Qg
QgsRectangle bbox = f.geometry().boundingBox();
request = QgsFeatureRequest().setFilterRect( bbox );
if ( onlyRequireTargetIds )
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();

QgsFeatureIterator testFeatureIt = targetSource->getFeatures( request );
QgsFeature testFeature;
Expand Down Expand Up @@ -192,7 +192,7 @@ void QgsLocationBasedAlgorithm::process( const QgsProcessingContext &context, Qg
disjointSet = disjointSet.subtract( foundSet );
QgsFeatureRequest disjointReq = QgsFeatureRequest().setFilterFids( disjointSet );
if ( onlyRequireTargetIds )
disjointReq.setSubsetOfAttributes( QgsAttributeList() ).setFlags( QgsFeatureRequest::NoGeometry );
disjointReq.setNoAttributes().setFlags( QgsFeatureRequest::NoGeometry );
QgsFeatureIterator disjointIt = targetSource->getFeatures( disjointReq );
QgsFeature f;
while ( disjointIt.nextFeature( f ) )
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmkmeansclustering.cpp
View file
Expand Up @@ -95,7 +95,7 @@ QVariantMap QgsKMeansClusteringAlgorithm::processAlgorithm( const QVariantMap &p
QgsFeature feat;

std::vector< Feature > clusterFeatures;
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setNoAttributes() );
QHash< QgsFeatureId, int > idToObj;
while ( features.nextFeature( feat ) )
{
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmlineintersection.cpp
View file
Expand Up @@ -144,7 +144,7 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p
if ( !sink )
throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );

QgsSpatialIndex spatialIndex( sourceB->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ).setDestinationCrs( sourceA->sourceCrs(), context.transformContext() ) ), feedback );
QgsSpatialIndex spatialIndex( sourceB->getFeatures( QgsFeatureRequest().setNoAttributes().setDestinationCrs( sourceA->sourceCrs(), context.transformContext() ) ), feedback );
QgsFeature outFeature;
QgsFeatureIterator features = sourceA->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( fieldsAIndices ) );
double step = sourceA->featureCount() > 0 ? 100.0 / sourceA->featureCount() : 1;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmsplitwithlines.cpp
View file
Expand Up @@ -105,7 +105,7 @@ QVariantMap QgsSplitWithLinesAlgorithm::processAlgorithm( const QVariantMap &par
QgsSpatialIndex spatialIndex;
QMap< QgsFeatureId, QgsGeometry > splitGeoms;
QgsFeatureRequest request;
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
request.setDestinationCrs( source->sourceCrs(), context.transformContext() );

QgsFeatureIterator splitLines = linesSource->getFeatures( request );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/processing/qgsalgorithmzonalhistogram.cpp
View file
Expand Up @@ -107,7 +107,7 @@ QVariantMap QgsZonalHistogramAlgorithm::processAlgorithm( const QVariantMap &par

// First loop through the zones to build up a list of unique values across all zones to determine sink fields list
QgsFeatureRequest request;
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
if ( zones->sourceCrs() != mCrs )
{
request.setDestinationCrs( mCrs, context.transformContext() );
Expand Down
10 changes: 5 additions & 5 deletions src/analysis/processing/qgsoverlayutils.cpp
View file
Expand Up @@ -77,7 +77,7 @@ static bool sanitizeDifferenceResult( QgsGeometry &geom )
void QgsOverlayUtils::difference( const QgsFeatureSource &sourceA, const QgsFeatureSource &sourceB, QgsFeatureSink &sink, QgsProcessingContext &context, QgsProcessingFeedback *feedback, int &count, int totalCount, QgsOverlayUtils::DifferenceOutput outputAttrs )
{
QgsFeatureRequest requestB;
requestB.setSubsetOfAttributes( QgsAttributeList() );
requestB.setNoAttributes();
if ( outputAttrs != OutputBA )
requestB.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );
QgsSpatialIndex indexB( sourceB.getFeatures( requestB ), feedback );
Expand Down Expand Up @@ -108,7 +108,7 @@ void QgsOverlayUtils::difference( const QgsFeatureSource &sourceA, const QgsFeat

QgsFeatureRequest request;
request.setFilterFids( intersects );
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
if ( outputAttrs != OutputBA )
request.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );

Expand Down Expand Up @@ -180,7 +180,7 @@ void QgsOverlayUtils::intersection( const QgsFeatureSource &sourceA, const QgsFe
int attrCount = fieldIndicesA.count() + fieldIndicesB.count();

QgsFeatureRequest request;
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
request.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );

QgsFeature outFeat;
Expand Down Expand Up @@ -261,14 +261,14 @@ void QgsOverlayUtils::resolveOverlaps( const QgsFeatureSource &source, QgsFeatur
QgsWkbTypes::GeometryType geometryType = QgsWkbTypes::geometryType( QgsWkbTypes::multiType( source.wkbType() ) );

QgsFeatureRequest requestOnlyGeoms;
requestOnlyGeoms.setSubsetOfAttributes( QgsAttributeList() );
requestOnlyGeoms.setNoAttributes();

QgsFeatureRequest requestOnlyAttrs;
requestOnlyAttrs.setFlags( QgsFeatureRequest::NoGeometry );

QgsFeatureRequest requestOnlyIds;
requestOnlyIds.setFlags( QgsFeatureRequest::NoGeometry );
requestOnlyIds.setSubsetOfAttributes( QgsAttributeList() );
requestOnlyIds.setNoAttributes();

// make a set of used feature IDs so that we do not try to reuse them for newly added features
QgsFeature f;
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp
View file
Expand Up @@ -64,7 +64,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea
searchBounds.grow( mContext->tolerance );
QgsFeatureIds refFeatureIds = mIndex->intersects( searchBounds ).toSet();

QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setNoAttributes();
QgsFeatureIterator refFeatureIt = mCheckLayer->getFeatures( refFeatureRequest );

if ( refFeatureIds.isEmpty() )
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/qgsgeometrysnapper.cpp
View file
Expand Up @@ -485,7 +485,7 @@ QgsGeometry QgsGeometrySnapper::snapGeometry( const QgsGeometry &geometry, doubl
QgsFeatureIds refFeatureIds = mIndex.intersects( searchBounds ).toSet();
mIndexMutex.unlock();

QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setNoAttributes();
mReferenceLayerMutex.lock();
QgsFeature refFeature;
QgsFeatureIterator refFeatureIt = mReferenceSource->getFeatures( refFeatureRequest );
Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/qgsgeometrysnappersinglesource.cpp
View file
Expand Up @@ -314,7 +314,7 @@ int QgsGeometrySnapperSingleSource::run( const QgsFeatureSource &source, QgsFeat
QgsSpatialIndex index;
QVector<AnchorPoint> pnts;
QgsFeatureRequest request;
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
QgsFeatureIterator fi = source.getFeatures( request );
buildSnapIndex( fi, index, pnts, feedback, count, totalCount );

Expand Down
2 changes: 1 addition & 1 deletion src/analysis/vector/qgszonalstatistics.cpp
View file
Expand Up @@ -209,7 +209,7 @@ int QgsZonalStatistics::calculateStatistics( QgsFeedback *feedback )

//iterate over each polygon
QgsFeatureRequest request;
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
request.setDestinationCrs( mRasterCrs, QgsProject::instance()->transformContext() );
QgsFeatureIterator fi = vectorProvider->getFeatures( request );
QgsFeature f;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgisapp.cpp
View file
Expand Up @@ -7670,7 +7670,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
if ( checkFeaturesVisible )
{
QgsFeature feat;
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setNoAttributes() );
bool allFeaturesInView = true;
QgsRectangle viewRect = mMapCanvas->mapSettings().mapToLayerCoordinates( vlayer, mMapCanvas->extent() );

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsgeometryvalidationservice.cpp
View file
Expand Up @@ -379,7 +379,7 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer

QMap<QString, QgsFeatureIds> layerIds;

QgsFeatureRequest request = QgsFeatureRequest( affectedFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
QgsFeatureRequest request = QgsFeatureRequest( affectedFeatureIds ).setNoAttributes();
QgsFeatureIterator it = layer->getFeatures( request );
QgsFeature feature;
QgsRectangle area;
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolmovefeature.cpp
View file
Expand Up @@ -86,7 +86,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

if ( vlayer->selectedFeatureCount() == 0 )
{
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setNoAttributes() );

//find the closest feature
QgsGeometry pointGeometry = QgsGeometry::fromPointXY( layerCoords );
Expand Down Expand Up @@ -131,7 +131,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

mRubberBand = createRubberBand( vlayer->geometryType() );
QgsFeature feat;
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setNoAttributes() );

bool allFeaturesInView = true;
QgsRectangle viewRect = mCanvas->mapSettings().mapToLayerCoordinates( vlayer, mCanvas->extent() );
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolreshape.cpp
View file
Expand Up @@ -91,7 +91,7 @@ bool QgsMapToolReshape::isBindingLine( QgsVectorLayer *vlayer, const QgsRectangl
const QgsPointXY beginPoint = points().first();
const QgsPointXY endPoint = points().last();

QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setNoAttributes() );
QgsFeature f;

// check that extremities of the new line are contained by features
Expand Down Expand Up @@ -126,7 +126,7 @@ void QgsMapToolReshape::reshape( QgsVectorLayer *vlayer )
reshapeLineString.addZValue( defaultZValue() );

//query all the features that intersect bounding box of capture line
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setNoAttributes() );
QgsFeature f;
int reshapeReturn;
bool reshapeDone = false;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolrotatefeature.cpp
View file
Expand Up @@ -235,7 +235,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )

if ( vlayer->selectedFeatureCount() == 0 )
{
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setNoAttributes() );

//find the closest feature
QgsGeometry pointGeometry = QgsGeometry::fromPointXY( layerCoords );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolselectutils.cpp
View file
Expand Up @@ -243,7 +243,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas *canvas,
if ( r )
request.setSubsetOfAttributes( r->usedAttributes( context ), vlayer->fields() );
else
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();

QgsFeatureIterator fit = vlayer->getFeatures( request );

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolshowhidelabels.cpp
View file
Expand Up @@ -218,7 +218,7 @@ bool QgsMapToolShowHideLabels::selectedFeatures( QgsVectorLayer *vlayer,
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest()
.setFilterRect( selectGeomTrans.boundingBox() )
.setFlags( QgsFeatureRequest::NoGeometry | QgsFeatureRequest::ExactIntersect )
.setSubsetOfAttributes( QgsAttributeList() ) );
.setNoAttributes() );

QgsFeature f;
while ( fit.nextFeature( f ) )
Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsmaptoolsimplify.cpp
View file
Expand Up @@ -424,7 +424,7 @@ void QgsMapToolSimplify::selectOneFeature( QPoint canvasPoint )
double r = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapSettings() );
QgsRectangle selectRect = QgsRectangle( layerCoords.x() - r, layerCoords.y() - r,
layerCoords.x() + r, layerCoords.y() + r );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setNoAttributes() );

QgsGeometry geometry = QgsGeometry::fromPointXY( layerCoords );
double minDistance = std::numeric_limits<double>::max();
Expand Down Expand Up @@ -459,7 +459,7 @@ void QgsMapToolSimplify::selectFeaturesInRect()
QgsFeatureRequest request;
request.setFilterRect( rect );
request.setFlags( QgsFeatureRequest::ExactIntersect );
request.setSubsetOfAttributes( QgsAttributeList() );
request.setNoAttributes();
QgsFeatureIterator fit = vlayer->getFeatures( request );
while ( fit.nextFeature( f ) )
mSelectedFeatures << f;
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmergeattributesdialog.cpp
View file
Expand Up @@ -554,7 +554,7 @@ void QgsMergeAttributesDialog::createRubberBandForFeature( QgsFeatureId featureI
mSelectionRubberBand = new QgsRubberBand( mMapCanvas, mVectorLayer->geometryType() );
mSelectionRubberBand->setColor( QColor( 255, 0, 0, 65 ) );
QgsFeature featureToSelect;
mVectorLayer->getFeatures( QgsFeatureRequest().setFilterFid( featureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( featureToSelect );
mVectorLayer->getFeatures( QgsFeatureRequest().setFilterFid( featureId ).setNoAttributes() ).nextFeature( featureToSelect );
mSelectionRubberBand->setToGeometry( featureToSelect.geometry(), mVectorLayer );
}

Expand Down
4 changes: 2 additions & 2 deletions src/app/qgsselectbyformdialog.cpp
View file
Expand Up @@ -74,7 +74,7 @@ void QgsSelectByFormDialog::zoomToFeatures( const QString &filter )

QgsFeatureRequest request = QgsFeatureRequest().setFilterExpression( filter )
.setExpressionContext( context )
.setSubsetOfAttributes( QgsAttributeList() );
.setNoAttributes();

QgsFeatureIterator features = mLayer->getFeatures( request );

Expand Down Expand Up @@ -122,7 +122,7 @@ void QgsSelectByFormDialog::flashFeatures( const QString &filter )

QgsFeatureRequest request = QgsFeatureRequest().setFilterExpression( filter )
.setExpressionContext( context )
.setSubsetOfAttributes( QgsAttributeList() );
.setNoAttributes();

QgsFeatureIterator features = mLayer->getFeatures( request );
QgsFeature feat;
Expand Down
6 changes: 3 additions & 3 deletions src/app/vertextool/qgsvertextool.cpp
View file
Expand Up @@ -485,7 +485,7 @@ void QgsVertexTool::cadCanvasReleaseEvent( QgsMapMouseEvent *e )

QgsRectangle layerRect = toLayerCoordinates( vlayer, map_rect );
QgsFeature f;
QgsFeatureIterator fi = vlayer->getFeatures( QgsFeatureRequest( layerRect ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fi = vlayer->getFeatures( QgsFeatureRequest( layerRect ).setNoAttributes() );
while ( fi.nextFeature( f ) )
{
bool isFeatureSelected = vlayer->selectedFeatureIds().contains( f.id() );
Expand Down Expand Up @@ -994,7 +994,7 @@ QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatu
if ( !layerCache.contains( fid ) )
{
QgsFeature f;
layer->getFeatures( QgsFeatureRequest( fid ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f );
layer->getFeatures( QgsFeatureRequest( fid ).setNoAttributes() ).nextFeature( f );
layerCache[fid] = f.geometry();
}

Expand Down Expand Up @@ -1488,7 +1488,7 @@ QgsPointXY QgsVertexTool::matchToLayerPoint( const QgsVectorLayer *destLayer, co
if ( match && match->hasVertex() && match->layer() && match->layer()->crs() == destLayer->crs() )
{
QgsFeature f;
QgsFeatureIterator fi = match->layer()->getFeatures( QgsFeatureRequest( match->featureId() ).setSubsetOfAttributes( QgsAttributeList() ) );
QgsFeatureIterator fi = match->layer()->getFeatures( QgsFeatureRequest( match->featureId() ).setNoAttributes() );
if ( fi.nextFeature( f ) )
return f.geometry().vertexAt( match->vertexIndex() );
}
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgsgeometryeditutils.cpp
View file
Expand Up @@ -254,7 +254,7 @@ std::unique_ptr<QgsAbstractGeometry> QgsGeometryEditUtils::avoidIntersections( c

QgsFeatureIterator fi = currentLayer->getFeatures( QgsFeatureRequest( geom.boundingBox() )
.setFlags( QgsFeatureRequest::ExactIntersect )
.setSubsetOfAttributes( QgsAttributeList() ) );
.setNoAttributes() );
QgsFeature f;
while ( fi.nextFeature( f ) )
{
Expand Down

0 comments on commit 6fc36dc

Please sign in to comment.