Rename QgsPolygonV2 to QgsPolygon

Author: m-kuhn

python/core/geometry/qgsabstractgeometry.sip

@@ -35,8 +35,8 @@ class QgsAbstractGeometry
       sipType = sipType_QgsCompoundCurve;
     else if ( qgsgeometry_cast<QgsTriangle *>( sipCpp ) != nullptr )
       sipType = sipType_QgsTriangle;
-    else if ( qgsgeometry_cast<QgsPolygonV2 *>( sipCpp ) != nullptr )
-      sipType = sipType_QgsPolygonV2;
+    else if ( qgsgeometry_cast<QgsPolygon *>( sipCpp ) != nullptr )
+      sipType = sipType_QgsPolygon;
     else if ( qgsgeometry_cast<QgsCurvePolygon *>( sipCpp ) != nullptr )
       sipType = sipType_QgsCurvePolygon;
     else if ( qgsgeometry_cast<QgsMultiPointV2 *>( sipCpp ) != nullptr )
@@ -396,7 +396,7 @@ Returns the centroid of the geometry
     virtual QgsAbstractGeometry *toCurveType() const = 0 /Factory/;
 %Docstring
  Returns the geometry converted to the more generic curve type.
- E.g. QgsLineString -> QgsCompoundCurve, QgsPolygonV2 -> QgsCurvePolygon,
+ E.g. QgsLineString -> QgsCompoundCurve, QgsPolygon -> QgsCurvePolygon,
  QgsMultiLineString -> QgsMultiCurve, QgsMultiPolygonV2 -> QgsMultiSurface
  :return: the converted geometry. Caller takes ownership
  :rtype: QgsAbstractGeometry

python/core/geometry/qgscurvepolygon.sip

@@ -61,7 +61,7 @@ class QgsCurvePolygon: QgsSurface
 
     virtual double perimeter() const;
 
-    virtual QgsPolygonV2 *surfaceToPolygon() const /Factory/;
+    virtual QgsPolygon *surfaceToPolygon() const /Factory/;
 
     virtual QgsAbstractGeometry *boundary() const /Factory/;
 
@@ -81,13 +81,13 @@ class QgsCurvePolygon: QgsSurface
  :rtype: QgsCurve
 %End
 
-    virtual QgsPolygonV2 *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
+    virtual QgsPolygon *toPolygon( double tolerance = M_PI_2 / 90, SegmentationToleranceType toleranceType = MaximumAngle ) const /Factory/;
 %Docstring
  Returns a new polygon geometry corresponding to a segmentized approximation
  of the curve.
  \param tolerance segmentation tolerance
  \param toleranceType maximum segmentation angle or maximum difference between approximation and curve*
- :rtype: QgsPolygonV2
+ :rtype: QgsPolygon
 %End
 
     virtual void setExteriorRing( QgsCurve *ring /Transfer/ );

python/core/geometry/qgsellipse.sip

@@ -202,11 +202,11 @@ The circumference of the ellipse using first approximation of Ramanujan.
  :rtype: QgsPointSequence
 %End
 
-    virtual QgsPolygonV2 *toPolygon( unsigned int segments = 36 ) const /Factory/;
+    virtual QgsPolygon *toPolygon( unsigned int segments = 36 ) const /Factory/;
 %Docstring
  Returns a segmented polygon.
  \param segments Number of segments used to segment geometry.
- :rtype: QgsPolygonV2
+ :rtype: QgsPolygon
 %End
 
     virtual QgsLineString *toLineString( unsigned int segments = 36 ) const /Factory/;
@@ -216,10 +216,10 @@ The circumference of the ellipse using first approximation of Ramanujan.
  :rtype: QgsLineString
 %End
 
-    virtual QgsPolygonV2 *orientedBoundingBox() const /Factory/;
+    virtual QgsPolygon *orientedBoundingBox() const /Factory/;
 %Docstring
  Returns the oriented minimal bounding box for the ellipse.
- :rtype: QgsPolygonV2
+ :rtype: QgsPolygon
 %End
 
     virtual QgsRectangle boundingBox() const;

python/core/geometry/qgspolygon.sip

@@ -20,19 +20,19 @@ class QgsPolygonV2: QgsCurvePolygon
 #include "qgspolygon.h"
 %End
   public:
-    QgsPolygonV2();
+    QgsPolygon();
 
     virtual QString geometryType() const;
 
-    virtual QgsPolygonV2 *clone() const /Factory/;
+    virtual QgsPolygon *clone() const /Factory/;
 
     virtual void clear();
 
     virtual bool fromWkb( QgsConstWkbPtr &wkb );
 
     virtual QByteArray asWkb() const;
 
-    virtual QgsPolygonV2 *surfaceToPolygon() const /Factory/;
+    virtual QgsPolygon *surfaceToPolygon() const /Factory/;
 
 
     virtual QgsCurvePolygon *toCurveType() const /Factory/;
@@ -63,7 +63,7 @@ class QgsPolygonV2: QgsCurvePolygon
 
   protected:
 
-    virtual QgsPolygonV2 *createEmptyWithSameType() const /Factory/;
+    virtual QgsPolygon *createEmptyWithSameType() const /Factory/;
 
 
 

python/core/geometry/qgsregularpolygon.sip

@@ -145,10 +145,10 @@ A regular polygon is empty if radius equal to 0 or number of sides < 3
  :rtype: QgsPointSequence
 %End
 
-    QgsPolygonV2 *toPolygon() const /Factory/;
+    QgsPolygon *toPolygon() const /Factory/;
 %Docstring
  Returns as a polygon.
- :rtype: QgsPolygonV2
+ :rtype: QgsPolygon
 %End
 
     QgsLineString *toLineString() const /Factory/;

python/core/geometry/qgssurface.sip

@@ -18,11 +18,11 @@ class QgsSurface: QgsAbstractGeometry
 %End
   public:
 
-    virtual QgsPolygonV2 *surfaceToPolygon() const = 0 /Factory/;
+    virtual QgsPolygon *surfaceToPolygon() const = 0 /Factory/;
 %Docstring
  Get a polygon representation of this surface.
  Ownership is transferred to the caller.
- :rtype: QgsPolygonV2
+ :rtype: QgsPolygon
 %End
 
     virtual QgsRectangle boundingBox() const;

python/core/geometry/qgstriangle.sip

@@ -68,7 +68,7 @@ class QgsTriangle : QgsPolygonV2
     virtual QDomElement asGML3( QDomDocument &doc, int precision = 17, const QString &ns = "gml" ) const;
 
 
-    virtual QgsPolygonV2 *surfaceToPolygon() const /Factory/;
+    virtual QgsPolygon *surfaceToPolygon() const /Factory/;
 
 
     virtual QgsCurvePolygon *toCurveType() const /Factory/;

python/core/symbology/qgssymbol.sip

@@ -342,7 +342,7 @@ Generate symbol as image
  :rtype: QPolygonF
 %End
 
-    static void _getPolygon( QPolygonF &pts, QList<QPolygonF> &holes, QgsRenderContext &context, const QgsPolygonV2 &polygon, bool clipToExtent = true );
+    static void _getPolygon( QPolygonF &pts, QList<QPolygonF> &holes, QgsRenderContext &context, const QgsPolygon &polygon, bool clipToExtent = true );
 %Docstring
  Creates a polygon in screen coordinates from a QgsPolygonXYin map coordinates
 %End

python/plugins/processing/algs/qgis/GeometryConvert.py

@@ -206,22 +206,22 @@ def convertToPolygon(self, geom):
                         points.append(p)
             linestring = QgsLineString(points)
             linestring.close()
-            p = QgsPolygonV2()
+            p = QgsPolygon()
             p.setExteriorRing(linestring)
             return [QgsGeometry(p)]
         elif QgsWkbTypes.geometryType(geom.wkbType()) == QgsWkbTypes.LineGeometry:
             if QgsWkbTypes.isMultiType(geom):
                 parts = []
                 for i in range(geom.constGet().numGeometries()):
-                    p = QgsPolygonV2()
+                    p = QgsPolygon()
                     linestring = geom.constGet().geometryN(i).clone()
                     linestring.close()
                     p.setExteriorRing(linestring)
                     parts.append(QgsGeometry(p))
                 return QgsGeometry.collectGeometry(parts)
             else:
                 # linestring to polygon
-                p = QgsPolygonV2()
+                p = QgsPolygon()
                 linestring = geom.constGet().clone()
                 linestring.close()
                 p.setExteriorRing(linestring)

python/plugins/processing/algs/qgis/LinesToPolygons.py

@@ -123,7 +123,7 @@ def getSurfaces(self, geometry):
         else:
             # not collection
             if geometry.vertexCount() > 2:
-                surface = QgsPolygonV2()
+                surface = QgsPolygon()
                 surface.setExteriorRing(geometry.clone())
                 surfaces.append(surface)