From 75712643cd393c88882e9eff6d8b34c29e18e6a2 Mon Sep 17 00:00:00 2001
From: Matthias Kuhn <matthias@opengis.ch>
Date: Thu, 16 Jul 2015 08:50:42 +0200
Subject: [PATCH] Remove references to QgsFeatureRequest::FilterRect

---
 src/app/qgsattributetabledialog.cpp                     | 2 +-
 src/gui/attributetable/qgsattributetablefiltermodel.cpp | 2 +-
 src/gui/attributetable/qgsdualview.cpp                  | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
index 0cdcb30da3e..f472db837ce 100644
--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@@ -359,7 +359,7 @@ void QgsAttributeTableDialog::runFieldCalculation( QgsVectorLayer* layer, QStrin
   bool useGeometry = exp.needsGeometry();
 
   QgsFeatureRequest request( mMainView->masterModel()->request() );
-  useGeometry |= request.filterType() == QgsFeatureRequest::FilterRect;
+  useGeometry |= !request.filterRect().isNull();
   request.setFlags( useGeometry ? QgsFeatureRequest::NoFlags : QgsFeatureRequest::NoGeometry );
 
   int rownum = 1;
diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
index 45c37f0e904..58906101f60 100644
--- a/src/gui/attributetable/qgsattributetablefiltermodel.cpp
+++ b/src/gui/attributetable/qgsattributetablefiltermodel.cpp
@@ -266,7 +266,7 @@ void QgsAttributeTableFilterModel::generateListOfVisibleFeatures()
   renderer->startRender( renderContext, layer()->pendingFields() );
 
   QgsFeatureRequest r( masterModel()->request() );
-  if ( r.filterType() == QgsFeatureRequest::FilterRect )
+  if ( !r.filterRect().isNull() )
   {
     r.setFilterRect( r.filterRect().intersect( &rect ) );
   }
diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
index 12a7883310e..24f19446377 100644
--- a/src/gui/attributetable/qgsdualview.cpp
+++ b/src/gui/attributetable/qgsdualview.cpp
@@ -65,7 +65,7 @@ void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, const Qg
 
   connect( mTableView, SIGNAL( willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT( viewWillShowContextMenu( QMenu*, QModelIndex ) ) );
 
-  initLayerCache( layer, request.filterType() == QgsFeatureRequest::FilterRect );
+  initLayerCache( layer, !request.filterRect().isNull() );
   initModels( mapCanvas, request );
 
   mTableView->setModel( mFilterModel );