Skip to content

Commit b6f46ea

Browse files
m-kuhnm-kuhn
committedOct 30, 2017
Rename QgsPolygonV2 to QgsPolygon
·
ltr-3_40final-3_0_0
1 parent 81586d2 commit b6f46ea

File tree

65 files changed

+283
-283
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+283
-283
lines changed
 

‎python/core/geometry/qgsabstractgeometry.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ class QgsAbstractGeometry
3535
sipType = sipType_QgsCompoundCurve;
3636
else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
3737
sipType = sipType_QgsTriangle;
38-
else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
39-
sipType = sipType_QgsPolygonV2;
38+
else if ( qgsgeometry_cast<QgsPolygon *>( sipCpp ) != nullptr )
39+
sipType = sipType_QgsPolygon;
4040
else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
4141
sipType = sipType_QgsCurvePolygon;
4242
else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
@@ -396,7 +396,7 @@ Returns the centroid of the geometry
396396
virtual QgsAbstractGeometry *toCurveType() const = 0 /Factory/;
397397
%Docstring
398398
Returns the geometry converted to the more generic curve type.
399-
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
399+
E.g. QgsLineString -> QgsCompoundCurve, QgsPolygon -> QgsCurvePolygon,
400400
QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
401401
:return: the converted geometry. Caller takes ownership
402402
:rtype: QgsAbstractGeometry

‎python/core/geometry/qgscurvepolygon.sip

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ class QgsCurvePolygon: QgsSurface
6161

6262
virtual double perimeter() const;
6363

64-
virtual QgsPolygonV2 *surfaceToPolygon() const /Factory/;
64+
virtual QgsPolygon *surfaceToPolygon() const /Factory/;
6565

6666
virtual QgsAbstractGeometry *boundary() const /Factory/;
6767

@@ -81,13 +81,13 @@ class QgsCurvePolygon: QgsSurface
8181
:rtype: QgsCurve
8282
%End
8383

84-
virtual QgsPolygonV2 *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
84+
virtual QgsPolygon *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
8585
%Docstring
8686
Returns a new polygon geometry corresponding to a segmentized approximation
8787
of the curve.
8888
\param tolerance segmentation tolerance
8989
\param toleranceType maximum segmentation angle or maximum difference between approximation and curve*
90-
:rtype: QgsPolygonV2
90+
:rtype: QgsPolygon
9191
%End
9292

9393
virtual void setExteriorRing( QgsCurve *ring /Transfer/ );

0 commit comments

Comments
 (0)
Please sign in to comment.