Use auto for const complex vars in for loop

elpaso · elpaso · commit c733b366f139 · 2017-09-09T12:07:05.000+02:00
diff --git a/src/providers/ogr/qgsgeopackagedataitems.cpp b/src/providers/ogr/qgsgeopackagedataitems.cpp
@@ -137,8 +137,8 @@ QgsGeoPackageConnectionItem::QgsGeoPackageConnectionItem( QgsDataItem *parent, Q
 QVector<QgsDataItem *> QgsGeoPackageConnectionItem::createChildren()
 {
   QVector<QgsDataItem *> children;
-  QList<QgsOgrDbLayerInfo *> layers = QgsOgrLayerItem::subLayers( mPath, QStringLiteral( "GPKG" ) );
-  for ( const QgsOgrDbLayerInfo *info : qgsAsConst( layers ) )
+  const auto layers = QgsOgrLayerItem::subLayers( mPath, QStringLiteral( "GPKG" ) );
+  for ( const QgsOgrDbLayerInfo *info : layers )
   {
     if ( info->layerType() == QgsLayerItem::LayerType::Raster )
     {
@@ -197,7 +197,7 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct
   QStringList importResults;
   bool hasError = false;
 
-  const QgsMimeDataUtils::UriList lst = QgsMimeDataUtils::decodeUriList( data );
+  const auto lst = QgsMimeDataUtils::decodeUriList( data );
   for ( const QgsMimeDataUtils::Uri &dropUri : lst )
   {
     // Check that we are not copying over self
@@ -239,8 +239,8 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct
 
         // check if the destination layer already exists
         bool exists = false;
-        const QVector< QgsDataItem *> c( children() );
-        for ( const auto child : c )
+        const auto c( children() );
+        for ( const QgsDataItem *child : c )
         {
           if ( child->name() == dropUri.name )
           {
@@ -495,7 +495,7 @@ void QgsGeoPackageAbstractLayerItem::deleteLayer()
 {
   // Check if the layer is in the registry
   const QgsMapLayer *projectLayer = nullptr;
-  const QMap<QString, QgsMapLayer *> mapLayers( QgsProject::instance()->mapLayers() );
+  const auto mapLayers( QgsProject::instance()->mapLayers() );
   for ( const QgsMapLayer *layer :  mapLayers )
   {
     if ( layer->publicSource() == mUri )

Original file line number	Diff line number	Diff line change
`@@ -137,8 +137,8 @@ QgsGeoPackageConnectionItem::QgsGeoPackageConnectionItem( QgsDataItem *parent, Q`
`137`	`137`	`QVector<QgsDataItem *> QgsGeoPackageConnectionItem::createChildren()`
`138`	`138`	`{`
`139`	`139`	`QVector<QgsDataItem *> children;`
`140`		`- QList<QgsOgrDbLayerInfo *> layers = QgsOgrLayerItem::subLayers( mPath, QStringLiteral( "GPKG" ) );`
`141`		`- for ( const QgsOgrDbLayerInfo *info : qgsAsConst( layers ) )`
	`140`	`+ const auto layers = QgsOgrLayerItem::subLayers( mPath, QStringLiteral( "GPKG" ) );`
	`141`	`+ for ( const QgsOgrDbLayerInfo *info : layers )`
`142`	`142`	`{`
`143`	`143`	`if ( info->layerType() == QgsLayerItem::LayerType::Raster )`
`144`	`144`	`{`
`@@ -197,7 +197,7 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct`
`197`	`197`	`QStringList importResults;`
`198`	`198`	`bool hasError = false;`
`199`	`199`
`200`		`- const QgsMimeDataUtils::UriList lst = QgsMimeDataUtils::decodeUriList( data );`
	`200`	`+ const auto lst = QgsMimeDataUtils::decodeUriList( data );`
`201`	`201`	`for ( const QgsMimeDataUtils::Uri &dropUri : lst )`
`202`	`202`	`{`
`203`	`203`	`// Check that we are not copying over self`
`@@ -239,8 +239,8 @@ bool QgsGeoPackageConnectionItem::handleDrop( const QMimeData *data, Qt::DropAct`
`239`	`239`
`240`	`240`	`// check if the destination layer already exists`
`241`	`241`	`bool exists = false;`
`242`		`- const QVector< QgsDataItem *> c( children() );`
`243`		`- for ( const auto child : c )`
	`242`	`+ const auto c( children() );`
	`243`	`+ for ( const QgsDataItem *child : c )`
`244`	`244`	`{`
`245`	`245`	`if ( child->name() == dropUri.name )`
`246`	`246`	`{`
`@@ -495,7 +495,7 @@ void QgsGeoPackageAbstractLayerItem::deleteLayer()`
`495`	`495`	`{`
`496`	`496`	`// Check if the layer is in the registry`
`497`	`497`	`const QgsMapLayer *projectLayer = nullptr;`
`498`		`- const QMap<QString, QgsMapLayer *> mapLayers( QgsProject::instance()->mapLayers() );`
	`498`	`+ const auto mapLayers( QgsProject::instance()->mapLayers() );`
`499`	`499`	`for ( const QgsMapLayer *layer : mapLayers )`
`500`	`500`	`{`
`501`	`501`	`if ( layer->publicSource() == mUri )`