Merge pull request #7790 from m-kuhn/featureid

Move QgsFeatureId to own header
qgis · Sep 4, 2018 · ded7978 · ded7978
2 parents 8af1c3f + b85f1ed
commit ded7978
Show file tree

Hide file tree

Showing 49 changed files with 105 additions and 66 deletions.
diff --git a/python/core/auto_generated/qgsattributes.sip.in b/python/core/auto_generated/qgsattributes.sip.in
@@ -26,7 +26,7 @@ typedef QVector<QVariant> QgsAttributes;
 %MappedType QgsAttributes
 {
 %TypeHeaderCode
-#include <qgsfeature.h>
+#include "qgsfeature.h"
 %End
 
 %ConvertFromTypeCode

diff --git a/python/core/auto_generated/qgsfeature.sip.in b/python/core/auto_generated/qgsfeature.sip.in
@@ -14,8 +14,6 @@
 
 
 
-
-
 class QgsFeature
 {
 %Docstring
@@ -527,9 +525,6 @@ typedef QMap<qint64, QMap<int, QVariant> > QgsChangedAttributesMap;
 
 typedef QMap<qint64, QgsGeometry> QgsGeometryMap;
 
-
-typedef QSet<qint64> QgsFeatureIds;
-
 typedef QList<QgsFeature> QgsFeatureList;
 
 

diff --git a/python/core/auto_generated/qgsfeatureid.sip.in b/python/core/auto_generated/qgsfeatureid.sip.in
@@ -0,0 +1,21 @@
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeatureid.h                                              *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
+
+
+
+
+
+typedef QSet<qint64> QgsFeatureIds;
+
+/************************************************************************
+ * This file has been generated automatically from                      *
+ *                                                                      *
+ * src/core/qgsfeatureid.h                                              *
+ *                                                                      *
+ * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
+ ************************************************************************/
diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip
@@ -44,6 +44,7 @@
 %Include auto_generated/qgsexpressioncontextscopegenerator.sip
 %Include auto_generated/qgsexpressionfieldbuffer.sip
 %Include auto_generated/qgsfeaturefilterprovider.sip
+%Include auto_generated/qgsfeatureid.sip
 %Include auto_generated/qgsfeatureiterator.sip
 %Include auto_generated/qgsfeaturerequest.sip
 %Include auto_generated/qgsfeaturesink.sip

diff --git a/python/gui/auto_generated/attributetable/qgsifeatureselectionmanager.sip.in b/python/gui/auto_generated/attributetable/qgsifeatureselectionmanager.sip.in
@@ -9,7 +9,6 @@
 
 
 
-
 class QgsIFeatureSelectionManager : QObject
 {
 %Docstring

diff --git a/src/analysis/network/qgsgraphbuilder.cpp b/src/analysis/network/qgsgraphbuilder.cpp
@@ -21,7 +21,6 @@
 #include "qgsgraphbuilder.h"
 #include "qgsgraph.h"
 
-#include "qgsfeature.h"
 #include "qgsgeometry.h"
 
 QgsGraphBuilder::QgsGraphBuilder( const QgsCoordinateReferenceSystem &crs, bool otfEnabled, double topologyTolerance, const QString &ellipsoidID )

diff --git a/src/analysis/vector/geometry_checker/qgsgeometrychecker.h b/src/analysis/vector/geometry_checker/qgsgeometrychecker.h
@@ -24,9 +24,8 @@
 #include <QMutex>
 #include <QStringList>
 #include "qgis_analysis.h"
+#include "qgsfeatureid.h"
 
-typedef qint64 QgsFeatureId;
-typedef QSet<QgsFeatureId> QgsFeatureIds;
 struct QgsGeometryCheckerContext;
 class QgsGeometryCheck;
 class QgsGeometryCheckError;

diff --git a/src/app/qgsattributerelationedit.h b/src/app/qgsattributerelationedit.h
@@ -19,7 +19,6 @@
 #include "ui_qgsattributerelationedit.h"
 
 #include "qgseditorconfigwidget.h"
-#include "qgsfeature.h"
 #include "qgsvectordataprovider.h"
 #include "qgshelp.h"
 #include "qgis_app.h"

diff --git a/src/app/qgsattributesforminitcode.h b/src/app/qgsattributesforminitcode.h
@@ -19,7 +19,6 @@
 #include "ui_qgsattributesforminitcode.h"
 
 #include "qgseditorconfigwidget.h"
-#include "qgsfeature.h"
 #include "qgsvectordataprovider.h"
 #include "qgshelp.h"
 #include "qgis_app.h"

diff --git a/src/app/qgsmaptooldigitizefeature.h b/src/app/qgsmaptooldigitizefeature.h
@@ -19,6 +19,8 @@
 #include "qgsmaptoolcapture.h"
 #include "qgis_app.h"
 
+class QgsFeature;
+
 //! This tool digitizes geometry of new point/line/polygon features on already existing vector layers
 class APP_EXPORT QgsMapToolDigitizeFeature : public QgsMapToolCapture
 {

diff --git a/src/app/qgsmaptooloffsetcurve.h b/src/app/qgsmaptooloffsetcurve.h
@@ -26,6 +26,7 @@ class QGridLayout;
 class QgsSnapIndicator;
 class QgsDoubleSpinBox;
 class QGraphicsProxyWidget;
+class QgsFeature;
 
 class APP_EXPORT QgsOffsetUserWidget : public QWidget, private Ui::QgsOffsetUserInputBase
 {

diff --git a/src/app/qgsmaptoolshowhidelabels.h b/src/app/qgsmaptoolshowhidelabels.h
@@ -19,7 +19,7 @@
 #define QGSMAPTOOLSHOWHIDELABELS_H
 
 #include "qgsmaptoollabel.h"
-#include "qgsfeature.h"
+#include "qgsfeatureid.h"
 #include "qgis_app.h"
 
 

diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h
@@ -20,9 +20,10 @@
 #include "ui_qgssimplifytolerancedialog.h"
 
 #include <QVector>
-#include "qgsfeature.h"
 #include "qgstolerance.h"
+#include "qgsgeometry.h"
 #include "qgis_app.h"
+#include "qgsfeature.h"
 
 class QgsRubberBand;
 class QgsMapToolSimplify;

diff --git a/src/app/vertextool/qgsselectedfeature.h b/src/app/vertextool/qgsselectedfeature.h
@@ -16,8 +16,8 @@
 #ifndef QGSSELECTEDFEATURE_H
 #define QGSSELECTEDFEATURE_H
 
-#include "qgsfeature.h"
 #include "qgsgeometry.h"
+#include "qgsfeatureid.h"
 
 #include <QObject>
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -851,6 +851,7 @@ SET(QGIS_CORE_HDRS
   qgsexpressioncontextscopegenerator.h
   qgsexpressionfieldbuffer.h
   qgsfeaturefilterprovider.h
+  qgsfeatureid.h
   qgsfeatureiterator.h
   qgsfeaturerequest.h
   qgsfeaturesink.h

diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h
@@ -29,9 +29,9 @@ email                : morb at ozemail dot com dot au
 #include "qgis.h"
 
 #include "qgsabstractgeometry.h"
-#include "qgsfeature.h"
 #include "qgspointxy.h"
 #include "qgspoint.h"
+#include "qgsfeatureid.h"
 
 
 class QgsGeometryEngine;

diff --git a/src/core/geometry/qgsgeometryeditutils.h b/src/core/geometry/qgsgeometryeditutils.h
@@ -23,8 +23,8 @@ class QgsVectorLayer;
 
 #define SIP_NO_FILE
 
-#include "qgsfeature.h"
 #include "qgsgeometry.h"
+#include "qgsfeatureid.h"
 #include <QMap>
 #include <memory>
 

diff --git a/src/core/layout/qgslayoutrendercontext.cpp b/src/core/layout/qgslayoutrendercontext.cpp
@@ -15,7 +15,6 @@
  ***************************************************************************/
 
 #include "qgslayoutrendercontext.h"
-#include "qgsfeature.h"
 #include "qgslayout.h"
 
 QgsLayoutRenderContext::QgsLayoutRenderContext( QgsLayout *layout )

diff --git a/src/core/mesh/qgstriangularmesh.cpp b/src/core/mesh/qgstriangularmesh.cpp
@@ -17,12 +17,14 @@
 
 #include <memory>
 #include <QList>
-#include "qgsfeature.h"
 #include "qgspolygon.h"
 #include "qgslinestring.h"
 #include "qgstriangularmesh.h"
 #include "qgsrendercontext.h"
 #include "qgscoordinatetransform.h"
+#include "qgsfeatureid.h"
+#include "qgsgeometry.h"
+#include "qgsrectangle.h"
 
 static void ENP_centroid_step( const QPolygonF &pX, double &cx, double &cy, double &signedArea, int i, int i1 )
 {

diff --git a/src/core/mesh/qgstriangularmesh.h b/src/core/mesh/qgstriangularmesh.h
@@ -25,6 +25,7 @@
 #include "qgis_core.h"
 #include "qgsmeshdataprovider.h"
 #include "qgsgeometry.h"
+#include "qgsfeatureid.h"
 #include "qgsspatialindex.h"
 
 class QgsRenderContext;

diff --git a/src/core/qgsattributes.h b/src/core/qgsattributes.h
@@ -33,7 +33,6 @@
 #include "qgsfields.h"
 
 
-class QgsGeometry;
 class QgsRectangle;
 class QgsFeature;
 class QgsFeaturePrivate;
@@ -130,7 +129,7 @@ typedef QVector<QVariant> QgsAttributes;
 % MappedType QgsAttributes
 {
   % TypeHeaderCode
-#include <qgsfeature.h>
+#include "qgsfeature.h"
   % End
 
   % ConvertFromTypeCode

diff --git a/src/core/qgscacheindex.h b/src/core/qgscacheindex.h
@@ -17,7 +17,7 @@
 #define QGSCACHEINDEX_H
 
 #include "qgis_core.h"
-#include "qgsfeature.h" // QgsFeatureIds
+#include "qgsfeatureid.h"
 
 class QgsFeatureRequest;
 class QgsFeatureIterator;

diff --git a/src/core/qgsfeature.h b/src/core/qgsfeature.h
@@ -29,6 +29,7 @@ email                : sherman at mrcc.com
 
 #include "qgsattributes.h"
 #include "qgsfields.h"
+#include "qgsfeatureid.h"
 
 class QgsFeature;
 class QgsFeaturePrivate;
@@ -43,15 +44,6 @@ class QgsRectangle;
  * See details in QEP #17
  ****************************************************************************/
 
-// feature id class (currently 64 bit)
-
-// 64 bit feature ids
-typedef qint64 QgsFeatureId SIP_SKIP;
-#define FID_IS_NEW(fid)     (fid<0)
-#define FID_TO_NUMBER(fid)  static_cast<qint64>(fid)
-#define FID_TO_STRING(fid)  QString::number( fid )
-#define STRING_TO_FID(str)  (str).toLongLong()
-
 
 /**
  * \ingroup core
@@ -540,13 +532,6 @@ typedef QMap<QgsFeatureId, QgsGeometry> QgsGeometryMap;
 typedef QMap<qint64, QgsGeometry> QgsGeometryMap;
 #endif
 
-
-#ifndef SIP_RUN
-typedef QSet<QgsFeatureId> QgsFeatureIds;
-#else
-typedef QSet<qint64> QgsFeatureIds;
-#endif
-
 typedef QList<QgsFeature> QgsFeatureList;
 
 uint qHash( const QgsFeature &key, uint seed = 0 )  SIP_SKIP;

diff --git a/src/core/qgsfeatureid.h b/src/core/qgsfeatureid.h
@@ -0,0 +1,37 @@
+/***************************************************************************
+                      qgsfeatureid.h
+                     --------------------------------------
+Date                 : 3.9.2018
+Copyright            : (C) 2018 by Matthias Kuhn
+email                : matthias@opengis.ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSFEATUREID_H
+#define QGSFEATUREID_H
+
+#include <QSet>
+#include "qgis_sip.h"
+
+// feature id (currently 64 bit)
+
+// 64 bit feature ids
+typedef qint64 QgsFeatureId SIP_SKIP;
+#define FID_IS_NEW(fid)     (fid<0)
+#define FID_TO_NUMBER(fid)  static_cast<qint64>(fid)
+#define FID_TO_STRING(fid)  QString::number( fid )
+#define STRING_TO_FID(str)  (str).toLongLong()
+
+#ifndef SIP_RUN
+typedef QSet<QgsFeatureId> QgsFeatureIds;
+#else
+typedef QSet<qint64> QgsFeatureIds;
+#endif
+
+#endif
diff --git a/src/core/qgspointlocator.h b/src/core/qgspointlocator.h
@@ -20,12 +20,14 @@ class QgsPointXY;
 class QgsVectorLayer;
 class QgsFeatureRenderer;
 class QgsRenderContext;
+class QgsRectangle;
 
 #include "qgis_core.h"
-#include "qgsfeature.h"
 #include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransform.h"
+#include "qgsfeatureid.h"
+#include "qgsgeometry.h"
 #include <memory>
 
 class QgsPointLocator_VisitorNearestVertex;

diff --git a/src/core/qgspropertytransformer.cpp b/src/core/qgspropertytransformer.cpp
@@ -18,9 +18,9 @@
 #include "qgslogger.h"
 #include "qgsexpression.h"
 #include "qgsexpressionnodeimpl.h"
-#include "qgsfeature.h"
 #include "qgssymbollayerutils.h"
 #include "qgscolorramp.h"
+#include "qgspointxy.h"
 
 
 //

diff --git a/src/core/qgsspatialindexkdbush.h b/src/core/qgsspatialindexkdbush.h
@@ -18,16 +18,15 @@
 #ifndef QGSSPATIALINDEXKDBUSH_H
 #define QGSSPATIALINDEXKDBUSH_H
 
-class QgsPointXY;
 class QgsFeatureIterator;
 class QgsFeedback;
 class QgsFeatureSource;
 class QgsSpatialIndexKDBushPrivate;
 class QgsRectangle;
 
 #include "qgis_core.h"
-#include "qgsfeature.h"
 #include "qgsspatialindexkdbushdata.h"
+#include "qgspointxy.h"
 #include <memory>
 #include <QList>
 

diff --git a/src/core/qgsspatialindexkdbushdata.h b/src/core/qgsspatialindexkdbushdata.h
@@ -18,7 +18,8 @@
 #ifndef QGSSPATIALINDEXKDBUSHDATA_H
 #define QGSSPATIALINDEXKDBUSHDATA_H
 
-#include "qgsfeature.h"
+#include "qgsfeatureid.h"
+#include "qgspointxy.h"
 
 /**
  * \class QgsSpatialIndexKDBushData

diff --git a/src/core/qgstracer.h b/src/core/qgstracer.h
@@ -23,9 +23,10 @@ class QgsVectorLayer;
 #include <QVector>
 #include <memory>
 
+#include "qgsfeatureid.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgsfeature.h"
 #include "qgsrectangle.h"
+#include "qgsgeometry.h"
 
 struct QgsTracerGraph;
 

diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h
@@ -18,9 +18,9 @@
 
 #include "qgis_core.h"
 #include "qgis.h"
-#include "qgsfeature.h"
 #include "qgsgeometry.h"
 #include "qgsvectorlayer.h"
+#include "qgsfeatureid.h"
 
 class QgsCurve;