sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-16 00:03:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

More drop V2 suffix fixes

Browse Source
This commit is contained in:
Matthias Kuhn 2017-10-29 20:47:31 +01:00
parent 271ef7c0a3
commit 750a54f8f6
No known key found for this signature in database
GPG Key ID: A0E766808764D73F
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/qgis/GeometryConvert.py
View File

@ -27,10 +27,10 @@ __revision__ = '$Format:%H$'
from qgis.core import (QgsFeature, from qgis.core import (QgsFeature,
QgsGeometry, QgsGeometry,
QgsMultiPointV2, QgsMultiPoint,
QgsMultiLineString, QgsMultiLineString,
QgsLineString, QgsLineString,
QgsPolygonV2, QgsPolygon,
QgsFeatureSink, QgsFeatureSink,
QgsWkbTypes, QgsWkbTypes,
QgsProcessingException, QgsProcessingException,

4
python/plugins/processing/algs/qgis/LinesToPolygons.py
View File

@ -32,8 +32,8 @@ from qgis.PyQt.QtGui import QIcon
from qgis.core import (QgsFeature, from qgis.core import (QgsFeature,
QgsGeometry, QgsGeometry,
QgsGeometryCollection, QgsGeometryCollection,
QgsPolygonV2, QgsPolygon,
QgsMultiPolygonV2, QgsMultiPolygon,
QgsMultiSurface, QgsMultiSurface,
QgsWkbTypes, QgsWkbTypes,
QgsFeatureSink, QgsFeatureSink,

2
python/plugins/processing/algs/qgis/MinimumBoundingGeometry.py
View File

@ -46,7 +46,7 @@ from qgis.core import (QgsField,
QgsProcessing, QgsProcessing,
QgsFeature, QgsFeature,
QgsVertexId, QgsVertexId,
QgsMultiPointV2) QgsMultiPoint)
from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm from processing.algs.qgis.QgisAlgorithm import QgisAlgorithm

2
tests/src/core/testqgsgeometry.cpp
View File

@ -85,7 +85,7 @@ class TestQgsGeometry : public QObject
void point(); //test QgsPointV2 void point(); //test QgsPointV2
void lineString(); //test QgsLineString void lineString(); //test QgsLineString
void circularString(); void circularString();
void polygon(); //test QgsPolygonV2 void polygon(); //test QgsPolygon
void curvePolygon(); void curvePolygon();
void triangle(); void triangle();
void circle(); void circle();

12
tests/src/python/test_qgsgeometry.py
View File

@ -29,10 +29,10 @@ from qgis.core import (
QgsLineString, QgsLineString,
QgsMultiCurve, QgsMultiCurve,
QgsMultiLineString, QgsMultiLineString,
QgsMultiPointV2, QgsMultiPoint,
QgsMultiPolygonV2, QgsMultiPolygon,
QgsMultiSurface, QgsMultiSurface,
QgsPolygonV2, QgsPolygon,
QgsCoordinateTransform, QgsCoordinateTransform,
QgsRectangle, QgsRectangle,
QgsWkbTypes, QgsWkbTypes,
@ -1947,11 +1947,11 @@ class TestQgsGeometry(unittest.TestCase):
(QgsLineString, "LineString", QgsWkbTypes.LineString), (QgsLineString, "LineString", QgsWkbTypes.LineString),
(QgsMultiCurve, "MultiCurve", QgsWkbTypes.MultiCurve), (QgsMultiCurve, "MultiCurve", QgsWkbTypes.MultiCurve),
(QgsMultiLineString, "MultiLineString", QgsWkbTypes.MultiLineString), (QgsMultiLineString, "MultiLineString", QgsWkbTypes.MultiLineString),
(QgsMultiPointV2, "MultiPoint", QgsWkbTypes.MultiPoint), (QgsMultiPoint, "MultiPoint", QgsWkbTypes.MultiPoint),
(QgsMultiPolygonV2, "MultiPolygon", QgsWkbTypes.MultiPolygon), (QgsMultiPolygon, "MultiPolygon", QgsWkbTypes.MultiPolygon),
(QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface), (QgsMultiSurface, "MultiSurface", QgsWkbTypes.MultiSurface),
(QgsPoint, "Point", QgsWkbTypes.Point), (QgsPoint, "Point", QgsWkbTypes.Point),
(QgsPolygonV2, "Polygon", QgsWkbTypes.Polygon), (QgsPolygon, "Polygon", QgsWkbTypes.Polygon),
] ]
for geomtype in types: for geomtype in types: