Skip to content
Permalink
Browse files

Remove unrequired qgsfeature.h includes

  • Loading branch information
m-kuhn committed Sep 4, 2018
1 parent 99c4b59 commit 1bfc2785c9eaf15aee8e58dd7699399d416d5c09
Showing with 22 additions and 40 deletions.
  1. +1 −1 python/core/auto_generated/qgsattributes.sip.in
  2. +0 −1 python/gui/auto_generated/attributetable/qgsifeatureselectionmanager.sip.in
  3. +0 −1 src/analysis/network/qgsgraphbuilder.cpp
  4. +0 −1 src/app/qgsattributerelationedit.h
  5. +0 −1 src/app/qgsattributesforminitcode.h
  6. +1 −1 src/app/qgsmaptoolshowhidelabels.h
  7. +0 −1 src/app/qgsmaptoolsimplify.h
  8. +1 −1 src/app/vertextool/qgsselectedfeature.h
  9. +0 −1 src/core/CMakeLists.txt
  10. +1 −1 src/core/geometry/qgsgeometry.h
  11. +1 −1 src/core/geometry/qgsgeometryeditutils.h
  12. +0 −1 src/core/layout/qgslayoutrendercontext.cpp
  13. +1 −1 src/core/mesh/qgstriangularmesh.cpp
  14. +1 −0 src/core/mesh/qgstriangularmesh.h
  15. +1 −1 src/core/qgsattributes.h
  16. +1 −1 src/core/qgscacheindex.h
  17. +1 −1 src/core/qgspointlocator.h
  18. +0 −1 src/core/qgspropertytransformer.cpp
  19. +0 −1 src/core/qgsspatialindexkdbush.h
  20. +1 −1 src/core/qgsspatialindexkdbushdata.h
  21. +1 −1 src/core/qgstracer.h
  22. +1 −1 src/core/qgsvectorlayereditutils.h
  23. +1 −1 src/core/qgsvectorlayerrenderer.h
  24. +1 −1 src/gui/attributetable/qgsattributetableview.h
  25. +1 −1 src/gui/attributetable/qgsfeaturemodel.h
  26. +1 −1 src/gui/attributetable/qgsfeatureselectionmodel.h
  27. +1 −1 src/gui/attributetable/qgsgenericfeatureselectionmanager.h
  28. +1 −2 src/gui/attributetable/qgsifeatureselectionmanager.h
  29. +0 −1 src/gui/qgsexpressionbuilderwidget.h
  30. +1 −1 src/gui/qgsmapcanvas.h
  31. +0 −1 src/gui/qgsrubberband.cpp
  32. +0 −1 src/gui/qgsvariableeditorwidget.cpp
  33. +0 −1 src/plugins/geometry_checker/qgsgeometrycheckersetuptab.h
  34. +1 −1 src/plugins/globe/featuresource/qgsglobefeaturesource.h
  35. +0 −1 src/plugins/globe/globe_plugin.cpp
  36. +0 −1 src/plugins/grass/qgsgrassmodule.cpp
  37. +0 −1 src/plugins/grass/qgsgrassmoduleparam.h
  38. +0 −1 src/providers/arcgisrest/qgsarcgisrestutils.h
  39. +1 −1 src/providers/gpx/gpsdata.h
  40. +0 −1 src/providers/grass/qgsgrass.h
@@ -26,7 +26,7 @@ typedef QVector<QVariant> QgsAttributes;
%MappedType QgsAttributes
{
%TypeHeaderCode
#include <qgsfeature.h>
#include "qgsfeature.h"
%End

%ConvertFromTypeCode
@@ -9,7 +9,6 @@




class QgsIFeatureSelectionManager : QObject
{
%Docstring
@@ -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 )
@@ -19,7 +19,6 @@
#include "ui_qgsattributerelationedit.h"

#include "qgseditorconfigwidget.h"
#include "qgsfeature.h"
#include "qgsvectordataprovider.h"
#include "qgshelp.h"
#include "qgis_app.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"
@@ -19,7 +19,7 @@
#define QGSMAPTOOLSHOWHIDELABELS_H

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


@@ -20,7 +20,6 @@
#include "ui_qgssimplifytolerancedialog.h"

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

@@ -16,8 +16,8 @@
#ifndef QGSSELECTEDFEATURE_H
#define QGSSELECTEDFEATURE_H

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

#include <QObject>

@@ -591,7 +591,6 @@ SET(QGIS_CORE_MOC_HDRS
qgsdataprovider.h
qgsdatasourceuri.h
qgsdbfilterproxymodel.h
qgsfeature.h
qgsfeedback.h
qgsfield.h
qgsfieldconstraints.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;
@@ -23,8 +23,8 @@ class QgsVectorLayer;

#define SIP_NO_FILE

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

@@ -15,7 +15,6 @@
***************************************************************************/

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

QgsLayoutRenderContext::QgsLayoutRenderContext( QgsLayout *layout )
@@ -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 )
{
@@ -25,6 +25,7 @@
#include "qgis_core.h"
#include "qgsmeshdataprovider.h"
#include "qgsgeometry.h"
#include "qgsfeatureid.h"
#include "qgsspatialindex.h"

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

% ConvertFromTypeCode
@@ -17,7 +17,7 @@
#define QGSCACHEINDEX_H

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

class QgsFeatureRequest;
class QgsFeatureIterator;
@@ -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;
@@ -18,7 +18,6 @@
#include "qgslogger.h"
#include "qgsexpression.h"
#include "qgsexpressionnodeimpl.h"
#include "qgsfeature.h"
#include "qgssymbollayerutils.h"
#include "qgscolorramp.h"

@@ -26,7 +26,6 @@ class QgsSpatialIndexKDBushPrivate;
class QgsRectangle;

#include "qgis_core.h"
#include "qgsfeature.h"
#include "qgsspatialindexkdbushdata.h"
#include <memory>
#include <QList>
@@ -18,7 +18,7 @@
#ifndef QGSSPATIALINDEXKDBUSHDATA_H
#define QGSSPATIALINDEXKDBUSHDATA_H

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

/**
* \class QgsSpatialIndexKDBushData
@@ -23,8 +23,8 @@ class QgsVectorLayer;
#include <QVector>
#include <memory>

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

struct QgsTracerGraph;
@@ -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;

@@ -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"

@@ -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;
@@ -16,7 +16,7 @@
#define QGSFEATUREMODEL_H

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

/**
@@ -17,8 +17,8 @@

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

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

class QgsVectorLayer;
@@ -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

@@ -18,9 +18,8 @@

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

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

/**
* \ingroup gui
@@ -21,7 +21,6 @@
#include "ui_qgsexpressionbuilder.h"
#include "qgsdistancearea.h"
#include "qgsexpressioncontext.h"
#include "qgsfeature.h"

#include "QStandardItemModel"
#include "QStandardItem"
@@ -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>
@@ -14,7 +14,6 @@
***************************************************************************/

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

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

@@ -19,7 +19,6 @@

#include <QMutex>

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

class QgisInterface;
@@ -21,7 +21,7 @@
#include <QObject>

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

class QgsGlobeFeatureSource : public QObject, public osgEarth::Features::FeatureSource
{
@@ -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>
@@ -27,7 +27,6 @@
#include "qgscoordinatereferencesystem.h"
#include "qgscoordinatetransform.h"

#include "qgsfeature.h"
#include "qgslogger.h"
#include "qgsmapcanvas.h"

@@ -25,7 +25,6 @@
#include <QVBoxLayout>

#include "qgis.h"
#include "qgsfeature.h"
#include "qgsfields.h"
#include "qgscoordinatereferencesystem.h"

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

class QNetworkReply;
class QgsNetworkAccessManager;
@@ -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
@@ -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>

0 comments on commit 1bfc278

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