Skip to content

Commit 6fc36dc

Browse files
3nids3nids
authored
use QgsFeatureRequest::setNoAttributes (#8332)
1 parent bf5537e commit 6fc36dc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+86
-86
lines changed

‎src/3d/symbols/qgspoint3dsymbol_p.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ void QgsPoint3DSymbolInstancedEntityFactory::addEntityForSelectedPoints( const Q
153153
QgsFeatureRequest req;
154154
req.setDestinationCrs( map.crs(), map.transformContext() );
155155
req.setFilterFids( layer->selectedFeatureIds() );
156-
req.setSubsetOfAttributes( QgsAttributeList() );
156+
req.setNoAttributes();
157157

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

174174
QgsFeatureIds notSelected = layer->allFeatureIds();
175175
notSelected.subtract( layer->selectedFeatureIds() );
@@ -328,7 +328,7 @@ void QgsPoint3DSymbolModelEntityFactory::addEntitiesForSelectedPoints( const Qgs
328328
{
329329
QgsFeatureRequest req;
330330
req.setDestinationCrs( map.crs(), map.transformContext() );
331-
req.setSubsetOfAttributes( QgsAttributeList() );
331+
req.setNoAttributes();
332332
req.setFilterFids( layer->selectedFeatureIds() );
333333

334334
addMeshEntities( map, layer, req, symbol, parent, true );
@@ -341,7 +341,7 @@ void QgsPoint3DSymbolModelEntityFactory::addEntitiesForNotSelectedPoints( const
341341
// build the feature request to select features
342342
QgsFeatureRequest req;
343343
req.setDestinationCrs( map.crs(), map.transformContext() );
344-
req.setSubsetOfAttributes( QgsAttributeList() );
344+
req.setNoAttributes();
345345
QgsFeatureIds notSelected = layer->allFeatureIds();
346346
notSelected.subtract( layer->selectedFeatureIds() );
347347
req.setFilterFids( notSelected );

‎src/analysis/network/qgsvectorlayerdirector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ void QgsVectorLayerDirector::makeGraph( QgsGraphBuilderInterface *builder, const
203203
};
204204

205205
// first iteration - get all nodes from network, and snap additional points to network
206-
QgsFeatureIterator fit = mSource->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
206+
QgsFeatureIterator fit = mSource->getFeatures( QgsFeatureRequest().setNoAttributes() );
207207
QgsFeature feature;
208208
while ( fit.nextFeature( feature ) )
209209
{

‎src/analysis/processing/qgsalgorithmdbscanclustering.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ QVariantMap QgsDbscanClusteringAlgorithm::processAlgorithm( const QVariantMap &p
133133
feedback->pushInfo( QObject::tr( "Analysing clusters" ) );
134134
std::unordered_map< QgsFeatureId, int> idToCluster;
135135
idToCluster.reserve( index.size() );
136-
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
136+
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setNoAttributes() );
137137
const long featureCount = source->featureCount();
138138

139139
int clusterCount = 0;

‎src/analysis/processing/qgsalgorithmextractbylocation.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ void QgsLocationBasedAlgorithm::process( const QgsProcessingContext &context, Qg
9696
disjointSet = targetSource->allFeatureIds();
9797

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

120120
QgsFeatureIterator testFeatureIt = targetSource->getFeatures( request );
121121
QgsFeature testFeature;
@@ -192,7 +192,7 @@ void QgsLocationBasedAlgorithm::process( const QgsProcessingContext &context, Qg
192192
disjointSet = disjointSet.subtract( foundSet );
193193
QgsFeatureRequest disjointReq = QgsFeatureRequest().setFilterFids( disjointSet );
194194
if ( onlyRequireTargetIds )
195-
disjointReq.setSubsetOfAttributes( QgsAttributeList() ).setFlags( QgsFeatureRequest::NoGeometry );
195+
disjointReq.setNoAttributes().setFlags( QgsFeatureRequest::NoGeometry );
196196
QgsFeatureIterator disjointIt = targetSource->getFeatures( disjointReq );
197197
QgsFeature f;
198198
while ( disjointIt.nextFeature( f ) )

‎src/analysis/processing/qgsalgorithmkmeansclustering.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ QVariantMap QgsKMeansClusteringAlgorithm::processAlgorithm( const QVariantMap &p
9595
QgsFeature feat;
9696

9797
std::vector< Feature > clusterFeatures;
98-
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
98+
QgsFeatureIterator features = source->getFeatures( QgsFeatureRequest().setNoAttributes() );
9999
QHash< QgsFeatureId, int > idToObj;
100100
while ( features.nextFeature( feat ) )
101101
{

‎src/analysis/processing/qgsalgorithmlineintersection.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ QVariantMap QgsLineIntersectionAlgorithm::processAlgorithm( const QVariantMap &p
144144
if ( !sink )
145145
throw QgsProcessingException( invalidSinkError( parameters, QStringLiteral( "OUTPUT" ) ) );
146146

147-
QgsSpatialIndex spatialIndex( sourceB->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ).setDestinationCrs( sourceA->sourceCrs(), context.transformContext() ) ), feedback );
147+
QgsSpatialIndex spatialIndex( sourceB->getFeatures( QgsFeatureRequest().setNoAttributes().setDestinationCrs( sourceA->sourceCrs(), context.transformContext() ) ), feedback );
148148
QgsFeature outFeature;
149149
QgsFeatureIterator features = sourceA->getFeatures( QgsFeatureRequest().setSubsetOfAttributes( fieldsAIndices ) );
150150
double step = sourceA->featureCount() > 0 ? 100.0 / sourceA->featureCount() : 1;

‎src/analysis/processing/qgsalgorithmsplitwithlines.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ QVariantMap QgsSplitWithLinesAlgorithm::processAlgorithm( const QVariantMap &par
105105
QgsSpatialIndex spatialIndex;
106106
QMap< QgsFeatureId, QgsGeometry > splitGeoms;
107107
QgsFeatureRequest request;
108-
request.setSubsetOfAttributes( QgsAttributeList() );
108+
request.setNoAttributes();
109109
request.setDestinationCrs( source->sourceCrs(), context.transformContext() );
110110

111111
QgsFeatureIterator splitLines = linesSource->getFeatures( request );

‎src/analysis/processing/qgsalgorithmzonalhistogram.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ QVariantMap QgsZonalHistogramAlgorithm::processAlgorithm( const QVariantMap &par
107107

108108
// First loop through the zones to build up a list of unique values across all zones to determine sink fields list
109109
QgsFeatureRequest request;
110-
request.setSubsetOfAttributes( QgsAttributeList() );
110+
request.setNoAttributes();
111111
if ( zones->sourceCrs() != mCrs )
112112
{
113113
request.setDestinationCrs( mCrs, context.transformContext() );

‎src/analysis/processing/qgsoverlayutils.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ static bool sanitizeDifferenceResult( QgsGeometry &geom )
7777
void QgsOverlayUtils::difference( const QgsFeatureSource &sourceA, const QgsFeatureSource &sourceB, QgsFeatureSink &sink, QgsProcessingContext &context, QgsProcessingFeedback *feedback, int &count, int totalCount, QgsOverlayUtils::DifferenceOutput outputAttrs )
7878
{
7979
QgsFeatureRequest requestB;
80-
requestB.setSubsetOfAttributes( QgsAttributeList() );
80+
requestB.setNoAttributes();
8181
if ( outputAttrs != OutputBA )
8282
requestB.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );
8383
QgsSpatialIndex indexB( sourceB.getFeatures( requestB ), feedback );
@@ -108,7 +108,7 @@ void QgsOverlayUtils::difference( const QgsFeatureSource &sourceA, const QgsFeat
108108

109109
QgsFeatureRequest request;
110110
request.setFilterFids( intersects );
111-
request.setSubsetOfAttributes( QgsAttributeList() );
111+
request.setNoAttributes();
112112
if ( outputAttrs != OutputBA )
113113
request.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );
114114

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

182182
QgsFeatureRequest request;
183-
request.setSubsetOfAttributes( QgsAttributeList() );
183+
request.setNoAttributes();
184184
request.setDestinationCrs( sourceA.sourceCrs(), context.transformContext() );
185185

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

263263
QgsFeatureRequest requestOnlyGeoms;
264-
requestOnlyGeoms.setSubsetOfAttributes( QgsAttributeList() );
264+
requestOnlyGeoms.setNoAttributes();
265265

266266
QgsFeatureRequest requestOnlyAttrs;
267267
requestOnlyAttrs.setFlags( QgsFeatureRequest::NoGeometry );
268268

269269
QgsFeatureRequest requestOnlyIds;
270270
requestOnlyIds.setFlags( QgsFeatureRequest::NoGeometry );
271-
requestOnlyIds.setSubsetOfAttributes( QgsAttributeList() );
271+
requestOnlyIds.setNoAttributes();
272272

273273
// make a set of used feature IDs so that we do not try to reuse them for newly added features
274274
QgsFeature f;

‎src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea
6464
searchBounds.grow( mContext->tolerance );
6565
QgsFeatureIds refFeatureIds = mIndex->intersects( searchBounds ).toSet();
6666

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

7070
if ( refFeatureIds.isEmpty() )

‎src/analysis/vector/qgsgeometrysnapper.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ QgsGeometry QgsGeometrySnapper::snapGeometry( const QgsGeometry &geometry, doubl
485485
QgsFeatureIds refFeatureIds = mIndex.intersects( searchBounds ).toSet();
486486
mIndexMutex.unlock();
487487

488-
QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
488+
QgsFeatureRequest refFeatureRequest = QgsFeatureRequest().setFilterFids( refFeatureIds ).setNoAttributes();
489489
mReferenceLayerMutex.lock();
490490
QgsFeature refFeature;
491491
QgsFeatureIterator refFeatureIt = mReferenceSource->getFeatures( refFeatureRequest );

‎src/analysis/vector/qgsgeometrysnappersinglesource.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ int QgsGeometrySnapperSingleSource::run( const QgsFeatureSource &source, QgsFeat
314314
QgsSpatialIndex index;
315315
QVector<AnchorPoint> pnts;
316316
QgsFeatureRequest request;
317-
request.setSubsetOfAttributes( QgsAttributeList() );
317+
request.setNoAttributes();
318318
QgsFeatureIterator fi = source.getFeatures( request );
319319
buildSnapIndex( fi, index, pnts, feedback, count, totalCount );
320320

‎src/analysis/vector/qgszonalstatistics.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ int QgsZonalStatistics::calculateStatistics( QgsFeedback *feedback )
209209

210210
//iterate over each polygon
211211
QgsFeatureRequest request;
212-
request.setSubsetOfAttributes( QgsAttributeList() );
212+
request.setNoAttributes();
213213
request.setDestinationCrs( mRasterCrs, QgsProject::instance()->transformContext() );
214214
QgsFeatureIterator fi = vectorProvider->getFeatures( request );
215215
QgsFeature f;

‎src/app/qgisapp.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -7670,7 +7670,7 @@ void QgisApp::deleteSelected( QgsMapLayer *layer, QWidget *parent, bool checkFea
76707670
if ( checkFeaturesVisible )
76717671
{
76727672
QgsFeature feat;
7673-
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setSubsetOfAttributes( QgsAttributeList() ) );
7673+
QgsFeatureIterator it = vlayer->getSelectedFeatures( QgsFeatureRequest().setNoAttributes() );
76747674
bool allFeaturesInView = true;
76757675
QgsRectangle viewRect = mMapCanvas->mapSettings().mapToLayerCoordinates( vlayer, mMapCanvas->extent() );
76767676

‎src/app/qgsgeometryvalidationservice.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ void QgsGeometryValidationService::triggerTopologyChecks( QgsVectorLayer *layer
379379

380380
QMap<QString, QgsFeatureIds> layerIds;
381381

382-
QgsFeatureRequest request = QgsFeatureRequest( affectedFeatureIds ).setSubsetOfAttributes( QgsAttributeList() );
382+
QgsFeatureRequest request = QgsFeatureRequest( affectedFeatureIds ).setNoAttributes();
383383
QgsFeatureIterator it = layer->getFeatures( request );
384384
QgsFeature feature;
385385
QgsRectangle area;

‎src/app/qgsmaptoolmovefeature.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ void QgsMapToolMoveFeature::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
8686

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

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

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

136136
bool allFeaturesInView = true;
137137
QgsRectangle viewRect = mCanvas->mapSettings().mapToLayerCoordinates( vlayer, mCanvas->extent() );

‎src/app/qgsmaptoolreshape.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bool QgsMapToolReshape::isBindingLine( QgsVectorLayer *vlayer, const QgsRectangl
9191
const QgsPointXY beginPoint = points().first();
9292
const QgsPointXY endPoint = points().last();
9393

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

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

128128
//query all the features that intersect bounding box of capture line
129-
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setSubsetOfAttributes( QgsAttributeList() ) );
129+
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( bbox ).setNoAttributes() );
130130
QgsFeature f;
131131
int reshapeReturn;
132132
bool reshapeDone = false;

‎src/app/qgsmaptoolrotatefeature.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,7 @@ void QgsMapToolRotateFeature::canvasReleaseEvent( QgsMapMouseEvent *e )
235235

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

240240
//find the closest feature
241241
QgsGeometry pointGeometry = QgsGeometry::fromPointXY( layerCoords );

‎src/app/qgsmaptoolselectutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ QgsFeatureIds QgsMapToolSelectUtils::getMatchingFeatures( QgsMapCanvas *canvas,
243243
if ( r )
244244
request.setSubsetOfAttributes( r->usedAttributes( context ), vlayer->fields() );
245245
else
246-
request.setSubsetOfAttributes( QgsAttributeList() );
246+
request.setNoAttributes();
247247

248248
QgsFeatureIterator fit = vlayer->getFeatures( request );
249249

‎src/app/qgsmaptoolshowhidelabels.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ bool QgsMapToolShowHideLabels::selectedFeatures( QgsVectorLayer *vlayer,
218218
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest()
219219
.setFilterRect( selectGeomTrans.boundingBox() )
220220
.setFlags( QgsFeatureRequest::NoGeometry | QgsFeatureRequest::ExactIntersect )
221-
.setSubsetOfAttributes( QgsAttributeList() ) );
221+
.setNoAttributes() );
222222

223223
QgsFeature f;
224224
while ( fit.nextFeature( f ) )

‎src/app/qgsmaptoolsimplify.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ void QgsMapToolSimplify::selectOneFeature( QPoint canvasPoint )
424424
double r = QgsTolerance::vertexSearchRadius( vlayer, mCanvas->mapSettings() );
425425
QgsRectangle selectRect = QgsRectangle( layerCoords.x() - r, layerCoords.y() - r,
426426
layerCoords.x() + r, layerCoords.y() + r );
427-
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setSubsetOfAttributes( QgsAttributeList() ) );
427+
QgsFeatureIterator fit = vlayer->getFeatures( QgsFeatureRequest().setFilterRect( selectRect ).setNoAttributes() );
428428

429429
QgsGeometry geometry = QgsGeometry::fromPointXY( layerCoords );
430430
double minDistance = std::numeric_limits<double>::max();
@@ -459,7 +459,7 @@ void QgsMapToolSimplify::selectFeaturesInRect()
459459
QgsFeatureRequest request;
460460
request.setFilterRect( rect );
461461
request.setFlags( QgsFeatureRequest::ExactIntersect );
462-
request.setSubsetOfAttributes( QgsAttributeList() );
462+
request.setNoAttributes();
463463
QgsFeatureIterator fit = vlayer->getFeatures( request );
464464
while ( fit.nextFeature( f ) )
465465
mSelectedFeatures << f;

‎src/app/qgsmergeattributesdialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ void QgsMergeAttributesDialog::createRubberBandForFeature( QgsFeatureId featureI
554554
mSelectionRubberBand = new QgsRubberBand( mMapCanvas, mVectorLayer->geometryType() );
555555
mSelectionRubberBand->setColor( QColor( 255, 0, 0, 65 ) );
556556
QgsFeature featureToSelect;
557-
mVectorLayer->getFeatures( QgsFeatureRequest().setFilterFid( featureId ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( featureToSelect );
557+
mVectorLayer->getFeatures( QgsFeatureRequest().setFilterFid( featureId ).setNoAttributes() ).nextFeature( featureToSelect );
558558
mSelectionRubberBand->setToGeometry( featureToSelect.geometry(), mVectorLayer );
559559
}
560560

‎src/app/qgsselectbyformdialog.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ void QgsSelectByFormDialog::zoomToFeatures( const QString &filter )
7474

7575
QgsFeatureRequest request = QgsFeatureRequest().setFilterExpression( filter )
7676
.setExpressionContext( context )
77-
.setSubsetOfAttributes( QgsAttributeList() );
77+
.setNoAttributes();
7878

7979
QgsFeatureIterator features = mLayer->getFeatures( request );
8080

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

123123
QgsFeatureRequest request = QgsFeatureRequest().setFilterExpression( filter )
124124
.setExpressionContext( context )
125-
.setSubsetOfAttributes( QgsAttributeList() );
125+
.setNoAttributes();
126126

127127
QgsFeatureIterator features = mLayer->getFeatures( request );
128128
QgsFeature feat;

‎src/app/vertextool/qgsvertextool.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ void QgsVertexTool::cadCanvasReleaseEvent( QgsMapMouseEvent *e )
485485

486486
QgsRectangle layerRect = toLayerCoordinates( vlayer, map_rect );
487487
QgsFeature f;
488-
QgsFeatureIterator fi = vlayer->getFeatures( QgsFeatureRequest( layerRect ).setSubsetOfAttributes( QgsAttributeList() ) );
488+
QgsFeatureIterator fi = vlayer->getFeatures( QgsFeatureRequest( layerRect ).setNoAttributes() );
489489
while ( fi.nextFeature( f ) )
490490
{
491491
bool isFeatureSelected = vlayer->selectedFeatureIds().contains( f.id() );
@@ -994,7 +994,7 @@ QgsGeometry QgsVertexTool::cachedGeometry( const QgsVectorLayer *layer, QgsFeatu
994994
if ( !layerCache.contains( fid ) )
995995
{
996996
QgsFeature f;
997-
layer->getFeatures( QgsFeatureRequest( fid ).setSubsetOfAttributes( QgsAttributeList() ) ).nextFeature( f );
997+
layer->getFeatures( QgsFeatureRequest( fid ).setNoAttributes() ).nextFeature( f );
998998
layerCache[fid] = f.geometry();
999999
}
10001000

@@ -1488,7 +1488,7 @@ QgsPointXY QgsVertexTool::matchToLayerPoint( const QgsVectorLayer *destLayer, co
14881488
if ( match && match->hasVertex() && match->layer() && match->layer()->crs() == destLayer->crs() )
14891489
{
14901490
QgsFeature f;
1491-
QgsFeatureIterator fi = match->layer()->getFeatures( QgsFeatureRequest( match->featureId() ).setSubsetOfAttributes( QgsAttributeList() ) );
1491+
QgsFeatureIterator fi = match->layer()->getFeatures( QgsFeatureRequest( match->featureId() ).setNoAttributes() );
14921492
if ( fi.nextFeature( f ) )
14931493
return f.geometry().vertexAt( match->vertexIndex() );
14941494
}

‎src/core/geometry/qgsgeometryeditutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ std::unique_ptr<QgsAbstractGeometry> QgsGeometryEditUtils::avoidIntersections( c
254254

255255
QgsFeatureIterator fi = currentLayer->getFeatures( QgsFeatureRequest( geom.boundingBox() )
256256
.setFlags( QgsFeatureRequest::ExactIntersect )
257-
.setSubsetOfAttributes( QgsAttributeList() ) );
257+
.setNoAttributes() );
258258
QgsFeature f;
259259
while ( fi.nextFeature( f ) )
260260
{

0 commit comments

Comments
 (0)