Skip to content

Commit 1491d56

Browse files
nyalldawsonnyalldawson
committedOct 1, 2015
Remove const from labeling QgsRenderContext usage
·
ltr-3_40archive/master_2
1 parent 1e6c890 commit 1491d56

15 files changed

+53
-53
lines changed
 

‎python/core/qgsmaprenderer.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,9 @@ class QgsLabelingEngineInterface
5656
//! @deprecated since 2.12 - use prepareDiagramLayer()
5757
virtual int addDiagramLayer( QgsVectorLayer* layer, const QgsDiagramLayerSettings* s ) /Deprecated/;
5858
//! called for every feature
59-
virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null ) = 0;
59+
virtual void registerFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context, QString dxfLayer = QString::null ) = 0;
6060
//! called for every diagram feature
61-
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() );
61+
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context );
6262
//! called when the map is drawn and labels should be placed
6363
virtual void drawLabeling( QgsRenderContext& context ) = 0;
6464
//! called when we're done with rendering

‎python/core/qgspallabeling.sip

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -485,15 +485,15 @@ class QgsPalLayerSettings
485485
double rasterCompressFactor; //pixel resolution scale factor
486486

487487
// called from register feature hook
488-
void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f = 0, const QgsRenderContext* context = 0 );
488+
void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f = 0, QgsRenderContext* context = 0 );
489489

490490
/** Register a feature for labelling.
491491
* @param f feature to label
492492
* @param context render context. The QgsExpressionContext contained within the render context
493493
* must have already had the feature and fields sets prior to calling this method.
494494
* @param dxfLayer dxfLayer name
495495
*/
496-
void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer );
496+
void registerFeature( QgsFeature& f, QgsRenderContext& context, QString dxfLayer );
497497

498498
void readFromLayer( QgsVectorLayer* layer );
499499
void writeToLayer( QgsVectorLayer* layer );
@@ -766,9 +766,9 @@ class QgsPalLabeling : QgsLabelingEngineInterface
766766
* must have already had the feature and fields sets prior to calling this method.
767767
* @param dxfLayer dxfLayer name
768768
*/
769-
virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null );
769+
virtual void registerFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context, QString dxfLayer = QString::null );
770770

771-
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() );
771+
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context );
772772
//! called when the map is drawn and labels should be placed
773773
virtual void drawLabeling( QgsRenderContext& context );
774774
//! called when we're done with rendering
@@ -823,7 +823,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
823823
* @returns prepared geometry
824824
* @note added in QGIS 2.9
825825
*/
826-
static QgsGeometry* prepareGeometry( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 ) /Factory/;
826+
static QgsGeometry* prepareGeometry( const QgsGeometry *geometry, QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 ) /Factory/;
827827

828828
/** Checks whether a geometry requires preparation before registration with PAL
829829
* @param geometry geometry to prepare
@@ -833,7 +833,7 @@ class QgsPalLabeling : QgsLabelingEngineInterface
833833
* @returns true if geometry requires preparation
834834
* @note added in QGIS 2.9
835835
*/
836-
static bool geometryRequiresPreparation( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
836+
static bool geometryRequiresPreparation( const QgsGeometry *geometry, QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
837837

838838
/** Splits a text string to a list of separate lines, using a specified wrap character.
839839
* The text string will be split on either newline characters or the wrap character.

‎src/core/dxf/qgsdxfpallabeling.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void QgsDxfLabelProvider::drawLabel( QgsRenderContext& context, pal::LabelPositi
139139
}
140140
}
141141

142-
void QgsDxfLabelProvider::registerDxfFeature( QgsFeature& feature, const QgsRenderContext& context, const QString& dxfLayerName )
142+
void QgsDxfLabelProvider::registerDxfFeature( QgsFeature& feature, QgsRenderContext& context, const QString& dxfLayerName )
143143
{
144144
registerFeature( feature, context );
145145
mDxfLayerNames[feature.id()] = dxfLayerName;

‎src/core/dxf/qgsdxfpallabeling.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class QgsDxfLabelProvider : public QgsVectorLayerLabelProvider
3939
virtual void drawLabel( QgsRenderContext& context, pal::LabelPosition* label ) const override;
4040

4141
//! registration method that keeps track of DXF layer names of individual features
42-
void registerDxfFeature( QgsFeature& feature, const QgsRenderContext& context, const QString& dxfLayerName );
42+
void registerDxfFeature( QgsFeature& feature, QgsRenderContext &context, const QString& dxfLayerName );
4343

4444
protected:
4545
//! pointer to parent DXF export where this instance is used

‎src/core/qgslabelingenginev2.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ void QgsLabelingEngineV2::run( QgsRenderContext& context )
188188

189189
// NOW DO THE LAYOUT (from QgsPalLabeling::drawLabeling)
190190

191-
QPainter* painter = const_cast<QgsRenderContext&>( context ).painter();
191+
QPainter* painter = context.painter();
192192

193193
QgsGeometry* extentGeom( QgsGeometry::fromRect( mMapSettings.visibleExtent() ) );
194194
if ( !qgsDoubleNear( mMapSettings.rotation(), 0.0 ) )

‎src/core/qgslabelingenginev2.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ class CORE_EXPORT QgsAbstractLabelProvider
267267
Q_DECLARE_FLAGS( Flags, Flag )
268268

269269
//! Return list of label features (they are owned by the provider and thus deleted on its destruction)
270-
virtual QList<QgsLabelFeature*> labelFeatures( const QgsRenderContext& context ) = 0;
270+
virtual QList<QgsLabelFeature*> labelFeatures( QgsRenderContext& context ) = 0;
271271

272272
//! draw this label at the position determined by the labeling engine
273273
virtual void drawLabel( QgsRenderContext& context, pal::LabelPosition* label ) const = 0;

‎src/core/qgsmaprenderer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ class CORE_EXPORT QgsLabelingEngineInterface
9595
Q_DECL_DEPRECATED virtual int addDiagramLayer( QgsVectorLayer* layer, const QgsDiagramLayerSettings* s )
9696
{ Q_UNUSED( layer ); Q_UNUSED( s ); return 0; }
9797
//! called for every feature
98-
virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null ) = 0;
98+
virtual void registerFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context, QString dxfLayer = QString::null ) = 0;
9999
//! called for every diagram feature
100-
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() )
100+
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context )
101101
{ Q_UNUSED( layerID ); Q_UNUSED( feat ); Q_UNUSED( context ); }
102102
//! called when the map is drawn and labels should be placed
103103
virtual void drawLabeling( QgsRenderContext& context ) = 0;

‎src/core/qgspallabeling.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ bool QgsPalLayerSettings::checkMinimumSizeMM( const QgsRenderContext& ct, const
17191719
return QgsPalLabeling::checkMinimumSizeMM( ct, geom, minSize );
17201720
}
17211721

1722-
void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f, const QgsRenderContext *context )
1722+
void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f, QgsRenderContext *context )
17231723
{
17241724
if ( !fm || !f )
17251725
{
@@ -1891,7 +1891,7 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t
18911891
}
18921892

18931893

1894-
void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer, QgsLabelFeature** labelFeature )
1894+
void QgsPalLayerSettings::registerFeature( QgsFeature& f, QgsRenderContext &context, QString dxfLayer, QgsLabelFeature** labelFeature )
18951895
{
18961896
// either used in QgsPalLabeling (palLayer is set) or in QgsLabelingEngineV2 (labelFeature is set)
18971897
Q_ASSERT( labelFeature );
@@ -2700,7 +2700,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature& f, const QgsRenderContext
27002700
}
27012701

27022702

2703-
void QgsPalLayerSettings::registerObstacleFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer , QgsLabelFeature** obstacleFeature )
2703+
void QgsPalLayerSettings::registerObstacleFeature( QgsFeature& f, QgsRenderContext &context, QString dxfLayer , QgsLabelFeature** obstacleFeature )
27042704
{
27052705
Q_UNUSED( dxfLayer ); // now handled in QgsDxfLabelProvider
27062706

@@ -2919,7 +2919,7 @@ bool QgsPalLayerSettings::dataDefinedValEval( DataDefinedValueType valType,
29192919

29202920
void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,
29212921
QgsPalLayerSettings::SizeUnit fontunits,
2922-
const QgsRenderContext& context )
2922+
QgsRenderContext &context )
29232923
{
29242924
// NOTE: labelFont already has pixelSize set, so pointSize or pointSizeF might return -1
29252925

@@ -3127,7 +3127,7 @@ void QgsPalLayerSettings::parseTextStyle( QFont& labelFont,
31273127

31283128
}
31293129

3130-
void QgsPalLayerSettings::parseTextBuffer( const QgsRenderContext &context )
3130+
void QgsPalLayerSettings::parseTextBuffer( QgsRenderContext &context )
31313131
{
31323132
QVariant exprVal; // value() is repeatedly nulled on data defined evaluation and replaced when successful
31333133

@@ -3180,7 +3180,7 @@ void QgsPalLayerSettings::parseTextBuffer( const QgsRenderContext &context )
31803180
dataDefinedValEval( DDBlendMode, QgsPalLayerSettings::BufferBlendMode, exprVal, context.expressionContext() );
31813181
}
31823182

3183-
void QgsPalLayerSettings::parseTextFormatting( const QgsRenderContext &context )
3183+
void QgsPalLayerSettings::parseTextFormatting( QgsRenderContext &context )
31843184
{
31853185
QVariant exprVal; // value() is repeatedly nulled on data defined evaluation and replaced when successful
31863186

@@ -3266,7 +3266,7 @@ void QgsPalLayerSettings::parseTextFormatting( const QgsRenderContext &context )
32663266
// formatting for numbers is inline with generation of base label text and not passed to label painting
32673267
}
32683268

3269-
void QgsPalLayerSettings::parseShapeBackground( const QgsRenderContext &context )
3269+
void QgsPalLayerSettings::parseShapeBackground( QgsRenderContext &context )
32703270
{
32713271
QVariant exprVal; // value() is repeatedly nulled on data defined evaluation and replaced when successful
32723272

@@ -3467,7 +3467,7 @@ void QgsPalLayerSettings::parseShapeBackground( const QgsRenderContext &context
34673467

34683468
}
34693469

3470-
void QgsPalLayerSettings::parseDropShadow( const QgsRenderContext &context )
3470+
void QgsPalLayerSettings::parseDropShadow( QgsRenderContext &context )
34713471
{
34723472
QVariant exprVal; // value() is repeatedly nulled on data defined evaluation and replaced when successful
34733473

@@ -3688,14 +3688,14 @@ int QgsPalLabeling::addDiagramLayer( QgsVectorLayer* layer, const QgsDiagramLaye
36883688
return 0;
36893689
}
36903690

3691-
void QgsPalLabeling::registerFeature( const QString& layerID, QgsFeature& f, const QgsRenderContext& context, QString dxfLayer )
3691+
void QgsPalLabeling::registerFeature( const QString& layerID, QgsFeature& f, QgsRenderContext &context, QString dxfLayer )
36923692
{
36933693
Q_UNUSED( dxfLayer ); // now handled by QgsDxfLabelProvider
36943694
if ( QgsVectorLayerLabelProvider* provider = mLabelProviders.value( layerID, 0 ) )
36953695
provider->registerFeature( f, context );
36963696
}
36973697

3698-
bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry* geometry, const QgsRenderContext& context, const QgsCoordinateTransform* ct, QgsGeometry* clipGeometry )
3698+
bool QgsPalLabeling::geometryRequiresPreparation( const QgsGeometry* geometry, QgsRenderContext &context, const QgsCoordinateTransform* ct, QgsGeometry* clipGeometry )
36993699
{
37003700
if ( !geometry )
37013701
{
@@ -3755,7 +3755,7 @@ QStringList QgsPalLabeling::splitToGraphemes( const QString &text )
37553755
return graphemes;
37563756
}
37573757

3758-
QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, const QgsRenderContext& context, const QgsCoordinateTransform* ct, QgsGeometry* clipGeometry )
3758+
QgsGeometry* QgsPalLabeling::prepareGeometry( const QgsGeometry* geometry, QgsRenderContext &context, const QgsCoordinateTransform* ct, QgsGeometry* clipGeometry )
37593759
{
37603760
if ( !geometry )
37613761
{
@@ -3875,7 +3875,7 @@ bool QgsPalLabeling::checkMinimumSizeMM( const QgsRenderContext& context, const
38753875
return true; //should never be reached. Return true in this case to label such geometries anyway.
38763876
}
38773877

3878-
void QgsPalLabeling::registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context )
3878+
void QgsPalLabeling::registerDiagramFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext &context )
38793879
{
38803880
if ( QgsVectorLayerDiagramProvider* provider = mDiagramProviders.value( layerID, 0 ) )
38813881
provider->registerFeature( feat, context );

‎src/core/qgspallabeling.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ class CORE_EXPORT QgsPalLayerSettings
467467
double rasterCompressFactor; //pixel resolution scale factor
468468

469469
// called from register feature hook
470-
void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f = 0, const QgsRenderContext* context = 0 );
470+
void calculateLabelSize( const QFontMetricsF* fm, QString text, double& labelX, double& labelY, QgsFeature* f = 0, QgsRenderContext* context = 0 );
471471

472472
/** Register a feature for labelling.
473473
* @param f feature to label
@@ -476,7 +476,7 @@ class CORE_EXPORT QgsPalLayerSettings
476476
* @param dxfLayer dxfLayer name
477477
* @param labelFeature if using QgsLabelingEngineV2, this will receive the label feature
478478
*/
479-
void registerFeature( QgsFeature& f, const QgsRenderContext& context, QString dxfLayer, QgsLabelFeature** labelFeature = 0 );
479+
void registerFeature( QgsFeature& f, QgsRenderContext& context, QString dxfLayer, QgsLabelFeature** labelFeature = 0 );
480480

481481
void readFromLayer( QgsVectorLayer* layer );
482482
void writeToLayer( QgsVectorLayer* layer );
@@ -628,23 +628,23 @@ class CORE_EXPORT QgsPalLayerSettings
628628

629629
void parseTextStyle( QFont& labelFont,
630630
QgsPalLayerSettings::SizeUnit fontunits,
631-
const QgsRenderContext& context );
631+
QgsRenderContext& context );
632632

633-
void parseTextBuffer( const QgsRenderContext& context );
633+
void parseTextBuffer( QgsRenderContext& context );
634634

635-
void parseTextFormatting( const QgsRenderContext& context );
635+
void parseTextFormatting( QgsRenderContext& context );
636636

637-
void parseShapeBackground( const QgsRenderContext& context );
637+
void parseShapeBackground( QgsRenderContext& context );
638638

639-
void parseDropShadow( const QgsRenderContext& context );
639+
void parseDropShadow( QgsRenderContext& context );
640640

641641
/** Checks if a feature is larger than a minimum size (in mm)
642642
@return true if above size, false if below*/
643643
bool checkMinimumSizeMM( const QgsRenderContext& ct, const QgsGeometry* geom, double minSize ) const;
644644

645645
/** Registers a feature as an obstacle only (no label rendered)
646646
*/
647-
void registerObstacleFeature( QgsFeature &f, const QgsRenderContext &context, QString dxfLayer, QgsLabelFeature** obstacleFeature );
647+
void registerObstacleFeature( QgsFeature &f, QgsRenderContext &context, QString dxfLayer, QgsLabelFeature** obstacleFeature );
648648

649649
QMap<DataDefinedProperties, QVariant> dataDefinedValues;
650650
QgsExpression* expression;
@@ -880,9 +880,9 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
880880
* must have already had the feature and fields sets prior to calling this method.
881881
* @param dxfLayer dxfLayer name
882882
*/
883-
virtual void registerFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext(), QString dxfLayer = QString::null ) override;
883+
virtual void registerFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context, QString dxfLayer = QString::null ) override;
884884

885-
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, const QgsRenderContext& context = QgsRenderContext() ) override;
885+
virtual void registerDiagramFeature( const QString& layerID, QgsFeature& feat, QgsRenderContext& context ) override;
886886
//! called when the map is drawn and labels should be placed
887887
virtual void drawLabeling( QgsRenderContext& context ) override;
888888
//! called when we're done with rendering
@@ -934,7 +934,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
934934
* @returns prepared geometry, the caller takes ownership
935935
* @note added in QGIS 2.9
936936
*/
937-
static QgsGeometry* prepareGeometry( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
937+
static QgsGeometry* prepareGeometry( const QgsGeometry *geometry, QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
938938

939939
/** Checks whether a geometry requires preparation before registration with PAL
940940
* @param geometry geometry to prepare
@@ -944,7 +944,7 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
944944
* @returns true if geometry requires preparation
945945
* @note added in QGIS 2.9
946946
*/
947-
static bool geometryRequiresPreparation( const QgsGeometry *geometry, const QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
947+
static bool geometryRequiresPreparation( const QgsGeometry *geometry, QgsRenderContext &context, const QgsCoordinateTransform *ct, QgsGeometry *clipGeometry = 0 );
948948

949949
/** Splits a text string to a list of separate lines, using a specified wrap character.
950950
* The text string will be split on either newline characters or the wrap character.

‎src/core/qgsrulebasedlabeling.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ bool QgsRuleBasedLabelProvider::prepare( const QgsRenderContext& context, QStrin
2525
return true;
2626
}
2727

28-
void QgsRuleBasedLabelProvider::registerFeature( QgsFeature& feature, const QgsRenderContext& context )
28+
void QgsRuleBasedLabelProvider::registerFeature( QgsFeature& feature, QgsRenderContext &context )
2929
{
3030
// will register the feature to relevant sub-providers
3131
mRules.rootRule()->registerFeature( feature, context, mSubProviders );
@@ -241,9 +241,9 @@ void QgsRuleBasedLabeling::Rule::prepare( const QgsRenderContext& context, QStri
241241
}
242242
}
243243

244-
QgsRuleBasedLabeling::Rule::RegisterResult QgsRuleBasedLabeling::Rule::registerFeature( QgsFeature& feature, const QgsRenderContext& context, QgsRuleBasedLabeling::RuleToProviderMap& subProviders )
244+
QgsRuleBasedLabeling::Rule::RegisterResult QgsRuleBasedLabeling::Rule::registerFeature( QgsFeature& feature, QgsRenderContext &context, QgsRuleBasedLabeling::RuleToProviderMap& subProviders )
245245
{
246-
if ( !isFilterOK( feature, const_cast<QgsRenderContext&>( context ) )
246+
if ( !isFilterOK( feature, context )
247247
|| !isScaleOK( context.rendererScale() ) )
248248
return Filtered;
249249

‎src/core/qgsrulebasedlabeling.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ class CORE_EXPORT QgsRuleBasedLabeling : public QgsAbstractVectorLayerLabeling
166166
void prepare( const QgsRenderContext& context, QStringList& attributeNames, RuleToProviderMap& subProviders );
167167

168168
//! register individual features
169-
RegisterResult registerFeature( QgsFeature& feature, const QgsRenderContext& context, RuleToProviderMap& subProviders );
169+
RegisterResult registerFeature( QgsFeature& feature, QgsRenderContext& context, RuleToProviderMap& subProviders );
170170

171171
protected:
172172
/**
@@ -243,7 +243,7 @@ class CORE_EXPORT QgsRuleBasedLabelProvider : public QgsVectorLayerLabelProvider
243243

244244
virtual bool prepare( const QgsRenderContext& context, QStringList& attributeNames ) override;
245245

246-
virtual void registerFeature( QgsFeature& feature, const QgsRenderContext& context ) override;
246+
virtual void registerFeature( QgsFeature& feature, QgsRenderContext& context ) override;
247247

248248
// new methods
249249

‎src/core/qgsvectorlayerdiagramprovider.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ QgsVectorLayerDiagramProvider::~QgsVectorLayerDiagramProvider()
7878
}
7979

8080

81-
QList<QgsLabelFeature*> QgsVectorLayerDiagramProvider::labelFeatures( const QgsRenderContext& context )
81+
QList<QgsLabelFeature*> QgsVectorLayerDiagramProvider::labelFeatures( QgsRenderContext &context )
8282
{
8383
if ( !mSource )
8484
{
@@ -226,15 +226,15 @@ bool QgsVectorLayerDiagramProvider::prepare( const QgsRenderContext& context, QS
226226
}
227227

228228

229-
void QgsVectorLayerDiagramProvider::registerFeature( QgsFeature& feature, const QgsRenderContext& context )
229+
void QgsVectorLayerDiagramProvider::registerFeature( QgsFeature& feature, QgsRenderContext& context )
230230
{
231231
QgsLabelFeature* label = registerDiagram( feature, context );
232232
if ( label )
233233
mFeatures << label;
234234
}
235235

236236

237-
QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& feat, const QgsRenderContext& context )
237+
QgsLabelFeature* QgsVectorLayerDiagramProvider::registerDiagram( QgsFeature& feat, QgsRenderContext &context )
238238
{
239239
const QgsMapSettings& mapSettings = mEngine->mapSettings();
240240

‎src/core/qgsvectorlayerdiagramprovider.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvide
7070
//! Clean up
7171
~QgsVectorLayerDiagramProvider();
7272

73-
virtual QList<QgsLabelFeature*> labelFeatures( const QgsRenderContext& context ) override;
73+
virtual QList<QgsLabelFeature*> labelFeatures( QgsRenderContext& context ) override;
7474

7575
virtual void drawLabel( QgsRenderContext& context, pal::LabelPosition* label ) const override;
7676

@@ -91,13 +91,13 @@ class CORE_EXPORT QgsVectorLayerDiagramProvider : public QgsAbstractLabelProvide
9191
* @param context render context. The QgsExpressionContext contained within the render context
9292
* must have already had the feature and fields sets prior to calling this method.
9393
*/
94-
virtual void registerFeature( QgsFeature& feature, const QgsRenderContext& context );
94+
virtual void registerFeature( QgsFeature& feature, QgsRenderContext &context );
9595

9696
protected:
9797
//! initialization method - called from constructors
9898
void init();
9999
//! helper method to register one diagram feautre
100-
QgsLabelFeature* registerDiagram( QgsFeature& feat, const QgsRenderContext& context );
100+
QgsLabelFeature* registerDiagram( QgsFeature& feat, QgsRenderContext& context );
101101

102102
protected:
103103

‎src/core/qgsvectorlayerlabelprovider.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ bool QgsVectorLayerLabelProvider::prepare( const QgsRenderContext& context, QStr
237237

238238

239239

240-
QList<QgsLabelFeature*> QgsVectorLayerLabelProvider::labelFeatures( const QgsRenderContext& ctx )
240+
QList<QgsLabelFeature*> QgsVectorLayerLabelProvider::labelFeatures( QgsRenderContext &ctx )
241241
{
242242
if ( !mSource )
243243
{
@@ -269,7 +269,7 @@ QList<QgsLabelFeature*> QgsVectorLayerLabelProvider::labelFeatures( const QgsRen
269269
}
270270

271271

272-
void QgsVectorLayerLabelProvider::registerFeature( QgsFeature& feature, const QgsRenderContext& context )
272+
void QgsVectorLayerLabelProvider::registerFeature( QgsFeature& feature, QgsRenderContext& context )
273273
{
274274
QgsLabelFeature* label = 0;
275275
mSettings.registerFeature( feature, context, QString(), &label );

‎src/core/qgsvectorlayerlabelprovider.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
4444

4545
~QgsVectorLayerLabelProvider();
4646

47-
virtual QList<QgsLabelFeature*> labelFeatures( const QgsRenderContext& context ) override;
47+
virtual QList<QgsLabelFeature*> labelFeatures( QgsRenderContext& context ) override;
4848

4949
virtual void drawLabel( QgsRenderContext& context, pal::LabelPosition* label ) const override;
5050

@@ -65,7 +65,7 @@ class CORE_EXPORT QgsVectorLayerLabelProvider : public QgsAbstractLabelProvider
6565
* @param context render context. The QgsExpressionContext contained within the render context
6666
* must have already had the feature and fields sets prior to calling this method.
6767
*/
68-
virtual void registerFeature( QgsFeature& feature, const QgsRenderContext& context );
68+
virtual void registerFeature( QgsFeature& feature, QgsRenderContext &context );
6969

7070
protected:
7171
//! initialization method - called from constructors

0 commit comments

Comments
 (0)
Please sign in to comment.