Merge pull request qgis#59515 from nyalldawson/cov_errors

Fix a bunch of coverity scan errors

Author: troopa81

src/3d/qgs3daxis.cpp

@@ -477,7 +477,7 @@ void Qgs3DAxis::createAxisScene()
       if ( axisDirections.length() > 0 )
         mTextX->setText( QgsCoordinateReferenceSystemUtils::axisDirectionToAbbreviatedString( axisDirections.at( 0 ) ) );
       else
-        mTextY->setText( "X?" );
+        mTextX->setText( "X?" );
 
       if ( axisDirections.length() > 1 )
         mTextY->setText( QgsCoordinateReferenceSystemUtils::axisDirectionToAbbreviatedString( axisDirections.at( 1 ) ) );

src/analysis/processing/qgsalgorithmgltftovector.cpp

@@ -384,7 +384,7 @@ QVariantMap QgsGltfToVectorFeaturesAlgorithm::processAlgorithm( const QVariantMa
               {
                 QgsFeature f;
                 f.setGeometry( std::move( geometry ) );
-                polygonSink->addFeature( f, QgsFeatureSink::FastInsert );
+                lineSink->addFeature( f, QgsFeatureSink::FastInsert );
               }
             }
             break;

src/core/geometry/qgsinternalgeometryengine.cpp

@@ -732,7 +732,7 @@ QgsLineString *doDensify( const QgsLineString *ring, int extraNodesPerSegment =
     if ( extraNodesPerSegment < 0 )
     {
       // distance mode
-      extraNodesThisSegment = std::floor( QgsGeometryUtilsBase::distance2D( x2, y2, x1, y1 ) / distance );
+      extraNodesThisSegment = std::floor( QgsGeometryUtilsBase::distance2D( x1, y1, x2, y2 ) / distance );
       if ( extraNodesThisSegment >= 1 )
         multiplier = 1.0 / ( extraNodesThisSegment + 1 );
     }

src/core/qgscoordinateutils.cpp

@@ -309,7 +309,7 @@ double QgsCoordinateUtils::dmsToDecimal( const QString &string, bool *ok, bool *
       value = !sign1.isEmpty() && negative.contains( sign1 ) ? -v : v;
       if ( isEasting )
       {
-        *isEasting = easting.contains( sign2 );
+        *isEasting = easting.contains( sign1 );
       }
     }
     else

src/core/qgspathresolver.cpp

@@ -223,12 +223,12 @@ QString QgsPathResolver::setPathWriter( const std::function<QString( const QStri
 
 bool QgsPathResolver::removePathWriter( const QString &id )
 {
-  const size_t prevCount = sCustomWriters->size();
-  sCustomWriters()->erase( std::remove_if( sCustomWriters->begin(), sCustomWriters->end(), [id]( std::pair< QString, std::function< QString( const QString & ) > > &a )
+  const size_t prevCount = sCustomWriters()->size();
+  sCustomWriters()->erase( std::remove_if( sCustomWriters()->begin(), sCustomWriters()->end(), [id]( std::pair< QString, std::function< QString( const QString & ) > > &a )
   {
     return a.first == id;
-  } ), sCustomWriters->end() );
-  return prevCount != sCustomWriters->size();
+  } ), sCustomWriters()->end() );
+  return prevCount != sCustomWriters()->size();
 }
 
 QString QgsPathResolver::writePath( const QString &s ) const

src/core/qgsvectorfilewriter.cpp

@@ -3776,7 +3776,7 @@ QgsVectorFileWriter::WriterError QgsVectorFileWriter::writeAsVectorFormatV2( Qgs
   if ( err != NoError )
     return err;
 
-  return writeAsVectorFormatV2( details, fileName, transformContext, options, errorMessage, newFilename, newLayer );
+  return writeAsVectorFormatV2( details, fileName, transformContext, options, newFilename, newLayer, errorMessage );
 }
 
 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

@@ -326,7 +326,7 @@ bool QgsRasterAttributeTable::insertField( int position, const Field &field, QSt
   {
     mType = Qgis::RasterAttributeTableType::Thematic;
   }
-  else if ( field.usage == Qgis::RasterAttributeTableFieldUsage::Max || field.usage == Qgis::RasterAttributeTableFieldUsage::Max )
+  else if ( field.usage == Qgis::RasterAttributeTableFieldUsage::Min || field.usage == Qgis::RasterAttributeTableFieldUsage::Max )
   {
     mType = Qgis::RasterAttributeTableType::Athematic;
   }

src/core/symbology/qgsfillsymbollayer.cpp

@@ -2707,7 +2707,6 @@ QImage QgsLinePatternFillSymbolLayer::toTiledPatternImage() const
   layerClone->drawPreviewIcon( symbolContext, pixmap.size() );
   painter.end();
   return pixmap.toImage();
-  return QImage();
 }
 
 double QgsLinePatternFillSymbolLayer::estimateMaxBleed( const QgsRenderContext & ) const

src/core/textrenderer/qgstextbackgroundsettings.cpp

@@ -62,7 +62,7 @@ QgsTextBackgroundSettings::~QgsTextBackgroundSettings() //NOLINT
 
 bool QgsTextBackgroundSettings::operator==( const QgsTextBackgroundSettings &other ) const
 {
-  if ( !d->enabled == other.enabled()
+  if ( d->enabled != other.enabled()
        || d->type != other.type()
        || d->svgFile != other.svgFile()
        || d->sizeType != other.sizeType()

src/core/tiledscene/qgsquantizedmeshdataprovider.cpp

@@ -90,15 +90,15 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
   QgsBlockingNetworkRequest request;
   if ( !mAuthCfg.isEmpty() )
     request.setAuthCfg( mAuthCfg );
-  auto respCode = request.get( requestData );
+  const QgsBlockingNetworkRequest::ErrorCode respCode = request.get( requestData );
   if ( respCode != QgsBlockingNetworkRequest::ErrorCode::NoError )
   {
     error.append(
       QObject::tr( "Failed to retrieve quantized mesh tiles metadata: %1" )
       .arg( request.errorMessage().data() ) );
     return;
   }
-  auto reply = request.reply().content();
+  const QByteArray reply = request.reply().content();
 
   try
   {
@@ -112,7 +112,7 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
       return;
     }
 
-    auto crsString = QString::fromStdString( jsonGet<std::string>( replyJson, "projection" ) );
+    const QString crsString = QString::fromStdString( jsonGet<std::string>( replyJson, "projection" ) );
     mCrs = QgsCoordinateReferenceSystem( crsString );
     if ( !mCrs.isValid() )
     {
@@ -135,12 +135,11 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
       mExtent = mCrs.bounds();
     }
 
-    auto zRange = dummyZRange;
     mBoundingVolume =
       QgsOrientedBox3D::fromBox3D(
         QgsBox3D(
-          mExtent.xMinimum(), mExtent.yMinimum(), zRange.lower(),
-          mExtent.xMaximum(), mExtent.yMaximum(), zRange.upper() ) );
+          mExtent.xMinimum(), mExtent.yMinimum(), dummyZRange.lower(),
+          mExtent.xMaximum(), mExtent.yMaximum(), dummyZRange.upper() ) );
 
     // The TileJSON spec uses "scheme", but some real-world datasets use "schema"
     if ( replyJson.find( "scheme" ) != replyJson.end() )
@@ -190,7 +189,7 @@ QgsQuantizedMeshMetadata::QgsQuantizedMeshMetadata(
 
     QgsCoordinateReferenceSystem wgs84( QStringLiteral( "EPSG:4326" ) );
     // Bounds of tile schema in projected coordinates
-    auto crsBounds =
+    const QgsRectangle crsBounds =
       QgsCoordinateTransform( wgs84, mCrs, transformContext )
       .transform( mCrs.bounds() );
     QgsPointXY topLeft( crsBounds.xMinimum(), crsBounds.yMaximum() );
@@ -228,7 +227,7 @@ bool QgsQuantizedMeshMetadata::containsTile( QgsTileXYZ tile ) const
   // be given in TMS-style
   if ( mTileScheme == QLatin1String( "tms" ) )
     tile = tileToTms( tile );
-  for ( auto &range : mAvailableTiles[tile.zoomLevel()] )
+  for ( const QgsTileRange &range : mAvailableTiles[tile.zoomLevel()] )
   {
     if ( range.startColumn() <= tile.column() && range.endColumn() >= tile.column() &&
          range.startRow() <= tile.row() && range.endRow() >= tile.row() )
@@ -273,8 +272,8 @@ QgsTileXYZ QgsQuantizedMeshIndex::decodeTileId( long long id )
 QgsTiledSceneTile QgsQuantizedMeshIndex::rootTile() const
 {
   // Returns virtual tile to paper over tiling schemes which have >1 tile at zoom 0
-  auto tile = QgsTiledSceneTile( ROOT_TILE_ID );
-  auto bounds = mWgs84ToCrs.transform( mMetadata.mCrs.bounds() );
+  QgsTiledSceneTile tile = QgsTiledSceneTile( ROOT_TILE_ID );
+  const QgsRectangle bounds = mWgs84ToCrs.transform( mMetadata.mCrs.bounds() );
   tile.setBoundingVolume(
     QgsOrientedBox3D::fromBox3D(
       QgsBox3D( bounds, mMetadata.dummyZRange.lower(), mMetadata.dummyZRange.upper() ) ) );
@@ -285,16 +284,18 @@ long long QgsQuantizedMeshIndex::parentTileId( long long id ) const
 {
   if ( id == ROOT_TILE_ID )
     return -1;
-  auto tile = decodeTileId( id );
+  const QgsTileXYZ tile = decodeTileId( id );
   if ( tile.zoomLevel() == 0 )
     return ROOT_TILE_ID;
   return encodeTileId( {tile.zoomLevel() - 1, tile.column() / 2, tile.row() / 2} );
 }
 QVector<long long> QgsQuantizedMeshIndex::childTileIds( long long id ) const
 {
-  auto tile = decodeTileId( id );
+  const QgsTileXYZ tile = decodeTileId( id );
   QVector<long long> children;
-  auto x = tile.column(), y = tile.row(), zoom = tile.zoomLevel();
+  const int x = tile.column();
+  const int y = tile.row();
+  const int zoom = tile.zoomLevel();
 
   if ( mMetadata.containsTile( {x * 2, y * 2, zoom + 1} ) )
     children.push_back( encodeTileId( {x * 2, y * 2, zoom + 1} ) );
@@ -309,11 +310,11 @@ QVector<long long> QgsQuantizedMeshIndex::childTileIds( long long id ) const
 }
 QgsTiledSceneTile QgsQuantizedMeshIndex::getTile( long long id )
 {
-  auto xyzTile = decodeTileId( id );
+  QgsTileXYZ xyzTile = decodeTileId( id );
   QgsTiledSceneTile sceneTile( id );
 
-  auto zoomedMatrix = QgsTileMatrix::fromTileMatrix( xyzTile.zoomLevel(), mMetadata.mTileMatrix );
-  auto tileExtent = zoomedMatrix.tileExtent( xyzTile );
+  const QgsTileMatrix zoomedMatrix = QgsTileMatrix::fromTileMatrix( xyzTile.zoomLevel(), mMetadata.mTileMatrix );
+  const QgsRectangle tileExtent = zoomedMatrix.tileExtent( xyzTile );
 
   sceneTile.setBoundingVolume(
     QgsOrientedBox3D::fromBox3D(
@@ -334,8 +335,8 @@ QgsTiledSceneTile QgsQuantizedMeshIndex::getTile( long long id )
   else
   {
     // TODO: Intelligently choose from alternatives. Round robin?
-    auto tileUri = QgsVectorTileUtils::formatXYZUrlTemplate(
-                     mMetadata.mTileUrls[0], xyzTile, zoomedMatrix );
+    const QString tileUri = QgsVectorTileUtils::formatXYZUrlTemplate(
+                              mMetadata.mTileUrls[0], xyzTile, zoomedMatrix );
     sceneTile.setResources( {{"content", tileUri}} );
     sceneTile.setMetadata(
     {
@@ -365,25 +366,25 @@ QgsQuantizedMeshIndex::getTiles( const QgsTiledSceneRequest &request )
             mMetadata.geometricErrorAtZoom( zoomLevel ) > request.requiredGeometricError() )
       zoomLevel++;
   }
-  auto tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mMetadata.mTileMatrix );
+  const QgsTileMatrix tileMatrix = QgsTileMatrix::fromTileMatrix( zoomLevel, mMetadata.mTileMatrix );
 
   QVector<long long> ids;
   // We can only filter on X and Y
-  auto extent = request.filterBox().extent().toRectangle();
+  const QgsRectangle extent = request.filterBox().extent().toRectangle();
   if ( request.parentTileId() != -1 )
   {
-    auto parentTile = decodeTileId( request.parentTileId() );
+    const QgsTileXYZ parentTile = decodeTileId( request.parentTileId() );
     extent.intersect( tileMatrix.tileExtent( parentTile ) );
   }
 
-  auto tileRange = tileMatrix.tileRangeFromExtent( extent );
+  const QgsTileRange tileRange = tileMatrix.tileRangeFromExtent( extent );
   if ( !tileRange.isValid() )
     return {};
 
   for ( int col = tileRange.startColumn(); col <= tileRange.endColumn(); col++ )
     for ( int row = tileRange.startRow(); row <= tileRange.endRow(); row++ )
     {
-      auto xyzTile = QgsTileXYZ( col, row, zoomLevel );
+      const QgsTileXYZ xyzTile = QgsTileXYZ( col, row, zoomLevel );
       if ( mMetadata.containsTile( xyzTile ) )
         ids.push_back( encodeTileId( xyzTile ) );
     }
@@ -393,7 +394,7 @@ QgsQuantizedMeshIndex::getTiles( const QgsTiledSceneRequest &request )
 Qgis::TileChildrenAvailability
 QgsQuantizedMeshIndex::childAvailability( long long id ) const
 {
-  auto childIds = childTileIds( id );
+  const QVector<long long> childIds = childTileIds( id );
   if ( childIds.count() == 0 )
     return Qgis::TileChildrenAvailability::NoChildren;
   return Qgis::TileChildrenAvailability::Available;

src/gui/editorwidgets/qgsrelationreferencewidget.cpp

@@ -807,7 +807,7 @@ void QgsRelationReferenceWidget::filterChanged()
           QgsAttributeList subset = attrs;
 
           QString expression = filterExpression;
-          if ( ! filterExpression.isEmpty() && ! filtersAttrs.isEmpty() )
+          if ( ! expression.isEmpty() && ! filtersAttrs.isEmpty() )
             expression += QLatin1String( " AND " );
 
           expression += filtersAttrs.isEmpty() ? QString() : QStringLiteral( " ( " );

src/gui/layout/qgslayoutelevationprofilewidget.cpp

@@ -714,7 +714,7 @@ void QgsLayoutElevationProfileWidget::setGuiElementValues()
     mDistanceAxisMinorLinesSymbolButton->setSymbol( mProfile->plot()->xAxis().gridMinorSymbol()->clone() );
   if ( mProfile->plot()->yAxis().gridMajorSymbol() )
     mElevationAxisMajorLinesSymbolButton->setSymbol( mProfile->plot()->yAxis().gridMajorSymbol()->clone() );
-  if ( mProfile->plot()->yAxis().gridMajorSymbol() )
+  if ( mProfile->plot()->yAxis().gridMinorSymbol() )
     mElevationAxisMinorLinesSymbolButton->setSymbol( mProfile->plot()->yAxis().gridMinorSymbol()->clone() );
 
   mDistanceAxisLabelFontButton->setTextFormat( mProfile->plot()->xAxis().textFormat() );

src/gui/maptools/qgsmaptoolcapture.cpp

@@ -344,8 +344,8 @@ bool QgsMapToolCapture::tracingAddVertex( const QgsPointXY &point )
     {
       const QgsGeometry linear = QgsGeometry( mCaptureCurve.segmentize() );
       const QgsGeometry curved = linear.convertToCurves(
-                                   QgsSettingsRegistryCore::settingsDigitizingConvertToCurveAngleTolerance->value(),
-                                   QgsSettingsRegistryCore::settingsDigitizingConvertToCurveDistanceTolerance->value()
+                                   QgsSettingsRegistryCore::settingsDigitizingConvertToCurveDistanceTolerance->value(),
+                                   QgsSettingsRegistryCore::settingsDigitizingConvertToCurveAngleTolerance->value()
                                  );
       if ( QgsWkbTypes::flatType( curved.wkbType() ) != Qgis::WkbType::CompoundCurve )
       {

src/gui/qgslayermetadataresultsmodel.cpp

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

src/gui/qgsnewvectortabledialog.cpp

@@ -191,7 +191,7 @@ QgsNewVectorTableDialog::QgsNewVectorTableDialog( QgsAbstractDatabaseProviderCon
     mHasZChk->setEnabled( false );
     mHasZChk->setChecked( false );
   }
-  if ( ! hasM && ! hasM )
+  if ( ! hasM && ! hasZ )
   {
     mHasZChk->setVisible( false );
     mHasMChk->setVisible( false );