Skip to content
Permalink
Browse files

Rework includes to forward declare as much as possible

Should speed up recompilation when headers change
  • Loading branch information
nyalldawson committed Jul 18, 2016
1 parent 7b883e2 commit c628c0f4345558a84834d429ff432f43b1b7d038
Showing 576 changed files with 784 additions and 463 deletions.
@@ -16,7 +16,8 @@

#include "Bezier3D.h"
#include "qgslogger.h"

#include "Vector3D.h"
#include "MathUtils.h"

void Bezier3D::calcFirstDer( float t, Vector3D* v )
{
@@ -18,8 +18,6 @@
#define BEZIER3D_H

#include "ParametricLine.h"
#include "Vector3D.h"
#include "MathUtils.h"
#include "qgslogger.h"

/** \ingroup analysis
@@ -16,7 +16,8 @@

#include "CloughTocherInterpolator.h"
#include "qgslogger.h"

#include "MathUtils.h"
#include "NormVecDecorator.h"
#include <qmath.h>

CloughTocherInterpolator::CloughTocherInterpolator()
@@ -17,12 +17,10 @@
#ifndef CLOUGHTOCHERINTERPOLATOR_H
#define CLOUGHTOCHERINTERPOLATOR_H

#include "NormVecDecorator.h"
#include "TriangleInterpolator.h"
#include "Point3D.h"
#include "Vector3D.h"
#include "MathUtils.h"
#include "Bezier3D.h"

class NormVecDecorator;

/** \ingroup analysis
* This is an implementation of a Clough-Tocher interpolator based on a triangular tessellation. The derivatives orthogonal to the boundary curves are interpolated linearly along a triangle edge.*/
@@ -17,6 +17,8 @@

#include "DualEdgeTriangulation.h"
#include <map>
#include "Line3D.h"
#include "MathUtils.h"
#include "qgsgeometry.h"
#include "qgslogger.h"
#include "qgsvectorfilewriter.h"
@@ -22,8 +22,6 @@
#include <QVector>
#include <QList>
#include <QSet>
#include "MathUtils.h"
#include "TriangleInterpolator.h"
#include <QColor>
#include <QFile>
#include <QTextStream>
@@ -17,7 +17,6 @@
#ifndef LINE3D_H
#define LINE3D_H

#include "Point3D.h"
#include "Node.h"

/** \ingroup analysis
@@ -16,6 +16,9 @@

#include "MathUtils.h"
#include "qgslogger.h"
#include "Point3D.h"
#include "Vector3D.h"

#include <qmath.h>

bool MathUtils::calcBarycentricCoordinates( double x, double y, Point3D* p1, Point3D* p2, Point3D* p3, Point3D* result )
@@ -18,9 +18,9 @@
#define MATHUTILS_H

#include <cmath>
#include "Vector3D.h"
#include "Point3D.h"

class Point3D;
class Vector3D;

namespace MathUtils
{
@@ -21,6 +21,7 @@
#include <TriangleInterpolator.h>
#include <MathUtils.h>
#include "qgslogger.h"

class QProgressDialog;

/** \ingroup analysis
@@ -18,9 +18,10 @@
#define PARAMETRICLINE_H

#include "Point3D.h"
#include "Vector3D.h"
#include <QVector>

class Vector3D;

/** \ingroup analysis
* ParametricLine is an Interface for parametric lines. It is possible, that a parametric line is composed of several parametric
* lines (see the composite pattern in Gamma et al. 'Design Patterns'). Do not build instances of it since it is an abstract class.*/
@@ -18,11 +18,11 @@
#define TRIANGULATION_H

#include <QList>
#include "Line3D.h"
#include "Vector3D.h"
#include <qpainter.h>
#include <TriangleInterpolator.h>

class Line3D;

/** \ingroup analysis
* Interface for Triangulation classes*/
class ANALYSIS_EXPORT Triangulation
@@ -16,6 +16,7 @@
***************************************************************************/

#include "qgsinterpolator.h"
#include "qgsfeatureiterator.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
#include "qgsgeometry.h"
@@ -16,10 +16,12 @@
***************************************************************************/

#include "qgstininterpolator.h"
#include "qgsfeatureiterator.h"
#include "CloughTocherInterpolator.h"
#include "DualEdgeTriangulation.h"
#include "NormVecDecorator.h"
#include "LinTriangleInterpolator.h"
#include "Line3D.h"
#include "Point3D.h"
#include "qgsfeature.h"
#include "qgsgeometry.h"
@@ -18,6 +18,7 @@
#include "qgsgraphbuilderintr.h"

// Qgis includes
#include "qgsfeatureiterator.h"
#include <qgsvectorlayer.h>
#include <qgsvectordataprovider.h>
#include <qgspoint.h>
@@ -14,6 +14,7 @@
***************************************************************************/
#include "qgsrastercalcnode.h"
#include "qgsrasterblock.h"
#include "qgsrastermatrix.h"
#include <cfloat>

QgsRasterCalcNode::QgsRasterCalcNode()
@@ -19,11 +19,11 @@
#ifndef QGSRASTERCALCNODE_H
#define QGSRASTERCALCNODE_H

#include "qgsrastermatrix.h"
#include <QMap>
#include <QString>

class QgsRasterBlock;
class QgsRasterMatrix;

/** \ingroup analysis
* \class QgsRasterCalcNode
@@ -17,8 +17,11 @@

#include "qgsrastercalculator.h"
#include "qgsrastercalcnode.h"
#include "qgsrasterdataprovider.h"
#include "qgsrasterinterface.h"
#include "qgsrasterlayer.h"
#include "qgsrastermatrix.h"
#include "qgsrasterprojector.h"

#include <QProgressDialog>
#include <QFile>
@@ -18,7 +18,6 @@
#ifndef QGSRASTERCALCULATOR_H
#define QGSRASTERCALCULATOR_H

#include "qgsfield.h"
#include "qgsrectangle.h"
#include "qgscoordinatereferencesystem.h"
#include <QString>
@@ -20,12 +20,14 @@
#include "qgsapplication.h"
#include "qgsfield.h"
#include "qgsfeature.h"
#include "qgsfeatureiterator.h"
#include "qgslogger.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsvectorfilewriter.h"
#include "qgsvectordataprovider.h"
#include "qgsdistancearea.h"
#include "qgis.h"
#include "qgsvectorlayer.h"

#include <QProgressDialog>

@@ -18,15 +18,13 @@
#ifndef QGSGEOMETRYANALYZERH
#define QGSGEOMETRYANALYZERH

#include "qgsvectorlayer.h"
#include "qgsfield.h"
#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgsdistancearea.h"

class QgsVectorFileWriter;
class QProgressDialog;

class QgsVectorDataProvider;
class QgsDistanceArea;

/** \ingroup analysis
* The QGis class provides vector geometry analysis functions
@@ -18,10 +18,13 @@
#include "qgsoverlayanalyzer.h"

#include "qgsapplication.h"
#include "qgsfeatureiterator.h"
#include "qgsfield.h"
#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgslogger.h"
#include "qgscoordinatereferencesystem.h"
#include "qgsspatialindex.h"
#include "qgsvectorfilewriter.h"
#include "qgsvectordataprovider.h"
#include "qgsdistancearea.h"
@@ -19,15 +19,10 @@
#define QGSOVERLAYANALYZERH

#include "qgsvectorlayer.h"
#include "qgsfield.h"
#include "qgsspatialindex.h"
#include "qgsfeature.h"
#include "qgsgeometry.h"
#include "qgsdistancearea.h"

class QgsVectorFileWriter;
class QProgressDialog;

class QgsSpatialIndex;

/** \ingroup analysis
* The QGis class provides vector overlay analysis functions
@@ -13,6 +13,7 @@
* *
***************************************************************************/
#include "qgspointsample.h"
#include "qgsfeatureiterator.h"
#include "qgsgeometry.h"
#include "qgsspatialindex.h"
#include "qgsvectorfilewriter.h"
@@ -14,6 +14,7 @@
***************************************************************************/
#include "qgstransectsample.h"
#include "qgsdistancearea.h"
#include "qgsfeatureiterator.h"
#include "qgsgeometry.h"
#include "qgsspatialindex.h"
#include "qgsvectorfilewriter.h"
@@ -16,6 +16,7 @@
***************************************************************************/

#include "qgszonalstatistics.h"
#include "qgsfeatureiterator.h"
#include "qgsgeometry.h"
#include "qgsvectordataprovider.h"
#include "qgsvectorlayer.h"
@@ -18,12 +18,15 @@
#ifndef QGSZONALSTATISTICS_H
#define QGSZONALSTATISTICS_H

#include "qgsrectangle.h"
#include <QString>
#include <QMap>
#include <limits>
#include <cfloat>

class QgsGeometry;
class QgsVectorLayer;
class QProgressDialog;
class QgsRectangle;

/** \ingroup analysis
* A class that calculates raster statistics (count, sum, mean) for a polygon or multipolygon layer and appends the results as attributes*/
@@ -24,6 +24,7 @@
#include "qgsmaplayerproxymodel.h"
#include "qgsexpressionbuilderdialog.h"
#include "qgscomposermap.h"
#include "qgsvectorlayer.h"

static QgsExpressionContext _getExpressionContext( const void* context )
{
@@ -15,7 +15,6 @@
***************************************************************************/

#include "ui_qgsatlascompositionwidgetbase.h"
#include "qgsvectorlayer.h"

class QgsComposition;
class QgsMapLayer;
@@ -16,6 +16,7 @@
***************************************************************************/

#include "qgsattributeselectiondialog.h"
#include "qgscomposerattributetable.h"
#include "qgscomposerattributetablev2.h"
#include "qgscomposerattributetablemodel.h"
#include "qgscomposerattributetablemodelv2.h"
@@ -26,6 +26,7 @@
#include "qgscomposition.h"
#include "qgscompositionwidget.h"
#include "qgscomposermodel.h"
#include "qgsdockwidget.h"
#include "qgsatlascompositionwidget.h"
#include "qgscomposerarrow.h"
#include "qgscomposerpolygon.h"
@@ -65,6 +66,7 @@
#include "qgspaperitem.h"
#include "qgsmaplayerregistry.h"
#include "qgsprevieweffect.h"
#include "qgsvectorlayer.h"
#include "qgscomposerimageexportoptionsdialog.h"
#include "ui_qgssvgexportoptions.h"

@@ -17,9 +17,6 @@
#ifndef QGSCOMPOSER_H
#define QGSCOMPOSER_H
#include "ui_qgscomposerbase.h"
#include "qgscomposermap.h"
#include "qgscontexthelp.h"
#include "qgsdockwidget.h"

class QgisApp;
class QgsComposerArrow;
@@ -41,10 +38,17 @@ class QgsComposition;
class QgsMapCanvas;
class QgsAtlasComposition;
class QgsMapLayerAction;
class QgsComposerMap;
class QgsComposerItem;
class QgsDockWidget;
class QgsMapLayer;
class QgsFeature;
class QgsVectorLayer;

class QGridLayout;
class QDomNode;
class QDomDocument;
class QDomElement;
class QMoveEvent;
class QResizeEvent;
class QFile;
@@ -16,6 +16,8 @@
***************************************************************************/

#include "qgscomposerattributetablewidget.h"
#include "qgsatlascomposition.h"
#include "qgscomposition.h"
#include "qgscomposerframe.h"
#include "qgsattributeselectiondialog.h"
#include "qgscomposeritemwidget.h"
@@ -16,6 +16,7 @@
***************************************************************************/

#include "qgscomposerimageexportoptionsdialog.h"
#include "qgis.h"
#include <QSettings>
#include <QCheckBox>
#include <QPushButton>
@@ -20,7 +20,6 @@

#include <QDialog>
#include "ui_qgscomposerimageexportoptions.h"
#include "qgscomposertablev2.h"


/** A dialog for customising the properties of an exported image file.

0 comments on commit c628c0f

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