forward declaration of QgsPoint

3nids · 3nids · commit ef1efebda4a7 · 2018-10-09T11:48:33.000-08:00
diff --git a/python/core/auto_generated/geometry/qgsbox3d.sip.in b/python/core/auto_generated/geometry/qgsbox3d.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsBox3d
 {
 %Docstring
diff --git a/python/core/auto_generated/geometry/qgscircle.sip.in b/python/core/auto_generated/geometry/qgscircle.sip.in
@@ -13,6 +13,7 @@
 
 
 
+
 class QgsCircle : QgsEllipse
 {
 %Docstring
diff --git a/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in b/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 class QgsGeometryCollection: QgsAbstractGeometry
 {
 %Docstring
diff --git a/python/core/auto_generated/metadata/qgslayermetadataformatter.sip.in b/python/core/auto_generated/metadata/qgslayermetadataformatter.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsLayerMetadataFormatter
 {
 %Docstring
diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in
@@ -10,7 +10,6 @@
 
 
 
-
 typedef QList<QgsSymbolLayer *> QgsSymbolLayerList;
 
 class QgsSymbol
diff --git a/src/analysis/interpolation/DualEdgeTriangulation.h b/src/analysis/interpolation/DualEdgeTriangulation.h
@@ -17,21 +17,25 @@
 #ifndef DUALEDGETRIANGULATION_H
 #define DUALEDGETRIANGULATION_H
 
-#include "Triangulation.h"
-#include "qgis_sip.h"
-#include "HalfEdge.h"
 #include <QVector>
 #include <QList>
 #include <QSet>
 #include <QColor>
 #include <QFile>
 #include <QTextStream>
 #include <QMessageBox>
-#include <cfloat>
 #include <QBuffer>
 #include <QStringList>
 #include <QCursor>
+
+#include <cfloat>
+
+#include "qgis_sip.h"
 #include "qgis_analysis.h"
+#include "qgspoint.h"
+
+#include "Triangulation.h"
+#include "HalfEdge.h"
 
 #define SIP_NO_FILE
 
diff --git a/src/analysis/interpolation/NormVecDecorator.cpp b/src/analysis/interpolation/NormVecDecorator.cpp
@@ -14,11 +14,15 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "NormVecDecorator.h"
+#include <QApplication>
+
 #include "qgsfeedback.h"
 #include "qgslogger.h"
 #include "qgsfields.h"
-#include <QApplication>
+#include "qgspoint.h"
+
+#include "NormVecDecorator.h"
+
 
 NormVecDecorator::~NormVecDecorator()
 {
diff --git a/src/analysis/interpolation/TriangleInterpolator.h b/src/analysis/interpolation/TriangleInterpolator.h
@@ -17,10 +17,13 @@
 #ifndef TINTERPOLATOR_H
 #define TINTERPOLATOR_H
 
-#include "qgspoint.h"
 #include "Vector3D.h"
+
+#include "qgis_sip.h"
 #include "qgis_analysis.h"
 
+class QgsPoint;
+
 #define SIP_NO_FILE
 
 /**
diff --git a/src/analysis/network/qgsgraphdirector.h b/src/analysis/network/qgsgraphdirector.h
@@ -21,12 +21,12 @@
 #include <QList>
 
 #include "qgis.h"
-#include "qgspoint.h"
 #include "qgsfeedback.h"
 #include "qgsnetworkstrategy.h"
 #include "qgis_analysis.h"
 
 class QgsGraphBuilderInterface;
+class QgsPoint;
 
 #ifdef SIP_RUN
 % ModuleHeaderCode
diff --git a/src/core/dxf/qgsdxfpaintdevice.cpp b/src/core/dxf/qgsdxfpaintdevice.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsdxfpaintdevice.h"
 #include "qgsdxfpaintengine.h"
+#include "qgspoint.h"
 
 QgsDxfPaintDevice::QgsDxfPaintDevice( QgsDxfExport *dxf )
 {
diff --git a/src/core/dxf/qgsdxfpaintengine.h b/src/core/dxf/qgsdxfpaintengine.h
@@ -23,8 +23,8 @@
 #include "qgis_core.h"
 #include <QPaintEngine>
 #include "qgsabstractgeometry.h"
-#include "qgspoint.h"
 
+class QgsPoint;
 class QgsDxfExport;
 class QgsDxfPaintDevice;
 
diff --git a/src/core/geometry/qgsbox3d.cpp b/src/core/geometry/qgsbox3d.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgsbox3d.h"
+#include "qgspoint.h"
 
 
 QgsBox3d::QgsBox3d( double xmin, double ymin, double zmin, double xmax, double ymax, double zmax )
diff --git a/src/core/geometry/qgsbox3d.h b/src/core/geometry/qgsbox3d.h
@@ -20,7 +20,8 @@
 
 #include "qgis_core.h"
 #include "qgsrectangle.h"
-#include "qgspoint.h"
+
+class QgsPoint;
 
 /**
  * \ingroup core
diff --git a/src/core/geometry/qgscircle.h b/src/core/geometry/qgscircle.h
@@ -22,12 +22,13 @@
 
 #include "qgis_core.h"
 #include "qgsellipse.h"
-#include "qgspoint.h"
 #include "qgspolygon.h"
 #include "qgsrectangle.h"
 #include "qgscircularstring.h"
 
 
+class QgsPoint;
+
 /**
  * \ingroup core
  * \class QgsCircle
diff --git a/src/core/geometry/qgsgeometrycollection.h b/src/core/geometry/qgsgeometrycollection.h
@@ -22,7 +22,8 @@ email                : marco.hugentobler at sourcepole dot com
 #include "qgis_core.h"
 #include "qgis.h"
 #include "qgsabstractgeometry.h"
-#include "qgspoint.h"
+
+class QgsPoint;
 
 
 /**
diff --git a/src/core/metadata/qgslayermetadataformatter.h b/src/core/metadata/qgslayermetadataformatter.h
@@ -18,6 +18,8 @@
 #ifndef QGSLAYERMETADATAFORMATTER_H
 #define QGSLAYERMETADATAFORMATTER_H
 
+#include <QCoreApplication>
+
 #include "qgis.h"
 #include "qgis_core.h"
 #include "qgslayermetadata.h"
diff --git a/src/core/qgstessellator.h b/src/core/qgstessellator.h
@@ -24,7 +24,6 @@ class QgsMultiPolygon;
 
 #include <QVector>
 #include <memory>
-#include "qgspoint.h"
 
 /**
  * \ingroup core
diff --git a/src/core/simplify/effectivearea.cpp b/src/core/simplify/effectivearea.cpp
@@ -23,6 +23,7 @@
  **********************************************************************/
 
 #include "effectivearea.h"
+#include "qgspoint.h"
 
 static MINHEAP initiate_minheap( int npoints )
 {
diff --git a/src/core/simplify/effectivearea.h b/src/core/simplify/effectivearea.h
@@ -24,7 +24,6 @@
 
 #include "qgsabstractgeometry.h"
 #include "qgscurve.h"
-#include "qgspoint.h"
 
 #define SIP_NO_FILE
 
diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h
@@ -21,7 +21,6 @@
 #include <QList>
 #include <QMap>
 #include "qgsmapunitscale.h"
-#include "qgspoint.h"
 #include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsrendercontext.h"
@@ -33,10 +32,8 @@ class QPainter;
 class QSize;
 class QPointF;
 class QPolygonF;
-
 class QDomDocument;
 class QDomElement;
-//class
 
 class QgsFields;
 class QgsSymbolLayer;
@@ -51,6 +48,7 @@ class QgsFeatureRenderer;
 class QgsCurve;
 class QgsPolygon;
 class QgsExpressionContext;
+class QgsPoint;
 
 typedef QList<QgsSymbolLayer *> QgsSymbolLayerList;
 
diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h
@@ -19,7 +19,6 @@
 #include "qgsconfig.h"
 #include "qgis.h"
 #include "qgsmessagebar.h"
-#include "qgspoint.h"
 #include "qgsmapmouseevent.h"
 
 #include <QCursor>
@@ -35,6 +34,7 @@ class QgsRenderContext;
 class QKeyEvent;
 class QMouseEvent;
 class QWheelEvent;
+class QgsPoint;
 class QgsPointXY;
 class QgsRectangle;
 class QPoint;

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`
`11`	`11`
	`12`	`+`
`12`	`13`	`class QgsBox3d`
`13`	`14`	`{`
`14`	`15`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`
`14`	`14`
`15`	`15`
	`16`	`+`
`16`	`17`	`class QgsCircle : QgsEllipse`
`17`	`18`	`{`
`18`	`19`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`
`12`	`12`
`13`	`13`
	`14`	`+`
`14`	`15`	`class QgsGeometryCollection: QgsAbstractGeometry`
`15`	`16`	`{`
`16`	`17`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,6 @@`
`10`	`10`
`11`	`11`
`12`	`12`
`13`		`-`
`14`	`13`	`typedef QList<QgsSymbolLayer *> QgsSymbolLayerList;`
`15`	`14`
`16`	`15`	`class QgsSymbol`
Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`
`18`	`18`	`#include "qgsdxfpaintdevice.h"`
`19`	`19`	`#include "qgsdxfpaintengine.h"`
	`20`	`+#include "qgspoint.h"`
`20`	`21`
`21`	`22`	`QgsDxfPaintDevice::QgsDxfPaintDevice( QgsDxfExport *dxf )`
`22`	`23`	`{`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@`
`23`	`23`	`**********************************************************************/`
`24`	`24`
`25`	`25`	`#include "effectivearea.h"`
	`26`	`+#include "qgspoint.h"`
`26`	`27`
`27`	`28`	`static MINHEAP initiate_minheap( int npoints )`
`28`	`29`	`{`