diff --git a/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in b/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in index 770de2f28f1..e8398614d71 100644 --- a/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in +++ b/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in @@ -517,13 +517,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the geometry. %End - std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom ) const; %Docstring Calculate the intersection of this and ``otherGeom``. :param otherGeom: geometry to perform the operation -:param parameters: can be used to specify parameters which control the - intersection results :return: new geometry @@ -532,13 +530,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the returned geometry. %End - std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom ) const; %Docstring Calculate the intersection of this and ``otherGeom``. :param otherGeom: geometry to perform the operation -:param parameters: can be used to specify parameters which control the - intersection results :return: new geometry diff --git a/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in b/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in index 770de2f28f1..e8398614d71 100644 --- a/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in +++ b/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in @@ -517,13 +517,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the geometry. %End - std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom ) const; %Docstring Calculate the intersection of this and ``otherGeom``. :param otherGeom: geometry to perform the operation -:param parameters: can be used to specify parameters which control the - intersection results :return: new geometry @@ -532,13 +530,11 @@ be retrieved by calling :py:func:`~QgsSfcgalGeometry.lastError` on the returned geometry. %End - std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom ) const; %Docstring Calculate the intersection of this and ``otherGeom``. :param otherGeom: geometry to perform the operation -:param parameters: can be used to specify parameters which control the - intersection results :return: new geometry diff --git a/src/core/geometry/qgssfcgalgeometry.cpp b/src/core/geometry/qgssfcgalgeometry.cpp index 5c69df0b1f5..3a6525eaa6a 100644 --- a/src/core/geometry/qgssfcgalgeometry.cpp +++ b/src/core/geometry/qgssfcgalgeometry.cpp @@ -390,7 +390,7 @@ bool QgsSfcgalGeometry::intersects( const QgsSfcgalGeometry &otherGeom ) const return out; } -std::unique_ptr QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters & ) const +std::unique_ptr QgsSfcgalGeometry::intersection( const QgsAbstractGeometry *otherGeom ) const { sfcgal::errorHandler()->clearText( &mLastError ); sfcgal::shared_geom otherShared = QgsSfcgalEngine::fromAbstractGeometry( otherGeom, &mLastError ); @@ -404,7 +404,7 @@ std::unique_ptr QgsSfcgalGeometry::intersection( const QgsAbs return resultGeom; } -std::unique_ptr QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters & ) const +std::unique_ptr QgsSfcgalGeometry::intersection( const QgsSfcgalGeometry &otherGeom ) const { sfcgal::errorHandler()->clearText( &mLastError ); sfcgal::shared_geom result = QgsSfcgalEngine::intersection( mSfcgalGeom.get(), otherGeom.mSfcgalGeom.get(), &mLastError ); diff --git a/src/core/geometry/qgssfcgalgeometry.h b/src/core/geometry/qgssfcgalgeometry.h index e841ed3b2c5..8c71e277603 100644 --- a/src/core/geometry/qgssfcgalgeometry.h +++ b/src/core/geometry/qgssfcgalgeometry.h @@ -485,27 +485,25 @@ class CORE_EXPORT QgsSfcgalGeometry * Calculate the intersection of this and \a otherGeom. * * \param otherGeom geometry to perform the operation - * \param parameters can be used to specify parameters which control the intersection results * \return new geometry * * If an error was encountered during the operation, more information can be retrieved * by calling lastError() on the returned geometry. * */ - std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsAbstractGeometry *otherGeom ) const; /** * Calculate the intersection of this and \a otherGeom. * * \param otherGeom geometry to perform the operation - * \param parameters can be used to specify parameters which control the intersection results * \return new geometry * * If an error was encountered during the operation, more information can be retrieved * by calling lastError() on the returned geometry. * */ - std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; + std::unique_ptr intersection( const QgsSfcgalGeometry &otherGeom ) const; /** * Calculate the combination of this and \a geomList.