Fix some more cppcheck nullptr redundant checks

nyalldawson · nyalldawson · commit 8107009bdb97 · 2023-04-13T14:16:33.000+10:00
diff --git a/src/app/georeferencer/qgsgeorefmainwindow.cpp b/src/app/georeferencer/qgsgeorefmainwindow.cpp
@@ -380,7 +380,7 @@ void QgsGeoreferencerMainWindow::openLayer( Qgis::LayerType layerType, const QSt
   mCanvas->refresh();
   QgisApp::instance()->mapCanvas()->refresh();
 
-  const bool hasExistingReference = mLayer->crs().isValid();
+  const bool hasExistingReference = mLayer ? mLayer->crs().isValid() : false;
   mActionLinkGeorefToQgis->setEnabled( hasExistingReference );
   mActionLinkQGisToGeoref->setEnabled( hasExistingReference );
   if ( !hasExistingReference )
diff --git a/src/app/maptools/qgsmaptoolshapecircularstringabstract.cpp b/src/app/maptools/qgsmaptoolshapecircularstringabstract.cpp
@@ -65,7 +65,8 @@ void QgsMapToolShapeCircularStringAbstract::undo()
     const int lastPositionCompleteCircularString = mPoints.size() - 1 - ( mPoints.size() + 1 ) % 2 ;
 
     geomTempRubberBand->setPoints( mPoints.mid( lastPositionCompleteCircularString ) );
-    mTempRubberBand->setGeometry( geomTempRubberBand.release() );
+    if ( mTempRubberBand )
+      mTempRubberBand->setGeometry( geomTempRubberBand.release() );
 
     if ( mRubberBand )
     {
diff --git a/src/app/pointcloud/qgspointcloudlayerproperties.cpp b/src/app/pointcloud/qgspointcloudlayerproperties.cpp
@@ -24,14 +24,11 @@
 #include "qgsnative.h"
 #include "qgsapplication.h"
 #include "qgsmetadatawidget.h"
-#include "qgsmaplayerloadstyledialog.h"
 #include "qgsmaplayerconfigwidgetfactory.h"
 #include "qgsmaplayerconfigwidget.h"
 #include "qgspointcloudattributemodel.h"
 #include "qgsdatumtransformdialog.h"
-#include "qgspointcloudlayerelevationproperties.h"
 #include "qgspointcloudquerybuilder.h"
-#include "qgspointcloudrenderer.h"
 
 #include <QFileDialog>
 #include <QMenu>
@@ -177,7 +174,7 @@ void QgsPointCloudLayerProperties::apply()
 
   mBackupCrs = mLayer->crs();
 
-  for ( QgsMapLayerConfigWidget *w : mConfigWidgets )
+  for ( QgsMapLayerConfigWidget *w : std::as_const( mConfigWidgets ) )
     w->apply();
 
   mLayer->triggerRepaint();
@@ -223,11 +220,10 @@ void QgsPointCloudLayerProperties::syncToLayer()
   txtSubsetSQL->setReadOnly( true );
   txtSubsetSQL->setCaretWidth( 0 );
   txtSubsetSQL->setCaretLineVisible( false );
-  pbnQueryBuilder->setEnabled( mLayer &&
-                               mLayer->dataProvider() &&
+  pbnQueryBuilder->setEnabled( mLayer->dataProvider() &&
                                mLayer->dataProvider()->supportsSubsetString() );
 
-  for ( QgsMapLayerConfigWidget *w : mConfigWidgets )
+  for ( QgsMapLayerConfigWidget *w : std::as_const( mConfigWidgets ) )
     w->syncToLayer( mLayer );
 
   mStatisticsCalculationWarningLabel->setHidden( mLayer->statisticsCalculationState() != QgsPointCloudLayer::PointCloudStatisticsCalculationState::Calculated );
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
@@ -645,7 +645,7 @@ QgsFeatureIds QgsMapToolSelectUtils::QgsMapToolSelectMenuActions::search( std::s
 
 void QgsMapToolSelectUtils::QgsMapToolSelectMenuActions::onSearchFinished()
 {
-  if ( mFutureWatcher && !mFutureWatcher->isFinished() )
+  if ( !mFutureWatcher || !mFutureWatcher->isFinished() )
     return;
 
   mAllFeatureIds = mFutureWatcher->result();
diff --git a/src/core/layout/qgslayoutitemelevationprofile.cpp b/src/core/layout/qgslayoutitemelevationprofile.cpp
@@ -619,7 +619,7 @@ void QgsLayoutItemElevationProfile::paint( QPainter *painter, const QStyleOption
 
     QSizeF layoutSize = mLayout->convertToLayoutUnits( sizeWithUnits() );
 
-    if ( mLayout && mLayout->renderContext().flags() & QgsLayoutRenderContext::FlagLosslessImageRendering )
+    if ( mLayout->renderContext().flags() & QgsLayoutRenderContext::FlagLosslessImageRendering )
       painter->setRenderHint( QPainter::LosslessImageRendering, true );
 
     QgsRenderContext rc = QgsLayoutUtils::createRenderContextForLayout( mLayout, painter );
diff --git a/src/core/layout/qgslayoutitemlabel.cpp b/src/core/layout/qgslayoutitemlabel.cpp
@@ -191,7 +191,7 @@ void QgsLayoutItemLabel::contentChanged()
       //set this to true after html is loaded.
       mHtmlLoaded = false;
 
-      const QUrl baseUrl = QUrl::fromLocalFile( mLayout->project()->absoluteFilePath() );
+      const QUrl baseUrl = mLayout ? QUrl::fromLocalFile( mLayout->project()->absoluteFilePath() ) : QUrl();
       mWebPage->mainFrame()->setHtml( textToDraw, baseUrl );
 
       //For very basic html labels with no external assets, the html load will already be
diff --git a/src/core/maprenderer/qgsmaprenderersequentialjob.cpp b/src/core/maprenderer/qgsmaprenderersequentialjob.cpp
@@ -85,6 +85,7 @@ void QgsMapRendererSequentialJob::cancel()
   QgsDebugMsgLevel( QStringLiteral( "sequential - cancel internal" ), 5 );
   mInternalJob->cancel();
 
+  // cppcheck-suppress nullPointerRedundantCheck
   Q_ASSERT( !mInternalJob && !mPainter );
 }
 
diff --git a/src/core/symbology/qgssymbol.cpp b/src/core/symbology/qgssymbol.cpp
@@ -737,10 +737,13 @@ QgsSymbol *QgsSymbol::defaultSymbol( Qgis::GeometryType geomType )
         break;
       default:
         QgsDebugMsg( QStringLiteral( "unknown layer's geometry type" ) );
-        return nullptr;
+        break;
     }
   }
 
+  if ( !s )
+    return nullptr;
+
   // set opacity
   s->setOpacity( QgsProject::instance()->styleSettings()->defaultSymbolOpacity() );
 

Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,8 @@ void QgsMapToolShapeCircularStringAbstract::undo()`
`65`	`65`	`const int lastPositionCompleteCircularString = mPoints.size() - 1 - ( mPoints.size() + 1 ) % 2 ;`
`66`	`66`
`67`	`67`	`geomTempRubberBand->setPoints( mPoints.mid( lastPositionCompleteCircularString ) );`
`68`		`- mTempRubberBand->setGeometry( geomTempRubberBand.release() );`
	`68`	`+ if ( mTempRubberBand )`
	`69`	`+ mTempRubberBand->setGeometry( geomTempRubberBand.release() );`
`69`	`70`
`70`	`71`	`if ( mRubberBand )`
`71`	`72`	`{`
Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ QgsFeatureIds QgsMapToolSelectUtils::QgsMapToolSelectMenuActions::search( std::s`
`645`	`645`
`646`	`646`	`void QgsMapToolSelectUtils::QgsMapToolSelectMenuActions::onSearchFinished()`
`647`	`647`	`{`
`648`		`- if ( mFutureWatcher && !mFutureWatcher->isFinished() )`
	`648`	`+ if ( !mFutureWatcher \|\| !mFutureWatcher->isFinished() )`
`649`	`649`	`return;`
`650`	`650`
`651`	`651`	`mAllFeatureIds = mFutureWatcher->result();`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ void QgsMapRendererSequentialJob::cancel()`
`85`	`85`	`QgsDebugMsgLevel( QStringLiteral( "sequential - cancel internal" ), 5 );`
`86`	`86`	`mInternalJob->cancel();`
`87`	`87`
	`88`	`+ // cppcheck-suppress nullPointerRedundantCheck`
`88`	`89`	`Q_ASSERT( !mInternalJob && !mPainter );`
`89`	`90`	`}`
`90`	`91`
Original file line number	Diff line number	Diff line change
`@@ -737,10 +737,13 @@ QgsSymbol *QgsSymbol::defaultSymbol( Qgis::GeometryType geomType )`
`737`	`737`	`break;`
`738`	`738`	`default:`
`739`	`739`	`QgsDebugMsg( QStringLiteral( "unknown layer's geometry type" ) );`
`740`		`- return nullptr;`
	`740`	`+ break;`
`741`	`741`	`}`
`742`	`742`	`}`
`743`	`743`
	`744`	`+ if ( !s )`
	`745`	`+ return nullptr;`
	`746`	`+`
`744`	`747`	`// set opacity`
`745`	`748`	`s->setOpacity( QgsProject::instance()->styleSettings()->defaultSymbolOpacity() );`
`746`	`749`