Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some maybe-dangling ref warnings
  • Loading branch information
nyalldawson committed Apr 9, 2023
1 parent e456d5a commit fc0f53b
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 5 deletions.
6 changes: 4 additions & 2 deletions src/gui/qgslayermetadataresultsmodel.cpp
Expand Up @@ -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() );
Expand All @@ -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() );
Expand Down
3 changes: 2 additions & 1 deletion src/gui/raster/qgsrasterattributetablemodel.cpp
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wms/qgswmscapabilities.cpp
Expand Up @@ -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() )
Expand Down
2 changes: 1 addition & 1 deletion src/providers/wms/qgswmsprovider.cpp
Expand Up @@ -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" ) %
Expand Down

0 comments on commit fc0f53b

Please sign in to comment.