More drop V2 suffix fixes

m-kuhn · m-kuhn · commit 750a54f8f6ff · 2017-10-30T09:14:05.000+01:00
diff --git a/python/plugins/processing/algs/qgis/GeometryConvert.py b/python/plugins/processing/algs/qgis/GeometryConvert.py
@@ -27,10 +27,10 @@
 
 from qgis.core import (QgsFeature,
                        QgsGeometry,
-                       QgsMultiPointV2,
+                       QgsMultiPoint,
                        QgsMultiLineString,
                        QgsLineString,
-                       QgsPolygonV2,
+                       QgsPolygon,
                        QgsFeatureSink,
                        QgsWkbTypes,
                        QgsProcessingException,
diff --git a/python/plugins/processing/algs/qgis/LinesToPolygons.py b/python/plugins/processing/algs/qgis/LinesToPolygons.py
@@ -32,8 +32,8 @@
 from qgis.core import (QgsFeature,
                        QgsGeometry,
                        QgsGeometryCollection,
-                       QgsPolygonV2,
-                       QgsMultiPolygonV2,
+                       QgsPolygon,
+                       QgsMultiPolygon,
                        QgsMultiSurface,
                        QgsWkbTypes,
                        QgsFeatureSink,
diff --git a/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py b/python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
@@ -46,7 +46,7 @@
                        QgsProcessing,
                        QgsFeature,
                        QgsVertexId,
-                       QgsMultiPointV2)
+                       QgsMultiPoint)
 
 from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm
 
diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp
@@ -85,7 +85,7 @@ class TestQgsGeometry : public QObject
     void point(); //test QgsPointV2
     void lineString(); //test QgsLineString
     void circularString();
-    void polygon(); //test QgsPolygonV2
+    void polygon(); //test QgsPolygon
     void curvePolygon();
     void triangle();
     void circle();
diff --git a/tests/src/python/test_qgsgeometry.py b/tests/src/python/test_qgsgeometry.py
@@ -29,10 +29,10 @@
     QgsLineString,
     QgsMultiCurve,
     QgsMultiLineString,
-    QgsMultiPointV2,
-    QgsMultiPolygonV2,
+    QgsMultiPoint,
+    QgsMultiPolygon,
     QgsMultiSurface,
-    QgsPolygonV2,
+    QgsPolygon,
     QgsCoordinateTransform,
     QgsRectangle,
     QgsWkbTypes,
@@ -1947,11 +1947,11 @@ def testTypeInformation(self):
             (QgsLineString, "LineString", QgsWkbTypes.LineString),
             (QgsMultiCurve, "MultiCurve", QgsWkbTypes.MultiCurve),
             (QgsMultiLineString, "MultiLineString", QgsWkbTypes.MultiLineString),
-            (QgsMultiPointV2, "MultiPoint", QgsWkbTypes.MultiPoint),
-            (QgsMultiPolygonV2, "MultiPolygon", QgsWkbTypes.MultiPolygon),
+            (QgsMultiPoint, "MultiPoint", QgsWkbTypes.MultiPoint),
+            (QgsMultiPolygon, "MultiPolygon", QgsWkbTypes.MultiPolygon),
             (QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface),
             (QgsPoint, "Point", QgsWkbTypes.Point),
-            (QgsPolygonV2, "Polygon", QgsWkbTypes.Polygon),
+            (QgsPolygon, "Polygon", QgsWkbTypes.Polygon),
         ]
 
         for geomtype in types:
