Remove QgsGeometry bool operator

nyalldawson · nyalldawson · commit 0b7416f08a29 · 2018-11-06T10:49:34.000+10:00
This is too dangerous -- it gets silently casted to numeric values instead of throwing compilation errors (cherry picked from commit 7be2925)
diff --git a/python/core/auto_generated/geometry/qgsgeometry.sip.in b/python/core/auto_generated/geometry/qgsgeometry.sip.in
@@ -1824,8 +1824,6 @@ Downgrades a point list from QgsPoint to :py:class:`QgsPointXY`
 
     operator QVariant() const;
 
-    operator bool() const;
-
 }; // class QgsGeometry
 
 
diff --git a/src/analysis/interpolation/qgsinterpolator.cpp b/src/analysis/interpolation/qgsinterpolator.cpp
@@ -114,7 +114,7 @@ QgsInterpolator::Result QgsInterpolator::cacheBaseData( QgsFeedback *feedback )
 
 bool QgsInterpolator::addVerticesToCache( const QgsGeometry &geom, ValueSource source, double attributeValue )
 {
-  if ( !geom || geom.isEmpty() )
+  if ( geom.isNull() || geom.isEmpty() )
     return true; // nothing to do
 
   //validate source
diff --git a/src/analysis/processing/qgsalgorithmboundary.cpp b/src/analysis/processing/qgsalgorithmboundary.cpp
@@ -109,7 +109,7 @@ QgsFeatureList QgsBoundaryAlgorithm::processFeature( const QgsFeature &feature,
   {
     QgsGeometry inputGeometry = feature.geometry();
     QgsGeometry outputGeometry = QgsGeometry( inputGeometry.constGet()->boundary() );
-    if ( !outputGeometry )
+    if ( outputGeometry.isNull() )
     {
       feedback->reportError( QObject::tr( "No boundary for feature %1 (possibly a closed linestring?)'" ).arg( feature.id() ) );
       outFeature.clearGeometry();
diff --git a/src/analysis/processing/qgsalgorithmbuffer.cpp b/src/analysis/processing/qgsalgorithmbuffer.cpp
@@ -136,7 +136,7 @@ QVariantMap QgsBufferAlgorithm::processAlgorithm( const QVariantMap &parameters,
       }
 
       QgsGeometry outputGeometry = f.geometry().buffer( distance, segments, endCapStyle, joinStyle, miterLimit );
-      if ( !outputGeometry )
+      if ( outputGeometry.isNull() )
       {
         QgsMessageLog::logMessage( QObject::tr( "Error calculating buffer for feature %1" ).arg( f.id() ), QObject::tr( "Processing" ), Qgis::Warning );
       }
diff --git a/src/analysis/processing/qgsalgorithmcentroid.cpp b/src/analysis/processing/qgsalgorithmcentroid.cpp
@@ -104,7 +104,7 @@ QgsFeatureList QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsPro
       {
         QgsGeometry partGeometry( geomCollection->geometryN( i )->clone() );
         QgsGeometry outputGeometry = partGeometry.centroid();
-        if ( !outputGeometry )
+        if ( outputGeometry.isNull() )
         {
           feedback->pushInfo( QObject::tr( "Error calculating centroid for feature %1 part %2: %3" ).arg( feature.id() ).arg( i ).arg( outputGeometry.lastError() ) );
         }
@@ -115,7 +115,7 @@ QgsFeatureList QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsPro
     else
     {
       QgsGeometry outputGeometry = feature.geometry().centroid();
-      if ( !outputGeometry )
+      if ( outputGeometry.isNull() )
       {
         feedback->pushInfo( QObject::tr( "Error calculating centroid for feature %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );
       }
diff --git a/src/analysis/processing/qgsalgorithmconvexhull.cpp b/src/analysis/processing/qgsalgorithmconvexhull.cpp
@@ -83,11 +83,11 @@ QgsFeatureList QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature
     else
     {
       outputGeometry = f.geometry().convexHull();
-      if ( !outputGeometry )
+      if ( outputGeometry.isNull() )
         feedback->reportError( outputGeometry.lastError() );
       f.setGeometry( outputGeometry );
     }
-    if ( outputGeometry )
+    if ( !outputGeometry.isNull() )
     {
       QgsAttributes attrs = f.attributes();
       attrs << outputGeometry.constGet()->area()
diff --git a/src/analysis/processing/qgsalgorithmdissolve.cpp b/src/analysis/processing/qgsalgorithmdissolve.cpp
@@ -67,7 +67,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
         firstFeature = false;
       }
 
-      if ( f.hasGeometry() && f.geometry() )
+      if ( f.hasGeometry() && !f.geometry().isNull() )
       {
         geomQueue.append( f.geometry() );
         if ( maxQueueLength > 0 && geomQueue.length() > maxQueueLength )
@@ -118,7 +118,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet
         attributeHash.insert( indexAttributes, f.attributes() );
       }
 
-      if ( f.hasGeometry() && f.geometry() )
+      if ( f.hasGeometry() && !f.geometry().isNull() )
       {
         geometryHash[ indexAttributes ].append( f.geometry() );
       }
diff --git a/src/analysis/processing/qgsalgorithmextendlines.cpp b/src/analysis/processing/qgsalgorithmextendlines.cpp
@@ -129,7 +129,7 @@ QgsFeatureList QgsExtendLinesAlgorithm::processFeature( const QgsFeature &featur
       endDistance = mEndDistanceProperty.valueAsDouble( context.expressionContext(), endDistance );
 
     const QgsGeometry outGeometry = geometry.extendLine( startDistance, endDistance );
-    if ( !outGeometry )
+    if ( outGeometry.isNull() )
       throw QgsProcessingException( QObject::tr( "Error calculating extended line" ) ); // don't think this can actually happen!
 
     f.setGeometry( outGeometry );
diff --git a/src/analysis/processing/qgsalgorithmfixgeometries.cpp b/src/analysis/processing/qgsalgorithmfixgeometries.cpp
@@ -93,7 +93,7 @@ QgsFeatureList QgsFixGeometriesAlgorithm::processFeature( const QgsFeature &feat
   QgsFeature outputFeature = feature;
 
   QgsGeometry outputGeometry = outputFeature.geometry().makeValid();
-  if ( !outputGeometry )
+  if ( outputGeometry.isNull() )
   {
     feedback->pushInfo( QObject::tr( "makeValid failed for feature %1 " ).arg( feature.id() ) );
     outputFeature.clearGeometry();
diff --git a/src/analysis/processing/qgsalgorithmkmeansclustering.cpp b/src/analysis/processing/qgsalgorithmkmeansclustering.cpp
@@ -115,7 +115,7 @@ QVariantMap QgsKMeansClusteringAlgorithm::processAlgorithm( const QVariantMap &p
     else
     {
       QgsGeometry centroid = feat.geometry().centroid();
-      if ( !centroid )
+      if ( centroid.isNull() )
         continue; // centroid failed, e.g. empty linestring
 
       point = QgsPointXY( *qgsgeometry_cast< const QgsPoint * >( centroid.constGet() ) );
diff --git a/src/analysis/processing/qgsalgorithmmergelines.cpp b/src/analysis/processing/qgsalgorithmmergelines.cpp
@@ -83,7 +83,7 @@ QgsFeatureList QgsMergeLinesAlgorithm::processFeature( const QgsFeature &feature
 
   QgsFeature out = feature;
   QgsGeometry outputGeometry = feature.geometry().mergeLines();
-  if ( !outputGeometry )
+  if ( outputGeometry.isNull() )
     feedback->reportError( QObject::tr( "Error merging lines for feature %1" ).arg( feature.id() ) );
 
   out.setGeometry( outputGeometry );
diff --git a/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.cpp b/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.cpp
@@ -133,7 +133,7 @@ QgsFeatureList QgsMultiRingConstantBufferAlgorithm::processFeature( const QgsFea
     QgsFeature out;
     currentDistance = i * distance;
     outputGeometry = feature.geometry().buffer( currentDistance, 40 );
-    if ( !outputGeometry )
+    if ( outputGeometry.isNull() )
     {
       feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) );
       continue;
diff --git a/src/analysis/processing/qgsalgorithmpointonsurface.cpp b/src/analysis/processing/qgsalgorithmpointonsurface.cpp
@@ -102,7 +102,7 @@ QgsFeatureList QgsPointOnSurfaceAlgorithm::processFeature( const QgsFeature &f,
       {
         QgsGeometry partGeometry( geomCollection->geometryN( i )->clone() );
         QgsGeometry outputGeometry = partGeometry.pointOnSurface();
-        if ( !outputGeometry )
+        if ( outputGeometry.isNull() )
         {
           feedback->pushInfo( QObject::tr( "Error calculating point on surface for feature %1 part %2: %3" ).arg( feature.id() ).arg( i ).arg( outputGeometry.lastError() ) );
         }
@@ -113,7 +113,7 @@ QgsFeatureList QgsPointOnSurfaceAlgorithm::processFeature( const QgsFeature &f,
     else
     {
       QgsGeometry outputGeometry = feature.geometry().pointOnSurface();
-      if ( !outputGeometry )
+      if ( outputGeometry.isNull() )
       {
         feedback->pushInfo( QObject::tr( "Error calculating point on surface for feature %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );
       }
diff --git a/src/analysis/processing/qgsalgorithmrotate.cpp b/src/analysis/processing/qgsalgorithmrotate.cpp
@@ -129,7 +129,7 @@ QgsFeatureList QgsRotateFeaturesAlgorithm::processFeature( const QgsFeature &fea
     else
     {
       QgsGeometry centroid = geometry.centroid();
-      if ( centroid )
+      if ( !centroid.isNull() )
       {
         geometry.rotate( angle, centroid.asPoint() );
         f.setGeometry( geometry );
diff --git a/src/analysis/processing/qgsalgorithmsmooth.cpp b/src/analysis/processing/qgsalgorithmsmooth.cpp
@@ -147,7 +147,7 @@ QgsFeatureList QgsSmoothAlgorithm::processFeature( const QgsFeature &feature, Qg
       maxAngle = mMaxAngleProperty.valueAsDouble( context.expressionContext(), maxAngle );
 
     QgsGeometry outputGeometry = f.geometry().smooth( iterations, offset, -1, maxAngle );
-    if ( !outputGeometry )
+    if ( outputGeometry.isNull() )
     {
       feedback->reportError( QObject::tr( "Error smoothing geometry %1" ).arg( feature.id() ) );
     }
diff --git a/src/analysis/processing/qgsalgorithmsnaptogrid.cpp b/src/analysis/processing/qgsalgorithmsnaptogrid.cpp
@@ -145,7 +145,7 @@ QgsFeatureList QgsSnapToGridAlgorithm::processFeature( const QgsFeature &feature
       intervalM = mIntervalMProperty.valueAsDouble( context.expressionContext(), intervalM );
 
     QgsGeometry outputGeometry = f.geometry().snappedToGrid( intervalX, intervalY, intervalZ, intervalM );
-    if ( !outputGeometry )
+    if ( outputGeometry.isNull() )
     {
       feedback->reportError( QObject::tr( "Error snapping geometry %1" ).arg( feature.id() ) );
     }
diff --git a/src/analysis/processing/qgsalgorithmsplitwithlines.cpp b/src/analysis/processing/qgsalgorithmsplitwithlines.cpp
@@ -192,7 +192,7 @@ QVariantMap QgsSplitWithLinesAlgorithm::processAlgorithm( const QVariantMap &par
             }
 
             QgsGeometry inGeom = inGeoms.takeFirst();
-            if ( !inGeom )
+            if ( inGeom.isNull() )
               continue;
 
             if ( splitGeomEngine->intersects( inGeom.constGet() ) )
diff --git a/src/analysis/processing/qgsalgorithmsubdivide.cpp b/src/analysis/processing/qgsalgorithmsubdivide.cpp
@@ -90,7 +90,7 @@ QgsFeatureList QgsSubdivideAlgorithm::processFeature( const QgsFeature &f, QgsPr
       maxNodes = mMaxNodesProperty.valueAsDouble( context.expressionContext(), maxNodes );
 
     feature.setGeometry( feature.geometry().subdivide( maxNodes ) );
-    if ( !feature.geometry() )
+    if ( !feature.hasGeometry() )
     {
       feedback->reportError( QObject::tr( "Error calculating subdivision for feature %1" ).arg( feature.id() ) );
     }
diff --git a/src/analysis/processing/qgsalgorithmtaperedbuffer.cpp b/src/analysis/processing/qgsalgorithmtaperedbuffer.cpp
@@ -141,7 +141,7 @@ QgsFeatureList QgsTaperedBufferAlgorithm::processFeature( const QgsFeature &feat
     endWidth = mEndWidthProperty.valueAsDouble( context.expressionContext(), endWidth );
 
   QgsGeometry outputGeometry = feature.geometry().taperedBuffer( startWidth, endWidth, segments );
-  if ( !outputGeometry )
+  if ( outputGeometry.isNull() )
   {
     feedback->reportError( QObject::tr( "Error buffering geometry %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );
   }
@@ -241,7 +241,7 @@ QgsFeatureList QgsVariableWidthBufferByMAlgorithm::processFeature( const QgsFeat
     segments = mSegmentsProperty.valueAsInt( context.expressionContext(), segments );
 
   QgsGeometry outputGeometry = feature.geometry().variableWidthBufferByM( segments );
-  if ( !outputGeometry )
+  if ( outputGeometry.isNull() )
   {
     feedback->reportError( QObject::tr( "Error buffering geometry %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );
   }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -45,7 +45,7 @@ QgsGeometryCheckerUtils::LayerFeature::LayerFeature( const QgsFeaturePool *pool,
     {
       mGeometry.transform( transform );
     }
-    catch ( const QgsCsException &e )
+    catch ( const QgsCsException & )
     {
       QgsDebugMsg( QStringLiteral( "Shrug. What shall we do with a geometry that cannot be converted?" ) );
     }
@@ -195,7 +195,7 @@ bool QgsGeometryCheckerUtils::LayerFeatures::iterator::nextFeature( bool begin )
     if ( mParent->mFeedback )
       mParent->mFeedback->setProgress( mParent->mFeedback->progress() + 1.0 );
     QgsFeature feature;
-    if ( featurePool->getFeature( *mFeatureIt, feature ) && feature.geometry() && feature.geometry().constGet() )
+    if ( featurePool->getFeature( *mFeatureIt, feature ) && !feature.geometry().isNull() )
     {
       mCurrentFeature.reset( new LayerFeature( mParent->mFeaturePools[*mLayerIt], feature, mParent->mContext, mParent->mUseMapCrs ) );
       return true;
diff --git a/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp
@@ -49,9 +49,9 @@ void QgsSingleGeometryCheckError::update( const QgsSingleGeometryCheckError *oth
 
 bool QgsSingleGeometryCheckError::isEqual( const QgsSingleGeometryCheckError *other ) const
 {
-  return mGeometry == other->mGeometry
+  return mGeometry.equals( other->mGeometry )
          && mCheck == other->mCheck
-         && mErrorLocation == other->mErrorLocation
+         && mErrorLocation.equals( other->mErrorLocation )
          && mVertexId == other->mVertexId;
 }
 
diff --git a/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp b/src/analysis/vector/geometry_checker/qgsvectordataproviderfeaturepool.cpp
@@ -35,7 +35,7 @@ QgsVectorDataProviderFeaturePool::QgsVectorDataProviderFeaturePool( QgsVectorLay
   QgsFeatureIterator it = layer->getFeatures( req );
   while ( it.nextFeature( feature ) )
   {
-    if ( feature.geometry() )
+    if ( feature.hasGeometry() )
     {
       insertFeature( feature );
       featureIds.insert( feature.id() );
diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp
@@ -1631,7 +1631,7 @@ void QgsIdentifyResultsDialog::highlightFeature( QTreeWidgetItem *item )
   if ( mHighlights.contains( featItem ) )
     return;
 
-  if ( !featItem->feature().geometry() || featItem->feature().geometry().wkbType() == QgsWkbTypes::Unknown )
+  if ( !featItem->feature().hasGeometry() || featItem->feature().geometry().wkbType() == QgsWkbTypes::Unknown )
     return;
 
   QgsHighlight *highlight = nullptr;
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -594,7 +594,7 @@ void QgsMapToolOffsetCurve::updateGeometryAndRubberBand( double offset )
     offsetGeom = mManipulatedGeometry.buffer( offset, quadSegments, capStyle, joinStyle, miterLimit );
   }
 
-  if ( !offsetGeom )
+  if ( offsetGeom.isNull() )
   {
     deleteRubberBandAndGeometry();
     deleteUserInputWidget();
diff --git a/src/app/qgsmaptoolreverseline.cpp b/src/app/qgsmaptoolreverseline.cpp
@@ -115,7 +115,7 @@ void QgsMapToolReverseLine::canvasReleaseEvent( QgsMapMouseEvent *e )
 
     }
 
-    if ( geom )
+    if ( !geom.isNull() )
     {
       vlayer->beginEditCommand( tr( "Reverse line" ) );
       vlayer->changeGeometry( f.id(), geom );
diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp
@@ -729,7 +729,7 @@ QgsGeometry::OperationResult QgsGeometry::addPart( const QgsGeometry &newPart )
   {
     return QgsGeometry::InvalidBaseGeometry;
   }
-  if ( !newPart || !newPart.d->geometry )
+  if ( newPart.isNull() || !newPart.d->geometry )
   {
     return QgsGeometry::AddPartNotMultiGeometry;
   }
@@ -752,7 +752,7 @@ QgsGeometry QgsGeometry::removeInteriorRings( double minimumRingArea ) const
     for ( const QgsGeometry &part : parts )
     {
       QgsGeometry result = part.removeInteriorRings( minimumRingArea );
-      if ( result )
+      if ( !result.isNull() )
         results << result;
     }
     if ( results.isEmpty() )
@@ -1729,7 +1729,7 @@ QgsGeometry QgsGeometry::offsetCurve( double distance, int segments, JoinStyle j
     for ( const QgsGeometry &part : parts )
     {
       QgsGeometry result = part.offsetCurve( distance, segments, joinStyle, miterLimit );
-      if ( result )
+      if ( !result.isNull() )
         results << result;
     }
     if ( results.isEmpty() )
@@ -1772,7 +1772,7 @@ QgsGeometry QgsGeometry::singleSidedBuffer( double distance, int segments, Buffe
     for ( const QgsGeometry &part : parts )
     {
       QgsGeometry result = part.singleSidedBuffer( distance, segments, side, joinStyle, miterLimit );
-      if ( result )
+      if ( !result.isNull() )
         results << result;
     }
     if ( results.isEmpty() )
@@ -1830,7 +1830,7 @@ QgsGeometry QgsGeometry::extendLine( double startDistance, double endDistance )
     for ( const QgsGeometry &part : parts )
     {
       QgsGeometry result = part.extendLine( startDistance, endDistance );
-      if ( result )
+      if ( !result.isNull() )
         results << result;
     }
     if ( results.isEmpty() )
@@ -2675,11 +2675,6 @@ void QgsGeometry::convertPointList( const QgsPointSequence &input, QVector<QgsPo
   }
 }
 
-QgsGeometry::operator bool() const
-{
-  return d->geometry.get();
-}
-
 void QgsGeometry::convertToPolyline( const QgsPointSequence &input, QgsPolylineXY &output )
 {
   output.clear();
diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -1823,13 +1823,6 @@ class CORE_EXPORT QgsGeometry
       return QVariant::fromValue( *this );
     }
 
-    /**
-     * Returns true if the geometry is non empty (ie, isNull() returns false),
-     * or false if it is an empty, uninitialized geometry (ie, isNull() returns true).
-     * \since QGIS 3.0
-     */
-    operator bool() const;
-
   private:
 
     QgsGeometryPrivate *d; //implicitly shared data pointer
diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp
@@ -393,7 +393,7 @@ QgsAbstractGeometry *QgsGeos::combine( const QVector<QgsGeometry> &geomList, QSt
   geosGeometries.reserve( geomList.size() );
   for ( const QgsGeometry &g : geomList )
   {
-    if ( !g )
+    if ( g.isNull() )
       continue;
 
     geosGeometries << asGeos( g.constGet(), mPrecision ).release();
diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp
@@ -152,7 +152,7 @@ void QgsMapHitTest::runHitTestLayer( QgsVectorLayer *vl, SymbolSet &usedSymbols,
   {
     context.expressionContext().setFeature( f );
     // filter out elements outside of the polygon
-    if ( f.geometry() && polygonEngine )
+    if ( f.hasGeometry() && polygonEngine )
     {
       if ( !polygonEngine->intersects( f.geometry().constGet() ) )
       {
diff --git a/src/core/qgsogcutils.cpp b/src/core/qgsogcutils.cpp
@@ -1135,7 +1135,7 @@ QDomElement QgsOgcUtils::geometryToGML( const QgsGeometry &geometry, QDomDocumen
                                         const QString &gmlIdBase,
                                         int precision )
 {
-  if ( !geometry )
+  if ( geometry.isNull() )
     return QDomElement();
 
   // coordinate separator
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
@@ -1567,7 +1567,7 @@ void QgsPalLayerSettings::registerFeature( QgsFeature &f, QgsRenderContext &cont
   }
 
   geos::unique_ptr geosObstacleGeomClone;
-  if ( obstacleGeometry )
+  if ( !obstacleGeometry.isNull() )
   {
     geosObstacleGeomClone = QgsGeos::asGeos( obstacleGeometry );
   }
@@ -2000,7 +2000,7 @@ void QgsPalLayerSettings::registerObstacleFeature( QgsFeature &f, QgsRenderConte
   mCurFeat = &f;
 
   QgsGeometry geom;
-  if ( obstacleGeometry )
+  if ( !obstacleGeometry.isNull() )
   {
     geom = obstacleGeometry;
   }
diff --git a/src/core/qgsvectorlayerdiagramprovider.cpp b/src/core/qgsvectorlayerdiagramprovider.cpp
diff --git a/src/gui/qgsmaptoolcapture.cpp b/src/gui/qgsmaptoolcapture.cpp
diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp
diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp
diff --git a/src/server/services/wfs/qgswfsgetfeature.cpp b/src/server/services/wfs/qgswfsgetfeature.cpp
diff --git a/tests/src/analysis/testqgsprocessing.cpp b/tests/src/analysis/testqgsprocessing.cpp
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp
diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ QgsInterpolator::Result QgsInterpolator::cacheBaseData( QgsFeedback *feedback )`
`114`	`114`
`115`	`115`	`bool QgsInterpolator::addVerticesToCache( const QgsGeometry &geom, ValueSource source, double attributeValue )`
`116`	`116`	`{`
`117`		`- if ( !geom \|\| geom.isEmpty() )`
	`117`	`+ if ( geom.isNull() \|\| geom.isEmpty() )`
`118`	`118`	`return true; // nothing to do`
`119`	`119`
`120`	`120`	`//validate source`
Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ QgsFeatureList QgsBoundaryAlgorithm::processFeature( const QgsFeature &feature,`
`109`	`109`	`{`
`110`	`110`	`QgsGeometry inputGeometry = feature.geometry();`
`111`	`111`	`QgsGeometry outputGeometry = QgsGeometry( inputGeometry.constGet()->boundary() );`
`112`		`- if ( !outputGeometry )`
	`112`	`+ if ( outputGeometry.isNull() )`
`113`	`113`	`{`
`114`	`114`	`feedback->reportError( QObject::tr( "No boundary for feature %1 (possibly a closed linestring?)'" ).arg( feature.id() ) );`
`115`	`115`	`outFeature.clearGeometry();`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ QVariantMap QgsBufferAlgorithm::processAlgorithm( const QVariantMap &parameters,`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`QgsGeometry outputGeometry = f.geometry().buffer( distance, segments, endCapStyle, joinStyle, miterLimit );`
`139`		`- if ( !outputGeometry )`
	`139`	`+ if ( outputGeometry.isNull() )`
`140`	`140`	`{`
`141`	`141`	`QgsMessageLog::logMessage( QObject::tr( "Error calculating buffer for feature %1" ).arg( f.id() ), QObject::tr( "Processing" ), Qgis::Warning );`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ QgsFeatureList QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsPro`
`104`	`104`	`{`
`105`	`105`	`QgsGeometry partGeometry( geomCollection->geometryN( i )->clone() );`
`106`	`106`	`QgsGeometry outputGeometry = partGeometry.centroid();`
`107`		`- if ( !outputGeometry )`
	`107`	`+ if ( outputGeometry.isNull() )`
`108`	`108`	`{`
`109`	`109`	`feedback->pushInfo( QObject::tr( "Error calculating centroid for feature %1 part %2: %3" ).arg( feature.id() ).arg( i ).arg( outputGeometry.lastError() ) );`
`110`	`110`	`}`
`@@ -115,7 +115,7 @@ QgsFeatureList QgsCentroidAlgorithm::processFeature( const QgsFeature &f, QgsPro`
`115`	`115`	`else`
`116`	`116`	`{`
`117`	`117`	`QgsGeometry outputGeometry = feature.geometry().centroid();`
`118`		`- if ( !outputGeometry )`
	`118`	`+ if ( outputGeometry.isNull() )`
`119`	`119`	`{`
`120`	`120`	`feedback->pushInfo( QObject::tr( "Error calculating centroid for feature %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );`
`121`	`121`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,11 +83,11 @@ QgsFeatureList QgsConvexHullAlgorithm::processFeature( const QgsFeature &feature`
`83`	`83`	`else`
`84`	`84`	`{`
`85`	`85`	`outputGeometry = f.geometry().convexHull();`
`86`		`- if ( !outputGeometry )`
	`86`	`+ if ( outputGeometry.isNull() )`
`87`	`87`	`feedback->reportError( outputGeometry.lastError() );`
`88`	`88`	`f.setGeometry( outputGeometry );`
`89`	`89`	`}`
`90`		`- if ( outputGeometry )`
	`90`	`+ if ( !outputGeometry.isNull() )`
`91`	`91`	`{`
`92`	`92`	`QgsAttributes attrs = f.attributes();`
`93`	`93`	`attrs << outputGeometry.constGet()->area()`
Original file line number	Diff line number	Diff line change
`@@ -67,7 +67,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet`
`67`	`67`	`firstFeature = false;`
`68`	`68`	`}`
`69`	`69`
`70`		`- if ( f.hasGeometry() && f.geometry() )`
	`70`	`+ if ( f.hasGeometry() && !f.geometry().isNull() )`
`71`	`71`	`{`
`72`	`72`	`geomQueue.append( f.geometry() );`
`73`	`73`	`if ( maxQueueLength > 0 && geomQueue.length() > maxQueueLength )`
`@@ -118,7 +118,7 @@ QVariantMap QgsCollectorAlgorithm::processCollection( const QVariantMap &paramet`
`118`	`118`	`attributeHash.insert( indexAttributes, f.attributes() );`
`119`	`119`	`}`
`120`	`120`
`121`		`- if ( f.hasGeometry() && f.geometry() )`
	`121`	`+ if ( f.hasGeometry() && !f.geometry().isNull() )`
`122`	`122`	`{`
`123`	`123`	`geometryHash[ indexAttributes ].append( f.geometry() );`
`124`	`124`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ QgsFeatureList QgsFixGeometriesAlgorithm::processFeature( const QgsFeature &feat`
`93`	`93`	`QgsFeature outputFeature = feature;`
`94`	`94`
`95`	`95`	`QgsGeometry outputGeometry = outputFeature.geometry().makeValid();`
`96`		`- if ( !outputGeometry )`
	`96`	`+ if ( outputGeometry.isNull() )`
`97`	`97`	`{`
`98`	`98`	`feedback->pushInfo( QObject::tr( "makeValid failed for feature %1 " ).arg( feature.id() ) );`
`99`	`99`	`outputFeature.clearGeometry();`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ QVariantMap QgsKMeansClusteringAlgorithm::processAlgorithm( const QVariantMap &p`
`115`	`115`	`else`
`116`	`116`	`{`
`117`	`117`	`QgsGeometry centroid = feat.geometry().centroid();`
`118`		`- if ( !centroid )`
	`118`	`+ if ( centroid.isNull() )`
`119`	`119`	`continue; // centroid failed, e.g. empty linestring`
`120`	`120`
`121`	`121`	`point = QgsPointXY( qgsgeometry_cast< const QgsPoint >( centroid.constGet() ) );`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ QgsFeatureList QgsMultiRingConstantBufferAlgorithm::processFeature( const QgsFea`
`133`	`133`	`QgsFeature out;`
`134`	`134`	`currentDistance = i * distance;`
`135`	`135`	`outputGeometry = feature.geometry().buffer( currentDistance, 40 );`
`136`		`- if ( !outputGeometry )`
	`136`	`+ if ( outputGeometry.isNull() )`
`137`	`137`	`{`
`138`	`138`	`feedback->reportError( QObject::tr( "Error calculating buffer for feature %1" ).arg( feature.id() ) );`
`139`	`139`	`continue;`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ QgsFeatureList QgsPointOnSurfaceAlgorithm::processFeature( const QgsFeature &f,`
`102`	`102`	`{`
`103`	`103`	`QgsGeometry partGeometry( geomCollection->geometryN( i )->clone() );`
`104`	`104`	`QgsGeometry outputGeometry = partGeometry.pointOnSurface();`
`105`		`- if ( !outputGeometry )`
	`105`	`+ if ( outputGeometry.isNull() )`
`106`	`106`	`{`
`107`	`107`	`feedback->pushInfo( QObject::tr( "Error calculating point on surface for feature %1 part %2: %3" ).arg( feature.id() ).arg( i ).arg( outputGeometry.lastError() ) );`
`108`	`108`	`}`
`@@ -113,7 +113,7 @@ QgsFeatureList QgsPointOnSurfaceAlgorithm::processFeature( const QgsFeature &f,`
`113`	`113`	`else`
`114`	`114`	`{`
`115`	`115`	`QgsGeometry outputGeometry = feature.geometry().pointOnSurface();`
`116`		`- if ( !outputGeometry )`
	`116`	`+ if ( outputGeometry.isNull() )`
`117`	`117`	`{`
`118`	`118`	`feedback->pushInfo( QObject::tr( "Error calculating point on surface for feature %1: %2" ).arg( feature.id() ).arg( outputGeometry.lastError() ) );`
`119`	`119`	`}`