Remove unnecessary includes

peppsac · peppsac · commit 96a9a7238a8e · 2019-01-22T21:45:38.000+01:00
diff --git a/python/core/auto_generated/annotations/qgsannotation.sip.in b/python/core/auto_generated/annotations/qgsannotation.sip.in
@@ -10,6 +10,7 @@
 
 
 
+
 class QgsAnnotation : QObject
 {
 %Docstring
diff --git a/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in b/python/core/auto_generated/mesh/qgsmeshlayerinterpolator.sip.in
@@ -11,6 +11,7 @@
 
 
 
+
 %ModuleHeaderCode
 #include "qgsmeshlayerinterpolator.h"
 %End
diff --git a/python/core/auto_generated/metadata/qgsprojectmetadata.sip.in b/python/core/auto_generated/metadata/qgsprojectmetadata.sip.in
@@ -9,6 +9,7 @@
 
 
 
+
 class QgsProjectMetadata : QgsAbstractMetadataBase
 {
 %Docstring
diff --git a/src/core/annotations/qgsannotation.h b/src/core/annotations/qgsannotation.h
@@ -22,11 +22,12 @@
 #include "qgis.h"
 #include "qgspointxy.h"
 #include "qgscoordinatereferencesystem.h"
-#include "qgsrendercontext.h"
 #include "qgssymbol.h"
 #include "qgsmargins.h"
 #include "qgsmaplayer.h"
 
+class QgsRenderContext;
+
 /**
  * \ingroup core
  * \class QgsAnnotation
diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp
@@ -14,9 +14,6 @@
  ***************************************************************************/
 #include "qgsdiagram.h"
 #include "qgsdiagramrenderer.h"
-#include "qgsrendercontext.h"
-#include "qgsexpression.h"
-#include "qgssymbollayerutils.h"
 
 #include <QPainter>
 
diff --git a/src/core/geometry/qgsgeometryfactory.h b/src/core/geometry/qgsgeometryfactory.h
@@ -21,6 +21,7 @@
 #define SIP_NO_FILE
 
 #include "qgis_core.h"
+#include "qgswkbtypes.h"
 #include <QString>
 #include <memory>
 
diff --git a/src/core/mesh/qgsmeshlayer.h b/src/core/mesh/qgsmeshlayer.h
@@ -22,14 +22,14 @@
 
 #include "qgis_core.h"
 #include "qgsmaplayer.h"
-#include "qgsrendercontext.h"
 #include "qgsmeshdataprovider.h"
 #include "qgsmeshrenderersettings.h"
 
 class QgsMapLayerRenderer;
 struct QgsMeshLayerRendererCache;
 class QgsSymbol;
 class QgsTriangularMesh;
+class QgsRenderContext;
 struct QgsMesh;
 
 /**
diff --git a/src/core/mesh/qgsmeshlayerinterpolator.h b/src/core/mesh/qgsmeshlayerinterpolator.h
@@ -29,12 +29,13 @@ class QgsMeshDatasetIndex;
 
 #include <QSize>
 #include "qgsmaplayerrenderer.h"
-#include "qgsrendercontext.h"
 #include "qgstriangularmesh.h"
 #include "qgsrasterinterface.h"
 #include "qgssinglebandpseudocolorrenderer.h"
 #include "qgsrastershader.h"
 
+class QgsRenderContext;
+
 #ifdef SIP_RUN
 % ModuleHeaderCode
 #include "qgsmeshlayerinterpolator.h"
diff --git a/src/core/mesh/qgsmeshlayerrenderer.h b/src/core/mesh/qgsmeshlayerrenderer.h
@@ -29,12 +29,13 @@ class QgsMeshLayer;
 
 #include "qgsmaplayerrenderer.h"
 #include "qgsrasterinterface.h"
-#include "qgsrendercontext.h"
 #include "qgstriangularmesh.h"
 #include "qgsmeshlayer.h"
 #include "qgssymbol.h"
 #include "qgsmeshdataprovider.h"
 
+class QgsRenderContext;
+
 ///@cond PRIVATE
 
 /**
diff --git a/src/core/mesh/qgsmeshvectorrenderer.h b/src/core/mesh/qgsmeshvectorrenderer.h
@@ -26,11 +26,12 @@
 
 #include "qgis_core.h"
 #include "qgsmeshdataprovider.h"
-#include "qgsrendercontext.h"
 #include "qgstriangularmesh.h"
 #include "qgsmeshlayer.h"
 #include "qgspointxy.h"
 
+class QgsRenderContext;
+
 ///@cond PRIVATE
 
 /**
diff --git a/src/core/metadata/qgslayermetadataformatter.cpp b/src/core/metadata/qgslayermetadataformatter.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 #include <QStringBuilder>
+#include <QDateTime>
 
 #include "qgslayermetadataformatter.h"
 #include "qgslayermetadata.h"
diff --git a/src/core/metadata/qgsprojectmetadata.h b/src/core/metadata/qgsprojectmetadata.h
@@ -22,6 +22,8 @@
 #include "qgis_core.h"
 #include "qgsabstractmetadatabase.h"
 
+#include <QDateTime>
+
 /**
  * \ingroup core
  * \class QgsProjectMetadata
diff --git a/src/core/providers/memory/qgsmemoryproviderutils.h b/src/core/providers/memory/qgsmemoryproviderutils.h
@@ -19,7 +19,7 @@
 #define QGSMEMORYPROVIDERUTILS_H
 
 #include "qgis_core.h"
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include "qgscoordinatereferencesystem.h"
 #include <QString>
 #include <QVariant>
diff --git a/src/core/qgis.h b/src/core/qgis.h
@@ -18,25 +18,12 @@
 #ifndef QGIS_H
 #define QGIS_H
 
-#include <QEvent>
-#include <QString>
-#include <QMetaType>
-#include <QMap>
 #include <QMetaEnum>
-#include <QVariant>
-#include <QDateTime>
-#include <QDate>
-#include <QTime>
-#include <QHash>
-#include <cstdlib>
 #include <cfloat>
 #include <memory>
-#include <type_traits>
 #include <cmath>
-#include <qnumeric.h>
 
 #include "qgstolerance.h"
-#include "qgswkbtypes.h"
 #include "qgis_core.h"
 #include "qgis_sip.h"
 
diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h
@@ -27,6 +27,7 @@
 #include <QMap>
 #include <QHash>
 #include <QReadWriteLock>
+#include <QExplicitlySharedDataPointer>
 
 //qgis includes
 #include "qgis.h"
diff --git a/src/core/qgscoordinatetransformcontext.h b/src/core/qgscoordinatetransformcontext.h
@@ -22,6 +22,7 @@
 #include "qgis.h"
 #include "qgsdatumtransform.h"
 
+#include <QExplicitlySharedDataPointer>
 class QgsCoordinateReferenceSystem;
 class QgsReadWriteContext;
 class QgsCoordinateTransformContextPrivate;
diff --git a/src/core/qgsdatasourceuri.h b/src/core/qgsdatasourceuri.h
@@ -20,7 +20,8 @@
 #define QGSDATASOURCEURI_H
 
 #include "qgis_core.h"
-#include "qgis.h"
+#include "qgis_sip.h"
+#include "qgswkbtypes.h"
 
 #include <QMap>
 
diff --git a/src/core/qgsinterval.cpp b/src/core/qgsinterval.cpp
@@ -20,6 +20,7 @@
 #include <QMap>
 #include <QObject>
 #include <QDebug>
+#include <QDateTime>
 
 /***************************************************************************
  * This class is considered CRITICAL and any change MUST be accompanied with
diff --git a/src/core/qgsmapsettings.h b/src/core/qgsmapsettings.h
@@ -24,7 +24,6 @@
 #include <QSize>
 #include <QStringList>
 
-#include "qgsabstractgeometry.h"
 #include "qgscoordinatereferencesystem.h"
 #include "qgslabelingenginesettings.h"
 #include "qgsmaptopixel.h"
diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h
@@ -23,7 +23,6 @@
 #include <QColor>
 #include <memory>
 
-#include "qgsabstractgeometry.h"
 #include "qgscoordinatetransform.h"
 #include "qgsexpressioncontext.h"
 #include "qgsfeaturefilterprovider.h"
diff --git a/src/core/qgsvectorsimplifymethod.cpp b/src/core/qgsvectorsimplifymethod.cpp
@@ -15,7 +15,6 @@
 
 #include "qgis.h"
 #include "qgsvectorsimplifymethod.h"
-#include "qgsvectorlayer.h"
 
 QgsVectorSimplifyMethod::QgsVectorSimplifyMethod()
   : mSimplifyHints( Qgis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorSimplifyMethod::FullSimplification : QgsVectorSimplifyMethod::GeometrySimplification )
diff --git a/src/core/qgsvirtuallayerdefinition.h b/src/core/qgsvirtuallayerdefinition.h
@@ -19,7 +19,7 @@ email                : hugo dot mercier at oslandia dot com
 
 #include "qgis_core.h"
 #include "qgsfields.h"
-#include "qgis.h"
+#include "qgswkbtypes.h"
 
 /**
  * \ingroup core
diff --git a/src/core/symbology/qgsrendererregistry.h b/src/core/symbology/qgsrendererregistry.h
@@ -22,7 +22,8 @@
 #include <QStringList>
 #include <QDomElement>
 
-#include "qgis.h"
+// #include "qgis.h"
+#include "qgswkbtypes.h"
 
 class QgsFeatureRenderer;
 class QgsReadWriteContext;
diff --git a/src/gui/qgsgeometryrubberband.h b/src/gui/qgsgeometryrubberband.h
@@ -19,7 +19,7 @@
 #define QGSGEOMETRYRUBBERBAND_H
 
 #include "qgsmapcanvasitem.h"
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include <QBrush>
 #include <QPen>
 #include "qgis_gui.h"
diff --git a/src/gui/qgsmaptooledit.h b/src/gui/qgsmaptooledit.h
@@ -16,7 +16,7 @@
 #ifndef QGSMAPTOOLEDIT_H
 #define QGSMAPTOOLEDIT_H
 
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include "qgsmaptool.h"
 #include "qgis_gui.h"
 
diff --git a/src/gui/qgsnewmemorylayerdialog.h b/src/gui/qgsnewmemorylayerdialog.h
@@ -19,7 +19,7 @@
 
 #include "ui_qgsnewmemorylayerdialogbase.h"
 #include "qgsguiutils.h"
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include "qgshelp.h"
 #include "qgis_gui.h"
 
diff --git a/src/gui/qgsnewvectorlayerdialog.h b/src/gui/qgsnewvectorlayerdialog.h
@@ -21,7 +21,7 @@
 #include "qgsguiutils.h"
 #include "qgshelp.h"
 
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include "qgis_gui.h"
 
 /**
diff --git a/src/providers/mssql/qgsmssqltablemodel.h b/src/providers/mssql/qgsmssqltablemodel.h
@@ -20,7 +20,7 @@
 
 #include <QStandardItemModel>
 
-#include "qgis.h"
+#include "qgswkbtypes.h"
 
 //! Layer Property structure
 struct QgsMssqlLayerProperty
diff --git a/src/providers/postgres/qgspgtablemodel.h b/src/providers/postgres/qgspgtablemodel.h
@@ -18,7 +18,7 @@
 #define QGSPGTABLEMODEL_H
 #include <QStandardItemModel>
 
-#include "qgis.h"
+#include "qgswkbtypes.h"
 #include "qgspostgresconn.h"
 
 class QIcon;
diff --git a/src/providers/spatialite/qgsspatialitetablemodel.h b/src/providers/spatialite/qgsspatialitetablemodel.h
@@ -17,7 +17,7 @@
 
 #include <QStandardItemModel>
 class QIcon;
-#include "qgis.h"
+#include "qgswkbtypes.h"
 
 /**
  * A model that holds the tables of a database in a hierarchy where the

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`
`11`	`11`
`12`	`12`
	`13`	`+`
`13`	`14`	`class QgsAnnotation : QObject`
`14`	`15`	`{`
`15`	`16`	`%Docstring`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`
`10`	`10`
`11`	`11`
	`12`	`+`
`12`	`13`	`class QgsProjectMetadata : QgsAbstractMetadataBase`
`13`	`14`	`{`
`14`	`15`	`%Docstring`