Skip to content

Commit

Permalink
Remove unrequired qgsfeature.h includes
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Sep 4, 2018
1 parent 99c4b59 commit 1bfc278
Show file tree
Hide file tree
Showing 40 changed files with 22 additions and 40 deletions.
2 changes: 1 addition & 1 deletion python/core/auto_generated/qgsattributes.sip.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ typedef QVector<QVariant> QgsAttributes;
%MappedType QgsAttributes
{
%TypeHeaderCode
#include <qgsfeature.h>
#include "qgsfeature.h"
%End

%ConvertFromTypeCode
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@




class QgsIFeatureSelectionManager : QObject
{
%Docstring
Expand Down
1 change: 0 additions & 1 deletion src/analysis/network/qgsgraphbuilder.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsattributerelationedit.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "ui_qgsattributerelationedit.h"

#include "qgseditorconfigwidget.h"
#include "qgsfeature.h"
#include "qgsvectordataprovider.h"
#include "qgshelp.h"
#include "qgis_app.h"
Expand Down
1 change: 0 additions & 1 deletion src/app/qgsattributesforminitcode.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "ui_qgsattributesforminitcode.h"

#include "qgseditorconfigwidget.h"
#include "qgsfeature.h"
#include "qgsvectordataprovider.h"
#include "qgshelp.h"
#include "qgis_app.h"
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmaptoolshowhidelabels.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#define QGSMAPTOOLSHOWHIDELABELS_H

#include "qgsmaptoollabel.h"
#include "qgsfeature.h"
#include "qgsfeatureid.h"
#include "qgis_app.h"


Expand Down
1 change: 0 additions & 1 deletion src/app/qgsmaptoolsimplify.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
#include "ui_qgssimplifytolerancedialog.h"

#include <QVector>
#include "qgsfeature.h"
#include "qgstolerance.h"
#include "qgis_app.h"

Expand Down
2 changes: 1 addition & 1 deletion src/app/vertextool/qgsselectedfeature.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
#ifndef QGSSELECTEDFEATURE_H
#define QGSSELECTEDFEATURE_H

#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgsfeatureid.h"

#include <QObject>

Expand Down
1 change: 0 additions & 1 deletion src/core/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,6 @@ SET(QGIS_CORE_MOC_HDRS
qgsdataprovider.h
qgsdatasourceuri.h
qgsdbfilterproxymodel.h
qgsfeature.h
qgsfeedback.h
qgsfield.h
qgsfieldconstraints.h
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgsgeometry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/core/geometry/qgsgeometryeditutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class QgsVectorLayer;

#define SIP_NO_FILE

#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgsfeatureid.h"
#include <QMap>
#include <memory>

Expand Down
1 change: 0 additions & 1 deletion src/core/layout/qgslayoutrendercontext.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
***************************************************************************/

#include "qgslayoutrendercontext.h"
#include "qgsfeature.h"
#include "qgslayout.h"

QgsLayoutRenderContext::QgsLayoutRenderContext( QgsLayout *layout )
Expand Down
2 changes: 1 addition & 1 deletion src/core/mesh/qgstriangularmesh.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
{
Expand Down
1 change: 1 addition & 0 deletions src/core/mesh/qgstriangularmesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#include "qgis_core.h"
#include "qgsmeshdataprovider.h"
#include "qgsgeometry.h"
#include "qgsfeatureid.h"
#include "qgsspatialindex.h"

class QgsRenderContext;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsattributes.h
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ typedef QVector<QVariant> QgsAttributes;
% MappedType QgsAttributes
{
% TypeHeaderCode
#include <qgsfeature.h>
#include "qgsfeature.h"
% End

% ConvertFromTypeCode
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgscacheindex.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define QGSCACHEINDEX_H

#include "qgis_core.h"
#include "qgsfeature.h" // QgsFeatureIds
#include "qgsfeatureid.h"

class QgsFeatureRequest;
class QgsFeatureIterator;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgspointlocator.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion src/core/qgspropertytransformer.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "qgslogger.h"
#include "qgsexpression.h"
#include "qgsexpressionnodeimpl.h"
#include "qgsfeature.h"
#include "qgssymbollayerutils.h"
#include "qgscolorramp.h"

Expand Down
1 change: 0 additions & 1 deletion src/core/qgsspatialindexkdbush.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class QgsSpatialIndexKDBushPrivate;
class QgsRectangle;

#include "qgis_core.h"
#include "qgsfeature.h"
#include "qgsspatialindexkdbushdata.h"
#include <memory>
#include <QList>
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsspatialindexkdbushdata.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#ifndef QGSSPATIALINDEXKDBUSHDATA_H
#define QGSSPATIALINDEXKDBUSHDATA_H

#include "qgsfeature.h"
#include "qgsfeatureid.h"

/**
* \class QgsSpatialIndexKDBushData
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgstracer.h
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ class QgsVectorLayer;
#include <QVector>
#include <memory>

#include "qgsfeatureid.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsfeature.h"
#include "qgsrectangle.h"

struct QgsTracerGraph;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayereditutils.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsvectorlayerrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsattributetableview.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsfeaturemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#define QGSFEATUREMODEL_H

#include "qgis_gui.h"
#include "qgsfeature.h" // QgsFeatureId
#include "qgsfeatureid.h"
#include <QModelIndex>

/**
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsfeatureselectionmodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@

#include <QItemSelectionModel>
#include "qgis.h"
#include "qgsfeatureid.h"

#include "qgsfeature.h"
#include "qgis_gui.h"

class QgsVectorLayer;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/attributetable/qgsgenericfeatureselectionmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions src/gui/attributetable/qgsifeatureselectionmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@

#include <QObject>
#include "qgis_sip.h"

#include "qgsfeature.h"
#include "qgis_gui.h"
#include "qgsfeatureid.h"

/**
* \ingroup gui
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsexpressionbuilderwidget.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "ui_qgsexpressionbuilder.h"
#include "qgsdistancearea.h"
#include "qgsexpressioncontext.h"
#include "qgsfeature.h"

#include "QStandardItemModel"
#include "QStandardItem"
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsmapcanvas.h
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsrubberband.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
***************************************************************************/

#include "qgsrubberband.h"
#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgslogger.h"
#include "qgsmapcanvas.h"
Expand Down
1 change: 0 additions & 1 deletion src/gui/qgsvariableeditorwidget.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include "qgsvariableeditorwidget.h"
#include "qgsexpressioncontext.h"
#include "qgsfeature.h"
#include "qgsapplication.h"
#include "qgssettings.h"

Expand Down
1 change: 0 additions & 1 deletion src/plugins/geometry_checker/qgsgeometrycheckersetuptab.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

#include <QMutex>

#include "qgsfeature.h"
#include "ui_qgsgeometrycheckersetuptab.h"

class QgisInterface;
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/globe/featuresource/qgsglobefeaturesource.h
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include <QObject>

#include "qgsglobefeatureoptions.h"
#include "qgsfeature.h"
#include "qgsfeatureid.h"

class QgsGlobeFeatureSource : public QObject, public osgEarth::Features::FeatureSource
{
Expand Down