Use layer method for unique values in query builder and old symbology

mhugent · mhugent · commit dafc6db95f7b · 2011-03-02T14:55:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@15311 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgsquerybuilder.cpp b/src/app/qgsquerybuilder.cpp
@@ -98,7 +98,7 @@ void QgsQueryBuilder::fillValues( int idx, int limit )
 
   // 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++ )
   {
diff --git a/src/app/qgsuniquevaluedialog.cpp b/src/app/qgsuniquevaluedialog.cpp
@@ -293,8 +293,7 @@ void QgsUniqueValueDialog::changeClassificationAttribute()
   }
   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 @@ void QgsUniqueValueDialog::changeClassificationAttribute()
     }
 
     QList<QVariant> values;
-    provider->uniqueValues( nr, values );
+    mVectorLayer->uniqueValues( nr, values );
 
     for ( int i = 0; i < values.size(); i++ )
     {

Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ void QgsQueryBuilder::fillValues( int idx, int limit )`
`98`	`98`
`99`	`99`	`// determine the field type`
`100`	`100`	`QList<QVariant> values;`
`101`		`- mLayer->dataProvider()->uniqueValues( idx, values, limit );`
	`101`	`+ mLayer->uniqueValues( idx, values, limit );`
`102`	`102`
`103`	`103`	`for ( int i = 0; i < values.size(); i++ )`
`104`	`104`	`{`
Original file line number	Diff line number	Diff line change
`@@ -293,8 +293,7 @@ void QgsUniqueValueDialog::changeClassificationAttribute()`
`293`	`293`	`}`
`294`	`294`	`mOldClassificationAttribute = attributeName;`
`295`	`295`
`296`		`- QgsVectorDataProvider provider = dynamic_cast<QgsVectorDataProvider >( mVectorLayer->dataProvider() );`
`297`		`- if ( provider )`
	`296`	`+ if ( mVectorLayer )`
`298`	`297`	`{`
`299`	`298`	`int nr = mClassificationComboBox->itemData( mClassificationComboBox->currentIndex() ).toInt();`
`300`	`299`	`if ( nr == -1 )`
`@@ -303,7 +302,7 @@ void QgsUniqueValueDialog::changeClassificationAttribute()`
`303`	`302`	`}`
`304`	`303`
`305`	`304`	`QList<QVariant> values;`
`306`		`- provider->uniqueValues( nr, values );`
	`305`	`+ mVectorLayer->uniqueValues( nr, values );`
`307`	`306`
`308`	`307`	`for ( int i = 0; i < values.size(); i++ )`
`309`	`308`	`{`