Add unique_ptr in nodeNotFromOgcFilter

pblottiere · pblottiere · commit 5ccb16734c12 · 2018-09-13T08:04:34.000+01:00
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -3398,14 +3398,14 @@ QgsExpressionNodeUnaryOperator *QgsOgcUtilsExpressionFromFilter::nodeNotFromOgcF
     return nullptr;
 
   QDomElement operandElem = element.firstChildElement();
-  QgsExpressionNode *operand = nodeFromOgcFilter( operandElem );
+  std::unique_ptr<QgsExpressionNode> operand( nodeFromOgcFilter( operandElem ) );
   if ( !operand )
   {
     mErrorMessage = QObject::tr( "invalid operand for '%1' unary operator" ).arg( element.tagName() );
     return nullptr;
   }
 
-  return new QgsExpressionNodeUnaryOperator( QgsExpressionNodeUnaryOperator::uoNot, operand );
+  return new QgsExpressionNodeUnaryOperator( QgsExpressionNodeUnaryOperator::uoNot, operand.release() );
 }
 
 QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIsNullFromOgcFilter( const QDomElement &element )

Original file line number	Diff line number	Diff line change
`@@ -3398,14 +3398,14 @@ QgsExpressionNodeUnaryOperator *QgsOgcUtilsExpressionFromFilter::nodeNotFromOgcF`
`3398`	`3398`	`return nullptr;`
`3399`	`3399`
`3400`	`3400`	`QDomElement operandElem = element.firstChildElement();`
`3401`		`- QgsExpressionNode *operand = nodeFromOgcFilter( operandElem );`
	`3401`	`+ std::unique_ptr<QgsExpressionNode> operand( nodeFromOgcFilter( operandElem ) );`
`3402`	`3402`	`if ( !operand )`
`3403`	`3403`	`{`
`3404`	`3404`	`mErrorMessage = QObject::tr( "invalid operand for '%1' unary operator" ).arg( element.tagName() );`
`3405`	`3405`	`return nullptr;`
`3406`	`3406`	`}`
`3407`	`3407`
`3408`		`- return new QgsExpressionNodeUnaryOperator( QgsExpressionNodeUnaryOperator::uoNot, operand );`
	`3408`	`+ return new QgsExpressionNodeUnaryOperator( QgsExpressionNodeUnaryOperator::uoNot, operand.release() );`
`3409`	`3409`	`}`
`3410`	`3410`
`3411`	`3411`	`QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIsNullFromOgcFilter( const QDomElement &element )`