diff --git a/src/core/qgsvectorlayerfeatureiterator.cpp b/src/core/qgsvectorlayerfeatureiterator.cpp
@@ -25,6 +25,10 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
 {
   QgsVectorLayerJoinBuffer* joinBuffer = L->mJoinBuffer;
 
+  // by default provider's request is the same
+  mProviderRequest = mRequest;
+  mChangedFeaturesRequest = mRequest;
+
   if ( L->editBuffer() )
   {
     mAddedFeatures = QgsFeatureMap( L->editBuffer()->addedFeatures() );
@@ -33,15 +37,13 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
     mChangedAttributeValues = QgsChangedAttributesMap( L->editBuffer()->changedAttributeValues() );
     mAddedAttributes = QList<QgsField>( L->editBuffer()->addedAttributes() );
     mDeletedAttributeIds = QgsAttributeList( L->editBuffer()->deletedAttributeIds() );
+    mChangedFeaturesRequest.setFilterFids( L->editBuffer()->changedAttributeValues().keys().toSet() );
   }
 
   // prepare joins: may add more attributes to fetch (in order to allow join)
   if ( joinBuffer->containsJoins() )
     prepareJoins();
 
-  // by default provider's request is the same
-  mProviderRequest = mRequest;
-
   if ( mProviderRequest.flags() & QgsFeatureRequest::SubsetOfAttributes )
   {
     // prepare list of attributes to match provider fields
@@ -65,10 +67,22 @@ QgsVectorLayerFeatureIterator::QgsVectorLayerFeatureIterator( QgsVectorLayer* la
   }
   else // no filter or filter by rect
   {
-    mProviderIterator = L->dataProvider()->getFeatures( mProviderRequest );
+    if ( L->editBuffer() )
+    {
+      mChangedFeaturesIterator = L->dataProvider()->getFeatures( mChangedFeaturesRequest );
+    }
+    else
+    {
+      mProviderIterator = L->dataProvider()->getFeatures( mProviderRequest );
+    }
 
     rewindEditBuffer();
   }
+
+  if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
+  {
+    mRequest.filterExpression()->prepare( L->pendingFields() );
+  }
 }
 
 
@@ -79,7 +93,7 @@ QgsVectorLayerFeatureIterator::~QgsVectorLayerFeatureIterator()
 
 
 
-bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
+bool QgsVectorLayerFeatureIterator::fetchFeature( QgsFeature& f )
 {
   f.setValid( false );
 
@@ -99,8 +113,29 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
   {
     if ( fetchNextChangedGeomFeature( f ) )
       return true;
+
+    // no more changed geometries
+  }
+
+  if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
+  {
+    if ( fetchNextChangedAttributeFeature( f ) )
+      return true;
+
+    // no more changed features
+  }
+
+  while ( fetchNextAddedFeature( f ) )
+  {
+    return true;
+  }
+  // no more added features
+
+  if ( mProviderIterator.isClosed() )
+  {
+    mChangedFeaturesIterator.close();
+    mProviderIterator = L->dataProvider()->getFeatures( mProviderRequest );
   }
-  // no more changed geometries
 
   while ( mProviderIterator.nextFeature( f ) )
   {
@@ -125,11 +160,6 @@ bool QgsVectorLayerFeatureIterator::nextFeature( QgsFeature& f )
   }
   // no more provider features
 
-  if ( fetchNextAddedFeature( f ) )
-    return true;
-  // no more added features
-
-
   close();
   return false;
 }
@@ -178,17 +208,16 @@ bool QgsVectorLayerFeatureIterator::fetchNextAddedFeature( QgsFeature& f )
       // must have changed geometry outside rectangle
       continue;
 
-    if ( mRequest.filterType() == QgsFeatureRequest::FilterRect &&
-         mFetchAddedFeaturesIt->geometry() &&
-         !mFetchAddedFeaturesIt->geometry()->intersects( mRequest.filterRect() ) )
-      // skip added features not in rectangle
+    if ( !mRequest.acceptFeature ( *mFetchAddedFeaturesIt ) )
+      // skip features which are not accepted by the filter
       continue;
 
     useAddedFeature( *mFetchAddedFeaturesIt, f );
 
     return true;
   }
 
+  mFetchAddedFeaturesIt = mAddedFeatures.constBegin();
   return false; // no more added features
 }
 
@@ -239,6 +268,30 @@ bool QgsVectorLayerFeatureIterator::fetchNextChangedGeomFeature( QgsFeature& f )
   return false; // no more changed geometries
 }
 
+bool QgsVectorLayerFeatureIterator::fetchNextChangedAttributeFeature( QgsFeature& f )
+{
+  while ( mChangedFeaturesIterator.nextFeature( f ) )
+  {
+    mFetchConsidered << f.id();
+
+    updateChangedAttributes( f );
+
+    if ( mRequest.filterType() == QgsFeatureRequest::FilterExpression )
+    {
+      if ( mRequest.filterExpression()->evaluate( &f ).toBool() )
+      {
+        return true;
+      }
+    }
+    else
+    {
+      return true;
+    }
+  }
+
+  return false;
+}
+
 
 void QgsVectorLayerFeatureIterator::useChangedAttributeFeature( QgsFeatureId fid, const QgsGeometry& geom, QgsFeature& f )
 {

diff --git a/src/core/qgsvectorlayerfeatureiterator.h b/src/core/qgsvectorlayerfeatureiterator.h
@@ -32,20 +32,26 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
 
     ~QgsVectorLayerFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
     //! end of iterating: free the resources / lock
     virtual bool close();
 
   protected:
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
+    //! Overrides default method as we only need to filter features in the edit buffer
+    //! while for others filtering is left to the provider implementation.
+    inline virtual bool nextFeatureFilterExpression( QgsFeature &f ) { return fetchFeature( f ); }
+
     QgsVectorLayer* L;
 
     QgsFeatureRequest mProviderRequest;
     QgsFeatureIterator mProviderIterator;
+    QgsFeatureRequest mChangedFeaturesRequest;
+    QgsFeatureIterator mChangedFeaturesIterator;
 
 #if 0
     // general stuff
@@ -67,6 +73,7 @@ class CORE_EXPORT QgsVectorLayerFeatureIterator : public QgsAbstractFeatureItera
     void prepareJoins();
     bool fetchNextAddedFeature( QgsFeature& f );
     bool fetchNextChangedGeomFeature( QgsFeature& f );
+    bool fetchNextChangedAttributeFeature( QgsFeature& f );
     void useAddedFeature( const QgsFeature& src, QgsFeature& f );
     void useChangedAttributeFeature( QgsFeatureId fid, const QgsGeometry& geom, QgsFeature& f );
     bool nextFeatureFid( QgsFeature& f );

diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -642,3 +642,8 @@ void QgsAttributeTableModel::prefetchColumnData( int column )
     mCachedField = fieldId;
   }
 }
+
+void QgsAttributeTableModel::setRequest( const QgsFeatureRequest& request )
+{
+  mFeatureRequest = request;
+}
diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
@@ -188,6 +188,8 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
      */
     void prefetchColumnData( int column );
 
+    void setRequest( const QgsFeatureRequest& request );
+
   signals:
     /**
      * Model has been changed

diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -57,14 +57,14 @@ QgsDualView::~QgsDualView()
   delete mAttributeDialog;
 }
 
-void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDistanceArea myDa )
+void QgsDualView::init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDistanceArea myDa, const QgsFeatureRequest &request )
 {
   mDistanceArea = myDa;
 
   connect( mTableView, SIGNAL( willShowContextMenu( QMenu*, QModelIndex ) ), this, SLOT( viewWillShowContextMenu( QMenu*, QModelIndex ) ) );
 
   initLayerCache( layer );
-  initModels( mapCanvas );
+  initModels( mapCanvas, request );
 
   mTableView->setModel( mFilterModel );
   mFeatureList->setModel( mFeatureListModel );
@@ -233,9 +233,10 @@ void QgsDualView::initLayerCache( QgsVectorLayer* layer )
   connect( layer, SIGNAL( featureDeleted( QgsFeatureId ) ), this, SLOT( featureDeleted( QgsFeatureId ) ) );
 }
 
-void QgsDualView::initModels( QgsMapCanvas* mapCanvas )
+void QgsDualView::initModels( QgsMapCanvas* mapCanvas, const QgsFeatureRequest& request )
 {
   mMasterModel = new QgsAttributeTableModel( mLayerCache, this );
+  mMasterModel->setRequest( request );
 
   connect( mMasterModel, SIGNAL( progress( int, bool & ) ), this, SLOT( progress( int, bool & ) ) );
   connect( mMasterModel, SIGNAL( finished() ), this, SLOT( finished() ) );
@@ -514,6 +515,11 @@ void QgsDualView::setFilteredFeatures( QgsFeatureIds filteredFeatures )
   mFilterModel->setFilteredFeatures( filteredFeatures );
 }
 
+void QgsDualView::setRequest( const QgsFeatureRequest& request )
+{
+  mMasterModel->setRequest( request );
+}
+
 void QgsDualView::progress( int i, bool& cancel )
 {
   if ( !mProgressDlg )

diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h
@@ -75,8 +75,9 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
      * @param mapCanvas  The mapCanvas (used for the FilterMode
      *                   {@link QgsAttributeTableFilterModel::ShowVisible}
      * @param myDa       Used for attribute dialog creation
+     * @param request    Use a modified request to limit the shown features
      */
-    void init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDistanceArea myDa );
+    void init( QgsVectorLayer* layer, QgsMapCanvas* mapCanvas, QgsDistanceArea myDa, const QgsFeatureRequest& request = QgsFeatureRequest() );
 
     /**
      * Change the current view mode.
@@ -130,6 +131,8 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
      */
     QgsAttributeTableModel* masterModel() const { return mMasterModel; }
 
+    void setRequest( const QgsFeatureRequest& request );
+
   protected:
     /**
      * Initializes widgets which depend on the attributes of this layer
@@ -230,7 +233,7 @@ class GUI_EXPORT QgsDualView : public QStackedWidget, private Ui::QgsDualViewBas
 
   private:
     void initLayerCache( QgsVectorLayer *layer );
-    void initModels( QgsMapCanvas* mapCanvas );
+    void initModels( QgsMapCanvas* mapCanvas, const QgsFeatureRequest& request );
 
     QgsAttributeTableModel* mMasterModel;
     QgsAttributeTableFilterModel* mFilterModel;

diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp
@@ -45,7 +45,8 @@
 int QgsAttributeDialog::smFormCounter = 0;
 
 QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeature, bool featureOwner, QgsDistanceArea myDa, QWidget* parent, bool showDialogButtons )
-    : mDialog( 0 )
+    : QObject( parent )
+    , mDialog( 0 )
     , mSettingsPath( "/Windows/AttributeDialog/" )
     , mLayer( vl )
     , mFeature( thepFeature )

diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp
@@ -138,7 +138,7 @@ QgsDelimitedTextFeatureIterator::~QgsDelimitedTextFeatureIterator()
   close();
 }
 
-bool QgsDelimitedTextFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsDelimitedTextFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   // before we do anything else, assume that there's something wrong with
   // the feature

diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h
@@ -34,9 +34,6 @@ class QgsDelimitedTextFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsDelimitedTextFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
@@ -58,6 +55,9 @@ class QgsDelimitedTextFeatureIterator : public QgsAbstractFeatureIterator
     bool wantGeometry( QgsGeometry *geom ) const;
 
   protected:
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     QgsDelimitedTextProvider* P;
     QList<QgsFeatureId> mFeatureIds;
     IteratorMode mMode;

diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp
@@ -71,7 +71,7 @@ bool QgsGPXFeatureIterator::close()
   return true;
 }
 
-bool QgsGPXFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsGPXFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 

diff --git a/src/providers/gpx/qgsgpxfeatureiterator.h b/src/providers/gpx/qgsgpxfeatureiterator.h
@@ -28,9 +28,6 @@ class QgsGPXFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsGPXFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
@@ -39,6 +36,9 @@ class QgsGPXFeatureIterator : public QgsAbstractFeatureIterator
 
   protected:
 
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     bool readFid( QgsFeature& feature );
 
     bool readWaypoint( const QgsWaypoint& wpt, QgsFeature& feature );

diff --git a/src/providers/grass/qgsgrassfeatureiterator.cpp b/src/providers/grass/qgsgrassfeatureiterator.cpp
@@ -147,7 +147,7 @@ QgsGrassFeatureIterator::~QgsGrassFeatureIterator()
   close();
 }
 
-bool QgsGrassFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsGrassFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   if ( mClosed )
     return false;

diff --git a/src/providers/grass/qgsgrassfeatureiterator.h b/src/providers/grass/qgsgrassfeatureiterator.h
@@ -28,7 +28,7 @@ class QgsGrassFeatureIterator : public QgsAbstractFeatureIterator
     ~QgsGrassFeatureIterator();
 
     //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
+    virtual bool fetchFeature( QgsFeature& feature );
 
     //! reset the iterator to the starting position
     virtual bool rewind();

diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp
@@ -62,7 +62,7 @@ QgsMemoryFeatureIterator::~QgsMemoryFeatureIterator()
 }
 
 
-bool QgsMemoryFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsMemoryFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 

diff --git a/src/providers/memory/qgsmemoryfeatureiterator.h b/src/providers/memory/qgsmemoryfeatureiterator.h
@@ -29,9 +29,6 @@ class QgsMemoryFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsMemoryFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
@@ -40,6 +37,9 @@ class QgsMemoryFeatureIterator : public QgsAbstractFeatureIterator
 
   protected:
 
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     bool nextFeatureUsingList( QgsFeature& feature );
     bool nextFeatureTraverseAll( QgsFeature& feature );
 

diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp
@@ -186,7 +186,7 @@ void QgsMssqlFeatureIterator::BuildStatement( const QgsFeatureRequest& request )
 }
 
 
-bool QgsMssqlFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsMssqlFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 

diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.h b/src/providers/mssql/qgsmssqlfeatureiterator.h
@@ -33,9 +33,6 @@ class QgsMssqlFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsMssqlFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
@@ -48,6 +45,9 @@ class QgsMssqlFeatureIterator : public QgsAbstractFeatureIterator
     void BuildStatement( const QgsFeatureRequest& request );
 
   private:
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     // The current database
     QSqlDatabase mDatabase;
 

diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp
@@ -96,7 +96,7 @@ void QgsOgrFeatureIterator::ensureRelevantFields()
 }
 
 
-bool QgsOgrFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsOgrFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 

diff --git a/src/providers/ogr/qgsogrfeatureiterator.h b/src/providers/ogr/qgsogrfeatureiterator.h
@@ -28,16 +28,16 @@ class QgsOgrFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsOgrFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
     //! end of iterating: free the resources / lock
     virtual bool close();
 
   protected:
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     QgsOgrProvider* P;
 
     void ensureRelevantFields();

diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -232,6 +232,7 @@ QgsOgrProvider::QgsOgrProvider( QString const & uri )
   // If there is no & in the uri, then the uri is just the filename. The loaded
   // layer will be layer 0.
   //this is not true for geojson
+
   if ( !uri.contains( '|', Qt::CaseSensitive ) )
   {
     mFilePath = uri;

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.cpp b/src/providers/postgres/qgspostgresfeatureiterator.cpp
@@ -61,6 +61,10 @@ QgsPostgresFeatureIterator::QgsPostgresFeatureIterator( QgsPostgresProvider* p,
   {
     whereClause = P->whereClause( request.filterFid() );
   }
+  else if ( request.filterType() == QgsFeatureRequest::FilterFids )
+  {
+    whereClause = P->whereClause( request.filterFids() );
+  }
 
   if ( !P->mSqlWhereClause.isEmpty() )
   {
@@ -86,7 +90,7 @@ QgsPostgresFeatureIterator::~QgsPostgresFeatureIterator()
 }
 
 
-bool QgsPostgresFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsPostgresFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   feature.setValid( false );
 
@@ -162,6 +166,7 @@ bool QgsPostgresFeatureIterator::nextFeature( QgsFeature& feature )
 
   feature.setValid( true );
   feature.setFields( &P->mAttributeFields ); // allow name-based attribute lookups
+
   return true;
 }
 

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.h b/src/providers/postgres/qgspostgresfeatureiterator.h
@@ -30,23 +30,25 @@ class QgsPostgresFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsPostgresFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
     //! end of iterating: free the resources / lock
     virtual bool close();
 
   protected:
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     QgsPostgresProvider* P;
 
     QString whereClauseRect();
     bool getFeature( QgsPostgresResult &queryResult, int row, QgsFeature &feature );
     void getFeatureAttribute( int idx, QgsPostgresResult& queryResult, int row, int& col, QgsFeature& feature );
     bool declareCursor( const QString& whereClause );
 
+    bool fetchNextFeature( QgsFeature& feature );
+
     QString mCursorName;
 
     /**

diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
@@ -510,15 +510,18 @@ QString QgsPostgresProvider::whereClause( QgsFeatureId featureId ) const
       break;
   }
 
-  if ( !mSqlWhereClause.isEmpty() )
-  {
-    if ( !whereClause.isEmpty() )
-      whereClause += " AND ";
+  return whereClause;
+}
 
-    whereClause += "(" + mSqlWhereClause + ")";
+QString QgsPostgresProvider::whereClause( QgsFeatureIds featureIds ) const
+{
+  QStringList whereClauses;
+  foreach ( const QgsFeatureId featureId, featureIds )
+  {
+    whereClauses << whereClause( featureId );
   }
 
-  return whereClause;
+  return whereClauses.join( " AND " );
 }
 
 QString QgsPostgresProvider::filterWhereClause() const

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -309,6 +309,7 @@ class QgsPostgresProvider : public QgsVectorDataProvider
      */
     QString pkParamWhereClause( int offset, const char* alias = 0 ) const;
     QString whereClause( QgsFeatureId featureId ) const;
+    QString whereClause( QgsFeatureIds featureIds ) const;
     QString filterWhereClause() const;
 
     bool hasSufficientPermsAndCapabilities();

diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.cpp b/src/providers/spatialite/qgsspatialitefeatureiterator.cpp
@@ -80,7 +80,7 @@ QgsSpatiaLiteFeatureIterator::~QgsSpatiaLiteFeatureIterator()
 }
 
 
-bool QgsSpatiaLiteFeatureIterator::nextFeature( QgsFeature& feature )
+bool QgsSpatiaLiteFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   if ( mClosed )
     return false;

diff --git a/src/providers/spatialite/qgsspatialitefeatureiterator.h b/src/providers/spatialite/qgsspatialitefeatureiterator.h
@@ -32,16 +32,17 @@ class QgsSpatiaLiteFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsSpatiaLiteFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
-
     //! reset the iterator to the starting position
     virtual bool rewind();
 
     //! end of iterating: free the resources / lock
     virtual bool close();
 
   protected:
+
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     QgsSpatiaLiteProvider* P;
 
     QString whereClauseRect();

diff --git a/src/providers/sqlanywhere/qgssqlanywherefeatureiterator.cpp b/src/providers/sqlanywhere/qgssqlanywherefeatureiterator.cpp
@@ -79,7 +79,7 @@ QgsSqlAnywhereFeatureIterator::~QgsSqlAnywhereFeatureIterator()
 }
 
 bool
-QgsSqlAnywhereFeatureIterator::nextFeature( QgsFeature& feature )
+QgsSqlAnywhereFeatureIterator::fetchFeature( QgsFeature& feature )
 {
   if ( mClosed )
     return false;

diff --git a/src/providers/sqlanywhere/qgssqlanywherefeatureiterator.h b/src/providers/sqlanywhere/qgssqlanywherefeatureiterator.h
@@ -31,8 +31,6 @@ class QgsSqlAnywhereFeatureIterator : public QgsAbstractFeatureIterator
 
     ~QgsSqlAnywhereFeatureIterator();
 
-    //! fetch next feature, return true on success
-    virtual bool nextFeature( QgsFeature& feature );
     bool nextFeature( QgsFeature& feature, SqlAnyStatement *stmt );
 
     //! reset the iterator to the starting position
@@ -42,6 +40,10 @@ class QgsSqlAnywhereFeatureIterator : public QgsAbstractFeatureIterator
     virtual bool close();
 
   protected:
+
+    //! fetch next feature, return true on success
+    virtual bool fetchFeature( QgsFeature& feature );
+
     QgsSqlAnywhereProvider* P;
 
   private:

diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp
@@ -56,7 +56,7 @@ QgsWFSFeatureIterator::~QgsWFSFeatureIterator()
   close();
 }
 
-bool QgsWFSFeatureIterator::nextFeature( QgsFeature& f )
+bool QgsWFSFeatureIterator::fetchFeature( QgsFeature& f )
 {
   if ( !mProvider )
   {

diff --git a/src/providers/wfs/qgswfsfeatureiterator.h b/src/providers/wfs/qgswfsfeatureiterator.h
@@ -25,10 +25,12 @@ class QgsWFSFeatureIterator: public QgsAbstractFeatureIterator
     QgsWFSFeatureIterator( QgsWFSProvider* provider, const QgsFeatureRequest& request );
     ~QgsWFSFeatureIterator();
 
-    bool nextFeature( QgsFeature& f );
     bool rewind();
     bool close();
 
+  protected:
+    bool fetchFeature( QgsFeature& f );
+
   private:
     QgsWFSProvider* mProvider;
     QList<QgsFeatureId> mSelectedFeatures;
-Original file line number
+Diff line change
@@ Expand Up / @@ -62,7 +62,7 @@ QgsMemoryFeatureIterator::~QgsMemoryFeatureIterator() @@
     }
-    bool QgsMemoryFeatureIterator::nextFeature( QgsFeature& feature )
+    bool QgsMemoryFeatureIterator::fetchFeature( QgsFeature& feature )
     {
       feature.setValid( false );
@@ Expand Down @@