Revert "QgsGeometryCheckError class requires context in constructor (not inherited classes yet)"

3nids · m-kuhn · commit 3817df69b208 · 2018-10-15T14:27:57.000+02:00
This reverts commit 73c89ae.
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in
@@ -33,7 +33,6 @@ the Free Software Foundation; either version 2 of the License, or     *
     enum ValueType { ValueLength, ValueArea, ValueOther };
 
     QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QgsGeometryCheckContext *context,
                            const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
                            const QgsPointXY &errorLocation,
                            QgsVertexId vidx = QgsVertexId(),
@@ -44,7 +43,6 @@ the Free Software Foundation; either version 2 of the License, or     *
 
 
     const QgsGeometryCheck *check() const;
-    const QgsGeometryCheckContext *context() const;
     const QString &layerId() const;
     QgsFeatureId featureId() const;
     QgsGeometry geometry() const;
diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerutils.sip.in
@@ -35,7 +35,7 @@ the Free Software Foundation; either version 2 of the License, or     *
 %End
       public:
 
-        LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, const QgsGeometryCheckContext *context, bool useMapCrs );
+        LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, QgsGeometryCheckContext *context, bool useMapCrs );
 %Docstring
 Create a new layer/feature combination.
 The layer is defined by ``pool``, ``feature`` needs to be from this layer.
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryanglecheck.cpp
@@ -63,7 +63,7 @@ void QgsGeometryAngleCheck::collectErrors( const QMap<QString, QgsFeaturePool *>
           double angle = std::acos( v21 * v23 ) / M_PI * 180.0;
           if ( angle < mMinAngle )
           {
-            errors.append( new QgsGeometryCheckError( this, context, layerFeature, p2, QgsVertexId( iPart, iRing, iVert ), angle ) );
+            errors.append( new QgsGeometryCheckError( this, layerFeature, p2, QgsVertexId( iPart, iRing, iVert ), angle ) );
           }
         }
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryareacheck.cpp
@@ -20,7 +20,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();
@@ -35,7 +35,7 @@ void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool *>
       const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( geom, iPart );
       if ( checkThreshold( layerToMapUnits, part, value ) )
       {
-        errors.append( new QgsGeometryCheckError( this, context, layerFeature, part->centroid(), QgsVertexId( iPart ), value * layerToMapUnits * layerToMapUnits, QgsGeometryCheckError::ValueArea ) );
+        errors.append( new QgsGeometryCheckError( this, layerFeature, part->centroid(), QgsVertexId( iPart ), value * layerToMapUnits * layerToMapUnits, QgsGeometryCheckError::ValueArea ) );
       }
     }
   }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp b/src/analysis/vector/geometry_checker/qgsgeometrychecker.cpp
@@ -200,14 +200,14 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo
     {
       if ( !recheckAreaFeatures.isEmpty() )
       {
-        check->collectErrors( mFeaturePools, mContext, recheckErrors, mMessages, nullptr, recheckAreaFeatures );
+        check->collectErrors( mFeaturePools, recheckErrors, mMessages, nullptr, recheckAreaFeatures );
       }
     }
     else
     {
       if ( !recheckFeatures.isEmpty() )
       {
-        check->collectErrors( mFeaturePools, mContext, recheckErrors, mMessages, nullptr, recheckFeatures );
+        check->collectErrors( mFeaturePools, recheckErrors, mMessages, nullptr, recheckFeatures );
       }
     }
   }
@@ -285,7 +285,7 @@ void QgsGeometryChecker::runCheck( const QMap<QString, QgsFeaturePool *> &featur
   // Run checks
   QList<QgsGeometryCheckError *> errors;
   QStringList messages;
-  check->collectErrors( featurePools, mContext, errors, messages, &mFeedback );
+  check->collectErrors( featurePools, errors, messages, &mFeedback );
   mErrorListMutex.lock();
   mCheckErrors.append( errors );
   mMessages.append( messages );
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerror.h
@@ -33,7 +33,6 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
     enum ValueType { ValueLength, ValueArea, ValueOther };
 
     QgsGeometryCheckError( const QgsGeometryCheck *check,
-                           const QgsGeometryCheckContext *context,
                            const QgsGeometryCheckerUtils::LayerFeature &layerFeature,
                            const QgsPointXY &errorLocation,
                            QgsVertexId vidx = QgsVertexId(),
@@ -45,7 +44,6 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
     const QgsGeometryCheckError &operator=( const QgsGeometryCheckError & ) = delete;
 
     const QgsGeometryCheck *check() const { return mCheck; }
-    const QgsGeometryCheckContext *context() const {return mContext;}
     const QString &layerId() const { return mLayerId; }
     QgsFeatureId featureId() const { return mFeatureId; }
     // In map units
@@ -101,7 +99,6 @@ class ANALYSIS_EXPORT QgsGeometryCheckError
                            ValueType valueType = ValueOther );
 
     const QgsGeometryCheck *mCheck = nullptr;
-    const QgsGeometryCheckContext *mContext = nullptr;
     QString mLayerId;
     QgsFeatureId mFeatureId;
     QgsGeometry mGeometry;
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.cpp
@@ -31,7 +31,7 @@
 
 QgsGeometryCheckerUtils::LayerFeature::LayerFeature( const QgsFeaturePool *pool,
     const QgsFeature &feature,
-    const QgsGeometryCheckContext *context,
+    QgsGeometryCheckContext *context,
     bool useMapCrs )
   : mFeaturePool( pool )
   , mFeature( feature )
@@ -211,7 +211,7 @@ QgsGeometryCheckerUtils::LayerFeatures::LayerFeatures( const QMap<QString, QgsFe
     const QMap<QString, QgsFeatureIds> &featureIds,
     const QList<QgsWkbTypes::GeometryType> &geometryTypes,
     QgsFeedback *feedback,
-    const QgsGeometryCheckContext *context,
+    QgsGeometryCheckContext *context,
     bool useMapCrs )
   : mFeaturePools( featurePools )
   , mFeatureIds( featureIds )
@@ -225,7 +225,7 @@ QgsGeometryCheckerUtils::LayerFeatures::LayerFeatures( const QMap<QString, QgsFe
 QgsGeometryCheckerUtils::LayerFeatures::LayerFeatures( const QMap<QString, QgsFeaturePool *> &featurePools,
     const QList<QString> &layerIds, const QgsRectangle &extent,
     const QList<QgsWkbTypes::GeometryType> &geometryTypes,
-    const QgsGeometryCheckContext *context )
+    QgsGeometryCheckContext *context )
   : mFeaturePools( featurePools )
   , mLayerIds( layerIds )
   , mExtent( extent )
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h b/src/analysis/vector/geometry_checker/qgsgeometrycheckerutils.h
@@ -41,7 +41,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
          * If \a useMapCrs is True, geometries will be reprojected to the mapCrs defined
          * in \a context.
          */
-        LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, const QgsGeometryCheckContext *context, bool useMapCrs );
+        LayerFeature( const QgsFeaturePool *pool, const QgsFeature &feature, QgsGeometryCheckContext *context, bool useMapCrs );
 
         /**
          * Returns the feature.
@@ -89,13 +89,13 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
                        const QMap<QString, QgsFeatureIds> &featureIds,
                        const QList<QgsWkbTypes::GeometryType> &geometryTypes,
                        QgsFeedback *feedback,
-                       const QgsGeometryCheckContext *context,
+                       QgsGeometryCheckContext *context,
                        bool useMapCrs = false );
 
         LayerFeatures( const QMap<QString, QgsFeaturePool *> &featurePools,
                        const QList<QString> &layerIds, const QgsRectangle &extent,
                        const QList<QgsWkbTypes::GeometryType> &geometryTypes,
-                       const QgsGeometryCheckContext *context );
+                       QgsGeometryCheckContext *context );
 
         class iterator
         {
@@ -133,7 +133,7 @@ class ANALYSIS_EXPORT QgsGeometryCheckerUtils
         QgsRectangle mExtent;
         QList<QgsWkbTypes::GeometryType> mGeometryTypes;
         QgsFeedback *mFeedback = nullptr;
-        const QgsGeometryCheckContext *mContext = nullptr;
+        QgsGeometryCheckContext *mContext = nullptr;
         bool mUseMapCrs = true;
     };
 
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.cpp
@@ -20,7 +20,7 @@
 #include "qgsvectorlayer.h"
 
 
-void QgsGeometryContainedCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryContainedCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();
   QgsGeometryCheckerUtils::LayerFeatures layerFeaturesA( featurePools, featureIds, compatibleGeometryTypes(), feedback, mContext );
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h b/src/analysis/vector/geometry_checker/qgsgeometrycontainedcheck.h
@@ -30,7 +30,7 @@ class ANALYSIS_EXPORT QgsGeometryContainedCheckError : public QgsGeometryCheckEr
                                     const QgsPointXY &errorLocation,
                                     const QgsGeometryCheckerUtils::LayerFeature &containingFeature
                                   )
-      : QgsGeometryCheckError( check, check->context(), layerFeature, errorLocation, QgsVertexId(), containingFeature.id(), ValueOther )
+      : QgsGeometryCheckError( check, layerFeature, errorLocation, QgsVertexId(), containingFeature.id(), ValueOther )
       , mContainingFeature( qMakePair( containingFeature.layer()->id(), containingFeature.feature().id() ) )
     { }
     const QPair<QString, QgsFeatureId> &containingFeature() const { return mContainingFeature; }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrydanglecheck.cpp
@@ -19,7 +19,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();
@@ -84,11 +84,11 @@ void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool *
       }
       if ( !p1touches )
       {
-        errors.append( new QgsGeometryCheckError( this, context, layerFeature, p1, QgsVertexId( iPart, 0, 0 ) ) );
+        errors.append( new QgsGeometryCheckError( this, layerFeature, p1, QgsVertexId( iPart, 0, 0 ) ) );
       }
       if ( !p2touches )
       {
-        errors.append( new QgsGeometryCheckError( this, context, layerFeature, p2, QgsVertexId( iPart, 0, nVerts - 1 ) ) );
+        errors.append( new QgsGeometryCheckError( this, layerFeature, p2, QgsVertexId( iPart, 0, nVerts - 1 ) ) );
       }
     }
   }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrydegeneratepolygoncheck.cpp
@@ -19,7 +19,7 @@
 #include "qgsgeometrycheckerror.h"
 
 
-void QgsGeometryDegeneratePolygonCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryDegeneratePolygonCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -35,7 +35,7 @@ void QgsGeometryDegeneratePolygonCheck::collectErrors( const QMap<QString, QgsFe
         if ( QgsGeometryCheckerUtils::polyLineSize( geom, iPart, iRing ) < 3 )
         {
           QgsVertexId vidx( iPart, iRing );
-          errors.append( new QgsGeometryCheckError( this, context, layerFeature, geom->vertexAt( vidx ), vidx ) );
+          errors.append( new QgsGeometryCheckError( this, layerFeature, geom->vertexAt( vidx ), vidx ) );
         }
       }
     }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatecheck.cpp
@@ -38,7 +38,7 @@ QString QgsGeometryDuplicateCheckError::duplicatesString( const QMap<QString, Qg
 }
 
 
-void QgsGeometryDuplicateCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryDuplicateCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();
   QgsGeometryCheckerUtils::LayerFeatures layerFeaturesA( featurePools, featureIds, compatibleGeometryTypes(), feedback, mContext, true );
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryduplicatenodescheck.cpp
@@ -19,7 +19,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryDuplicateNodesCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryDuplicateNodesCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -41,7 +41,7 @@ void QgsGeometryDuplicateNodesCheck::collectErrors( const QMap<QString, QgsFeatu
           QgsPoint pj = geom->vertexAt( QgsVertexId( iPart, iRing, jVert ) );
           if ( QgsGeometryUtils::sqrDistance2D( pi, pj ) < mContext->tolerance )
           {
-            errors.append( new QgsGeometryCheckError( this, context, layerFeature, pj, QgsVertexId( iPart, iRing, jVert ) ) );
+            errors.append( new QgsGeometryCheckError( this, layerFeature, pj, QgsVertexId( iPart, iRing, jVert ) ) );
           }
         }
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryfollowboundariescheck.cpp
@@ -36,7 +36,7 @@ QgsGeometryFollowBoundariesCheck::~QgsGeometryFollowBoundariesCheck()
   delete mIndex;
 }
 
-void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -70,7 +70,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea
     if ( refFeatureIds.isEmpty() )
     {
       // If no potential reference features are found, the geometry is definitely not following boundaries of reference layer features
-      errors.append( new QgsGeometryCheckError( this, context, layerFeature, QgsPointXY( geom->centroid() ) ) );
+      errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( geom->centroid() ) ) );
     }
     else
     {
@@ -83,7 +83,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea
         QgsGeometry reducedRefGeom( refgeomEngine->buffer( -mContext->tolerance, 0 ) );
         if ( !( geomEngine->contains( reducedRefGeom.constGet() ) || geomEngine->disjoint( reducedRefGeom.constGet() ) ) )
         {
-          errors.append( new QgsGeometryCheckError( this, context, layerFeature, QgsPointXY( geom->centroid() ) ) );
+          errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( geom->centroid() ) ) );
           break;
         }
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometryholecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometryholecheck.cpp
@@ -20,7 +20,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryHoleCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryHoleCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -41,7 +41,7 @@ void QgsGeometryHoleCheck::collectErrors( const QMap<QString, QgsFeaturePool *>
       {
 
         QgsPoint pos = poly->interiorRing( iRing - 1 )->centroid();
-        errors.append( new QgsGeometryCheckError( this, context, layerFeature, pos, QgsVertexId( iPart, iRing ) ) );
+        errors.append( new QgsGeometryCheckError( this, layerFeature, pos, QgsVertexId( iPart, iRing ) ) );
       }
     }
   }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylineintersectioncheck.cpp
@@ -19,7 +19,7 @@
 #include "qgsvectorlayer.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryLineIntersectionCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryLineIntersectionCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -67,7 +67,7 @@ void QgsGeometryLineIntersectionCheck::collectErrors( const QMap<QString, QgsFea
           const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );
           for ( const QgsPoint &inter : intersections )
           {
-            errors.append( new QgsGeometryCheckError( this, context, layerFeatureA, inter, QgsVertexId( iPart ), layerFeatureB.id() ) );
+            errors.append( new QgsGeometryCheckError( this, layerFeatureA, inter, QgsVertexId( iPart ), layerFeatureB.id() ) );
           }
         }
       }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrylinelayerintersectioncheck.cpp
@@ -20,7 +20,7 @@
 #include "qgsfeaturepool.h"
 #include "qgsgeometrycheckerror.h"
 
-void QgsGeometryLineLayerIntersectionCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, const QgsGeometryCheckContext *context, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
+void QgsGeometryLineLayerIntersectionCheck::collectErrors( const QMap<QString, QgsFeaturePool *> &featurePools, QList<QgsGeometryCheckError *> &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const
 {
   Q_UNUSED( messages )
 
@@ -52,7 +52,7 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( const QMap<QString, Q
             const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, testLine, mContext->tolerance );
             for ( const QgsPoint &inter : intersections )
             {
-              errors.append( new QgsGeometryCheckError( this, context, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
+              errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
             }
           }
           else if ( const QgsPolygon *polygon = dynamic_cast<const QgsPolygon *>( part ) )
@@ -63,7 +63,7 @@ void QgsGeometryLineLayerIntersectionCheck::collectErrors( const QMap<QString, Q
               const QList< QgsPoint > intersections = QgsGeometryCheckerUtils::lineIntersections( line, ring, mContext->tolerance );
               for ( const QgsPoint &inter : intersections )
               {
-                errors.append( new QgsGeometryCheckError( this, context, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
+                errors.append( new QgsGeometryCheckError( this, layerFeature, inter, QgsVertexId( iPart ), checkFeature.id() ) );
               }
             }
           }
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrypointcoveredbylinecheck.cpp
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrypointinpolygoncheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrypointinpolygoncheck.cpp
diff --git a/src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp b/src/analysis/vector/geometry_checker/qgsgeometrysegmentlengthcheck.cpp
diff --git a/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp b/src/analysis/vector/geometry_checker/qgssinglegeometrycheck.cpp

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ void QgsGeometryAngleCheck::collectErrors( const QMap<QString, QgsFeaturePool *>`
`63`	`63`	`double angle = std::acos( v21 * v23 ) / M_PI * 180.0;`
`64`	`64`	`if ( angle < mMinAngle )`
`65`	`65`	`{`
`66`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, p2, QgsVertexId( iPart, iRing, iVert ), angle ) );`
	`66`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, p2, QgsVertexId( iPart, iRing, iVert ), angle ) );`
`67`	`67`	`}`
`68`	`68`	`}`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@`
`20`	`20`	`#include "qgsfeaturepool.h"`
`21`	`21`	`#include "qgsgeometrycheckerror.h"`
`22`	`22`
`23`		`-void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, const QgsGeometryCheckContext context, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback feedback, const LayerFeatureIds &ids ) const`
	`23`	`+void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const`
`24`	`24`	`{`
`25`	`25`	`Q_UNUSED( messages )`
`26`	`26`	`QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();`
`@@ -35,7 +35,7 @@ void QgsGeometryAreaCheck::collectErrors( const QMap<QString, QgsFeaturePool *>`
`35`	`35`	`const QgsAbstractGeometry *part = QgsGeometryCheckerUtils::getGeomPart( geom, iPart );`
`36`	`36`	`if ( checkThreshold( layerToMapUnits, part, value ) )`
`37`	`37`	`{`
`38`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, part->centroid(), QgsVertexId( iPart ), value * layerToMapUnits * layerToMapUnits, QgsGeometryCheckError::ValueArea ) );`
	`38`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, part->centroid(), QgsVertexId( iPart ), value * layerToMapUnits * layerToMapUnits, QgsGeometryCheckError::ValueArea ) );`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -200,14 +200,14 @@ bool QgsGeometryChecker::fixError( QgsGeometryCheckError *error, int method, boo`
`200`	`200`	`{`
`201`	`201`	`if ( !recheckAreaFeatures.isEmpty() )`
`202`	`202`	`{`
`203`		`- check->collectErrors( mFeaturePools, mContext, recheckErrors, mMessages, nullptr, recheckAreaFeatures );`
	`203`	`+ check->collectErrors( mFeaturePools, recheckErrors, mMessages, nullptr, recheckAreaFeatures );`
`204`	`204`	`}`
`205`	`205`	`}`
`206`	`206`	`else`
`207`	`207`	`{`
`208`	`208`	`if ( !recheckFeatures.isEmpty() )`
`209`	`209`	`{`
`210`		`- check->collectErrors( mFeaturePools, mContext, recheckErrors, mMessages, nullptr, recheckFeatures );`
	`210`	`+ check->collectErrors( mFeaturePools, recheckErrors, mMessages, nullptr, recheckFeatures );`
`211`	`211`	`}`
`212`	`212`	`}`
`213`	`213`	`}`
`@@ -285,7 +285,7 @@ void QgsGeometryChecker::runCheck( const QMap<QString, QgsFeaturePool *> &featur`
`285`	`285`	`// Run checks`
`286`	`286`	`QList<QgsGeometryCheckError *> errors;`
`287`	`287`	`QStringList messages;`
`288`		`- check->collectErrors( featurePools, mContext, errors, messages, &mFeedback );`
	`288`	`+ check->collectErrors( featurePools, errors, messages, &mFeedback );`
`289`	`289`	`mErrorListMutex.lock();`
`290`	`290`	`mCheckErrors.append( errors );`
`291`	`291`	`mMessages.append( messages );`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ class ANALYSIS_EXPORT QgsGeometryContainedCheckError : public QgsGeometryCheckEr`
`30`	`30`	`const QgsPointXY &errorLocation,`
`31`	`31`	`const QgsGeometryCheckerUtils::LayerFeature &containingFeature`
`32`	`32`	`)`
`33`		`- : QgsGeometryCheckError( check, check->context(), layerFeature, errorLocation, QgsVertexId(), containingFeature.id(), ValueOther )`
	`33`	`+ : QgsGeometryCheckError( check, layerFeature, errorLocation, QgsVertexId(), containingFeature.id(), ValueOther )`
`34`	`34`	`, mContainingFeature( qMakePair( containingFeature.layer()->id(), containingFeature.feature().id() ) )`
`35`	`35`	`{ }`
`36`	`36`	`const QPair<QString, QgsFeatureId> &containingFeature() const { return mContainingFeature; }`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@`
`19`	`19`	`#include "qgsvectorlayer.h"`
`20`	`20`	`#include "qgsgeometrycheckerror.h"`
`21`	`21`
`22`		`-void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, const QgsGeometryCheckContext context, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback feedback, const LayerFeatureIds &ids ) const`
	`22`	`+void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const`
`23`	`23`	`{`
`24`	`24`	`Q_UNUSED( messages )`
`25`	`25`	`QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();`
`@@ -84,11 +84,11 @@ void QgsGeometryDangleCheck::collectErrors( const QMap<QString, QgsFeaturePool *`
`84`	`84`	`}`
`85`	`85`	`if ( !p1touches )`
`86`	`86`	`{`
`87`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, p1, QgsVertexId( iPart, 0, 0 ) ) );`
	`87`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, p1, QgsVertexId( iPart, 0, 0 ) ) );`
`88`	`88`	`}`
`89`	`89`	`if ( !p2touches )`
`90`	`90`	`{`
`91`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, p2, QgsVertexId( iPart, 0, nVerts - 1 ) ) );`
	`91`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, p2, QgsVertexId( iPart, 0, nVerts - 1 ) ) );`
`92`	`92`	`}`
`93`	`93`	`}`
`94`	`94`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ QString QgsGeometryDuplicateCheckError::duplicatesString( const QMap<QString, Qg`
`38`	`38`	`}`
`39`	`39`
`40`	`40`
`41`		`-void QgsGeometryDuplicateCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, const QgsGeometryCheckContext context, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback feedback, const LayerFeatureIds &ids ) const`
	`41`	`+void QgsGeometryDuplicateCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const`
`42`	`42`	`{`
`43`	`43`	`QMap<QString, QgsFeatureIds> featureIds = ids.isEmpty() ? allLayerFeatureIds( featurePools ) : ids.toMap();`
`44`	`44`	`QgsGeometryCheckerUtils::LayerFeatures layerFeaturesA( featurePools, featureIds, compatibleGeometryTypes(), feedback, mContext, true );`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ QgsGeometryFollowBoundariesCheck::~QgsGeometryFollowBoundariesCheck()`
`36`	`36`	`delete mIndex;`
`37`	`37`	`}`
`38`	`38`
`39`		`-void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, const QgsGeometryCheckContext context, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback feedback, const LayerFeatureIds &ids ) const`
	`39`	`+void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFeaturePool > &featurePools, QList<QgsGeometryCheckError > &errors, QStringList &messages, QgsFeedback *feedback, const LayerFeatureIds &ids ) const`
`40`	`40`	`{`
`41`	`41`	`Q_UNUSED( messages )`
`42`	`42`
`@@ -70,7 +70,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea`
`70`	`70`	`if ( refFeatureIds.isEmpty() )`
`71`	`71`	`{`
`72`	`72`	`// If no potential reference features are found, the geometry is definitely not following boundaries of reference layer features`
`73`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, QgsPointXY( geom->centroid() ) ) );`
	`73`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( geom->centroid() ) ) );`
`74`	`74`	`}`
`75`	`75`	`else`
`76`	`76`	`{`
`@@ -83,7 +83,7 @@ void QgsGeometryFollowBoundariesCheck::collectErrors( const QMap<QString, QgsFea`
`83`	`83`	`QgsGeometry reducedRefGeom( refgeomEngine->buffer( -mContext->tolerance, 0 ) );`
`84`	`84`	`if ( !( geomEngine->contains( reducedRefGeom.constGet() ) \|\| geomEngine->disjoint( reducedRefGeom.constGet() ) ) )`
`85`	`85`	`{`
`86`		`- errors.append( new QgsGeometryCheckError( this, context, layerFeature, QgsPointXY( geom->centroid() ) ) );`
	`86`	`+ errors.append( new QgsGeometryCheckError( this, layerFeature, QgsPointXY( geom->centroid() ) ) );`
`87`	`87`	`break;`
`88`	`88`	`}`
`89`	`89`	`}`