diff --git a/src/3d/qgs3daxis.cpp b/src/3d/qgs3daxis.cpp index cb4fd94103623..b6c8e02f1ad7c 100644 --- a/src/3d/qgs3daxis.cpp +++ b/src/3d/qgs3daxis.cpp @@ -517,7 +517,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 ) ) ); diff --git a/src/analysis/processing/qgsalgorithmgltftovector.cpp b/src/analysis/processing/qgsalgorithmgltftovector.cpp index f78129ff7e665..5b7cadec655ae 100644 --- a/src/analysis/processing/qgsalgorithmgltftovector.cpp +++ b/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; diff --git a/src/core/qgscoordinateutils.cpp b/src/core/qgscoordinateutils.cpp index 2ada73a9d5756..46de0153180d1 100644 --- a/src/core/qgscoordinateutils.cpp +++ b/src/core/qgscoordinateutils.cpp @@ -308,7 +308,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 diff --git a/src/core/qgspathresolver.cpp b/src/core/qgspathresolver.cpp index 0d3cdeebe18c9..b624e29905f3c 100644 --- a/src/core/qgspathresolver.cpp +++ b/src/core/qgspathresolver.cpp @@ -228,12 +228,12 @@ QString QgsPathResolver::setPathWriter( const std::functionsize(); - 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 diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index c29f5744632c7..9c5d042cbfcbb 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -3765,7 +3765,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 ) diff --git a/src/core/raster/qgsrasterattributetable.cpp b/src/core/raster/qgsrasterattributetable.cpp index ee45be5366280..b45625029c5b5 100644 --- a/src/core/raster/qgsrasterattributetable.cpp +++ b/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; } diff --git a/src/core/symbology/qgsfillsymbollayer.cpp b/src/core/symbology/qgsfillsymbollayer.cpp index bed5b6cd9ef5a..4a4c2dda04f9f 100644 --- a/src/core/symbology/qgsfillsymbollayer.cpp +++ b/src/core/symbology/qgsfillsymbollayer.cpp @@ -2704,7 +2704,6 @@ QImage QgsLinePatternFillSymbolLayer::toTiledPatternImage() const layerClone->drawPreviewIcon( symbolContext, pixmap.size() ); painter.end(); return pixmap.toImage(); - return QImage(); } double QgsLinePatternFillSymbolLayer::estimateMaxBleed( const QgsRenderContext & ) const diff --git a/src/core/textrenderer/qgstextbackgroundsettings.cpp b/src/core/textrenderer/qgstextbackgroundsettings.cpp index a98b2c84d81d6..e5b76a6cfe2c7 100644 --- a/src/core/textrenderer/qgstextbackgroundsettings.cpp +++ b/src/core/textrenderer/qgstextbackgroundsettings.cpp @@ -61,7 +61,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() diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp index c6d68352c10e7..c4a0ee4b28ce6 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp @@ -797,7 +797,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( " ( " ); diff --git a/src/gui/layout/qgslayoutelevationprofilewidget.cpp b/src/gui/layout/qgslayoutelevationprofilewidget.cpp index 8522ed5a80a7a..02dad4a0a8b8a 100644 --- a/src/gui/layout/qgslayoutelevationprofilewidget.cpp +++ b/src/gui/layout/qgslayoutelevationprofilewidget.cpp @@ -713,7 +713,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() ); diff --git a/src/gui/qgslayermetadataresultsmodel.cpp b/src/gui/qgslayermetadataresultsmodel.cpp index 3b27f373584e8..625935ee7974d 100644 --- a/src/gui/qgslayermetadataresultsmodel.cpp +++ b/src/gui/qgslayermetadataresultsmodel.cpp @@ -185,7 +185,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 metadata { results.metadata() }; for ( const QgsLayerMetadataProviderResult &result : std::as_const( metadata ) ) diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp index e17ae834bb74c..a293e6d12d7c3 100644 --- a/src/gui/qgsmaptoolcapture.cpp +++ b/src/gui/qgsmaptoolcapture.cpp @@ -333,8 +333,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 ) { diff --git a/src/gui/qgsnewvectortabledialog.cpp b/src/gui/qgsnewvectortabledialog.cpp index 169520990a8ab..5fea42561579d 100644 --- a/src/gui/qgsnewvectortabledialog.cpp +++ b/src/gui/qgsnewvectortabledialog.cpp @@ -183,7 +183,7 @@ QgsNewVectorTableDialog::QgsNewVectorTableDialog( QgsAbstractDatabaseProviderCon mHasZChk->setEnabled( false ); mHasZChk->setChecked( false ); } - if ( ! hasM && ! hasM ) + if ( ! hasM && ! hasZ ) { mHasZChk->setVisible( false ); mHasMChk->setVisible( false );