diff --git a/python/core/geometry/qgspointv2.sip b/python/core/geometry/qgspointv2.sip index 7f0f00b12fa..2638ff8bbc9 100644 --- a/python/core/geometry/qgspointv2.sip +++ b/python/core/geometry/qgspointv2.sip @@ -14,7 +14,7 @@ class QgsPoint: QgsAbstractGeometry { %Docstring Point geometry type, with support for z-dimension and m-values. -.. versionadded:: 2.10 +.. versionadded:: 3.0 %End %TypeHeaderCode diff --git a/python/plugins/processing/algs/qgis/GridLine.py b/python/plugins/processing/algs/qgis/GridLine.py index 16c65c4229a..a15e58cb567 100644 --- a/python/plugins/processing/algs/qgis/GridLine.py +++ b/python/plugins/processing/algs/qgis/GridLine.py @@ -150,8 +150,8 @@ class GridLine(GeoAlgorithm): count_update = count_max * 0.10 y = bbox.yMaximum() while y >= bbox.yMinimum(): - pt1 = QgsPointXY(bbox.xMinimum(), y) - pt2 = QgsPointXY(bbox.xMaximum(), y) + pt1 = QgsPoint(bbox.xMinimum(), y) + pt2 = QgsPoint(bbox.xMaximum(), y) line = QgsLineString() line.setPoints([pt1, pt2]) feat.setGeometry(QgsGeometry(line)) @@ -177,8 +177,8 @@ class GridLine(GeoAlgorithm): count_update = count_max * 0.10 x = bbox.xMinimum() while x <= bbox.xMaximum(): - pt1 = QgsPointXY(x, bbox.yMaximum()) - pt2 = QgsPointXY(x, bbox.yMinimum()) + pt1 = QgsPoint(x, bbox.yMaximum()) + pt2 = QgsPoint(x, bbox.yMinimum()) line = QgsLineString() line.setPoints([pt1, pt2]) feat.setGeometry(QgsGeometry(line)) diff --git a/src/core/geometry/qgspointv2.h b/src/core/geometry/qgspointv2.h index 59d4931a71d..bb953be895a 100644 --- a/src/core/geometry/qgspointv2.h +++ b/src/core/geometry/qgspointv2.h @@ -30,9 +30,8 @@ ****************************************************************************/ /** \ingroup core - * \class QgsPointV2 * \brief Point geometry type, with support for z-dimension and m-values. - * \since QGIS 2.10 + * \since QGIS 3.0, (previously QgsPointv2 since QGIS 2.10) */ class CORE_EXPORT QgsPoint: public QgsAbstractGeometry { diff --git a/tests/src/python/test_qgsbearingutils.py b/tests/src/python/test_qgsbearingutils.py index 5ff59de3969..f1635d7141f 100644 --- a/tests/src/python/test_qgsbearingutils.py +++ b/tests/src/python/test_qgsbearingutils.py @@ -16,7 +16,7 @@ import qgis # NOQA switch sip api from qgis.core import (QgsBearingUtils, QgsCoordinateReferenceSystem, - QgsPoint + QgsPointXY ) from qgis.testing import start_app, unittest diff --git a/tests/src/python/test_qgsmaprenderer.py b/tests/src/python/test_qgsmaprenderer.py index afe0308a942..17d0ab38cff 100644 --- a/tests/src/python/test_qgsmaprenderer.py +++ b/tests/src/python/test_qgsmaprenderer.py @@ -26,7 +26,7 @@ from qgis.core import (QgsMapRendererCache, QgsFeature, QgsGeometry, QgsMapSettings, - QgsPoint) + QgsPointXY) from qgis.testing import start_app, unittest from qgis.PyQt.QtCore import QSize, QThreadPool from qgis.PyQt.QtGui import QPainter, QImage diff --git a/tests/src/python/test_qgspoint.py b/tests/src/python/test_qgspoint.py index 229748e220c..b82c511cfa0 100644 --- a/tests/src/python/test_qgspoint.py +++ b/tests/src/python/test_qgspoint.py @@ -14,7 +14,7 @@ __revision__ = '$Format:%H$' import qgis # NOQA -from qgis.core import QgsPoint +from qgis.core import QgsPointXY from qgis.testing import start_app, unittest