[QGIS Commit] r15645 - trunk/qgis/src/gui

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-03-30 13:12:49 -0700 (Wed, 30 Mar 2011)
New Revision: 15645

Modified:
   trunk/qgis/src/gui/qgssearchquerybuilder.cpp
Log:
Use vector layer methods to test queries (instead of provider methods)

Modified: trunk/qgis/src/gui/qgssearchquerybuilder.cpp
===================================================================
--- trunk/qgis/src/gui/qgssearchquerybuilder.cpp	2011-03-30 18:53:03 UTC (rev 15644)
+++ trunk/qgis/src/gui/qgssearchquerybuilder.cpp	2011-03-30 20:12:49 UTC (rev 15645)
@@ -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 @@
 
   int count = 0;
   QgsFeature feat;
-  QgsVectorDataProvider* provider = mLayer->dataProvider();
-  const QgsFieldMap& fields = provider->fields();
-  QgsAttributeList allAttributes = provider->attributeIndexes();
+  const QgsFieldMap& fields = mLayer->pendingFields();
+  QgsAttributeList allAttributes = mLayer->pendingAllAttributesList();
+  mLayer->select( allAttributes, QgsRectangle(), fetchGeom );
 
-  provider->select( allAttributes, QgsRectangle(), fetchGeom );
-
-  while ( provider->nextFeature( feat ) )
+  while ( mLayer->nextFeature( feat ) )
   {
     if ( searchTree->checkAgainst( fields, feat ) )
     {