Skip to content

Commit 7571264

Browse files
committed
Remove references to QgsFeatureRequest::FilterRect
1 parent 1d7a6a4 commit 7571264

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

src/app/qgsattributetabledialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -359,7 +359,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
359359
bool useGeometry = exp.needsGeometry();
360360

361361
QgsFeatureRequest request( mMainView->masterModel()->request() );
362-
useGeometry |= request.filterType() == QgsFeatureRequest::FilterRect;
362+
useGeometry |= !request.filterRect().isNull();
363363
request.setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry );
364364

365365
int rownum = 1;

src/gui/attributetable/qgsattributetablefiltermodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
266266
renderer->startRender( renderContext, layer()->pendingFields() );
267267

268268
QgsFeatureRequest r( masterModel()->request() );
269-
if ( r.filterType() == QgsFeatureRequest::FilterRect )
269+
if ( !r.filterRect().isNull() )
270270
{
271271
r.setFilterRect( r.filterRect().intersect( &rect ) );
272272
}

src/gui/attributetable/qgsdualview.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, const Qg
6565

6666
connect( mTableView, SIGNAL( willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT( viewWillShowContextMenu( QMenu*, QModelIndex ) ) );
6767

68-
initLayerCache( layer, request.filterType() == QgsFeatureRequest::FilterRect );
68+
initLayerCache( layer, !request.filterRect().isNull() );
6969
initModels( mapCanvas, request );
7070

7171
mTableView->setModel( mFilterModel );

0 commit comments

Comments
 (0)