Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
QgsGeometry::error() does not exist, should be lastError()
  • Loading branch information
nyalldawson committed Jun 15, 2020
1 parent 3ef7d89 commit e653711
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 18 deletions.
18 changes: 9 additions & 9 deletions python/core/auto_generated/geometry/qgsgeometry.sip.in
Expand Up @@ -1263,7 +1263,7 @@ Returns the center of mass of a geometry.
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.

.. note::

Expand All @@ -1284,7 +1284,7 @@ the point on surface will always be inside the geometry.
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.

.. seealso:: :py:func:`centroid`

Expand Down Expand Up @@ -1315,7 +1315,7 @@ Returns the smallest convex polygon that contains all the points in the geometry
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.
%End

QgsGeometry voronoiDiagram( const QgsGeometry &extent = QgsGeometry(), double tolerance = 0.0, bool edgesOnly = false ) const;
Expand Down Expand Up @@ -1364,7 +1364,7 @@ Curved geometries will be segmentized before subdivision.
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.

.. versionadded:: 3.0
%End
Expand Down Expand Up @@ -1428,7 +1428,7 @@ Returns a geometry representing the points shared by this geometry and other.
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.
%End

QgsGeometry clipped( const QgsRectangle &rectangle );
Expand All @@ -1449,7 +1449,7 @@ union geometry operation).
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.

.. note::

Expand All @@ -1475,7 +1475,7 @@ Returns a geometry representing the points making up this geometry that do not m
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.
%End

QgsGeometry symDifference( const QgsGeometry &geometry ) const;
Expand All @@ -1485,7 +1485,7 @@ Returns a geometry representing the points making up this geometry that do not m
If the input is a NULL geometry, the output will also be a NULL geometry.

If an error was encountered while creating the result, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.
%End

QgsGeometry extrude( double x, double y );
Expand Down Expand Up @@ -1899,7 +1899,7 @@ Single polygons may become multi-geometries in case of self-intersections.
It preserves Z values, but M values will be dropped.

If an error was encountered during the process, more information can be retrieved
by calling `error()` on the returned geometry.
by calling lastError() on the returned geometry.

:return: new valid QgsGeometry or null geometry on error

Expand Down
18 changes: 9 additions & 9 deletions src/core/geometry/qgsgeometry.h
Expand Up @@ -1269,7 +1269,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*
* \note for line based geometries, the center point of the line is returned,
* and for point based geometries, the point itself is returned
Expand All @@ -1286,7 +1286,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*
* \see centroid()
* \see poleOfInaccessibility()
Expand All @@ -1313,7 +1313,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*/
QgsGeometry convexHull() const;

Expand Down Expand Up @@ -1360,7 +1360,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*
* \since QGIS 3.0
*/
Expand Down Expand Up @@ -1413,7 +1413,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*/
QgsGeometry intersection( const QgsGeometry &geometry ) const;

Expand All @@ -1433,7 +1433,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*
* \note this operation is not called union since its a reserved word in C++.
*/
Expand All @@ -1455,7 +1455,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*/
QgsGeometry difference( const QgsGeometry &geometry ) const;

Expand All @@ -1465,7 +1465,7 @@ class CORE_EXPORT QgsGeometry
* If the input is a NULL geometry, the output will also be a NULL geometry.
*
* If an error was encountered while creating the result, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*/
QgsGeometry symDifference( const QgsGeometry &geometry ) const;

Expand Down Expand Up @@ -1980,7 +1980,7 @@ class CORE_EXPORT QgsGeometry
* It preserves Z values, but M values will be dropped.
*
* If an error was encountered during the process, more information can be retrieved
* by calling `error()` on the returned geometry.
* by calling lastError() on the returned geometry.
*
* \returns new valid QgsGeometry or null geometry on error
*
Expand Down

0 comments on commit e653711

Please sign in to comment.