From b744a0ebbbd9599ad3f7f49054f6a3952b048e1a Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Thu, 27 Mar 2025 08:27:35 +1000 Subject: [PATCH] Avoid .get() for boolean checks on unique_ptr --- src/core/geometry/qgsgeos.cpp | 2 +- src/core/layout/qgsreportsectionfieldgroup.cpp | 4 ++-- src/core/pointcloud/qgspointcloudstatscalculator.cpp | 2 +- src/core/proj/qgsellipsoidutils.cpp | 2 +- src/core/qgsofflineediting.cpp | 2 +- src/core/qgsuserprofilemanager.cpp | 2 +- src/core/symbology/qgssymbollayerutils.cpp | 2 +- src/core/vector/qgsvectorlayerprofilegenerator.cpp | 2 +- src/providers/wcs/qgswcsprovider.cpp | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp index 817e638c7b3..f0cc42b4219 100644 --- a/src/core/geometry/qgsgeos.cpp +++ b/src/core/geometry/qgsgeos.cpp @@ -3845,7 +3845,7 @@ int QgsGeos::geomDigits( const GEOSGeometry *geom ) { GEOSContextHandle_t context = QgsGeosContext::get(); geos::unique_ptr bbox( GEOSEnvelope_r( context, geom ) ); - if ( !bbox.get() ) + if ( !bbox ) return -1; const GEOSGeometry *bBoxRing = GEOSGetExteriorRing_r( context, bbox.get() ); diff --git a/src/core/layout/qgsreportsectionfieldgroup.cpp b/src/core/layout/qgsreportsectionfieldgroup.cpp index e1f475880f5..2a74db9875d 100644 --- a/src/core/layout/qgsreportsectionfieldgroup.cpp +++ b/src/core/layout/qgsreportsectionfieldgroup.cpp @@ -27,7 +27,7 @@ QgsReportSectionFieldGroup::QgsReportSectionFieldGroup( QgsAbstractReportSection QString QgsReportSectionFieldGroup::description() const { - if ( mCoverageLayer.get() ) + if ( mCoverageLayer ) return QObject::tr( "Group: %1 - %2" ).arg( mCoverageLayer->name(), mField ); else return QObject::tr( "Group" ); @@ -60,7 +60,7 @@ QgsReportSectionFieldGroup *QgsReportSectionFieldGroup::clone() const bool QgsReportSectionFieldGroup::beginRender() { - if ( !mCoverageLayer.get() ) + if ( !mCoverageLayer ) return false; if ( !mField.isEmpty() ) diff --git a/src/core/pointcloud/qgspointcloudstatscalculator.cpp b/src/core/pointcloud/qgspointcloudstatscalculator.cpp index d9550ec2ed2..b25544345be 100644 --- a/src/core/pointcloud/qgspointcloudstatscalculator.cpp +++ b/src/core/pointcloud/qgspointcloudstatscalculator.cpp @@ -90,7 +90,7 @@ struct StatsProcessor } } - if ( !block.get() ) + if ( !block ) { updateFeedback(); return QgsPointCloudStatistics(); diff --git a/src/core/proj/qgsellipsoidutils.cpp b/src/core/proj/qgsellipsoidutils.cpp index 4f127013143..86be65dfc04 100644 --- a/src/core/proj/qgsellipsoidutils.cpp +++ b/src/core/proj/qgsellipsoidutils.cpp @@ -263,7 +263,7 @@ QList QgsEllipsoidUtils::definitions() while ( char *code = *codesIt ) { const QgsProjUtils::proj_pj_unique_ptr ellipsoid( proj_create_from_database( context, authority, code, PJ_CATEGORY_ELLIPSOID, 0, nullptr ) ); - if ( ellipsoid.get() ) + if ( ellipsoid ) { EllipsoidDefinition def; QString name = QString( proj_get_name( ellipsoid.get() ) ); diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp index 769ebaaf9f8..c8fa679d35b 100644 --- a/src/core/qgsofflineediting.cpp +++ b/src/core/qgsofflineediting.cpp @@ -224,7 +224,7 @@ void QgsOfflineEditing::synchronize( bool useTransaction ) const QPair pair( remoteLayer->providerType(), connectionString ); std::shared_ptr transactionGroup = transactionGroups.value( pair ); - if ( !transactionGroup.get() ) + if ( !transactionGroup ) transactionGroup = std::make_shared(); if ( !transactionGroup->addLayer( remoteLayer.get() ) ) diff --git a/src/core/qgsuserprofilemanager.cpp b/src/core/qgsuserprofilemanager.cpp index b11d59ff08c..547f4339bcb 100644 --- a/src/core/qgsuserprofilemanager.cpp +++ b/src/core/qgsuserprofilemanager.cpp @@ -258,7 +258,7 @@ void QgsUserProfileManager::loadUserProfile( const QString &name ) void QgsUserProfileManager::setActiveUserProfile( const QString &profile ) { - if ( ! mUserProfile.get() ) + if ( ! mUserProfile ) { mUserProfile.reset( profileForName( profile ) ); } diff --git a/src/core/symbology/qgssymbollayerutils.cpp b/src/core/symbology/qgssymbollayerutils.cpp index c880d85a148..7da09e76b74 100644 --- a/src/core/symbology/qgssymbollayerutils.cpp +++ b/src/core/symbology/qgssymbollayerutils.cpp @@ -1297,7 +1297,7 @@ std::unique_ptr< QgsSymbol > QgsSymbolLayerUtils::loadSymbol( const QDomElement else { std::unique_ptr< QgsSymbolLayer > layer = loadSymbolLayer( e, context ); - if ( layer.get() ) + if ( layer ) { // Dealing with sub-symbols nested into a layer const QDomElement s = e.firstChildElement( QStringLiteral( "symbol" ) ); diff --git a/src/core/vector/qgsvectorlayerprofilegenerator.cpp b/src/core/vector/qgsvectorlayerprofilegenerator.cpp index eff5571fece..452fb597b96 100644 --- a/src/core/vector/qgsvectorlayerprofilegenerator.cpp +++ b/src/core/vector/qgsvectorlayerprofilegenerator.cpp @@ -1442,7 +1442,7 @@ bool QgsVectorLayerProfileGenerator::generateProfileForPolygons() shiftedPoly.reset( new QgsPolygon( new QgsLineString( newX, newY, newZ ) ) ); intersection.reset( mProfileBufferedCurveEngine->intersection( shiftedPoly.get(), &error ) ); - if ( intersection.get() ) + if ( intersection ) processTriangleLineIntersect( clampedPolygon.get(), intersection.get(), transformedParts, crossSectionParts ); #ifdef QGISDEBUG else diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index 945476c26ec..f66f00b7ed3 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -946,7 +946,7 @@ QList QgsWcsProvider::colorTable( int bandNum Qgis::RasterColorInterpretation QgsWcsProvider::colorInterpretation( int bandNo ) const { - if ( !mCachedGdalDataset.get() ) + if ( !mCachedGdalDataset ) { return Qgis::RasterColorInterpretation::Undefined; }