Revert "sort includes"

This reverts commit 2b7d3d3.

Author: 3nids

src/analysis/interpolation/Bezier3D.h

@@ -17,10 +17,10 @@
 #ifndef BEZIER3D_H
 #define BEZIER3D_H
 
-#include "MathUtils.h"
 #include "ParametricLine.h"
-#include "qgslogger.h"
 #include "Vector3D.h"
+#include "MathUtils.h"
+#include "qgslogger.h"
 
 /**Class Bezier3D represents a bezier curve, represented by control points. Parameter t is running from 0 to 1. The class is capable to calculate the curve point and the first two derivatives belonging to t.*/
 class ANALYSIS_EXPORT Bezier3D: public ParametricLine

src/analysis/interpolation/CloughTocherInterpolator.h

@@ -17,12 +17,12 @@
 #ifndef CLOUGHTOCHERINTERPOLATOR_H
 #define CLOUGHTOCHERINTERPOLATOR_H
 
-#include "Bezier3D.h"
-#include "MathUtils.h"
 #include "NormVecDecorator.h"
-#include "Point3D.h"
 #include "TriangleInterpolator.h"
+#include "Point3D.h"
 #include "Vector3D.h"
+#include "MathUtils.h"
+#include "Bezier3D.h"
 
 /**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.*/
 class ANALYSIS_EXPORT CloughTocherInterpolator : public TriangleInterpolator

src/analysis/interpolation/DualEdgeTriangulation.h

@@ -17,22 +17,22 @@
 #ifndef DUALEDGETRIANGULATION_H
 #define DUALEDGETRIANGULATION_H
 
-#include <cfloat>
-#include <QBuffer>
-#include <QColor>
-#include <QCursor>
-#include <QFile>
+#include "Triangulation.h"
+#include "HalfEdge.h"
+#include <QVector>
 #include <QList>
-#include <QMessageBox>
-#include <QProgressDialog>
 #include <QSet>
-#include <QStringList>
-#include <QTextStream>
-#include <QVector>
-#include "HalfEdge.h"
 #include "MathUtils.h"
 #include "TriangleInterpolator.h"
-#include "Triangulation.h"
+#include <QColor>
+#include <QFile>
+#include <QTextStream>
+#include <QMessageBox>
+#include <cfloat>
+#include <QBuffer>
+#include <QStringList>
+#include <QProgressDialog>
+#include <QCursor>
 
 /**DualEdgeTriangulation is an implementation of a triangulation class based on the dual edge data structure*/
 class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation

src/analysis/interpolation/LinTriangleInterpolator.h

@@ -17,8 +17,8 @@
 #ifndef LINTRIANGLEINTERPOLATOR_H
 #define LINTRIANGLEINTERPOLATOR_H
 
-#include "DualEdgeTriangulation.h"
 #include "TriangleInterpolator.h"
+#include "DualEdgeTriangulation.h"
 
 /**LinTriangleInterpolator is a class which interpolates linearly on a triangulation*/
 class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator

src/analysis/interpolation/Line3D.h

@@ -17,8 +17,8 @@
 #ifndef LINE3D_H
 #define LINE3D_H
 
-#include "Node.h"
 #include "Point3D.h"
+#include "Node.h"
 
 /**This class represents a line. It is implemented as a single directed linked list of nodes (with related Point3D objects). Attention: the points inserted in a line are not deleted from Line3D*/
 class ANALYSIS_EXPORT Line3D

src/analysis/interpolation/MathUtils.h

@@ -18,8 +18,8 @@
 #define MATHUTILS_H
 
 #include <cmath>
-#include "Point3D.h"
 #include "Vector3D.h"
+#include "Point3D.h"
 
 
 namespace MathUtils

src/analysis/interpolation/NormVecDecorator.h

@@ -17,10 +17,10 @@
 #ifndef NORMVECDECORATOR_H
 #define NORMVECDECORATOR_H
 
-#include <MathUtils.h>
+#include "TriDecorator.h"
 #include <TriangleInterpolator.h>
+#include <MathUtils.h>
 #include "qgslogger.h"
-#include "TriDecorator.h"
 class QProgressDialog;
 
 /**Decorator class which adds the functionality of estimating normals at the data points*/

src/analysis/interpolation/ParametricLine.h

@@ -17,9 +17,9 @@
 #ifndef PARAMETRICLINE_H
 #define PARAMETRICLINE_H
 
-#include <QVector>
 #include "Point3D.h"
 #include "Vector3D.h"
+#include <QVector>
 
 class ANALYSIS_EXPORT ParametricLine
       /**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.*/

src/analysis/interpolation/Triangulation.h

@@ -18,10 +18,10 @@
 #define TRIANGULATION_H
 
 #include <QList>
-#include <qpainter.h>
-#include <TriangleInterpolator.h>
 #include "Line3D.h"
 #include "Vector3D.h"
+#include <qpainter.h>
+#include <TriangleInterpolator.h>
 
 /**Interface for Triangulation classes*/
 class ANALYSIS_EXPORT Triangulation

src/analysis/interpolation/qgsgridfilewriter.cpp

@@ -15,12 +15,12 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QFile>
-#include <QFileInfo>
-#include <QProgressDialog>
 #include "qgsgridfilewriter.h"
 #include "qgsinterpolator.h"
 #include "qgsvectorlayer.h"
+#include <QFile>
+#include <QFileInfo>
+#include <QProgressDialog>
 
 QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows, double cellSizeX, double cellSizeY )
     : mInterpolator( i )

src/analysis/interpolation/qgsgridfilewriter.h

@@ -18,9 +18,9 @@
 #ifndef QGSGRIDFILEWRITER_H
 #define QGSGRIDFILEWRITER_H
 
+#include "qgsrectangle.h"
 #include <QString>
 #include <QTextStream>
-#include "qgsrectangle.h"
 
 class QgsInterpolator;
 

src/analysis/interpolation/qgsidwinterpolator.cpp

@@ -15,9 +15,9 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgsidwinterpolator.h"
 #include <cmath>
 #include <limits>
-#include "qgsidwinterpolator.h"
 
 QgsIDWInterpolator::QgsIDWInterpolator( const QList<LayerData>& layerData ): QgsInterpolator( layerData ), mDistanceCoefficient( 2.0 )
 {

src/analysis/interpolation/qgsinterpolator.cpp

@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsgeometry.h"
 #include "qgsinterpolator.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgsgeometry.h"
 #include "qgswkbptr.h"
 
 QgsInterpolator::QgsInterpolator( const QList<LayerData>& layerData )

src/analysis/interpolation/qgstininterpolator.cpp

@@ -15,17 +15,17 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QProgressDialog>
+#include "qgstininterpolator.h"
 #include "CloughTocherInterpolator.h"
 #include "DualEdgeTriangulation.h"
-#include "LinTriangleInterpolator.h"
 #include "NormVecDecorator.h"
+#include "LinTriangleInterpolator.h"
 #include "Point3D.h"
 #include "qgsfeature.h"
 #include "qgsgeometry.h"
-#include "qgstininterpolator.h"
 #include "qgsvectorlayer.h"
 #include "qgswkbptr.h"
+#include <QProgressDialog>
 
 QgsTINInterpolator::QgsTINInterpolator( const QList<LayerData>& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog )
     : QgsInterpolator( inputData )

src/analysis/interpolation/qgstininterpolator.h

@@ -18,8 +18,8 @@
 #ifndef QGSTININTERPOLATOR_H
 #define QGSTININTERPOLATOR_H
 
-#include <QString>
 #include "qgsinterpolator.h"
+#include <QString>
 
 class Triangulation;
 class TriangleInterpolator;

src/analysis/network/qgsgraph.h

@@ -28,8 +28,8 @@
 
 // QT4 includes
 #include <QList>
-#include <QVariant>
 #include <QVector>
+#include <QVariant>
 
 // QGIS includes
 #include "qgspoint.h"

src/analysis/network/qgsgraphanalyzer.cpp

@@ -19,12 +19,12 @@
 
 // QT includes
 #include <QMap>
-#include <QPair>
 #include <QVector>
+#include <QPair>
 
 //QGIS-uncludes
-#include "qgsgraphanalyzer.h"
 #include "qgsgraph.h"
+#include "qgsgraphanalyzer.h"
 
 void QgsGraphAnalyzer::dijkstra( const QgsGraph* source, int startPointIdx, int criterionNum, QVector<int>* resultTree, QVector<double>* resultCost )
 {

src/analysis/network/qgsgraphbuilderintr.h

@@ -16,13 +16,13 @@
 #define QGSGRAPHBUILDERINTERFACE
 
 //QT4 includes
-#include <QVariant>
 #include <QVector>
+#include <QVariant>
 
 //QGIS includes
+#include <qgspoint.h>
 #include <qgscoordinatereferencesystem.h>
 #include <qgsdistancearea.h>
-#include <qgspoint.h>
 
 //forward declarations
 

src/analysis/network/qgsgraphdirector.h

@@ -16,9 +16,9 @@
 #define QGSGRAPHDIRECTORH
 
 //QT4 includes
-#include <QList>
 #include <QObject>
 #include <QVector>
+#include <QList>
 
 //QGIS includes
 #include <qgspoint.h>

src/analysis/network/qgslinevectorlayerdirector.cpp

@@ -14,23 +14,23 @@
  * \brief implementation of QgsLineVectorLayerDirector
  */
 
-#include "qgsgraphbuilderintr.h"
 #include "qgslinevectorlayerdirector.h"
+#include "qgsgraphbuilderintr.h"
 
 // Qgis includes
-#include <qgsdistancearea.h>
-#include <qgsgeometry.h>
-#include <qgspoint.h>
-#include <qgsvectordataprovider.h>
 #include <qgsvectorlayer.h>
+#include <qgsvectordataprovider.h>
+#include <qgspoint.h>
+#include <qgsgeometry.h>
+#include <qgsdistancearea.h>
 
 // QT includes
 #include <QString>
 #include <QtAlgorithms>
 
 //standard includes
-#include <algorithm>
 #include <limits>
+#include <algorithm>
 
 class QgsPointCompare
 {

src/analysis/openstreetmap/qgsosmdatabase.cpp

@@ -13,10 +13,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsgeometry.h"
-#include "qgslogger.h"
 #include "qgsosmdatabase.h"
 #include "qgsslconnect.h"
+#include "qgsgeometry.h"
+#include "qgslogger.h"
 
 
 QgsOSMDatabase::QgsOSMDatabase( const QString& dbFileName )

src/analysis/openstreetmap/qgsosmdownload.cpp

@@ -1,8 +1,8 @@
 #include "qgsosmdownload.h"
 
 #include <QNetworkAccessManager>
-#include <QNetworkReply>
 #include <QNetworkRequest>
+#include <QNetworkReply>
 
 #include "qgsnetworkaccessmanager.h"
 #include "qgsrectangle.h"

src/analysis/openstreetmap/qgsosmdownload.h

@@ -17,9 +17,9 @@
 #define OSMDOWNLOAD_H
 
 
+#include <QObject>
 #include <QFile>
 #include <QNetworkReply>
-#include <QObject>
 
 class QgsRectangle;
 

src/analysis/raster/qgsninecellfilter.cpp

@@ -15,10 +15,10 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QFile>
-#include <QProgressDialog>
-#include "cpl_string.h"
 #include "qgsninecellfilter.h"
+#include "cpl_string.h"
+#include <QProgressDialog>
+#include <QFile>
 
 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
 #define TO8F(x) (x).toUtf8().constData()

src/analysis/raster/qgsrastercalcnode.cpp

@@ -12,9 +12,9 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
-#include <cfloat>
-#include "qgsrasterblock.h"
 #include "qgsrastercalcnode.h"
+#include "qgsrasterblock.h"
+#include <cfloat>
 
 QgsRasterCalcNode::QgsRasterCalcNode()
     : mType( tNumber )

src/analysis/raster/qgsrastercalcnode.h

@@ -19,9 +19,9 @@
 #ifndef QGSRASTERCALCNODE_H
 #define QGSRASTERCALCNODE_H
 
+#include "qgsrastermatrix.h"
 #include <QMap>
 #include <QString>
-#include "qgsrastermatrix.h"
 
 class QgsRasterBlock;
 

src/analysis/raster/qgsrastercalculator.cpp

@@ -15,13 +15,13 @@
  *                                                                         *
  ***************************************************************************/
 
-#include "qgsrastercalcnode.h"
 #include "qgsrastercalculator.h"
+#include "qgsrastercalcnode.h"
 #include "qgsrasterlayer.h"
 #include "qgsrastermatrix.h"
 
-#include <QFile>
 #include <QProgressDialog>
+#include <QFile>
 
 #include <cpl_string.h>
 #include <gdalwarper.h>

src/analysis/raster/qgsrastercalculator.h

@@ -18,12 +18,12 @@
 #ifndef QGSRASTERCALCULATOR_H
 #define QGSRASTERCALCULATOR_H
 
+#include "qgsfield.h"
+#include "qgsrectangle.h"
+#include "qgscoordinatereferencesystem.h"
 #include <QString>
 #include <QVector>
 #include "gdal.h"
-#include "qgscoordinatereferencesystem.h"
-#include "qgsfield.h"
-#include "qgsrectangle.h"
 
 class QgsRasterLayer;
 class QProgressDialog;