Skip to content

Commit 25c4a83

Browse files
authored
Merge pull request qgis#59515 from nyalldawson/cov_errors
Fix a bunch of coverity scan errors
2 parents c4c8f38 + 60780fc commit 25c4a83

15 files changed

+42
-42
lines changed

src/3d/qgs3daxis.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -477,7 +477,7 @@ void Qgs3DAxis::createAxisScene()
477477
if ( axisDirections.length() > 0 )
478478
mTextX->setText( QgsCoordinateReferenceSystemUtils::axisDirectionToAbbreviatedString( axisDirections.at( 0 ) ) );
479479
else
480-
mTextY->setText( "X?" );
480+
mTextX->setText( "X?" );
481481

482482
if ( axisDirections.length() > 1 )
483483
mTextY->setText( QgsCoordinateReferenceSystemUtils::axisDirectionToAbbreviatedString( axisDirections.at( 1 ) ) );

src/analysis/processing/qgsalgorithmgltftovector.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ QVariantMap QgsGltfToVectorFeaturesAlgorithm::processAlgorithm( const QVariantMa
384384
{
385385
QgsFeature f;
386386
f.setGeometry( std::move( geometry ) );
387-
polygonSink->addFeature( f, QgsFeatureSink::FastInsert );
387+
lineSink->addFeature( f, QgsFeatureSink::FastInsert );
388388
}
389389
}
390390
break;

src/core/geometry/qgsinternalgeometryengine.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ QgsLineString *doDensify( const QgsLineString *ring, int extraNodesPerSegment =
732732
if ( extraNodesPerSegment < 0 )
733733
{
734734
// distance mode
735-
extraNodesThisSegment = std::floor( QgsGeometryUtilsBase::distance2D( x2, y2, x1, y1 ) / distance );
735+
extraNodesThisSegment = std::floor( QgsGeometryUtilsBase::distance2D( x1, y1, x2, y2 ) / distance );
736736
if ( extraNodesThisSegment >= 1 )
737737
multiplier = 1.0 / ( extraNodesThisSegment + 1 );
738738
}

src/core/qgscoordinateutils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,7 @@ double QgsCoordinateUtils::dmsToDecimal( const QString &string, bool *ok, bool *
309309
value = !sign1.isEmpty() && negative.contains( sign1 ) ? -v : v;
310310
if ( isEasting )
311311
{
312-
*isEasting = easting.contains( sign2 );
312+
*isEasting = easting.contains( sign1 );
313313
}
314314
}
315315
else

src/core/qgspathresolver.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ QString QgsPathResolver::setPathWriter( const std::function<QString( const QStri
223223

224224
bool QgsPathResolver::removePathWriter( const QString &id )
225225
{
226-
const size_t prevCount = sCustomWriters->size();
227-
sCustomWriters()->erase( std::remove_if( sCustomWriters->begin(), sCustomWriters->end(), [id]( std::pair< QString, std::function< QString( const QString & ) > > &a )
226+
const size_t prevCount = sCustomWriters()->size();
227+
sCustomWriters()->erase( std::remove_if( sCustomWriters()->begin(), sCustomWriters()->end(), [id]( std::pair< QString, std::function< QString( const QString & ) > > &a )
228228
{
229229
return a.first == id;
230-
} ), sCustomWriters->end() );
231-
return prevCount != sCustomWriters->size();
230+
} ), sCustomWriters()->end() );
231+
return prevCount != sCustomWriters()->size();
232232
}
233233

234234
QString QgsPathResolver::writePath( const QString &s ) const

src/core/qgsvectorfilewriter.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -3776,7 +3776,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( Qgs
37763776
if ( err != NoError )
37773777
return err;
37783778

3779-
return writeAsVectorFormatV2( details, fileName, transformContext, options, errorMessage, newFilename, newLayer );
3779+
return writeAsVectorFormatV2( details, fileName, transformContext, options, newFilename, newLayer, errorMessage );
37803780
}
37813781

37823782
QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV3( QgsVectorLayer *layer, const QString &fileName, const QgsCoordinateTransformContext &transformContext, const QgsVectorFileWriter::SaveVectorOptions &options, QString *errorMessage, QString *newFilename, QString *newLayer )

src/core/raster/qgsrasterattributetable.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ bool QgsRasterAttributeTable::insertField( int position, const Field &field, QSt
326326
{
327327
mType = Qgis::RasterAttributeTableType::Thematic;
328328
}
329-
else if ( field.usage == Qgis::RasterAttributeTableFieldUsage::Max || field.usage == Qgis::RasterAttributeTableFieldUsage::Max )
329+
else if ( field.usage == Qgis::RasterAttributeTableFieldUsage::Min || field.usage == Qgis::RasterAttributeTableFieldUsage::Max )
330330
{
331331
mType = Qgis::RasterAttributeTableType::Athematic;
332332
}

src/core/symbology/qgsfillsymbollayer.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -2707,7 +2707,6 @@ QImage QgsLinePatternFillSymbolLayer::toTiledPatternImage() const
27072707
layerClone->drawPreviewIcon( symbolContext, pixmap.size() );
27082708
painter.end();
27092709
return pixmap.toImage();
2710-
return QImage();
27112710
}
27122711

27132712
double QgsLinePatternFillSymbolLayer::estimateMaxBleed( const QgsRenderContext & ) const

src/core/textrenderer/qgstextbackgroundsettings.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ QgsTextBackgroundSettings::~QgsTextBackgroundSettings() //NOLINT
6262

6363
bool QgsTextBackgroundSettings::operator==( const QgsTextBackgroundSettings &other ) const
6464
{
65-
if ( !d->enabled == other.enabled()
65+
if ( d->enabled != other.enabled()
6666
|| d->type != other.type()
6767
|| d->svgFile != other.svgFile()
6868
|| d->sizeType != other.sizeType()

src/core/tiledscene/qgsquantizedmeshdataprovider.cpp

+25-24
Original file line numberDiff line numberDiff line change
@@ -90,15 +90,15 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
9090
QgsBlockingNetworkRequest request;
9191
if ( !mAuthCfg.isEmpty() )
9292
request.setAuthCfg( mAuthCfg );
93-
auto respCode = request.get( requestData );
93+
const QgsBlockingNetworkRequest::ErrorCode respCode = request.get( requestData );
9494
if ( respCode != QgsBlockingNetworkRequest::ErrorCode::NoError )
9595
{
9696
error.append(
9797
QObject::tr( "Failed to retrieve quantized mesh tiles metadata: %1" )
9898
.arg( request.errorMessage().data() ) );
9999
return;
100100
}
101-
auto reply = request.reply().content();
101+
const QByteArray reply = request.reply().content();
102102

103103
try
104104
{
@@ -112,7 +112,7 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
112112
return;
113113
}
114114

115-
auto crsString = QString::fromStdString( jsonGet<std::string>( replyJson, "projection" ) );
115+
const QString crsString = QString::fromStdString( jsonGet<std::string>( replyJson, "projection" ) );
116116
mCrs = QgsCoordinateReferenceSystem( crsString );
117117
if ( !mCrs.isValid() )
118118
{
@@ -135,12 +135,11 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
135135
mExtent = mCrs.bounds();
136136
}
137137

138-
auto zRange = dummyZRange;
139138
mBoundingVolume =
140139
QgsOrientedBox3D::fromBox3D(
141140
QgsBox3D(
142-
mExtent.xMinimum(), mExtent.yMinimum(), zRange.lower(),
143-
mExtent.xMaximum(), mExtent.yMaximum(), zRange.upper() ) );
141+
mExtent.xMinimum(), mExtent.yMinimum(), dummyZRange.lower(),
142+
mExtent.xMaximum(), mExtent.yMaximum(), dummyZRange.upper() ) );
144143

145144
// The TileJSON spec uses "scheme", but some real-world datasets use "schema"
146145
if ( replyJson.find( "scheme" ) != replyJson.end() )
@@ -190,7 +189,7 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
190189

191190
QgsCoordinateReferenceSystem wgs84( QStringLiteral( "EPSG:4326" ) );
192191
// Bounds of tile schema in projected coordinates
193-
auto crsBounds =
192+
const QgsRectangle crsBounds =
194193
QgsCoordinateTransform( wgs84, mCrs, transformContext )
195194
.transform( mCrs.bounds() );
196195
QgsPointXY topLeft( crsBounds.xMinimum(), crsBounds.yMaximum() );
@@ -228,7 +227,7 @@ bool QgsQuantizedMeshMetadata::containsTile( QgsTileXYZ tile ) const
228227
// be given in TMS-style
229228
if ( mTileScheme == QLatin1String( "tms" ) )
230229
tile = tileToTms( tile );
231-
for ( auto &range : mAvailableTiles[tile.zoomLevel()] )
230+
for ( const QgsTileRange &range : mAvailableTiles[tile.zoomLevel()] )
232231
{
233232
if ( range.startColumn() <= tile.column() && range.endColumn() >= tile.column() &&
234233
range.startRow() <= tile.row() && range.endRow() >= tile.row() )
@@ -273,8 +272,8 @@ QgsTileXYZ QgsQuantizedMeshIndex::decodeTileId( long long id )
273272
QgsTiledSceneTile QgsQuantizedMeshIndex::rootTile() const
274273
{
275274
// Returns virtual tile to paper over tiling schemes which have >1 tile at zoom 0
276-
auto tile = QgsTiledSceneTile( ROOT_TILE_ID );
277-
auto bounds = mWgs84ToCrs.transform( mMetadata.mCrs.bounds() );
275+
QgsTiledSceneTile tile = QgsTiledSceneTile( ROOT_TILE_ID );
276+
const QgsRectangle bounds = mWgs84ToCrs.transform( mMetadata.mCrs.bounds() );
278277
tile.setBoundingVolume(
279278
QgsOrientedBox3D::fromBox3D(
280279
QgsBox3D( bounds, mMetadata.dummyZRange.lower(), mMetadata.dummyZRange.upper() ) ) );
@@ -285,16 +284,18 @@ long long QgsQuantizedMeshIndex::parentTileId( long long id ) const
285284
{
286285
if ( id == ROOT_TILE_ID )
287286
return -1;
288-
auto tile = decodeTileId( id );
287+
const QgsTileXYZ tile = decodeTileId( id );
289288
if ( tile.zoomLevel() == 0 )
290289
return ROOT_TILE_ID;
291290
return encodeTileId( {tile.zoomLevel() - 1, tile.column() / 2, tile.row() / 2} );
292291
}
293292
QVector<long long> QgsQuantizedMeshIndex::childTileIds( long long id ) const
294293
{
295-
auto tile = decodeTileId( id );
294+
const QgsTileXYZ tile = decodeTileId( id );
296295
QVector<long long> children;
297-
auto x = tile.column(), y = tile.row(), zoom = tile.zoomLevel();
296+
const int x = tile.column();
297+
const int y = tile.row();
298+
const int zoom = tile.zoomLevel();
298299

299300
if ( mMetadata.containsTile( {x * 2, y * 2, zoom + 1} ) )
300301
children.push_back( encodeTileId( {x * 2, y * 2, zoom + 1} ) );
@@ -309,11 +310,11 @@ QVector<long long> QgsQuantizedMeshIndex::childTileIds( long long id ) const
309310
}
310311
QgsTiledSceneTile QgsQuantizedMeshIndex::getTile( long long id )
311312
{
312-
auto xyzTile = decodeTileId( id );
313+
QgsTileXYZ xyzTile = decodeTileId( id );
313314
QgsTiledSceneTile sceneTile( id );
314315

315-
auto zoomedMatrix = QgsTileMatrix::fromTileMatrix( xyzTile.zoomLevel(), mMetadata.mTileMatrix );
316-
auto tileExtent = zoomedMatrix.tileExtent( xyzTile );
316+
const QgsTileMatrix zoomedMatrix = QgsTileMatrix::fromTileMatrix( xyzTile.zoomLevel(), mMetadata.mTileMatrix );
317+
const QgsRectangle tileExtent = zoomedMatrix.tileExtent( xyzTile );
317318

318319
sceneTile.setBoundingVolume(
319320
QgsOrientedBox3D::fromBox3D(
@@ -334,8 +335,8 @@ QgsTiledSceneTile QgsQuantizedMeshIndex::getTile( long long id )
334335
else
335336
{
336337
// TODO: Intelligently choose from alternatives. Round robin?
337-
auto tileUri = QgsVectorTileUtils::formatXYZUrlTemplate(
338-
mMetadata.mTileUrls[0], xyzTile, zoomedMatrix );
338+
const QString tileUri = QgsVectorTileUtils::formatXYZUrlTemplate(
339+
mMetadata.mTileUrls[0], xyzTile, zoomedMatrix );
339340
sceneTile.setResources( {{"content", tileUri}} );
340341
sceneTile.setMetadata(
341342
{
@@ -365,25 +366,25 @@ QgsQuantizedMeshIndex::getTiles( const QgsTiledSceneRequest &request )
365366
mMetadata.geometricErrorAtZoom( zoomLevel ) > request.requiredGeometricError() )
366367
zoomLevel++;
367368
}
368-
auto tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mMetadata.mTileMatrix );
369+
const QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mMetadata.mTileMatrix );
369370

370371
QVector<long long> ids;
371372
// We can only filter on X and Y
372-
auto extent = request.filterBox().extent().toRectangle();
373+
const QgsRectangle extent = request.filterBox().extent().toRectangle();
373374
if ( request.parentTileId() != -1 )
374375
{
375-
auto parentTile = decodeTileId( request.parentTileId() );
376+
const QgsTileXYZ parentTile = decodeTileId( request.parentTileId() );
376377
extent.intersect( tileMatrix.tileExtent( parentTile ) );
377378
}
378379

379-
auto tileRange = tileMatrix.tileRangeFromExtent( extent );
380+
const QgsTileRange tileRange = tileMatrix.tileRangeFromExtent( extent );
380381
if ( !tileRange.isValid() )
381382
return {};
382383

383384
for ( int col = tileRange.startColumn(); col <= tileRange.endColumn(); col++ )
384385
for ( int row = tileRange.startRow(); row <= tileRange.endRow(); row++ )
385386
{
386-
auto xyzTile = QgsTileXYZ( col, row, zoomLevel );
387+
const QgsTileXYZ xyzTile = QgsTileXYZ( col, row, zoomLevel );
387388
if ( mMetadata.containsTile( xyzTile ) )
388389
ids.push_back( encodeTileId( xyzTile ) );
389390
}
@@ -393,7 +394,7 @@ QgsQuantizedMeshIndex::getTiles( const QgsTiledSceneRequest &request )
393394
Qgis::TileChildrenAvailability
394395
QgsQuantizedMeshIndex::childAvailability( long long id ) const
395396
{
396-
auto childIds = childTileIds( id );
397+
const QVector<long long> childIds = childTileIds( id );
397398
if ( childIds.count() == 0 )
398399
return Qgis::TileChildrenAvailability::NoChildren;
399400
return Qgis::TileChildrenAvailability::Available;

src/gui/editorwidgets/qgsrelationreferencewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ void QgsRelationReferenceWidget::filterChanged()
807807
QgsAttributeList subset = attrs;
808808

809809
QString expression = filterExpression;
810-
if ( ! filterExpression.isEmpty() && ! filtersAttrs.isEmpty() )
810+
if ( ! expression.isEmpty() && ! filtersAttrs.isEmpty() )
811811
expression += QLatin1String( " AND " );
812812

813813
expression += filtersAttrs.isEmpty() ? QString() : QStringLiteral( " ( " );

src/gui/layout/qgslayoutelevationprofilewidget.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -714,7 +714,7 @@ void QgsLayoutElevationProfileWidget::setGuiElementValues()
714714
mDistanceAxisMinorLinesSymbolButton->setSymbol( mProfile->plot()->xAxis().gridMinorSymbol()->clone() );
715715
if ( mProfile->plot()->yAxis().gridMajorSymbol() )
716716
mElevationAxisMajorLinesSymbolButton->setSymbol( mProfile->plot()->yAxis().gridMajorSymbol()->clone() );
717-
if ( mProfile->plot()->yAxis().gridMajorSymbol() )
717+
if ( mProfile->plot()->yAxis().gridMinorSymbol() )
718718
mElevationAxisMinorLinesSymbolButton->setSymbol( mProfile->plot()->yAxis().gridMinorSymbol()->clone() );
719719

720720
mDistanceAxisLabelFontButton->setTextFormat( mProfile->plot()->xAxis().textFormat() );

src/gui/maptools/qgsmaptoolcapture.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -344,8 +344,8 @@ bool QgsMapToolCapture::tracingAddVertex( const QgsPointXY &point )
344344
{
345345
const QgsGeometry linear = QgsGeometry( mCaptureCurve.segmentize() );
346346
const QgsGeometry curved = linear.convertToCurves(
347-
QgsSettingsRegistryCore::settingsDigitizingConvertToCurveAngleTolerance->value(),
348-
QgsSettingsRegistryCore::settingsDigitizingConvertToCurveDistanceTolerance->value()
347+
QgsSettingsRegistryCore::settingsDigitizingConvertToCurveDistanceTolerance->value(),
348+
QgsSettingsRegistryCore::settingsDigitizingConvertToCurveAngleTolerance->value()
349349
);
350350
if ( QgsWkbTypes::flatType( curved.wkbType() ) != Qgis::WkbType::CompoundCurve )
351351
{

src/gui/qgslayermetadataresultsmodel.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ void QgsLayerMetadataResultsModel::reloadAsync()
186186

187187
void QgsLayerMetadataResultsModel::resultsReady( const QgsLayerMetadataSearchResults &results )
188188
{
189-
mFeedback->setProgress( mFeedback->progress() + 100 / QgsApplication::instance()->layerMetadataProviderRegistry()->layerMetadataProviders().count() );
189+
mFeedback->setProgress( mFeedback->progress() + static_cast< double >( 100 ) / QgsApplication::instance()->layerMetadataProviderRegistry()->layerMetadataProviders().count() );
190190
beginInsertRows( QModelIndex(), mResult.metadata().count(), mResult.metadata().count() + results.metadata().count() - 1 );
191191
const QList<QgsLayerMetadataProviderResult> metadata { results.metadata() };
192192
for ( const QgsLayerMetadataProviderResult &result : std::as_const( metadata ) )

src/gui/qgsnewvectortabledialog.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ QgsNewVectorTableDialog::QgsNewVectorTableDialog( QgsAbstractDatabaseProviderCon
191191
mHasZChk->setEnabled( false );
192192
mHasZChk->setChecked( false );
193193
}
194-
if ( ! hasM && ! hasM )
194+
if ( ! hasM && ! hasZ )
195195
{
196196
mHasZChk->setVisible( false );
197197
mHasMChk->setVisible( false );

0 commit comments

Comments
 (0)