Rename qgspoint.h and qgspointv2.h

To qgspointxy.h
And qgspoint.h

python/core/conversions.sip

@@ -259,7 +259,7 @@ template <TYPE>
 {
 %TypeHeaderCode
 #include <QList>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
 
 %ConvertFromTypeCode
@@ -333,7 +333,7 @@ template <TYPE>
 {
 %TypeHeaderCode
 #include <QList>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
 
 %ConvertFromTypeCode

python/core/geometry/qgspointv2.sip

@@ -18,7 +18,7 @@ class QgsPoint: QgsAbstractGeometry
 %End
 
 %TypeHeaderCode
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
   public:
 

python/core/qgspoint.sip

@@ -20,7 +20,7 @@ class QgsPointXY
 %End
 
 %TypeHeaderCode
-#include "qgspoint.h"
+#include "qgspointxy.h"
 %End
   public:
     QgsPointXY();

src/analysis/network/qgsgraph.h

@@ -29,7 +29,7 @@
 #include <QVector>
 #include <QVariant>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_analysis.h"
 
 class QgsGraphVertex;

src/analysis/openstreetmap/qgsosmbase.h

@@ -17,7 +17,7 @@
 
 #include <QString>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include <sqlite3.h>
 #include "qgis_analysis.h"

src/analysis/vector/qgsgeometrysnapper.h

@@ -22,7 +22,7 @@
 #include <QStringList>
 #include "qgsspatialindex.h"
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometry.h"
 #include "qgis_analysis.h"
 

src/app/composer/qgscomposeritemwidget.cpp

@@ -20,7 +20,7 @@
 #include "qgscomposermap.h"
 #include "qgsatlascomposition.h"
 #include "qgscomposition.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgspropertyoverridebutton.h"
 #include "qgsexpressioncontext.h"
 #include "qgsproject.h"

src/app/dwg/qgsdwgimporter.cpp

@@ -22,7 +22,7 @@
 #include "libdwgr.h"
 #include "libdxfrw.h"
 #include "qgis.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgscircularstring.h"
 #include "qgscurvepolygon.h"

src/app/gps/qgsgpsinformationwidget.cpp

@@ -29,7 +29,7 @@
 #include "qgslogger.h"
 #include "qgsmaptooladdfeature.h"
 #include "qgsnmeaconnection.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsrubberband.h"
 #include "qgsvectordataprovider.h"

src/app/gps/qgsgpsmarker.h

@@ -18,7 +18,7 @@
 
 #include "qgsmapcanvasitem.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include <QSvgRenderer>
 
 class QPainter;

src/app/nodetool/qgsselectedfeature.cpp

@@ -17,7 +17,7 @@
 #include "nodetool/qgsvertexentry.h"
 
 #include "qgsfeatureiterator.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgssettings.h"
 #include "qgslogger.h"
 #include "qgsvertexmarker.h"

src/app/nodetool/qgsvertexentry.h

@@ -16,10 +16,10 @@
 #ifndef QGSVERTEXENTRY_H
 #define QGSVERTEXENTRY_H
 
-#include <qgspointv2.h>
-#include <qgsvertexmarker.h>
-#include <qgsmapcanvas.h>
-#include <qgsmaplayer.h>
+#include "qgspoint.h"
+#include "qgsvertexmarker.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayer.h"
 
 class QgsVertexEntry
 {

src/app/qgisapp.cpp

@@ -218,7 +218,7 @@ Q_GUI_EXPORT extern int qt_defaultDpiX();
 #include "qgspluginlayerregistry.h"
 #include "qgspluginmanager.h"
 #include "qgspluginregistry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsruntimeprofiler.h"
 #include "qgshandlebadlayers.h"
 #include "qgsproject.h"

src/app/qgisapp.h

@@ -130,7 +130,7 @@ class QgsDataSourceManagerDialog;
 #include "qgsauthmanager.h"
 #include "qgsconfig.h"
 #include "qgsfeature.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsmessagebar.h"
 #include "qgsmimedatautils.h"
 #include "qgswelcomepageitemsmodel.h"

src/app/qgsdecorationgrid.cpp

@@ -25,7 +25,7 @@
 #include "qgsrasterlayer.h"
 #include "qgsmaptopixel.h"
 #include "qgspathresolver.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgssymbollayerutils.h" //for pointOnLineWithDistance
 #include "qgssymbol.h" //for symbology

src/app/qgsdecorationitem.cpp

@@ -24,7 +24,7 @@
 #include "qgsmapdecoration.h"
 #include "qgsmaplayer.h"
 #include "qgsmaptopixel.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgssymbollayerutils.h" //for pointOnLineWithDistance
 #include "qgsunittypes.h"

src/app/qgsdecorationscalebar.cpp

@@ -29,7 +29,7 @@ email                : sbr00pwb@users.sourceforge.net
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 #include "qgsmaptopixel.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsunittypes.h"
 #include "qgssettings.h"

src/app/qgsmapcanvasdockwidget.h

@@ -18,7 +18,7 @@
 #include <ui_qgsmapcanvasdockwidgetbase.h>
 
 #include "qgsdockwidget.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_app.h"
 #include <QWidgetAction>
 #include <QTimer>

src/app/qgsmaptooladdcircularstring.cpp

@@ -21,7 +21,7 @@
 #include "qgsgeometryutils.h"
 #include "qgslinestring.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgisapp.h"
 
 QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *parentTool, QgsMapCanvas *canvas, CaptureMode mode )

src/app/qgsmaptoolcircularstringcurvepoint.cpp

@@ -17,7 +17,7 @@
 #include "qgscompoundcurve.h"
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include <QMouseEvent>
 
 QgsMapToolCircularStringCurvePoint::QgsMapToolCircularStringCurvePoint( QgsMapToolCapture *parentTool,

src/app/qgsmaptoolcircularstringradius.cpp

@@ -20,7 +20,7 @@
 #include "qgsgeometryutils.h"
 #include "qgsgeometryrubberband.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsstatusbar.h"
 #include <QDoubleSpinBox>
 #include <QMouseEvent>

src/app/qgsmaptoolcircularstringradius.h

@@ -18,7 +18,7 @@
 #define QGSMAPTOOLCIRCULARSTRINGRADIUS_H
 
 #include "qgsmaptooladdcircularstring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class QDoubleSpinBox;
 

src/app/qgsmaptoolmeasureangle.h

@@ -17,7 +17,7 @@
 #define QGSMAPTOOLMEASUREANGLE_H
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsdistancearea.h"
 #include "qgis_app.h"
 

src/app/qgsmaptoolselect.cpp

@@ -20,7 +20,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis.h"
 
 #include <QMouseEvent>

src/app/qgsmaptoolselectradius.h

@@ -18,7 +18,7 @@ email                : jpalmer at linz dot govt dot nz
 
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_app.h"
 
 class QgsMapCanvas;

src/app/qgsmaptoolselectrectangle.cpp

@@ -22,7 +22,7 @@
 #include "qgsvectorlayer.h"
 #include "qgscursors.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis.h"
 
 #include <QMouseEvent>

src/app/qgsmeasuredialog.h

@@ -19,7 +19,7 @@
 
 #include "ui_qgsmeasurebase.h"
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsdistancearea.h"
 #include "qgshelp.h"
 #include "qgis_app.h"

src/core/CMakeLists.txt

@@ -224,7 +224,7 @@ SET(QGIS_CORE_SRCS
   qgspathresolver.cpp
   qgspluginlayer.cpp
   qgspluginlayerregistry.cpp
-  qgspoint.cpp
+  qgspointxy.cpp
   qgspointlocator.cpp
   qgsproject.cpp
   qgsprojectbadlayerhandler.cpp
@@ -413,7 +413,7 @@ SET(QGIS_CORE_SRCS
   geometry/qgsmultipoint.cpp
   geometry/qgsmultipolygon.cpp
   geometry/qgsmultisurface.cpp
-  geometry/qgspointv2.cpp
+  geometry/qgspoint.cpp
   geometry/qgspolygon.cpp
   geometry/qgsrectangle.cpp
   geometry/qgsregularpolygon.cpp
@@ -559,7 +559,7 @@ SET(QGIS_CORE_MOC_HDRS
   qgsofflineediting.h
   qgsowsconnection.h
   qgspluginlayer.h
-  qgspoint.h
+  qgspointxy.h
   qgspointlocator.h
   qgsproject.h
   qgsrelationmanager.h
@@ -641,7 +641,7 @@ SET(QGIS_CORE_MOC_HDRS
   raster/qgsrasterlayer.h
   raster/qgsrasterdataprovider.h
 
-  geometry/qgspointv2.h
+  geometry/qgspoint.h
 
   gps/qgsgpsconnection.h
   gps/qgsgpsdetector.h

src/core/annotations/qgsannotation.h

@@ -20,7 +20,7 @@
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsrendercontext.h"
 #include "qgssymbol.h"

src/core/dxf/qgsdxfexport.cpp

@@ -29,7 +29,7 @@
 #include "qgsdxfexport.h"
 #include "qgsdxfpallabeling.h"
 #include "qgsvectordataprovider.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsrenderer.h"
 #include "qgssymbollayer.h"
@@ -44,7 +44,7 @@
 #include "qgsmaplayerstylemanager.h"
 
 #include "qgswkbtypes.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeos.h"
 
 #include "pal/feature.h"

src/core/dxf/qgsdxfpaintengine.h

@@ -21,7 +21,7 @@
 #include "qgis_core.h"
 #include <QPaintEngine>
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class QgsDxfExport;
 class QgsDxfPaintDevice;

src/core/geometry/qgsabstractgeometry.cpp

@@ -18,7 +18,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgswkbptr.h"
 #include "qgsgeos.h"
 #include "qgsmaptopixel.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #include <limits>
 #include <QTransform>

src/core/geometry/qgsbox3d.h

@@ -20,7 +20,7 @@
 
 #include "qgis_core.h"
 #include "qgsrectangle.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 /** \ingroup core
  * A 3-dimensional box composed of x, y, z coordinates.

src/core/geometry/qgscircle.h

@@ -22,7 +22,7 @@
 
 #include "qgis_core.h"
 #include "qgsellipse.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgsrectangle.h"
 #include "qgscircularstring.h"

src/core/geometry/qgscircularstring.cpp

@@ -21,7 +21,7 @@
 #include "qgsgeometryutils.h"
 #include "qgslinestring.h"
 #include "qgsmaptopixel.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgswkbptr.h"
 #include <QPainter>
 #include <QPainterPath>

src/core/geometry/qgscurve.cpp

@@ -17,7 +17,7 @@
 
 #include "qgscurve.h"
 #include "qgslinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmultipoint.h"
 
 QgsCurve::QgsCurve(): QgsAbstractGeometry()

src/core/geometry/qgsellipse.h

@@ -21,7 +21,7 @@
 #include <QString>
 
 #include "qgis_core.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgsrectangle.h"

src/core/geometry/qgsgeometry.cpp

@@ -30,7 +30,7 @@ email                : morb at ozemail dot com dot au
 #include "qgslogger.h"
 #include "qgsmaptopixel.h"
 #include "qgsmessagelog.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 #include "qgsvectorlayer.h"
@@ -41,7 +41,7 @@ email                : morb at ozemail dot com dot au
 #include "qgsmultipoint.h"
 #include "qgsmultipolygon.h"
 #include "qgsmultisurface.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 

src/core/geometry/qgsgeometry.h

@@ -36,8 +36,8 @@ email                : morb at ozemail dot com dot au
 
 #include "qgsabstractgeometry.h"
 #include "qgsfeature.h"
+#include "qgspointxy.h"
 #include "qgspoint.h"
-#include "qgspointv2.h"
 
 
 class QgsGeometryEngine;

src/core/geometry/qgsgeometrycollection.cpp

@@ -21,7 +21,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgscompoundcurve.h"
 #include "qgslinestring.h"
 #include "qgsmultilinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmultipoint.h"
 #include "qgspolygon.h"
 #include "qgsmultipolygon.h"

src/core/geometry/qgsgeometrycollection.h

@@ -22,7 +22,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgis_core.h"
 #include "qgis.h"
 #include "qgsabstractgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 
 /** \ingroup core

src/core/geometry/qgsgeometryfactory.cpp

@@ -19,7 +19,7 @@
 #include "qgscircularstring.h"
 #include "qgscompoundcurve.h"
 #include "qgscurvepolygon.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgsmulticurve.h"

src/core/geometry/qgsgeometryfactory.h

@@ -27,7 +27,7 @@ class QgsConstWkbPtr;
 class QgsRectangle;
 
 //compatibility with old classes
-#include "qgspoint.h"
+#include "qgspointxy.h"
 typedef QVector<QgsPointXY> QgsPolyline;
 typedef QVector<QgsPolyline> QgsPolygon;
 typedef QVector<QgsPointXY> QgsMultiPoint;

src/core/geometry/qgsgeometryutils.h

@@ -20,7 +20,7 @@ email                : marco.hugentobler at sourcepole dot com
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 
 class QgsLineString;

src/core/geometry/qgsmultipoint.cpp

@@ -16,7 +16,7 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgsmultipoint.h"
 #include "qgsapplication.h"
 #include "qgsgeometryutils.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgswkbptr.h"
 
 QgsMultiPointV2::QgsMultiPointV2()

src/core/geometry/qgspoint.cpp

@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsapplication.h"
 #include "qgscoordinatetransform.h"
 #include "qgsgeometryutils.h"

src/core/geometry/qgsrectangle.cpp

@@ -25,7 +25,7 @@
 #include <QRegExp>
 #include <qnumeric.h>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 #include "qgslogger.h"
 #include "qgsbox3d.h"

src/core/geometry/qgsrectangle.h

@@ -25,7 +25,7 @@
 class QString;
 class QRectF;
 class QgsBox3d;
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 /** \ingroup core

src/core/geometry/qgsregularpolygon.h

@@ -21,7 +21,7 @@
 #include <QString>
 
 #include "qgis_core.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgscircle.h"

src/core/qgsbearingutils.cpp

@@ -17,7 +17,7 @@
 
 #include "qgsbearingutils.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatetransform.h"
 #include "qgsexception.h"
 

src/core/qgsclipper.h

@@ -21,7 +21,7 @@
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 #include <QVector>

src/core/qgscoordinatetransform.cpp

@@ -19,7 +19,7 @@
 #include "qgsapplication.h"
 #include "qgsmessagelog.h"
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 #include "qgscsexception.h"
 

src/core/qgsdistancearea.cpp

@@ -19,7 +19,7 @@
 
 #include "qgsdistancearea.h"
 #include "qgis.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatetransform.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsgeometry.h"

src/core/qgsmaptopixel.cpp

@@ -22,7 +22,7 @@
 #include <QTransform>
 
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 QgsMapToPixel::QgsMapToPixel( double mapUnitsPerPixel,

src/core/qgspallabeling.h

@@ -37,7 +37,7 @@
 #include "qgsgeometry.h"
 #include "qgsfields.h"
 #include "qgslabelingenginesettings.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsmapunitscale.h"
 #include "qgsstringutils.h"
 #include "qgstextrenderer.h"

src/core/qgspointlocator.h

@@ -21,7 +21,7 @@ class QgsVectorLayer;
 
 #include "qgis_core.h"
 #include "qgsfeature.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransform.h"
 

src/core/qgspointxy.cpp

@@ -16,8 +16,8 @@
  ***************************************************************************/
 
 
+#include "qgspointxy.h"
 #include "qgspoint.h"
-#include "qgspointv2.h"
 
 #include <cmath>
 #include <QTextStream>

src/core/qgspointxy.h

@@ -31,8 +31,13 @@
 class QgsPoint;
 
 /** \ingroup core
- * A class to represent a point.
- * For Z and M support prefer QgsPointV2.
+ * A class to represent a 2D point.
+ *
+ * A QgsPointXY represents a position with X and Y coordinates.
+ * In most scenarios it is preferable to use a QgsPoint instead which also
+ * supports Z and M values.
+ *
+ * \since QGIS 3.0
  */
 class CORE_EXPORT QgsPointXY
 {

src/core/qgspropertytransformer.h

@@ -18,7 +18,7 @@
 #include "qgis_core.h"
 #include "qgsexpression.h"
 #include "qgsexpressioncontext.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include <QVariant>
 #include <QHash>
 #include <QString>

src/core/qgsvectorlayer.cpp

@@ -57,7 +57,7 @@
 #include "qgsmessagelog.h"
 #include "qgsogcutils.h"
 #include "qgspainting.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsproject.h"
 #include "qgsproviderregistry.h"
 #include "qgsrectangle.h"
@@ -73,7 +73,7 @@
 #include "qgsvectorlayerrenderer.h"
 #include "qgsvectorlayerundocommand.h"
 #include "qgsvectorlayerfeaturecounter.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsrenderer.h"
 #include "qgssymbollayer.h"
 #include "qgssinglesymbolrenderer.h"

src/core/qgsvectorlayereditutils.cpp

@@ -19,7 +19,7 @@
 #include "qgsvectorlayereditbuffer.h"
 #include "qgslinestring.h"
 #include "qgslogger.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometryfactory.h"
 #include "qgis.h"
 #include "qgswkbtypes.h"

src/core/raster/qgsrasterviewport.h

@@ -17,7 +17,7 @@
 #ifndef QGSRASTERVIEWPORT_H
 #define QGSRASTERVIEWPORT_H
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgsrectangle.h"
 

src/core/simplify/effectivearea.h

@@ -24,7 +24,7 @@
 
 #include "qgsabstractgeometry.h"
 #include "qgscurve.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #ifndef _EFFECTIVEAREA_H
 #define _EFFECTIVEAREA_H 1

src/core/symbology-ng/qgsrenderer.cpp

@@ -33,7 +33,7 @@
 #include "qgseffectstack.h"
 #include "qgspainteffectregistry.h"
 #include "qgswkbptr.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsproperty.h"
 
 #include <QDomElement>

src/core/symbology-ng/qgssymbol.h

@@ -21,7 +21,7 @@
 #include <QList>
 #include <QMap>
 #include "qgsmapunitscale.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsrendercontext.h"

src/gui/qgsadvanceddigitizingdockwidget.cpp

@@ -26,7 +26,7 @@
 #include "qgsmaptoolcapture.h"
 #include "qgsmaptooladvanceddigitizing.h"
 #include "qgsmessagebaritem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgslinestring.h"
 #include "qgsfocuswatcher.h"
 #include "qgssettings.h"

src/gui/qgsgeometryrubberband.cpp

@@ -18,7 +18,7 @@
 #include "qgsgeometryrubberband.h"
 #include "qgsabstractgeometry.h"
 #include "qgsmapcanvas.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include <QPainter>
 
 QgsGeometryRubberBand::QgsGeometryRubberBand( QgsMapCanvas *mapCanvas, QgsWkbTypes::GeometryType geomType ): QgsMapCanvasItem( mapCanvas ),

src/gui/qgsmapmouseevent.h

@@ -18,7 +18,7 @@
 
 #include <QMouseEvent>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgspointlocator.h"
 #include "qgis_gui.h"
 

src/gui/qgsmaptool.h

@@ -19,7 +19,7 @@
 #include "qgsconfig.h"
 #include "qgis.h"
 #include "qgsmessagebar.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsmapmouseevent.h"
 
 #include <QCursor>

src/gui/qgsmaptoolidentify.h

@@ -19,7 +19,7 @@
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsunittypes.h"
 
 #include <QObject>

src/gui/qgsvertexmarker.h

@@ -17,7 +17,7 @@
 #define QGSVERTEXMARKER_H
 
 #include "qgsmapcanvasitem.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgis_gui.h"
 
 class QPainter;

src/plugins/coordinate_capture/coordinatecapturemaptool.h

@@ -17,7 +17,7 @@
 #define COORDINATECAPTUREMAPTOOL_H
 
 #include "qgsmaptool.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include <QObject>
 #include <QPointer>

src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp

@@ -32,7 +32,7 @@
 #include "qgsmapcanvas.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsfields.h"
 #include "qgsrectangle.h"
 

src/plugins/evis/idtool/eviseventidtool.h

@@ -33,7 +33,7 @@
 #include "qgsmaplayer.h"
 #include "qgsmaptool.h"
 #include "qgsmapcanvas.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include "evisgenericeventbrowsergui.h"
 

src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h

@@ -18,7 +18,7 @@
 #define QGS_GEOMETRYCHECKERUTILS_H
 
 #include "geometry/qgsabstractgeometry.h"
-#include "geometry/qgspointv2.h"
+#include "geometry/qgspoint.h"
 #include <qmath.h>
 
 class QgsGeometryEngine;

src/plugins/georeferencer/qgsgcplist.cpp

@@ -13,7 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsgeorefdatapoint.h"
 
 #include "qgsgcplist.h"

src/plugins/georeferencer/qgsimagewarper.h

@@ -20,7 +20,7 @@
 
 #include <gdalwarper.h>
 #include <vector>
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 
 class QgsGeorefTransform;

src/plugins/georeferencer/qgsleastsquares.h

@@ -19,7 +19,7 @@
 #include <cstdarg>
 #include <stdexcept>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 
 class QgsLeastSquares

src/plugins/georeferencer/qgsmapcoordsdialog.h

@@ -17,7 +17,7 @@
 
 #include "qgsmaptoolemitpoint.h"
 #include "qgssnappingutils.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsvertexmarker.h"
 #include "qgsmapcanvas.h"
 

src/plugins/georeferencer/qgsrasterchangecoords.h

@@ -18,7 +18,7 @@
 
 #include <QVector>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgsrectangle.h"
 
 class QgsRasterChangeCoords

src/plugins/grass/qgsgrassregion.h

@@ -21,7 +21,7 @@
 #include "qgscoordinatetransform.h"
 #include "qgsmaptool.h"
 #include "qgsrubberband.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 class QgsGrassPlugin;
 class QgsGrassRegionEdit;

src/providers/arcgisrest/qgsarcgisrestutils.cpp

@@ -26,7 +26,7 @@
 #include "geometry/qgsmultipoint.h"
 #include "geometry/qgsmulticurve.h"
 #include "geometry/qgspolygon.h"
-#include "geometry/qgspointv2.h"
+#include "geometry/qgspoint.h"
 
 #include <QEventLoop>
 #include <QNetworkRequest>

src/providers/gdal/qgsgdalprovider.cpp

@@ -32,7 +32,7 @@
 #include "qgsrasteridentifyresult.h"
 #include "qgsrasterlayer.h"
 #include "qgsrasterpyramid.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgssettings.h"
 
 #include <QImage>

src/providers/grass/qgsgrassprovider.cpp

@@ -26,7 +26,7 @@
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgslinestring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgsrectangle.h"
 #include "qgsvectorlayer.h"

src/providers/grass/qgsgrassvectormap.cpp

@@ -19,7 +19,7 @@
 
 #include "qgslinestring.h"
 #include "qgspolygon.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 #include "qgslogger.h"
 #include "qgsgeometry.h"

tests/src/app/testqgisappclipboard.cpp

@@ -28,7 +28,7 @@
 #include "qgsclipboard.h"
 #include "qgsvectorlayer.h"
 #include "qgsgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgssettings.h"
 
 /** \ingroup UnitTests

tests/src/core/testqgsconnectionpool.cpp

@@ -17,7 +17,7 @@
 #include "qgsapplication.h"
 #include "qgsfeatureiterator.h"
 #include "qgsgeometry.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgsvectorlayer.h"
 #include <QEventLoop>

tests/src/core/testqgsgeometry.cpp

@@ -31,7 +31,7 @@
 #include <qgsgeometry.h>
 #include "qgsgeometryutils.h"
 #include <qgspoint.h>
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgspolygon.h"
 #include "qgstriangle.h"

tests/src/core/testqgsgeometryimport.cpp

@@ -15,7 +15,7 @@
 
 #include "qgsapplication.h"
 #include "qgsgeometry.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgswkbptr.h"
 #include <QPolygonF>
 

tests/src/core/testqgsmapsettings.cpp

@@ -22,7 +22,7 @@
 #include "qgsexpressioncontext.h"
 #include "qgsrectangle.h"
 #include "qgsmapsettings.h"
-#include "qgspoint.h"
+#include "qgspointxy.h"
 #include "qgslogger.h"
 #include "qgsapplication.h"
 #include "qgsmaplayerlistutils.h"

tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp

@@ -32,7 +32,7 @@
 #if 0
 #include <qgspoint.h>
 #include "qgsgeometryutils.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgslinestring.h"
 #include "qgspolygon.h"
 #include "qgscircularstring.h"

tests/src/core/testqgsogrutils.cpp

@@ -26,7 +26,7 @@
 #include "qgsgeometry.h"
 #include "qgsogrutils.h"
 #include "qgsapplication.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class TestQgsOgrUtils: public QObject
 {

tests/src/core/testqgsprocessing.cpp

@@ -27,7 +27,7 @@
 #include "qgstestutils.h"
 #include "qgsrasterlayer.h"
 #include "qgsproject.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 #include "qgsgeometry.h"
 #include "qgsvectorfilewriter.h"
 

tests/src/core/testqgsvectorfilewriter.cpp

@@ -22,7 +22,7 @@
 #include "qgsvectorfilewriter.h" //logic for writing shpfiles
 #include "qgsfeature.h" //we will need to pass a bunch of these for each rec
 #include "qgsgeometry.h" //each feature needs a geometry
-#include "qgspoint.h" //we will use point geometry
+#include "qgspointxy.h" //we will use point geometry
 #include "qgscoordinatereferencesystem.h" //needed for creating a srs
 #include "qgsapplication.h" //search path for srs.db
 #include "qgslogger.h"

tests/src/providers/grass/testqgsgrassprovider.cpp

@@ -22,24 +22,24 @@
 #include <QTemporaryFile>
 #include "qgstest.h"
 
-#include <qgsapplication.h>
-#include <qgscoordinatereferencesystem.h>
+#include "qgsapplication.h"
+#include "qgscoordinatereferencesystem.h"
 #include "qgsfeatureiterator.h"
-#include <qgsgeometry.h>
-#include <qgslinestring.h>
-#include <qgspointv2.h>
-#include <qgspolygon.h>
-#include <qgsproviderregistry.h>
-#include <qgsrasterbandstats.h>
+#include "qgsgeometry.h"
+#include "qgslinestring.h"
+#include "qgspoint.h"
+#include "qgspolygon.h"
+#include "qgsproviderregistry.h"
+#include "qgsrasterbandstats.h"
 #include "qgsrasterdataprovider.h"
-#include <qgsrasterlayer.h>
+#include "qgsrasterlayer.h"
 #include "qgsrasterprojector.h"
-#include <qgsvectordataprovider.h>
-#include <qgsvectorlayer.h>
+#include "qgsvectordataprovider.h"
+#include "qgsvectorlayer.h"
 
-#include <qgsgrass.h>
-#include <qgsgrassimport.h>
-#include <qgsgrassprovider.h>
+#include "qgsgrass.h"
+#include "qgsgrassimport.h"
+#include "qgsgrassprovider.h"
 
 extern "C"
 {