From ba800662a05f17ffbb7bbedc897dbf567815a0b1 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 12 Aug 2019 14:42:21 +1000 Subject: [PATCH] Use reference instead of pointer --- .../qgsrenderedfeaturehandlerinterface.sip.in | 7 +++++-- src/core/qgsrenderedfeaturehandlerinterface.h | 4 ++-- src/core/symbology/qgspointdisplacementrenderer.cpp | 2 +- src/core/symbology/qgssymbol.cpp | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in b/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in index 9e66a9e9fd6..e0066f0caf9 100644 --- a/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in +++ b/python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in @@ -37,14 +37,17 @@ of all features rendered on a map. struct RenderedFeatureContext { - RenderedFeatureContext( const QgsRenderContext *renderContext = 0 ); + RenderedFeatureContext( const QgsRenderContext &renderContext ); %Docstring Constructor for RenderedFeatureContext. :param renderContext: The render context which was used while rendering feature. %End - const QgsRenderContext *renderContext; + const QgsRenderContext &renderContext; +%Docstring +The render context which was used while rendering feature. +%End }; virtual void handleRenderedFeature( const QgsFeature &feature, const QgsGeometry &renderedBounds, const QgsRenderedFeatureHandlerInterface::RenderedFeatureContext &context ) = 0; diff --git a/src/core/qgsrenderedfeaturehandlerinterface.h b/src/core/qgsrenderedfeaturehandlerinterface.h index d7e4de70ca9..28a7e3a3659 100644 --- a/src/core/qgsrenderedfeaturehandlerinterface.h +++ b/src/core/qgsrenderedfeaturehandlerinterface.h @@ -55,14 +55,14 @@ class CORE_EXPORT QgsRenderedFeatureHandlerInterface * Constructor for RenderedFeatureContext. * \param renderContext The render context which was used while rendering feature. */ - RenderedFeatureContext( const QgsRenderContext *renderContext = nullptr ) + RenderedFeatureContext( const QgsRenderContext &renderContext ) : renderContext( renderContext ) {} /** * The render context which was used while rendering feature. */ - const QgsRenderContext *renderContext = nullptr; + const QgsRenderContext &renderContext; }; /** diff --git a/src/core/symbology/qgspointdisplacementrenderer.cpp b/src/core/symbology/qgspointdisplacementrenderer.cpp index 6709e87e5c8..e3154d7a571 100644 --- a/src/core/symbology/qgspointdisplacementrenderer.cpp +++ b/src/core/symbology/qgspointdisplacementrenderer.cpp @@ -467,7 +467,7 @@ void QgsPointDisplacementRenderer::drawSymbols( const ClusteredGroup &group, Qgs { const QgsGeometry bounds( QgsGeometry::fromRect( QgsRectangle( groupIt->symbol()->bounds( *symbolPosIt, context, groupIt->feature ) ) ) ); const QList< QgsRenderedFeatureHandlerInterface * > handlers = context.renderedFeatureHandlers(); - QgsRenderedFeatureHandlerInterface::RenderedFeatureContext featureContext( &context ); + QgsRenderedFeatureHandlerInterface::RenderedFeatureContext featureContext( context ); for ( QgsRenderedFeatureHandlerInterface *handler : handlers ) handler->handleRenderedFeature( groupIt->feature, bounds, featureContext ); } diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp index 845f04b912e..f28f2fa5358 100644 --- a/src/core/symbology/qgssymbol.cpp +++ b/src/core/symbology/qgssymbol.cpp @@ -1091,7 +1091,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont if ( context.hasRenderedFeatureHandlers() ) { - QgsRenderedFeatureHandlerInterface::RenderedFeatureContext featureContext( &context ); + QgsRenderedFeatureHandlerInterface::RenderedFeatureContext featureContext( context ); const QList< QgsRenderedFeatureHandlerInterface * > handlers = context.renderedFeatureHandlers(); for ( QgsRenderedFeatureHandlerInterface *handler : handlers ) handler->handleRenderedFeature( feature, renderedBoundsGeom, featureContext );