Use std::move to reassign unique_ptrs

qgis · Sep 11, 2017 · 7855849 · 7855849
1 parent 68ad9fe
commit 7855849
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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 );