Fix some maybe-dangling ref warnings

nyalldawson · nyalldawson · commit fc0f53b258ea · 2023-04-09T14:38:28.000+10:00
diff --git a/src/gui/qgslayermetadataresultsmodel.cpp b/src/gui/qgslayermetadataresultsmodel.cpp
@@ -70,7 +70,8 @@ QVariant QgsLayerMetadataResultsModel::data( const QModelIndex &index, int role
           }
           case Sections::GeometryType:
           {
-            const QgsLayerMetadataProviderResult &md { mResult.metadata().at( index.row() ) };
+            const QList<QgsLayerMetadataProviderResult> metadata = mResult.metadata();
+            const QgsLayerMetadataProviderResult &md { metadata.at( index.row() ) };
             if ( md.layerType() == Qgis::LayerType::Raster )
               return tr( "Raster" );
             return md.geometryType() == Qgis::GeometryType::Unknown ? QgsWkbTypes::geometryDisplayString( Qgis::GeometryType::Null ) : QgsWkbTypes::geometryDisplayString( md.geometryType() );
@@ -92,7 +93,8 @@ QVariant QgsLayerMetadataResultsModel::data( const QModelIndex &index, int role
       {
         if ( index.column() == 0 )
         {
-          const QgsLayerMetadataProviderResult &md { mResult.metadata().at( index.row() ) };
+          const QList<QgsLayerMetadataProviderResult> metadata = mResult.metadata();
+          const QgsLayerMetadataProviderResult &md { metadata.at( index.row() ) };
           if ( md.layerType() == Qgis::LayerType::Raster )
             return QgsApplication::getThemeIcon( QStringLiteral( "mIconRaster.svg" ) );
           return QgsIconUtils::iconForGeometryType( md.geometryType() == Qgis::GeometryType::Unknown ? Qgis::GeometryType::Null : md.geometryType() );
diff --git a/src/gui/raster/qgsrasterattributetablemodel.cpp b/src/gui/raster/qgsrasterattributetablemodel.cpp
@@ -509,7 +509,8 @@ Qt::ItemFlags QgsRasterAttributeTableModel::flags( const QModelIndex &index ) co
       {
         if ( index.column() < mRat->fields().count( ) )
         {
-          const QgsRasterAttributeTable::Field &field { mRat->fields().at( index.column() ) };
+          const QList<QgsRasterAttributeTable::Field> fields = mRat->fields();
+          const QgsRasterAttributeTable::Field &field { fields.at( index.column() ) };
           if ( ! field.isColor() && ! field.isRamp() )
           {
             flags |= Qt::ItemIsEditable;
diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp
@@ -2394,7 +2394,7 @@ bool QgsWmsCapabilities::detectTileLayerBoundingBox( QgsWmtsTileLayer &tileLayer
     return false;
 
   // take first supported tile matrix set
-  const QgsWmtsTileMatrixSetLink &setLink = tileLayer.setLinks.constBegin().value();
+  const QgsWmtsTileMatrixSetLink &setLink = *tileLayer.setLinks.constBegin();
 
   QHash<QString, QgsWmtsTileMatrixSet>::const_iterator tmsIt = mTileMatrixSets.constFind( setLink.tileMatrixSet );
   if ( tmsIt == mTileMatrixSets.constEnd() )
diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp
@@ -3075,7 +3075,7 @@ QString QgsWmsProvider::htmlMetadata()
       metadata += QLatin1String( "</table></td></tr>" );  // End nested table 3
     }
 
-    const QgsWmsStatistics::Stat &stat = QgsWmsStatistics::statForUri( dataSourceUri() );
+    const QgsWmsStatistics::Stat stat = QgsWmsStatistics::statForUri( dataSourceUri() );
 
     metadata += QStringLiteral( "<tr><th class=\"strong\" id=\"cachestats\">" ) %
                 tr( "Cache stats" ) %

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,8 @@ QVariant QgsLayerMetadataResultsModel::data( const QModelIndex &index, int role`
`70`	`70`	`}`
`71`	`71`	`case Sections::GeometryType:`
`72`	`72`	`{`
`73`		`- const QgsLayerMetadataProviderResult &md { mResult.metadata().at( index.row() ) };`
	`73`	`+ const QList<QgsLayerMetadataProviderResult> metadata = mResult.metadata();`
	`74`	`+ const QgsLayerMetadataProviderResult &md { metadata.at( index.row() ) };`
`74`	`75`	`if ( md.layerType() == Qgis::LayerType::Raster )`
`75`	`76`	`return tr( "Raster" );`
`76`	`77`	`return md.geometryType() == Qgis::GeometryType::Unknown ? QgsWkbTypes::geometryDisplayString( Qgis::GeometryType::Null ) : QgsWkbTypes::geometryDisplayString( md.geometryType() );`
`@@ -92,7 +93,8 @@ QVariant QgsLayerMetadataResultsModel::data( const QModelIndex &index, int role`
`92`	`93`	`{`
`93`	`94`	`if ( index.column() == 0 )`
`94`	`95`	`{`
`95`		`- const QgsLayerMetadataProviderResult &md { mResult.metadata().at( index.row() ) };`
	`96`	`+ const QList<QgsLayerMetadataProviderResult> metadata = mResult.metadata();`
	`97`	`+ const QgsLayerMetadataProviderResult &md { metadata.at( index.row() ) };`
`96`	`98`	`if ( md.layerType() == Qgis::LayerType::Raster )`
`97`	`99`	`return QgsApplication::getThemeIcon( QStringLiteral( "mIconRaster.svg" ) );`
`98`	`100`	`return QgsIconUtils::iconForGeometryType( md.geometryType() == Qgis::GeometryType::Unknown ? Qgis::GeometryType::Null : md.geometryType() );`
Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,8 @@ Qt::ItemFlags QgsRasterAttributeTableModel::flags( const QModelIndex &index ) co`
`509`	`509`	`{`
`510`	`510`	`if ( index.column() < mRat->fields().count( ) )`
`511`	`511`	`{`
`512`		`- const QgsRasterAttributeTable::Field &field { mRat->fields().at( index.column() ) };`
	`512`	`+ const QList<QgsRasterAttributeTable::Field> fields = mRat->fields();`
	`513`	`+ const QgsRasterAttributeTable::Field &field { fields.at( index.column() ) };`
`513`	`514`	`if ( ! field.isColor() && ! field.isRamp() )`
`514`	`515`	`{`
`515`	`516`	`flags \|= Qt::ItemIsEditable;`
Original file line number	Diff line number	Diff line change
`@@ -3075,7 +3075,7 @@ QString QgsWmsProvider::htmlMetadata()`
`3075`	`3075`	`metadata += QLatin1String( "</table></td></tr>" ); // End nested table 3`
`3076`	`3076`	`}`
`3077`	`3077`
`3078`		`- const QgsWmsStatistics::Stat &stat = QgsWmsStatistics::statForUri( dataSourceUri() );`
	`3078`	`+ const QgsWmsStatistics::Stat stat = QgsWmsStatistics::statForUri( dataSourceUri() );`
`3079`	`3079`
`3080`	`3080`	`metadata += QStringLiteral( "<tr><th class=\"strong\" id=\"cachestats\">" ) %`
`3081`	`3081`	`tr( "Cache stats" ) %`