From 78558496777ad5d93eff2816e9bbd18e829d5a0a Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 11 Sep 2017 21:29:02 +1000 Subject: [PATCH] Use std::move to reassign unique_ptrs --- src/core/qgsproject.cpp | 2 +- src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp index f3ce3e5c7750..e7c9822fc9ce 100644 --- a/src/core/qgsproject.cpp +++ b/src/core/qgsproject.cpp @@ -2141,7 +2141,7 @@ bool QgsProject::unzip( const QString &filename ) } // keep the archive and remove the temporary .qgs file - mArchive.reset( archive.release() ); + mArchive = std::move( archive ); mArchive->clearProjectFile(); return true; diff --git a/src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp b/src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp index d3843398b88c..2ccd77fd1d36 100644 --- a/src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp +++ b/src/gui/symbology/qgsdatadefinedsizelegendwidget.cpp @@ -192,7 +192,7 @@ void QgsDataDefinedSizeLegendWidget::changeSymbol() if ( d.exec() != QDialog::Accepted ) return; - mSourceSymbol.reset( newSymbol.release() ); + mSourceSymbol = std::move( newSymbol ); QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSourceSymbol.get(), btnChangeSymbol->iconSize() ); btnChangeSymbol->setIcon( icon );