Swap QScopedPointer to std::unique_ptr

Why? - no benefits to QScopedPointer over std::unique_ptr - unlike QScopedPointer, std::unique_ptr has no overhead over regular pointers - using standard language features makes it more likely that compilers can optimise this use and static analysers can correctly handle code using unique_ptrs - QScopedPointer has an (IMO) uncertain future (given that Qt is dropping features which have become part of the c++ standard). Better to port now before wider use of QScopedPointer in the codebase!
qgis · Feb 7, 2017 · aed6c73
1 parent 9475850
commit aed6c73
Show file tree

Hide file tree

Showing 170 changed files with 680 additions and 659 deletions.
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
@@ -913,7 +913,7 @@ void QgsComposer::setTitle( const QString& title )
 bool QgsComposer::loadFromTemplate( const QDomDocument& templateDoc, bool clearExisting )
 {
   // provide feedback, since composer will be hidden when loading template (much faster)
-  QScopedPointer< QDialog > dlg( new QgsBusyIndicatorDialog( tr( "Loading template into composer..." ), this ) );
+  std::unique_ptr< QDialog > dlg( new QgsBusyIndicatorDialog( tr( "Loading template into composer..." ), this ) );
   dlg->setStyleSheet( mQgis->styleSheet() );
   dlg->show();
 

diff --git a/src/app/dwg/qgsdwgimportdialog.cpp b/src/app/dwg/qgsdwgimportdialog.cpp
@@ -155,7 +155,7 @@ void QgsDwgImportDialog::on_pbLoadDatabase_clicked()
 
   bool lblVisible = false;
 
-  QScopedPointer<QgsVectorLayer> d( new QgsVectorLayer( QString( "%1|layername=drawing" ).arg( leDatabase->text() ), "layers", "ogr", false ) );
+  std::unique_ptr<QgsVectorLayer> d( new QgsVectorLayer( QString( "%1|layername=drawing" ).arg( leDatabase->text() ), "layers", "ogr", false ) );
   if ( d && d->isValid() )
   {
     int idxPath = d->fields().lookupField( "path" );
@@ -190,7 +190,7 @@ void QgsDwgImportDialog::on_pbLoadDatabase_clicked()
 
   lblMessage->setVisible( lblVisible );
 
-  QScopedPointer<QgsVectorLayer> l( new QgsVectorLayer( QString( "%1|layername=layers" ).arg( leDatabase->text() ), "layers", "ogr", false ) );
+  std::unique_ptr<QgsVectorLayer> l( new QgsVectorLayer( QString( "%1|layername=layers" ).arg( leDatabase->text() ), "layers", "ogr", false ) );
   if ( l && l->isValid() )
   {
     int idxName = l->fields().lookupField( "name" );

diff --git a/src/app/dwg/qgsdwgimporter.cpp b/src/app/dwg/qgsdwgimporter.cpp
@@ -44,6 +44,7 @@
 #include <cpl_string.h>
 #include <gdal.h>
 #include <ogr_srs_api.h>
+#include <memory>
 
 #define LOG( x ) { QgsDebugMsg( x ); QgsMessageLog::logMessage( x, QObject::tr( "DWG/DXF import" ) ); }
 #define ONCE( x ) { static bool show=true; if( show ) LOG( x ); show=false; }
@@ -614,7 +615,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   if ( fi.suffix().toLower() == "dxf" )
   {
     //loads dxf
-    QScopedPointer<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );
+    std::unique_ptr<dxfRW> dxf( new dxfRW( drawing.toUtf8() ) );
     if ( !dxf->read( this, false ) )
     {
       result = DRW::BAD_UNKNOWN;
@@ -623,7 +624,7 @@ bool QgsDwgImporter::import( const QString &drawing, QString &error, bool doExpa
   else if ( fi.suffix().toLower() == "dwg" )
   {
     //loads dwg
-    QScopedPointer<dwgR> dwg( new dwgR( drawing.toUtf8() ) );
+    std::unique_ptr<dwgR> dwg( new dwgR( drawing.toUtf8() ) );
     if ( !dwg->read( this, false ) )
     {
       result = dwg->getError();
@@ -1185,12 +1186,12 @@ void QgsDwgImporter::addAppId( const DRW_AppId &data )
 bool QgsDwgImporter::createFeature( OGRLayerH layer, OGRFeatureH f, const QgsAbstractGeometry &g0 ) const
 {
   const QgsAbstractGeometry *g;
-  QScopedPointer<QgsAbstractGeometry> sg( nullptr );
+  std::unique_ptr<QgsAbstractGeometry> sg( nullptr );
 
   if ( !mUseCurves && g0.hasCurvedSegments() )
   {
     sg.reset( g0.segmentize() );
-    g = sg.data();
+    g = sg.get();
   }
   else
   {

diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -449,15 +449,15 @@ void QgisApp::layerTreeViewDoubleClicked( const QModelIndex& index )
           if ( !originalSymbol )
             return;
 
-          QScopedPointer< QgsSymbol > symbol( originalSymbol->clone() );
+          std::unique_ptr< QgsSymbol > symbol( originalSymbol->clone() );
           QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( node->layerNode()->layer() );
-          QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), vlayer, this );
+          QgsSymbolSelectorDialog dlg( symbol.get(), QgsStyle::defaultStyle(), vlayer, this );
           QgsSymbolWidgetContext context;
           context.setMapCanvas( mMapCanvas );
           dlg.setContext( context );
           if ( dlg.exec() )
           {
-            node->setSymbol( symbol.take() );
+            node->setSymbol( symbol.release() );
           }
 
           return;
@@ -6241,7 +6241,7 @@ void QgisApp::saveAsRasterFile()
   // TODO: show error dialogs
   // TODO: this code should go somewhere else, but probably not into QgsRasterFileWriter
   // clone pipe/provider is not really necessary, ready for threads
-  QScopedPointer<QgsRasterPipe> pipe( nullptr );
+  std::unique_ptr<QgsRasterPipe> pipe( nullptr );
 
   if ( d.mode() == QgsRasterLayerSaveAsDialog::RawDataMode )
   {
@@ -6303,7 +6303,7 @@ void QgisApp::saveAsRasterFile()
   fileWriter.setPyramidsFormat( d.pyramidsFormat() );
   fileWriter.setPyramidsConfigOptions( d.pyramidsConfigOptions() );
 
-  QgsRasterFileWriter::WriterError err = fileWriter.writeRaster( pipe.data(), d.nColumns(), d.nRows(), d.outputRectangle(), d.outputCrs(), &pd );
+  QgsRasterFileWriter::WriterError err = fileWriter.writeRaster( pipe.get(), d.nColumns(), d.nRows(), d.outputRectangle(), d.outputCrs(), &pd );
   if ( err != QgsRasterFileWriter::NoError )
   {
     QMessageBox::warning( this, tr( "Error" ),

diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp
@@ -147,7 +147,7 @@ void QgsAnnotationWidget::updateCenterIcon()
   {
     return;
   }
-  QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mMarkerSymbol.data(), mMapMarkerButton->iconSize() );
+  QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mMarkerSymbol.get(), mMapMarkerButton->iconSize() );
   mMapMarkerButton->setIcon( icon );
 }
 
@@ -157,7 +157,7 @@ void QgsAnnotationWidget::updateFillIcon()
   {
     return;
   }
-  QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mFillSymbol.data(), mFrameStyleButton->iconSize() );
+  QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mFillSymbol.get(), mFrameStyleButton->iconSize() );
   mFrameStyleButton->setIcon( icon );
 }
 
diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
@@ -20,6 +20,7 @@
 
 #include "ui_qgsannotationwidgetbase.h"
 #include "qgis_app.h"
+#include <memory>
 
 class QgsMapCanvasAnnotationItem;
 class QgsMarkerSymbol;
@@ -47,8 +48,8 @@ class APP_EXPORT QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationW
 
   private:
     QgsMapCanvasAnnotationItem* mItem = nullptr;
-    QScopedPointer< QgsMarkerSymbol > mMarkerSymbol;
-    QScopedPointer< QgsFillSymbol > mFillSymbol;
+    std::unique_ptr< QgsMarkerSymbol > mMarkerSymbol;
+    std::unique_ptr< QgsFillSymbol > mFillSymbol;
 
     void blockAllSignals( bool block );
     void updateCenterIcon();

diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp
@@ -500,15 +500,15 @@ void QgsAppLayerTreeViewMenuProvider::editVectorSymbol()
   if ( !singleRenderer )
     return;
 
-  QScopedPointer< QgsSymbol > symbol( singleRenderer->symbol() ? singleRenderer->symbol()->clone() : nullptr );
-  QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), layer, mView->window() );
+  std::unique_ptr< QgsSymbol > symbol( singleRenderer->symbol() ? singleRenderer->symbol()->clone() : nullptr );
+  QgsSymbolSelectorDialog dlg( symbol.get(), QgsStyle::defaultStyle(), layer, mView->window() );
   dlg.setWindowTitle( tr( "Symbol selector" ) );
   QgsSymbolWidgetContext context;
   context.setMapCanvas( mCanvas );
   dlg.setContext( context );
   if ( dlg.exec() )
   {
-    singleRenderer->setSymbol( symbol.take() );
+    singleRenderer->setSymbol( symbol.release() );
     layer->triggerRepaint();
     mView->refreshLayerSymbology( layer->id() );
   }
@@ -576,16 +576,16 @@ void QgsAppLayerTreeViewMenuProvider::editSymbolLegendNodeSymbol()
   if ( !originalSymbol )
     return;
 
-  QScopedPointer< QgsSymbol > symbol( originalSymbol->clone() );
+  std::unique_ptr< QgsSymbol > symbol( originalSymbol->clone() );
   QgsVectorLayer* vlayer = qobject_cast<QgsVectorLayer*>( node->layerNode()->layer() );
-  QgsSymbolSelectorDialog dlg( symbol.data(), QgsStyle::defaultStyle(), vlayer, mView->window() );
+  QgsSymbolSelectorDialog dlg( symbol.get(), QgsStyle::defaultStyle(), vlayer, mView->window() );
   dlg.setWindowTitle( tr( "Symbol selector" ) );
   QgsSymbolWidgetContext context;
   context.setMapCanvas( mCanvas );
   dlg.setContext( context );
   if ( dlg.exec() )
   {
-    node->setSymbol( symbol.take() );
+    node->setSymbol( symbol.release() );
     if ( vlayer )
     {
       vlayer->emitStyleChanged();

diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp
@@ -101,7 +101,7 @@ QgsBookmarks::QgsBookmarks( QWidget *parent )
   mProjectModel = new QgsProjectBookmarksTableModel();
   mModel.reset( new QgsMergedBookmarksTableModel( *mQgisModel, *mProjectModel, lstBookmarks ) );
 
-  lstBookmarks->setModel( mModel.data() );
+  lstBookmarks->setModel( mModel.get() );
 
   QSettings settings;
   lstBookmarks->header()->restoreState( settings.value( QStringLiteral( "/Windows/Bookmarks/headerstate" ) ).toByteArray() );

diff --git a/src/app/qgsbookmarks.h b/src/app/qgsbookmarks.h
@@ -18,7 +18,7 @@
 #define QGSBOOKMARKS_H
 
 #include <QSqlTableModel>
-#include <QScopedPointer>
+#include <memory>
 
 #include "ui_qgsbookmarksbase.h"
 #include "qgsdockwidget.h"
@@ -121,7 +121,7 @@ class APP_EXPORT QgsBookmarks : public QgsDockWidget, private Ui::QgsBookmarksBa
   private:
     QSqlTableModel* mQgisModel;
     QgsProjectBookmarksTableModel* mProjectModel;
-    QScopedPointer<QgsMergedBookmarksTableModel> mModel;
+    std::unique_ptr<QgsMergedBookmarksTableModel> mModel;
 
     void saveWindowLocation();
     void restorePosition();

diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
@@ -251,7 +251,7 @@ QgsDiagramProperties::QgsDiagramProperties( QgsVectorLayer* layer, QWidget* pare
     mCheckBoxAttributeLegend->setChecked( dr->attributeLegend() );
     mCheckBoxSizeLegend->setChecked( dr->sizeLegend() );
     mSizeLegendSymbol.reset( dr->sizeLegendSymbol() ? dr->sizeLegendSymbol()->clone() : QgsMarkerSymbol::createSimple( QgsStringMap() ) );
-    QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSizeLegendSymbol.data(), mButtonSizeLegendSymbol->iconSize() );
+    QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSizeLegendSymbol.get(), mButtonSizeLegendSymbol->iconSize() );
     mButtonSizeLegendSymbol->setIcon( icon );
 
     //assume single category or linearly interpolated diagram renderer for now
@@ -943,7 +943,7 @@ void QgsDiagramProperties::on_mButtonSizeLegendSymbol_clicked()
   if ( d.exec() == QDialog::Accepted )
   {
     mSizeLegendSymbol.reset( newSymbol );
-    QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSizeLegendSymbol.data(), mButtonSizeLegendSymbol->iconSize() );
+    QIcon icon = QgsSymbolLayerUtils::symbolPreviewIcon( mSizeLegendSymbol.get(), mButtonSizeLegendSymbol->iconSize() );
     mButtonSizeLegendSymbol->setIcon( icon );
   }
   else

diff --git a/src/app/qgsdiagramproperties.h b/src/app/qgsdiagramproperties.h
@@ -80,7 +80,7 @@ class APP_EXPORT QgsDiagramProperties : public QWidget, private Ui::QgsDiagramPr
 
     // Keeps track of the diagram type to properly save / restore settings when the diagram type combo box is set to no diagram.
     QString mDiagramType;
-    QScopedPointer< QgsMarkerSymbol > mSizeLegendSymbol;
+    std::unique_ptr< QgsMarkerSymbol > mSizeLegendSymbol;
 
     QString guessLegendText( const QString &expression );
     QgsMapCanvas *mMapCanvas;

diff --git a/src/app/qgsfeatureaction.cpp b/src/app/qgsfeatureaction.cpp
@@ -116,7 +116,7 @@ bool QgsFeatureAction::editFeature( bool showModal )
 
   if ( showModal )
   {
-    QScopedPointer<QgsAttributeDialog> dialog( newDialog( false ) );
+    std::unique_ptr<QgsAttributeDialog> dialog( newDialog( false ) );
 
     if ( !mFeature->isValid() )
       dialog->setMode( QgsAttributeForm::AddFeatureMode );

diff --git a/src/app/qgslabelingwidget.cpp b/src/app/qgslabelingwidget.cpp
@@ -46,13 +46,13 @@ QgsLabelingWidget::QgsLabelingWidget( QgsVectorLayer* layer, QgsMapCanvas* canva
 
 void QgsLabelingWidget::resetSettings()
 {
-  if ( mOldSettings.data() )
+  if ( mOldSettings )
   {
     if ( mOldSettings->type() == QLatin1String( "simple" ) )
     {
       mOldPalSettings.writeToLayer( mLayer );
     }
-    mLayer->setLabeling( mOldSettings.take() );
+    mLayer->setLabeling( mOldSettings.release() );
   }
   setLayer( mLayer );
 }

diff --git a/src/app/qgslabelingwidget.h b/src/app/qgslabelingwidget.h