From d3c8c2d37f80c291b575ce23b32b9f69011c6c41 Mon Sep 17 00:00:00 2001 From: Jean Felder Date: Tue, 5 Aug 2025 15:10:28 +0200 Subject: [PATCH] qgssfcgalgeometry: Add missing SIP_OUT parameter to combine --- .../core/auto_generated/geometry/qgssfcgalgeometry.sip.in | 6 +++--- .../core/auto_generated/geometry/qgssfcgalgeometry.sip.in | 6 +++--- src/core/geometry/qgssfcgalgeometry.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in b/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in index 6eed550d7f0..6e0dae14559 100644 --- a/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in +++ b/python/PyQt6/core/auto_generated/geometry/qgssfcgalgeometry.sip.in @@ -417,14 +417,14 @@ Calculate the intersection of this and ``otherGeom``. - errorMsg: Error message returned by SFGCAL %End - std::unique_ptr combine( const QVector &geomList, QString *errorMsg ) const; + std::unique_ptr combine( const QVector &geomList, QString *errorMsg /Out/ = 0 ) const; %Docstring Calculate the combination of this and ``geomList``. :param geomList: list of geometries to perform the operation -:param errorMsg: Error message returned by SFGCAL -:return: new geometry +:return: - new geometry + - errorMsg: Error message returned by SFGCAL %End std::unique_ptr difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; diff --git a/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in b/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in index 6eed550d7f0..6e0dae14559 100644 --- a/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in +++ b/python/core/auto_generated/geometry/qgssfcgalgeometry.sip.in @@ -417,14 +417,14 @@ Calculate the intersection of this and ``otherGeom``. - errorMsg: Error message returned by SFGCAL %End - std::unique_ptr combine( const QVector &geomList, QString *errorMsg ) const; + std::unique_ptr combine( const QVector &geomList, QString *errorMsg /Out/ = 0 ) const; %Docstring Calculate the combination of this and ``geomList``. :param geomList: list of geometries to perform the operation -:param errorMsg: Error message returned by SFGCAL -:return: new geometry +:return: - new geometry + - errorMsg: Error message returned by SFGCAL %End std::unique_ptr difference( const QgsAbstractGeometry *otherGeom, QString *errorMsg /Out/ = 0, const QgsGeometryParameters ¶meters = QgsGeometryParameters() ) const; diff --git a/src/core/geometry/qgssfcgalgeometry.h b/src/core/geometry/qgssfcgalgeometry.h index 273556f55d2..a280d2296a1 100644 --- a/src/core/geometry/qgssfcgalgeometry.h +++ b/src/core/geometry/qgssfcgalgeometry.h @@ -375,7 +375,7 @@ class CORE_EXPORT QgsSfcgalGeometry * \param errorMsg Error message returned by SFGCAL * \return new geometry */ - std::unique_ptr combine( const QVector &geomList, QString *errorMsg ) const; + std::unique_ptr combine( const QVector &geomList, QString *errorMsg SIP_OUT = nullptr ) const; /** * Calculate the difference of this and \a otherGeom.