[QGIS Commit] r15311 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: mhugent
Date: 2011-03-02 06:55:42 -0800 (Wed, 02 Mar 2011)
New Revision: 15311

Modified:
   trunk/qgis/src/app/qgsquerybuilder.cpp
   trunk/qgis/src/app/qgsuniquevaluedialog.cpp
Log:
Use layer method for unique values in query builder and old symbology

Modified: trunk/qgis/src/app/qgsquerybuilder.cpp
===================================================================
--- trunk/qgis/src/app/qgsquerybuilder.cpp	2011-03-02 14:45:49 UTC (rev 15310)
+++ trunk/qgis/src/app/qgsquerybuilder.cpp	2011-03-02 14:55:42 UTC (rev 15311)
@@ -98,7 +98,7 @@
 
   // determine the field type
   QList<QVariant> values;
-  mLayer->dataProvider()->uniqueValues( idx, values, limit );
+  mLayer->uniqueValues( idx, values, limit );
 
   for ( int i = 0; i < values.size(); i++ )
   {

Modified: trunk/qgis/src/app/qgsuniquevaluedialog.cpp
===================================================================
--- trunk/qgis/src/app/qgsuniquevaluedialog.cpp	2011-03-02 14:45:49 UTC (rev 15310)
+++ trunk/qgis/src/app/qgsuniquevaluedialog.cpp	2011-03-02 14:55:42 UTC (rev 15311)
@@ -293,8 +293,7 @@
   }
   mOldClassificationAttribute = attributeName;
 
-  QgsVectorDataProvider *provider = dynamic_cast<QgsVectorDataProvider *>( mVectorLayer->dataProvider() );
-  if ( provider )
+  if ( mVectorLayer )
   {
     int nr = mClassificationComboBox->itemData( mClassificationComboBox->currentIndex() ).toInt();
     if ( nr == -1 )
@@ -303,7 +302,7 @@
     }
 
     QList<QVariant> values;
-    provider->uniqueValues( nr, values );
+    mVectorLayer->uniqueValues( nr, values );
 
     for ( int i = 0; i < values.size(); i++ )
     {