QgsVectorLayerCache: include edit buffer changes as well

qgis · Apr 15, 2013 · 47fa53e · 47fa53e
1 parent 2d07fa6
commit 47fa53e
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 10 deletions.
diff --git a/src/core/qgscachedfeatureiterator.cpp b/src/core/qgscachedfeatureiterator.cpp
@@ -15,7 +15,6 @@
 
 #include "qgscachedfeatureiterator.h"
 #include "qgsvectorlayercache.h"
-#include "qgsvectordataprovider.h"
 
 QgsCachedFeatureIterator::QgsCachedFeatureIterator( QgsVectorLayerCache *vlCache, QgsFeatureRequest featureRequest, QgsFeatureIds featureIds )
     : QgsAbstractFeatureIterator( featureRequest )
@@ -56,7 +55,7 @@ QgsCachedFeatureWriterIterator::QgsCachedFeatureWriterIterator( QgsVectorLayerCa
     : QgsAbstractFeatureIterator( featureRequest )
     , mVectorLayerCache( vlCache )
 {
-  mFeatIt = vlCache->layer()->dataProvider()->getFeatures( featureRequest );
+  mFeatIt = vlCache->layer()->getFeatures( featureRequest );
 }
 
 bool QgsCachedFeatureWriterIterator::nextFeature( QgsFeature& f )

diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp
@@ -125,13 +125,6 @@ void QgsAttributeTableView::setModel( QgsAttributeTableFilterModel* filterModel
   mTableDelegate->setFeatureSelectionModel( mFeatureSelectionModel );
   connect( mFeatureSelectionModel, SIGNAL( requestRepaint( QModelIndexList ) ), this, SLOT( repaintRequested( QModelIndexList ) ) );
   connect( mFeatureSelectionModel, SIGNAL( requestRepaint() ), this, SLOT( repaintRequested() ) );
-
-  if ( filterModel )
-  {
-    // Connect new model stuff
-    connect( mFilterModel, SIGNAL( filterAboutToBeInvalidated() ), SLOT( onFilterAboutToBeInvalidated() ) );
-    connect( mFilterModel, SIGNAL( filterInvalidated() ), SLOT( onFilterInvalidated() ) );
-  }
 }
 
 void QgsAttributeTableView::closeEvent( QCloseEvent *e )

diff --git a/src/gui/attributetable/qgsdualview.cpp b/src/gui/attributetable/qgsdualview.cpp
@@ -225,7 +225,6 @@ void QgsDualView::initModels( QgsMapCanvas* mapCanvas )
 
   mFilterModel = new QgsAttributeTableFilterModel( mapCanvas, mMasterModel, mMasterModel );
 
-  connect( mFilterModel, SIGNAL( filterInvalidated() ), this, SIGNAL( filterChanged() ) );
   connect( mFeatureList, SIGNAL( displayExpressionChanged( QString ) ), this, SIGNAL( displayExpressionChanged( QString ) ) );
 
   mFeatureListModel = new QgsFeatureListModel( mFilterModel, mFilterModel );