Skip to content
Permalink
Browse files

Rename qgspoint.h and qgspointv2.h

To qgspointxy.h
And qgspoint.h
  • Loading branch information
m-kuhn committed Jun 2, 2017
1 parent 4f3cd3e commit 2bbadbacb714224a4801a8e87fc5123d53f701fd
Showing with 124 additions and 119 deletions.
  1. +2 −2 python/core/conversions.sip
  2. +1 −1 python/core/geometry/qgspointv2.sip
  3. +1 −1 python/core/qgspoint.sip
  4. +1 −1 src/analysis/network/qgsgraph.h
  5. +1 −1 src/analysis/openstreetmap/qgsosmbase.h
  6. +1 −1 src/analysis/vector/qgsgeometrysnapper.h
  7. +1 −1 src/app/composer/qgscomposeritemwidget.cpp
  8. +1 −1 src/app/dwg/qgsdwgimporter.cpp
  9. +1 −1 src/app/gps/qgsgpsinformationwidget.cpp
  10. +1 −1 src/app/gps/qgsgpsmarker.h
  11. +1 −1 src/app/nodetool/qgsselectedfeature.cpp
  12. +4 −4 src/app/nodetool/qgsvertexentry.h
  13. +1 −1 src/app/qgisapp.cpp
  14. +1 −1 src/app/qgisapp.h
  15. +1 −1 src/app/qgsdecorationgrid.cpp
  16. +1 −1 src/app/qgsdecorationitem.cpp
  17. +1 −1 src/app/qgsdecorationscalebar.cpp
  18. +1 −1 src/app/qgsmapcanvasdockwidget.h
  19. +1 −1 src/app/qgsmaptooladdcircularstring.cpp
  20. +1 −1 src/app/qgsmaptoolcircularstringcurvepoint.cpp
  21. +1 −1 src/app/qgsmaptoolcircularstringradius.cpp
  22. +1 −1 src/app/qgsmaptoolcircularstringradius.h
  23. +1 −1 src/app/qgsmaptoolmeasureangle.h
  24. +1 −1 src/app/qgsmaptoolselect.cpp
  25. +1 −1 src/app/qgsmaptoolselectradius.h
  26. +1 −1 src/app/qgsmaptoolselectrectangle.cpp
  27. +1 −1 src/app/qgsmeasuredialog.h
  28. +4 −4 src/core/CMakeLists.txt
  29. +1 −1 src/core/annotations/qgsannotation.h
  30. +2 −2 src/core/dxf/qgsdxfexport.cpp
  31. +1 −1 src/core/dxf/qgsdxfpaintengine.h
  32. +1 −1 src/core/geometry/qgsabstractgeometry.cpp
  33. +1 −1 src/core/geometry/qgsbox3d.h
  34. +1 −1 src/core/geometry/qgscircle.h
  35. +1 −1 src/core/geometry/qgscircularstring.cpp
  36. +1 −1 src/core/geometry/qgscurve.cpp
  37. +1 −1 src/core/geometry/qgsellipse.h
  38. +2 −2 src/core/geometry/qgsgeometry.cpp
  39. +1 −1 src/core/geometry/qgsgeometry.h
  40. +1 −1 src/core/geometry/qgsgeometrycollection.cpp
  41. +1 −1 src/core/geometry/qgsgeometrycollection.h
  42. +1 −1 src/core/geometry/qgsgeometryfactory.cpp
  43. +1 −1 src/core/geometry/qgsgeometryfactory.h
  44. +1 −1 src/core/geometry/qgsgeometryutils.h
  45. +1 −1 src/core/geometry/qgsmultipoint.cpp
  46. +1 −1 src/core/geometry/{qgspointv2.cpp → qgspoint.cpp}
  47. 0 src/core/geometry/{qgspointv2.h → qgspoint.h}
  48. +1 −1 src/core/geometry/qgsrectangle.cpp
  49. +1 −1 src/core/geometry/qgsrectangle.h
  50. +1 −1 src/core/geometry/qgsregularpolygon.h
  51. +1 −1 src/core/qgsbearingutils.cpp
  52. +1 −1 src/core/qgsclipper.h
  53. +1 −1 src/core/qgscoordinatetransform.cpp
  54. +1 −1 src/core/qgsdistancearea.cpp
  55. +1 −1 src/core/qgsmaptopixel.cpp
  56. +1 −1 src/core/qgspallabeling.h
  57. +1 −1 src/core/qgspointlocator.h
  58. +1 −1 src/core/{qgspoint.cpp → qgspointxy.cpp}
  59. +7 −2 src/core/{qgspoint.h → qgspointxy.h}
  60. +1 −1 src/core/qgspropertytransformer.h
  61. +2 −2 src/core/qgsvectorlayer.cpp
  62. +1 −1 src/core/qgsvectorlayereditutils.cpp
  63. +1 −1 src/core/raster/qgsrasterviewport.h
  64. +1 −1 src/core/simplify/effectivearea.h
  65. +1 −1 src/core/symbology-ng/qgsrenderer.cpp
  66. +1 −1 src/core/symbology-ng/qgssymbol.h
  67. +1 −1 src/gui/qgsadvanceddigitizingdockwidget.cpp
  68. +1 −1 src/gui/qgsgeometryrubberband.cpp
  69. +1 −1 src/gui/qgsmapmouseevent.h
  70. +1 −1 src/gui/qgsmaptool.h
  71. +1 −1 src/gui/qgsmaptoolidentify.h
  72. +1 −1 src/gui/qgsvertexmarker.h
  73. +1 −1 src/plugins/coordinate_capture/coordinatecapturemaptool.h
  74. +1 −1 src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
  75. +1 −1 src/plugins/evis/idtool/eviseventidtool.h
  76. +1 −1 src/plugins/geometry_checker/utils/qgsgeometrycheckerutils.h
  77. +1 −1 src/plugins/georeferencer/qgsgcplist.cpp
  78. +1 −1 src/plugins/georeferencer/qgsimagewarper.h
  79. +1 −1 src/plugins/georeferencer/qgsleastsquares.h
  80. +1 −1 src/plugins/georeferencer/qgsmapcoordsdialog.h
  81. +1 −1 src/plugins/georeferencer/qgsrasterchangecoords.h
  82. +1 −1 src/plugins/grass/qgsgrassregion.h
  83. +1 −1 src/providers/arcgisrest/qgsarcgisrestutils.cpp
  84. +1 −1 src/providers/gdal/qgsgdalprovider.cpp
  85. +1 −1 src/providers/grass/qgsgrassprovider.cpp
  86. +1 −1 src/providers/grass/qgsgrassvectormap.cpp
  87. +1 −1 tests/src/app/testqgisappclipboard.cpp
  88. +1 −1 tests/src/core/testqgsconnectionpool.cpp
  89. +1 −1 tests/src/core/testqgsgeometry.cpp
  90. +1 −1 tests/src/core/testqgsgeometryimport.cpp
  91. +1 −1 tests/src/core/testqgsmapsettings.cpp
  92. +1 −1 tests/src/core/testqgsmaptopixelgeometrysimplifier.cpp
  93. +1 −1 tests/src/core/testqgsogrutils.cpp
  94. +1 −1 tests/src/core/testqgsprocessing.cpp
  95. +1 −1 tests/src/core/testqgsvectorfilewriter.cpp
  96. +14 −14 tests/src/providers/grass/testqgsgrassprovider.cpp
@@ -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
@@ -18,7 +18,7 @@ class QgsPoint: QgsAbstractGeometry
%End

%TypeHeaderCode
#include "qgspointv2.h"
#include "qgspoint.h"
%End
public:

@@ -20,7 +20,7 @@ class QgsPointXY
%End

%TypeHeaderCode
#include "qgspoint.h"
#include "qgspointxy.h"
%End
public:
QgsPointXY();
@@ -29,7 +29,7 @@
#include <QVector>
#include <QVariant>

#include "qgspoint.h"
#include "qgspointxy.h"
#include "qgis_analysis.h"

class QgsGraphVertex;
@@ -17,7 +17,7 @@

#include <QString>

#include "qgspoint.h"
#include "qgspointxy.h"

#include <sqlite3.h>
#include "qgis_analysis.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"

@@ -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"
@@ -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"
@@ -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"
@@ -18,7 +18,7 @@

#include "qgsmapcanvasitem.h"
#include "qgscoordinatereferencesystem.h"
#include "qgspoint.h"
#include "qgspointxy.h"
#include <QSvgRenderer>

class QPainter;
@@ -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"
@@ -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
{
@@ -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"
@@ -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"
@@ -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
@@ -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"
@@ -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"
@@ -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>
@@ -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 )
@@ -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,
@@ -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>
@@ -18,7 +18,7 @@
#define QGSMAPTOOLCIRCULARSTRINGRADIUS_H

#include "qgsmaptooladdcircularstring.h"
#include "qgspointv2.h"
#include "qgspoint.h"

class QDoubleSpinBox;

@@ -17,7 +17,7 @@
#define QGSMAPTOOLMEASUREANGLE_H

#include "qgsmaptool.h"
#include "qgspoint.h"
#include "qgspointxy.h"
#include "qgsdistancearea.h"
#include "qgis_app.h"

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

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

#include <QMouseEvent>
@@ -19,7 +19,7 @@

#include "ui_qgsmeasurebase.h"

#include "qgspoint.h"
#include "qgspointxy.h"
#include "qgsdistancearea.h"
#include "qgshelp.h"
#include "qgis_app.h"
@@ -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
@@ -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"
@@ -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"
@@ -21,7 +21,7 @@
#include "qgis_core.h"
#include <QPaintEngine>
#include "qgsabstractgeometry.h"
#include "qgspointv2.h"
#include "qgspoint.h"

class QgsDxfExport;
class QgsDxfPaintDevice;
@@ -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>
@@ -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.
@@ -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"
@@ -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>
@@ -17,7 +17,7 @@

#include "qgscurve.h"
#include "qgslinestring.h"
#include "qgspointv2.h"
#include "qgspoint.h"
#include "qgsmultipoint.h"

QgsCurve::QgsCurve(): QgsAbstractGeometry()
@@ -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"

4 comments on commit 2bbadba

@3nids

This comment has been minimized.

Copy link
Member

@3nids 3nids replied Jun 2, 2017

@m-kuhn there is a warning in the sip test:

4: *** Missing header: src/core/qgspoint.h for sipfile core/qgspoint.sip
4: *** Missing header: src/core/geometry/qgspointv2.h for sipfile core/geometry/qgspointv2.sip

you probably left the old sip files in there

@m-kuhn

This comment has been minimized.

Copy link
Member Author

@m-kuhn m-kuhn replied Jun 3, 2017

Thanks, coming along in 72952bc (#4677)

@mj10777

This comment has been minimized.

Copy link
Contributor

@mj10777 mj10777 replied Jun 9, 2017

'qgspoint.sip' must be changed to ' qgspointxy.sip' in core.sip

@m-kuhn

This comment has been minimized.

Copy link
Member Author

@m-kuhn m-kuhn replied Jun 9, 2017

still being prepared in #4677 , almost ready

Please sign in to comment.
You can’t perform that action at this time.