Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix some more cppcheck nullptr redundant checks
  • Loading branch information
nyalldawson authored and github-actions[bot] committed Apr 13, 2023
1 parent 76a7746 commit 091731c
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 13 deletions.
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgsgeorefmainwindow.cpp
Expand Up @@ -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 )
Expand Down
3 changes: 2 additions & 1 deletion src/app/maptools/qgsmaptoolshapecircularstringabstract.cpp
Expand Up @@ -64,7 +64,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 )
{
Expand Down
10 changes: 3 additions & 7 deletions src/app/pointcloud/qgspointcloudlayerproperties.cpp
Expand Up @@ -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>
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolselectutils.cpp
Expand Up @@ -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();
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemelevationprofile.cpp
Expand Up @@ -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 );
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitemlabel.cpp
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/core/maprenderer/qgsmaprenderersequentialjob.cpp
Expand Up @@ -85,6 +85,7 @@ void QgsMapRendererSequentialJob::cancel()
QgsDebugMsgLevel( QStringLiteral( "sequential - cancel internal" ), 5 );
mInternalJob->cancel();

// cppcheck-suppress nullPointerRedundantCheck
Q_ASSERT( !mInternalJob && !mPainter );
}

Expand Down
5 changes: 4 additions & 1 deletion src/core/symbology/qgssymbol.cpp
Expand Up @@ -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() );

Expand Down

0 comments on commit 091731c

Please sign in to comment.