Fix cppcheck warnings

qgis · Nov 29, 2022 · 6b8d53a · 6b8d53a
1 parent 3527257
commit 6b8d53a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp
@@ -91,11 +91,13 @@ QgsLayerTreeModelLegendNode::ItemMetrics QgsLayerTreeModelLegendNode::draw( cons
   const QStringList lines = settings.evaluateItemText( data( Qt::DisplayRole ).toString(), ctx->context->expressionContext() );
 
   const QgsTextDocument textDocument = f.allowHtmlFormatting() ? QgsTextDocument::fromHtml( lines ) : QgsTextDocument::fromPlainText( lines );
+  // cppcheck-suppress autoVariables
   ctx->textDocument = &textDocument;
 
   std::optional< QgsScopedRenderContextScaleToPixels > scaleToPx( *ctx->context );
   const QgsTextDocumentMetrics textDocumentMetrics = QgsTextDocumentMetrics::calculateMetrics( textDocument, f, *ctx->context,
-      ctx->context->flags() & Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering ? QgsTextRenderer::FONT_WORKAROUND_SCALE : 1 );
+      ( ctx->context->flags() & Qgis::RenderContextFlag::ApplyScalingWorkaroundForTextRendering ) ? QgsTextRenderer::FONT_WORKAROUND_SCALE : 1 );
+  // cppcheck-suppress autoVariables
   ctx->textDocumentMetrics = &textDocumentMetrics;
   scaleToPx.reset();
 
@@ -194,13 +196,13 @@ QSizeF QgsLayerTreeModelLegendNode::drawSymbolText( const QgsLegendSettings &set
 
   const QgsTextFormat format = settings.style( QgsLegendStyle::SymbolLabel ).textFormat();
 
-  const double dotsPerMM = ctx->context->scaleFactor();
+  const double dotsPerMM = context->scaleFactor();
   QgsScopedRenderContextScaleToPixels scaleToPx( *context );
 
   // TODO when no metrics
   // TODO --- line spacing!!!
 
-  const QSizeF documentSize = ctx->textDocumentMetrics->documentSize( Qgis::TextLayoutMode::RectangleCapHeightBased, Qgis::TextOrientation::Horizontal );
+  const QSizeF documentSize = ctx ? ctx->textDocumentMetrics->documentSize( Qgis::TextLayoutMode::RectangleCapHeightBased, Qgis::TextOrientation::Horizontal ) : QSizeF();
   const QSizeF labelSizeMM( documentSize / dotsPerMM );
 
   double labelXMin = 0.0;

diff --git a/src/core/qgslegendrenderer.cpp b/src/core/qgslegendrenderer.cpp
@@ -687,7 +687,7 @@ int QgsLegendRenderer::setColumns( QList<LegendComponentGroup> &componentGroups
   return targetNumberColumns;
 }
 
-QSizeF QgsLegendRenderer::drawTitle( QgsRenderContext &context, double top, Qt::AlignmentFlag halignment, double legendWidth )
+QSizeF QgsLegendRenderer::drawTitle( QgsRenderContext &context, double top, Qt::AlignmentFlag halignment, double legendWidth ) const
 {
   QSizeF size( 0, 0 );
   if ( mSettings.title().isEmpty() )

diff --git a/src/core/qgslegendrenderer.h b/src/core/qgslegendrenderer.h
@@ -257,7 +257,7 @@ class CORE_EXPORT QgsLegendRenderer
      *
      * If \a context is NULLPTR, no painting will be attempted, but the required size will still be calculated and returned.
      */
-    QSizeF drawTitle( QgsRenderContext &context, double top, Qt::AlignmentFlag halignment = Qt::AlignLeft, double legendWidth = 0 );
+    QSizeF drawTitle( QgsRenderContext &context, double top, Qt::AlignmentFlag halignment = Qt::AlignLeft, double legendWidth = 0 ) const;
 
     /**
      * Draws an \a group and return its actual size, using the specified render \a context.