Add unique_ptr in nodePropertyIsNullFromOgcFilter

pblottiere · pblottiere · commit 694af1cce0cd · 2018-09-13T08:04:34.000+01:00
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -3417,12 +3417,12 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIs
   }
 
   QDomElement operandElem = element.firstChildElement();
-  QgsExpressionNode *opLeft = nodeFromOgcFilter( operandElem );
+  std::unique_ptr<QgsExpressionNode> opLeft( nodeFromOgcFilter( operandElem ) );
   if ( !opLeft )
     return nullptr;
 
-  QgsExpressionNode *opRight = new QgsExpressionNodeLiteral( QVariant() );
-  return new QgsExpressionNodeBinaryOperator( QgsExpressionNodeBinaryOperator::boIs, opLeft, opRight );
+  std::unique_ptr<QgsExpressionNode> opRight( new QgsExpressionNodeLiteral( QVariant() ) );
+  return new QgsExpressionNodeBinaryOperator( QgsExpressionNodeBinaryOperator::boIs, opLeft.release(), opRight.release() );
 }
 
 QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeFunctionFromOgcFilter( const QDomElement &element )

Original file line number	Diff line number	Diff line change
`@@ -3417,12 +3417,12 @@ QgsExpressionNodeBinaryOperator *QgsOgcUtilsExpressionFromFilter::nodePropertyIs`
`3417`	`3417`	`}`
`3418`	`3418`
`3419`	`3419`	`QDomElement operandElem = element.firstChildElement();`
`3420`		`- QgsExpressionNode *opLeft = nodeFromOgcFilter( operandElem );`
	`3420`	`+ std::unique_ptr<QgsExpressionNode> opLeft( nodeFromOgcFilter( operandElem ) );`
`3421`	`3421`	`if ( !opLeft )`
`3422`	`3422`	`return nullptr;`
`3423`	`3423`
`3424`		`- QgsExpressionNode *opRight = new QgsExpressionNodeLiteral( QVariant() );`
`3425`		`- return new QgsExpressionNodeBinaryOperator( QgsExpressionNodeBinaryOperator::boIs, opLeft, opRight );`
	`3424`	`+ std::unique_ptr<QgsExpressionNode> opRight( new QgsExpressionNodeLiteral( QVariant() ) );`
	`3425`	`+ return new QgsExpressionNodeBinaryOperator( QgsExpressionNodeBinaryOperator::boIs, opLeft.release(), opRight.release() );`
`3426`	`3426`	`}`
`3427`	`3427`
`3428`	`3428`	`QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeFunctionFromOgcFilter( const QDomElement &element )`