sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix leak

Browse Source
This commit is contained in:
Nyall Dawson 2019-09-03 09:05:56 +10:00
parent 6de34d472e
commit 4d67f803b4
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in
View File

@ -261,7 +261,8 @@ Recalculate classes for a layer
:param nclasses: the number of classes
%End
const QgsRendererRangeLabelFormat &labelFormat() const;
QgsRendererRangeLabelFormat labelFormat() const /Deprecated/;
%Docstring
Returns the label format used to generate default classification labels

10
src/core/symbology/qgsgraduatedsymbolrenderer.cpp
View File

@ -433,14 +433,12 @@ void QgsGraduatedSymbolRenderer::updateClasses( const QgsVectorLayer *vl, int nc
updateColorRamp( nullptr );
}
const QgsRendererRangeLabelFormat &QgsGraduatedSymbolRenderer::labelFormat() const
Q_NOWARN_DEPRECATED_PUSH
QgsRendererRangeLabelFormat QgsGraduatedSymbolRenderer::labelFormat() const
{
// this is leaking but will be removed in QGIS 4
Q_NOWARN_DEPRECATED_PUSH
QgsRendererRangeLabelFormat *format = new QgsRendererRangeLabelFormat( mClassificationMethod->labelFormat(), mClassificationMethod->labelPrecision(), mClassificationMethod->labelTrimTrailingZeroes() );
Q_NOWARN_DEPRECATED_POP
return *format;
return QgsRendererRangeLabelFormat( mClassificationMethod->labelFormat(), mClassificationMethod->labelPrecision(), mClassificationMethod->labelTrimTrailingZeroes() );
}
Q_NOWARN_DEPRECATED_POP
QgsFeatureRenderer *QgsGraduatedSymbolRenderer::create( QDomElement &element, const QgsReadWriteContext &context )
{

2
src/core/symbology/qgsgraduatedsymbolrenderer.h
View File

@ -232,7 +232,7 @@ class CORE_EXPORT QgsGraduatedSymbolRenderer : public QgsFeatureRenderer
* \since QGIS 2.6
* \deprecated since QGIS 3.10 use classificationMethod() and QgsClassificationMethod::setLabelFormat instead
*/
Q_DECL_DEPRECATED const QgsRendererRangeLabelFormat &labelFormat() const;
Q_DECL_DEPRECATED QgsRendererRangeLabelFormat labelFormat() const SIP_DEPRECATED;
/**
* Set the label format used to generate default classification labels