Remove deprecated method from getDataValues()

nyalldawson · nyalldawson · commit 7c1fc8e4bc37 · 2016-09-13T11:05:45.000+10:00
diff --git a/doc/api_break.dox b/doc/api_break.dox
@@ -619,6 +619,12 @@ and the new ramp can be retrieved after executing the dialog by calling ramp().<
 <li>Some internal methods which were previously public or protected were made private.</li>
 </ul>
 
+\subsection qgis_api_break_3_0_QgsGraduatedSymbolRenderer QgsGraduatedSymbolRenderer
+
+<ul>
+<li>getDataValues() has been removed - use QgsVectorLayer::getDoubleValues() instead</li>
+</ul>
+
 \subsection qgis_api_break_3_0_QgsGraphBuilderInterface QgsGraphBuilderInterface
 
 <ul>
diff --git a/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip b/python/core/symbology-ng/qgsgraduatedsymbolrenderer.sip
@@ -183,12 +183,6 @@ class QgsGraduatedSymbolRenderer : QgsFeatureRenderer
     //! @note Added in 2.6
     void updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses );
 
-    //! Evaluates the data expression and returns the list of values from the layer
-    //! @param vlayer  The layer for which to evaluate the expression
-    //! @note Added in 2.6
-    //! @deprecated use QgsVectorLayer::getDoubleValues instead
-    QList<double> getDataValues( QgsVectorLayer *vlayer ) /Deprecated/;
-
     //! Return the label format used to generate default classification labels
     //! @note Added in 2.6
     const QgsRendererRangeLabelFormat &labelFormat() const;
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.cpp
@@ -858,12 +858,6 @@ QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::createRenderer(
   return r;
 }
 
-QList<double> QgsGraduatedSymbolRenderer::getDataValues( QgsVectorLayer *vlayer )
-{
-  bool ok;
-  return vlayer->getDoubleValues( mAttrName, ok );
-}
-
 void QgsGraduatedSymbolRenderer::updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses )
 {
   if ( mAttrName.isEmpty() )
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h b/src/core/symbology-ng/qgsgraduatedsymbolrenderer.h
@@ -227,12 +227,6 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
     //! @note Added in 2.6
     void updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses );
 
-    //! Evaluates the data expression and returns the list of values from the layer
-    //! @param vlayer  The layer for which to evaluate the expression
-    //! @note Added in 2.6
-    //! @deprecated use QgsVectorLayer::getDoubleValues instead
-    Q_DECL_DEPRECATED QList<double> getDataValues( QgsVectorLayer *vlayer );
-
     //! Return the label format used to generate default classification labels
     //! @note Added in 2.6
     const QgsRendererRangeLabelFormat &labelFormat() const { return mLabelFormat; }

Original file line number	Diff line number	Diff line change
`@@ -858,12 +858,6 @@ QgsGraduatedSymbolRenderer* QgsGraduatedSymbolRenderer::createRenderer(`
`858`	`858`	`return r;`
`859`	`859`	`}`
`860`	`860`
`861`		`-QList<double> QgsGraduatedSymbolRenderer::getDataValues( QgsVectorLayer *vlayer )`
`862`		`-{`
`863`		`- bool ok;`
`864`		`- return vlayer->getDoubleValues( mAttrName, ok );`
`865`		`-}`
`866`		`-`
`867`	`861`	`void QgsGraduatedSymbolRenderer::updateClasses( QgsVectorLayer *vlayer, Mode mode, int nclasses )`
`868`	`862`	`{`
`869`	`863`	`if ( mAttrName.isEmpty() )`