More unique_ptr

pblottiere · pblottiere · commit 5fd9501ad910 · 2018-09-13T08:04:34.000+01:00
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -3287,11 +3287,11 @@ QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeSpatialOperatorF
     return nullptr;
   }
 
-  QgsExpressionNode::NodeList *opArgs = new QgsExpressionNode::NodeList();
+  std::unique_ptr<QgsExpressionNode::NodeList> opArgs( new QgsExpressionNode::NodeList() );
   opArgs->append( new QgsExpressionNodeFunction( QgsExpression::functionIndex( QStringLiteral( "$geometry" ) ), new QgsExpressionNode::NodeList() ) );
   opArgs->append( new QgsExpressionNodeFunction( QgsExpression::functionIndex( QStringLiteral( "geomFromGML" ) ), gml2Args.release() ) );
 
-  return new QgsExpressionNodeFunction( opIdx, opArgs );
+  return new QgsExpressionNodeFunction( opIdx, opArgs.release() );
 }
 
 QgsExpressionNodeColumnRef *QgsOgcUtilsExpressionFromFilter::nodeColumnRefFromOgcFilter( const QDomElement &element )

Original file line number	Diff line number	Diff line change
`@@ -3287,11 +3287,11 @@ QgsExpressionNodeFunction *QgsOgcUtilsExpressionFromFilter::nodeSpatialOperatorF`
`3287`	`3287`	`return nullptr;`
`3288`	`3288`	`}`
`3289`	`3289`
`3290`		`- QgsExpressionNode::NodeList *opArgs = new QgsExpressionNode::NodeList();`
	`3290`	`+ std::unique_ptr<QgsExpressionNode::NodeList> opArgs( new QgsExpressionNode::NodeList() );`
`3291`	`3291`	`opArgs->append( new QgsExpressionNodeFunction( QgsExpression::functionIndex( QStringLiteral( "$geometry" ) ), new QgsExpressionNode::NodeList() ) );`
`3292`	`3292`	`opArgs->append( new QgsExpressionNodeFunction( QgsExpression::functionIndex( QStringLiteral( "geomFromGML" ) ), gml2Args.release() ) );`
`3293`	`3293`
`3294`		`- return new QgsExpressionNodeFunction( opIdx, opArgs );`
	`3294`	`+ return new QgsExpressionNodeFunction( opIdx, opArgs.release() );`
`3295`	`3295`	`}`
`3296`	`3296`
`3297`	`3297`	`QgsExpressionNodeColumnRef *QgsOgcUtilsExpressionFromFilter::nodeColumnRefFromOgcFilter( const QDomElement &element )`