Rename qgspoint.h and qgspointv2.h

To qgspointxy.h And qgspoint.h
qgis · Jun 2, 2017 · 2bbadba · 2bbadba · 3nids · Jun 2, 2017
1 parent 4f3cd3e
commit 2bbadba
Show file tree

Hide file tree

Showing 96 changed files with 124 additions and 119 deletions.
diff --git a/python/core/conversions.sip b/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

diff --git a/python/core/geometry/qgspointv2.sip b/python/core/geometry/qgspointv2.sip
@@ -18,7 +18,7 @@ class QgsPoint: QgsAbstractGeometry
 %End
 
 %TypeHeaderCode
-#include "qgspointv2.h"
+#include "qgspoint.h"
 %End
   public:
 

diff --git a/python/core/qgspoint.sip b/python/core/qgspoint.sip
@@ -20,7 +20,7 @@ class QgsPointXY
 %End
 
 %TypeHeaderCode
-#include "qgspoint.h"
+#include "qgspointxy.h"
 %End
   public:
     QgsPointXY();

diff --git a/src/analysis/network/qgsgraph.h b/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;

diff --git a/src/analysis/openstreetmap/qgsosmbase.h b/src/analysis/openstreetmap/qgsosmbase.h
@@ -17,7 +17,7 @@
 
 #include <QString>
 
-#include "qgspoint.h"
+#include "qgspointxy.h"
 
 #include <sqlite3.h>
 #include "qgis_analysis.h"

diff --git a/src/analysis/vector/qgsgeometrysnapper.h b/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"
 

diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/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"

diff --git a/src/app/dwg/qgsdwgimporter.cpp b/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"

diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/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"

diff --git a/src/app/gps/qgsgpsmarker.h b/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;

diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/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"

diff --git a/src/app/nodetool/qgsvertexentry.h b/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
 {

diff --git a/src/app/qgisapp.cpp b/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"

diff --git a/src/app/qgisapp.h b/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"

diff --git a/src/app/qgsdecorationgrid.cpp b/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

diff --git a/src/app/qgsdecorationitem.cpp b/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"

diff --git a/src/app/qgsdecorationscalebar.cpp b/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"

diff --git a/src/app/qgsmapcanvasdockwidget.h b/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>

diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/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 )

diff --git a/src/app/qgsmaptoolcircularstringcurvepoint.cpp b/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,

diff --git a/src/app/qgsmaptoolcircularstringradius.cpp b/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>

diff --git a/src/app/qgsmaptoolcircularstringradius.h b/src/app/qgsmaptoolcircularstringradius.h
@@ -18,7 +18,7 @@
 #define QGSMAPTOOLCIRCULARSTRINGRADIUS_H
 
 #include "qgsmaptooladdcircularstring.h"
-#include "qgspointv2.h"
+#include "qgspoint.h"
 
 class QDoubleSpinBox;
 

diff --git a/src/app/qgsmaptoolmeasureangle.h b/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"
 

diff --git a/src/app/qgsmaptoolselect.cpp b/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>

diff --git a/src/app/qgsmaptoolselectradius.h b/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;

diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/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>

diff --git a/src/app/qgsmeasuredialog.h b/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"

diff --git a/src/core/CMakeLists.txt b/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

diff --git a/src/core/annotations/qgsannotation.h b/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"

diff --git a/src/core/dxf/qgsdxfexport.cpp b/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"

diff --git a/src/core/dxf/qgsdxfpaintengine.h b/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;

diff --git a/src/core/geometry/qgsabstractgeometry.cpp b/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>

diff --git a/src/core/geometry/qgsbox3d.h b/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.

diff --git a/src/core/geometry/qgscircle.h b/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"

diff --git a/src/core/geometry/qgscircularstring.cpp b/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>

diff --git a/src/core/geometry/qgscurve.cpp b/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()

diff --git a/src/core/geometry/qgsellipse.h b/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"