Use vector layer methods to test queries (instead of provider methods)

git-svn-id: http://svn.osgeo.org/qgis/trunk@15645 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Mar 30, 2011 · 7deafa0 · 7deafa0
1 parent 8e1c0b4
commit 7deafa0
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/gui/qgssearchquerybuilder.cpp b/src/gui/qgssearchquerybuilder.cpp
@@ -29,7 +29,6 @@
 #include "qgssearchquerybuilder.h"
 #include "qgssearchstring.h"
 #include "qgssearchtreenode.h"
-#include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 #include "qgslogger.h"
 
@@ -215,13 +214,11 @@ long QgsSearchQueryBuilder::countRecords( QString searchString )
 
   int count = 0;
   QgsFeature feat;
-  QgsVectorDataProvider* provider = mLayer->dataProvider();
-  const QgsFieldMap& fields = provider->fields();
-  QgsAttributeList allAttributes = provider->attributeIndexes();
-
-  provider->select( allAttributes, QgsRectangle(), fetchGeom );
+  const QgsFieldMap& fields = mLayer->pendingFields();
+  QgsAttributeList allAttributes = mLayer->pendingAllAttributesList();
+  mLayer->select( allAttributes, QgsRectangle(), fetchGeom );
 
-  while ( provider->nextFeature( feat ) )
+  while ( mLayer->nextFeature( feat ) )
   {
     if ( searchTree->checkAgainst( fields, feat ) )
     {