Swap some members to unique_ptrs to make ownership clearer

nyalldawson · nyalldawson · commit 5d50b17c8022 · 2017-05-08T07:53:38.000+10:00
diff --git a/src/core/symbology-ng/qgssymbol.cpp b/src/core/symbology-ng/qgssymbol.cpp
@@ -83,7 +83,6 @@ QgsSymbol::QgsSymbol( SymbolType type, const QgsSymbolLayerList &layers )
   , mRenderHints( 0 )
   , mClipFeaturesToExtent( true )
   , mLayer( nullptr )
-  , mSymbolRenderContext( nullptr )
 {
 
   // check they're all correct symbol layers
@@ -188,7 +187,6 @@ void QgsSymbol::_getPolygon( QPolygonF &pts, QList<QPolygonF> &holes, QgsRenderC
 
 QgsSymbol::~QgsSymbol()
 {
-  delete mSymbolRenderContext;
   // delete all symbol layers (we own them, so it's okay)
   qDeleteAll( mLayers );
 }
@@ -377,14 +375,12 @@ bool QgsSymbol::changeSymbolLayer( int index, QgsSymbolLayer *layer )
 
 void QgsSymbol::startRender( QgsRenderContext &context, const QgsFields &fields )
 {
-  delete mSymbolRenderContext;
-  mSymbolRenderContext = new QgsSymbolRenderContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() );
+  mSymbolRenderContext.reset( new QgsSymbolRenderContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() ) );
 
   QgsSymbolRenderContext symbolContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() );
 
-  QgsExpressionContextScope *scope = QgsExpressionContextUtils::updateSymbolScope( this, new QgsExpressionContextScope() );
-
-  mSymbolRenderContext->setExpressionContextScope( scope );
+  std::unique_ptr< QgsExpressionContextScope > scope( QgsExpressionContextUtils::updateSymbolScope( this, new QgsExpressionContextScope() ) );
+  mSymbolRenderContext->setExpressionContextScope( scope.release() );
 
   Q_FOREACH ( QgsSymbolLayer *layer, mLayers )
   {
@@ -410,8 +406,7 @@ void QgsSymbol::stopRender( QgsRenderContext &context )
     }
   }
 
-  delete mSymbolRenderContext;
-  mSymbolRenderContext = nullptr;
+  mSymbolRenderContext.reset( nullptr );
 
   mLayer = nullptr;
 }
@@ -985,7 +980,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont
 
 QgsSymbolRenderContext *QgsSymbol::symbolRenderContext()
 {
-  return mSymbolRenderContext;
+  return mSymbolRenderContext.get();
 }
 
 void QgsSymbol::renderVertexMarker( QPointF pt, QgsRenderContext &context, int currentVertexMarkerType, int currentVertexMarkerSize )
@@ -998,7 +993,6 @@ void QgsSymbol::renderVertexMarker( QPointF pt, QgsRenderContext &context, int c
 
 QgsSymbolRenderContext::QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal alpha, bool selected, QgsSymbol::RenderHints renderHints, const QgsFeature *f, const QgsFields &fields, const QgsMapUnitScale &mapUnitScale )
   : mRenderContext( c )
-  , mExpressionContextScope( nullptr )
   , mOutputUnit( u )
   , mMapUnitScale( mapUnitScale )
   , mAlpha( alpha )
@@ -1011,11 +1005,6 @@ QgsSymbolRenderContext::QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitType
 {
 }
 
-QgsSymbolRenderContext::~QgsSymbolRenderContext()
-{
-  delete mExpressionContextScope;
-}
-
 void QgsSymbolRenderContext::setOriginalValueVariable( const QVariant &value )
 {
   mRenderContext.expressionContext().setOriginalValueVariable( value );
@@ -1043,12 +1032,12 @@ QgsSymbolRenderContext &QgsSymbolRenderContext::operator=( const QgsSymbolRender
 
 QgsExpressionContextScope *QgsSymbolRenderContext::expressionContextScope()
 {
-  return mExpressionContextScope;
+  return mExpressionContextScope.get();
 }
 
 void QgsSymbolRenderContext::setExpressionContextScope( QgsExpressionContextScope *contextScope )
 {
-  mExpressionContextScope = contextScope;
+  mExpressionContextScope.reset( contextScope );
 }
 
 ///////////////////
diff --git a/src/core/symbology-ng/qgssymbol.h b/src/core/symbology-ng/qgssymbol.h
@@ -363,7 +363,7 @@ class CORE_EXPORT QgsSymbol
 
   private:
     //! Initialized in startRender, destroyed in stopRender
-    QgsSymbolRenderContext *mSymbolRenderContext = nullptr;
+    std::unique_ptr< QgsSymbolRenderContext > mSymbolRenderContext;
 
     Q_DISABLE_COPY( QgsSymbol )
 
@@ -391,7 +391,6 @@ class CORE_EXPORT QgsSymbolRenderContext
      * \param mapUnitScale
      */
     QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal alpha = 1.0, bool selected = false, QgsSymbol::RenderHints renderHints = 0, const QgsFeature *f = nullptr, const QgsFields &fields = QgsFields(), const QgsMapUnitScale &mapUnitScale = QgsMapUnitScale() );
-    ~QgsSymbolRenderContext();
 
     QgsRenderContext &renderContext() { return mRenderContext; }
     const QgsRenderContext &renderContext() const { return mRenderContext; }
@@ -497,11 +496,11 @@ class CORE_EXPORT QgsSymbolRenderContext
      *
      * \param contextScope An expression scope for details about this symbol
      */
-    void setExpressionContextScope( QgsExpressionContextScope *contextScope );
+    void setExpressionContextScope( QgsExpressionContextScope *contextScope SIP_TRANSFER );
 
   private:
     QgsRenderContext &mRenderContext;
-    QgsExpressionContextScope *mExpressionContextScope = nullptr;
+    std::unique_ptr< QgsExpressionContextScope > mExpressionContextScope;
     QgsUnitTypes::RenderUnit mOutputUnit;
     QgsMapUnitScale mMapUnitScale;
     qreal mAlpha;

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ QgsSymbol::QgsSymbol( SymbolType type, const QgsSymbolLayerList &layers )`
`83`	`83`	`, mRenderHints( 0 )`
`84`	`84`	`, mClipFeaturesToExtent( true )`
`85`	`85`	`, mLayer( nullptr )`
`86`		`- , mSymbolRenderContext( nullptr )`
`87`	`86`	`{`
`88`	`87`
`89`	`88`	`// check they're all correct symbol layers`
`@@ -188,7 +187,6 @@ void QgsSymbol::_getPolygon( QPolygonF &pts, QList<QPolygonF> &holes, QgsRenderC`
`188`	`187`
`189`	`188`	`QgsSymbol::~QgsSymbol()`
`190`	`189`	`{`
`191`		`- delete mSymbolRenderContext;`
`192`	`190`	`// delete all symbol layers (we own them, so it's okay)`
`193`	`191`	`qDeleteAll( mLayers );`
`194`	`192`	`}`
`@@ -377,14 +375,12 @@ bool QgsSymbol::changeSymbolLayer( int index, QgsSymbolLayer *layer )`
`377`	`375`
`378`	`376`	`void QgsSymbol::startRender( QgsRenderContext &context, const QgsFields &fields )`
`379`	`377`	`{`
`380`		`- delete mSymbolRenderContext;`
`381`		`- mSymbolRenderContext = new QgsSymbolRenderContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() );`
	`378`	`+ mSymbolRenderContext.reset( new QgsSymbolRenderContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() ) );`
`382`	`379`
`383`	`380`	`QgsSymbolRenderContext symbolContext( context, outputUnit(), mAlpha, false, mRenderHints, nullptr, fields, mapUnitScale() );`
`384`	`381`
`385`		`- QgsExpressionContextScope *scope = QgsExpressionContextUtils::updateSymbolScope( this, new QgsExpressionContextScope() );`
`386`		`-`
`387`		`- mSymbolRenderContext->setExpressionContextScope( scope );`
	`382`	`+ std::unique_ptr< QgsExpressionContextScope > scope( QgsExpressionContextUtils::updateSymbolScope( this, new QgsExpressionContextScope() ) );`
	`383`	`+ mSymbolRenderContext->setExpressionContextScope( scope.release() );`
`388`	`384`
`389`	`385`	`Q_FOREACH ( QgsSymbolLayer *layer, mLayers )`
`390`	`386`	`{`
`@@ -410,8 +406,7 @@ void QgsSymbol::stopRender( QgsRenderContext &context )`
`410`	`406`	`}`
`411`	`407`	`}`
`412`	`408`
`413`		`- delete mSymbolRenderContext;`
`414`		`- mSymbolRenderContext = nullptr;`
	`409`	`+ mSymbolRenderContext.reset( nullptr );`
`415`	`410`
`416`	`411`	`mLayer = nullptr;`
`417`	`412`	`}`
`@@ -985,7 +980,7 @@ void QgsSymbol::renderFeature( const QgsFeature &feature, QgsRenderContext &cont`
`985`	`980`
`986`	`981`	`QgsSymbolRenderContext *QgsSymbol::symbolRenderContext()`
`987`	`982`	`{`
`988`		`- return mSymbolRenderContext;`
	`983`	`+ return mSymbolRenderContext.get();`
`989`	`984`	`}`
`990`	`985`
`991`	`986`	`void QgsSymbol::renderVertexMarker( QPointF pt, QgsRenderContext &context, int currentVertexMarkerType, int currentVertexMarkerSize )`
`@@ -998,7 +993,6 @@ void QgsSymbol::renderVertexMarker( QPointF pt, QgsRenderContext &context, int c`
`998`	`993`
`999`	`994`	`QgsSymbolRenderContext::QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitTypes::RenderUnit u, qreal alpha, bool selected, QgsSymbol::RenderHints renderHints, const QgsFeature *f, const QgsFields &fields, const QgsMapUnitScale &mapUnitScale )`
`1000`	`995`	`: mRenderContext( c )`
`1001`		`- , mExpressionContextScope( nullptr )`
`1002`	`996`	`, mOutputUnit( u )`
`1003`	`997`	`, mMapUnitScale( mapUnitScale )`
`1004`	`998`	`, mAlpha( alpha )`
`@@ -1011,11 +1005,6 @@ QgsSymbolRenderContext::QgsSymbolRenderContext( QgsRenderContext &c, QgsUnitType`
`1011`	`1005`	`{`
`1012`	`1006`	`}`
`1013`	`1007`
`1014`		`-QgsSymbolRenderContext::~QgsSymbolRenderContext()`
`1015`		`-{`
`1016`		`- delete mExpressionContextScope;`
`1017`		`-}`
`1018`		`-`
`1019`	`1008`	`void QgsSymbolRenderContext::setOriginalValueVariable( const QVariant &value )`
`1020`	`1009`	`{`
`1021`	`1010`	`mRenderContext.expressionContext().setOriginalValueVariable( value );`
`@@ -1043,12 +1032,12 @@ QgsSymbolRenderContext &QgsSymbolRenderContext::operator=( const QgsSymbolRender`
`1043`	`1032`
`1044`	`1033`	`QgsExpressionContextScope *QgsSymbolRenderContext::expressionContextScope()`
`1045`	`1034`	`{`
`1046`		`- return mExpressionContextScope;`
	`1035`	`+ return mExpressionContextScope.get();`
`1047`	`1036`	`}`
`1048`	`1037`
`1049`	`1038`	`void QgsSymbolRenderContext::setExpressionContextScope( QgsExpressionContextScope *contextScope )`
`1050`	`1039`	`{`
`1051`		`- mExpressionContextScope = contextScope;`
	`1040`	`+ mExpressionContextScope.reset( contextScope );`
`1052`	`1041`	`}`
`1053`	`1042`
`1054`	`1043`	`///////////////////`