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

Use reference instead of pointer

Browse Source
This commit is contained in:
Nyall Dawson 2019-08-12 14:42:21 +10:00
parent 8b154a1753
commit ba800662a0
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/core/auto_generated/qgsrenderedfeaturehandlerinterface.sip.in
View File

@ -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;

4
src/core/qgsrenderedfeaturehandlerinterface.h
View File

@ -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;
};
/**

2
src/core/symbology/qgspointdisplacementrenderer.cpp
View File

@ -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 );
}

2
src/core/symbology/qgssymbol.cpp
View File

@ -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 );