Merge pull request #52650 from qgis/backport-52641-to-release-3_28

rouault · web-flow · commit 0670a14dab9a · 2023-04-13T01:18:40.000+02:00
[Backport release-3_28] Fix some cppcheck nullptr check warnings
diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp
@@ -359,17 +359,16 @@ QgsDefaultVectorLayerLegend::QgsDefaultVectorLayerLegend( QgsVectorLayer *vl )
 QList<QgsLayerTreeModelLegendNode *> QgsDefaultVectorLayerLegend::createLayerTreeModelLegendNodes( QgsLayerTreeLayer *nodeLayer )
 {
   QList<QgsLayerTreeModelLegendNode *> nodes;
+  if ( !mLayer )
+    return nodes;
 
-  if ( mLayer )
+  const QString placeholderImage = mLayer->legendPlaceholderImage();
+  if ( !placeholderImage.isEmpty() )
   {
-    const QString placeholderImage = mLayer->legendPlaceholderImage();
-    if ( !placeholderImage.isEmpty() )
-    {
-      bool fitsInCache;
-      const QImage img = QgsApplication::imageCache()->pathAsImage( placeholderImage, QSize(), false, 1.0, fitsInCache );
-      nodes << new QgsImageLegendNode( nodeLayer, img );
-      return nodes;
-    }
+    bool fitsInCache;
+    const QImage img = QgsApplication::imageCache()->pathAsImage( placeholderImage, QSize(), false, 1.0, fitsInCache );
+    nodes << new QgsImageLegendNode( nodeLayer, img );
+    return nodes;
   }
 
   QgsFeatureRenderer *r = mLayer->renderer();
diff --git a/src/core/vector/qgsvectorlayerprofilegenerator.cpp b/src/core/vector/qgsvectorlayerprofilegenerator.cpp
@@ -536,7 +536,7 @@ void QgsVectorLayerProfileResults::renderResultsAsIndividualFeatures( QgsProfile
 
     renderer->stopRender( context.renderContext() );
   }
-  else
+  else if ( mLayer )
   {
     QSet<QString> attributes;
     attributes.unite( mMarkerSymbol->usedAttributes( context.renderContext() ) );
diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp
@@ -145,7 +145,10 @@ void QgsRelationReferenceWidgetWrapper::showIndeterminateState()
 
 QVariantList QgsRelationReferenceWidgetWrapper::additionalFieldValues() const
 {
-  if ( !mWidget || !mWidget->relation().isValid() )
+  if ( !mWidget )
+    return {};
+
+  if ( !mWidget->relation().isValid() )
   {
     QVariantList values;
     for ( int i = 0; i < mWidget->relation().fieldPairs().count(); i++ )
diff --git a/src/gui/mesh/qgsmeshlayerproperties.cpp b/src/gui/mesh/qgsmeshlayerproperties.cpp
@@ -216,8 +216,7 @@ void QgsMeshLayerProperties::syncToLayer()
   mLayerOrigNameLineEd->setText( mMeshLayer->name() );
   whileBlocking( mCrsSelector )->setCrs( mMeshLayer->crs() );
 
-  if ( mMeshLayer )
-    mDatasetGroupTreeWidget->syncToLayer( mMeshLayer );
+  mDatasetGroupTreeWidget->syncToLayer( mMeshLayer );
 
   QgsDebugMsgLevel( QStringLiteral( "populate config tab" ), 4 );
   for ( QgsMapLayerConfigWidget *w : std::as_const( mConfigWidgets ) )

Original file line number	Diff line number	Diff line change
`@@ -536,7 +536,7 @@ void QgsVectorLayerProfileResults::renderResultsAsIndividualFeatures( QgsProfile`
`536`	`536`
`537`	`537`	`renderer->stopRender( context.renderContext() );`
`538`	`538`	`}`
`539`		`- else`
	`539`	`+ else if ( mLayer )`
`540`	`540`	`{`
`541`	`541`	`QSet<QString> attributes;`
`542`	`542`	`attributes.unite( mMarkerSymbol->usedAttributes( context.renderContext() ) );`
Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,10 @@ void QgsRelationReferenceWidgetWrapper::showIndeterminateState()`
`145`	`145`
`146`	`146`	`QVariantList QgsRelationReferenceWidgetWrapper::additionalFieldValues() const`
`147`	`147`	`{`
`148`		`- if ( !mWidget \|\| !mWidget->relation().isValid() )`
	`148`	`+ if ( !mWidget )`
	`149`	`+ return {};`
	`150`	`+`
	`151`	`+ if ( !mWidget->relation().isValid() )`
`149`	`152`	`{`
`150`	`153`	`QVariantList values;`
`151`	`154`	`for ( int i = 0; i < mWidget->relation().fieldPairs().count(); i++ )`