QgsVectorLayerSaveAsDialog::createControls(): fix memory leak

rouault · nyalldawson · commit 4735bd9c58c6 · 2023-10-03T10:13:02.000+10:00
diff --git a/src/gui/ogr/qgsvectorlayersaveasdialog.cpp b/src/gui/ogr/qgsvectorlayersaveasdialog.cpp
@@ -236,7 +236,6 @@ QList<QPair<QLabel *, QWidget *> > QgsVectorLayerSaveAsDialog::createControls( c
   for ( it = options.constBegin(); it != options.constEnd(); ++it )
   {
     QgsVectorFileWriter::Option *option = it.value();
-    QLabel *label = new QLabel( it.key() );
     QWidget *control = nullptr;
     switch ( option->type )
     {
@@ -295,6 +294,8 @@ QList<QPair<QLabel *, QWidget *> > QgsVectorLayerSaveAsDialog::createControls( c
 
     if ( control )
     {
+      QLabel *label = new QLabel( it.key() );
+
       // Pack the tooltip in some html element, so it gets linebreaks.
       label->setToolTip( QStringLiteral( "<p>%1</p>" ).arg( option->docString.toHtmlEscaped() ) );
       control->setToolTip( QStringLiteral( "<p>%1</p>" ).arg( option->docString.toHtmlEscaped() ) );

Original file line number	Diff line number	Diff line change
`@@ -236,7 +236,6 @@ QList<QPair<QLabel , QWidget > > QgsVectorLayerSaveAsDialog::createControls( c`
`236`	`236`	`for ( it = options.constBegin(); it != options.constEnd(); ++it )`
`237`	`237`	`{`
`238`	`238`	`QgsVectorFileWriter::Option *option = it.value();`
`239`		`- QLabel *label = new QLabel( it.key() );`
`240`	`239`	`QWidget *control = nullptr;`
`241`	`240`	`switch ( option->type )`
`242`	`241`	`{`
`@@ -295,6 +294,8 @@ QList<QPair<QLabel , QWidget > > QgsVectorLayerSaveAsDialog::createControls( c`
`295`	`294`
`296`	`295`	`if ( control )`
`297`	`296`	`{`
	`297`	`+ QLabel *label = new QLabel( it.key() );`
	`298`	`+`
`298`	`299`	`// Pack the tooltip in some html element, so it gets linebreaks.`
`299`	`300`	`label->setToolTip( QStringLiteral( "<p>%1</p>" ).arg( option->docString.toHtmlEscaped() ) );`
`300`	`301`	`control->setToolTip( QStringLiteral( "<p>%1</p>" ).arg( option->docString.toHtmlEscaped() ) );`