QgsVectorLayerCache: include edit buffer changes as well

m-kuhn · m-kuhn · commit 47fa53e8daef · 2013-04-15T14:24:51.000+02:00
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 );

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@`
`15`	`15`
`16`	`16`	`#include "qgscachedfeatureiterator.h"`
`17`	`17`	`#include "qgsvectorlayercache.h"`
`18`		`-#include "qgsvectordataprovider.h"`
`19`	`18`
`20`	`19`	`QgsCachedFeatureIterator::QgsCachedFeatureIterator( QgsVectorLayerCache *vlCache, QgsFeatureRequest featureRequest, QgsFeatureIds featureIds )`
`21`	`20`	`: QgsAbstractFeatureIterator( featureRequest )`
`@@ -56,7 +55,7 @@ QgsCachedFeatureWriterIterator::QgsCachedFeatureWriterIterator( QgsVectorLayerCa`
`56`	`55`	`: QgsAbstractFeatureIterator( featureRequest )`
`57`	`56`	`, mVectorLayerCache( vlCache )`
`58`	`57`	`{`
`59`		`- mFeatIt = vlCache->layer()->dataProvider()->getFeatures( featureRequest );`
	`58`	`+ mFeatIt = vlCache->layer()->getFeatures( featureRequest );`
`60`	`59`	`}`
`61`	`60`
`62`	`61`	`bool QgsCachedFeatureWriterIterator::nextFeature( QgsFeature& f )`