Remove unrequired qgsfeature.h includes

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

python/gui/auto_generated/attributetable/qgsifeatureselectionmanager.sip.in

@@ -9,7 +9,6 @@
 
 
 
-
 class QgsIFeatureSelectionManager : QObject
 {
 %Docstring

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 )

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"

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"

src/app/qgsmaptoolshowhidelabels.h

@@ -19,7 +19,7 @@
 #define QGSMAPTOOLSHOWHIDELABELS_H
 
 #include "qgsmaptoollabel.h"
-#include "qgsfeature.h"
+#include "qgsfeatureid.h"
 #include "qgis_app.h"
 
 

src/app/qgsmaptoolsimplify.h

@@ -20,7 +20,6 @@
 #include "ui_qgssimplifytolerancedialog.h"
 
 #include <QVector>
-#include "qgsfeature.h"
 #include "qgstolerance.h"
 #include "qgis_app.h"
 

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>
 

src/core/CMakeLists.txt

@@ -591,7 +591,6 @@ SET(QGIS_CORE_MOC_HDRS
   qgsdataprovider.h
   qgsdatasourceuri.h
   qgsdbfilterproxymodel.h
-  qgsfeature.h
   qgsfeedback.h
   qgsfield.h
   qgsfieldconstraints.h

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;

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>
 

src/core/layout/qgslayoutrendercontext.cpp

@@ -15,7 +15,6 @@
  ***************************************************************************/
 
 #include "qgslayoutrendercontext.h"
-#include "qgsfeature.h"
 #include "qgslayout.h"
 
 QgsLayoutRenderContext::QgsLayoutRenderContext( QgsLayout *layout )

src/core/mesh/qgstriangularmesh.cpp

@@ -17,12 +17,12 @@
 
 #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"
 
 static void ENP_centroid_step( const QPolygonF &pX, double &cx, double &cy, double &signedArea, int i, int i1 )
 {

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;

src/core/qgsattributes.h

@@ -130,7 +130,7 @@ typedef QVector<QVariant> QgsAttributes;
 % MappedType QgsAttributes
 {
   % TypeHeaderCode
-#include <qgsfeature.h>
+#include "qgsfeature.h"
   % End
 
   % ConvertFromTypeCode

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;

src/core/qgspointlocator.h

@@ -22,10 +22,10 @@ class QgsFeatureRenderer;
 class QgsRenderContext;
 
 #include "qgis_core.h"
-#include "qgsfeature.h"
 #include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransform.h"
+#include "qgsfeatureid.h"
 #include <memory>
 
 class QgsPointLocator_VisitorNearestVertex;

src/core/qgspropertytransformer.cpp

@@ -18,7 +18,6 @@
 #include "qgslogger.h"
 #include "qgsexpression.h"
 #include "qgsexpressionnodeimpl.h"
-#include "qgsfeature.h"
 #include "qgssymbollayerutils.h"
 #include "qgscolorramp.h"
 

src/core/qgsspatialindexkdbush.h

@@ -26,7 +26,6 @@ class QgsSpatialIndexKDBushPrivate;
 class QgsRectangle;
 
 #include "qgis_core.h"
-#include "qgsfeature.h"
 #include "qgsspatialindexkdbushdata.h"
 #include <memory>
 #include <QList>

src/core/qgsspatialindexkdbushdata.h

@@ -18,7 +18,7 @@
 #ifndef QGSSPATIALINDEXKDBUSHDATA_H
 #define QGSSPATIALINDEXKDBUSHDATA_H
 
-#include "qgsfeature.h"
+#include "qgsfeatureid.h"
 
 /**
  * \class QgsSpatialIndexKDBushData

src/core/qgstracer.h

@@ -23,8 +23,8 @@ class QgsVectorLayer;
 #include <QVector>
 #include <memory>
 
+#include "qgsfeatureid.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgsfeature.h"
 #include "qgsrectangle.h"
 
 struct QgsTracerGraph;

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;
 

src/core/qgsvectorlayerrenderer.h

@@ -36,10 +36,10 @@ typedef QList<int> QgsAttributeList;
 
 #include "qgis.h"
 #include "qgsfields.h"  // QgsFields
-#include "qgsfeature.h"  // QgsFeatureIds
 #include "qgsfeatureiterator.h"
 #include "qgsvectorsimplifymethod.h"
 #include "qgsfeedback.h"
+#include "qgsfeatureid.h"
 
 #include "qgsmaplayerrenderer.h"
 

src/gui/attributetable/qgsattributetableview.h

@@ -19,8 +19,8 @@
 #include <QTableView>
 #include "qgis.h"
 #include <QAction>
+#include "qgsfeatureid.h"
 
-#include "qgsfeature.h" // For QgsFeatureIds
 #include "qgis_gui.h"
 
 class QgsAttributeTableDelegate;

src/gui/attributetable/qgsfeaturemodel.h

@@ -16,7 +16,7 @@
 #define QGSFEATUREMODEL_H
 
 #include "qgis_gui.h"
-#include "qgsfeature.h" // QgsFeatureId
+#include "qgsfeatureid.h"
 #include <QModelIndex>
 
 /**

src/gui/attributetable/qgsfeatureselectionmodel.h

@@ -17,8 +17,8 @@
 
 #include <QItemSelectionModel>
 #include "qgis.h"
+#include "qgsfeatureid.h"
 
-#include "qgsfeature.h"
 #include "qgis_gui.h"
 
 class QgsVectorLayer;

src/gui/attributetable/qgsgenericfeatureselectionmanager.h

@@ -16,9 +16,9 @@
 #ifndef QGSGENERICFEATURESELECTIONMANAGER_H
 #define QGSGENERICFEATURESELECTIONMANAGER_H
 
-#include "qgsfeature.h"
 #include "qgsifeatureselectionmanager.h"
 #include "qgis_gui.h"
+#include "qgsfeatureid.h"
 
 SIP_NO_FILE
 

src/gui/attributetable/qgsifeatureselectionmanager.h

@@ -18,9 +18,8 @@
 
 #include <QObject>
 #include "qgis_sip.h"
-
-#include "qgsfeature.h"
 #include "qgis_gui.h"
+#include "qgsfeatureid.h"
 
 /**
  * \ingroup gui

src/gui/qgsexpressionbuilderwidget.h

@@ -21,7 +21,6 @@
 #include "ui_qgsexpressionbuilder.h"
 #include "qgsdistancearea.h"
 #include "qgsexpressioncontext.h"
-#include "qgsfeature.h"
 
 #include "QStandardItemModel"
 #include "QStandardItem"

src/gui/qgsmapcanvas.h

@@ -22,9 +22,9 @@
 #include "qgis_sip.h"
 
 #include "qgsexpressioncontext.h"
-#include "qgsfeature.h"
 #include "qgsmessagebar.h"
 #include "qgsrectangle.h"
+#include "qgsfeatureid.h"
 #include "qgis.h"
 
 #include <QDomDocument>

src/gui/qgsrubberband.cpp

@@ -14,7 +14,6 @@
  ***************************************************************************/
 
 #include "qgsrubberband.h"
-#include "qgsfeature.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"

src/gui/qgsvariableeditorwidget.cpp

@@ -15,7 +15,6 @@
 
 #include "qgsvariableeditorwidget.h"
 #include "qgsexpressioncontext.h"
-#include "qgsfeature.h"
 #include "qgsapplication.h"
 #include "qgssettings.h"
 

src/plugins/geometry_checker/qgsgeometrycheckersetuptab.h

@@ -19,7 +19,6 @@
 
 #include <QMutex>
 
-#include "qgsfeature.h"
 #include "ui_qgsgeometrycheckersetuptab.h"
 
 class QgisInterface;

src/plugins/globe/featuresource/qgsglobefeaturesource.h

@@ -21,7 +21,7 @@
 #include <QObject>
 
 #include "qgsglobefeatureoptions.h"
-#include "qgsfeature.h"
+#include "qgsfeatureid.h"
 
 class QgsGlobeFeatureSource : public QObject, public osgEarth::Features::FeatureSource
 {

src/plugins/globe/globe_plugin.cpp

@@ -30,7 +30,6 @@
 #include <qgsapplication.h>
 #include <qgsmapcanvas.h>
 #include <qgsvectorlayer.h>
-#include <qgsfeature.h>
 #include <qgsgeometry.h>
 #include <qgspoint.h>
 #include <qgsdistancearea.h>

src/plugins/grass/qgsgrassmodule.cpp

@@ -27,7 +27,6 @@
 #include "qgscoordinatereferencesystem.h"
 #include "qgscoordinatetransform.h"
 
-#include "qgsfeature.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
 

src/plugins/grass/qgsgrassmoduleparam.h

@@ -25,7 +25,6 @@
 #include <QVBoxLayout>
 
 #include "qgis.h"
-#include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgscoordinatereferencesystem.h"
 

src/providers/arcgisrest/qgsarcgisrestutils.h

@@ -18,7 +18,6 @@
 #include <QStringList>
 #include <QVariant>
 #include "geometry/qgswkbtypes.h"
-#include "qgsfeature.h"
 
 class QNetworkReply;
 class QgsNetworkAccessManager;

src/providers/gpx/gpsdata.h

@@ -25,8 +25,8 @@
 #include <QTextStream>
 #include <QStack>
 
-#include "qgsfeature.h"
 #include "qgsrectangle.h"
+#include "qgsfeatureid.h"
 
 // workaround for MSVC compiler which already has defined macro max
 // that interferes with calling std::numeric_limits<int>::max

src/providers/grass/qgsgrass.h

@@ -33,7 +33,6 @@ extern "C"
 #include <stdexcept>
 #include "qgsapplication.h"
 #include "qgsexception.h"
-#include "qgsfeature.h"
 #include "qgsfields.h"
 #include "qgsrectangle.h"
 #include <QFileSystemWatcher>