Merge pull request #2131 from 3nids/test_sort_include_2

sort and remove duplicates in includes
2025-03-12 00:02:25 -04:00 · 2015-06-10 14:42:15 +02:00 · 2015-06-10 14:42:15 +02:00 · d077a1681c
commit d077a1681c
parent 86a4820f48 2b7d3d3c73
1244 changed files with 4266 additions and 4306 deletions
--- a/src/analysis/interpolation/Bezier3D.h
+++ b/src/analysis/interpolation/Bezier3D.h
@ -17,10 +17,10 @@
 #ifndef BEZIER3D_H
 #define BEZIER3D_H

-#include "ParametricLine.h"
-#include "Vector3D.h"
 #include "MathUtils.h"
+#include "ParametricLine.h"
 #include "qgslogger.h"
+#include "Vector3D.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
--- a/src/analysis/interpolation/CloughTocherInterpolator.h
+++ b/src/analysis/interpolation/CloughTocherInterpolator.h
@ -17,12 +17,12 @@
 #ifndef CLOUGHTOCHERINTERPOLATOR_H
 #define CLOUGHTOCHERINTERPOLATOR_H

-#include "NormVecDecorator.h"
-#include "TriangleInterpolator.h"
-#include "Point3D.h"
-#include "Vector3D.h"
-#include "MathUtils.h"
 #include "Bezier3D.h"
+#include "MathUtils.h"
+#include "NormVecDecorator.h"
+#include "Point3D.h"
+#include "TriangleInterpolator.h"
+#include "Vector3D.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
--- a/src/analysis/interpolation/DualEdgeTriangulation.h
+++ b/src/analysis/interpolation/DualEdgeTriangulation.h
@ -17,22 +17,22 @@
 #ifndef DUALEDGETRIANGULATION_H
 #define DUALEDGETRIANGULATION_H

-#include "Triangulation.h"
-#include "HalfEdge.h"
-#include <QVector>
-#include <QList>
-#include <QSet>
-#include "MathUtils.h"
-#include "TriangleInterpolator.h"
-#include <QColor>
-#include <QFile>
-#include <QTextStream>
-#include <QMessageBox>
 #include <cfloat>
 #include <QBuffer>
-#include <QStringList>
-#include <QProgressDialog>
+#include <QColor>
 #include <QCursor>
+#include <QFile>
+#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"

 /**DualEdgeTriangulation is an implementation of a triangulation class based on the dual edge data structure*/
 class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
--- a/src/analysis/interpolation/LinTriangleInterpolator.h
+++ b/src/analysis/interpolation/LinTriangleInterpolator.h
@ -17,8 +17,8 @@
 #ifndef LINTRIANGLEINTERPOLATOR_H
 #define LINTRIANGLEINTERPOLATOR_H

-#include "TriangleInterpolator.h"
 #include "DualEdgeTriangulation.h"
+#include "TriangleInterpolator.h"

 /**LinTriangleInterpolator is a class which interpolates linearly on a triangulation*/
 class ANALYSIS_EXPORT LinTriangleInterpolator : public TriangleInterpolator
--- a/src/analysis/interpolation/Line3D.h
+++ b/src/analysis/interpolation/Line3D.h
@ -17,8 +17,8 @@
 #ifndef LINE3D_H
 #define LINE3D_H

-#include "Point3D.h"
 #include "Node.h"
+#include "Point3D.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
--- a/src/analysis/interpolation/MathUtils.h
+++ b/src/analysis/interpolation/MathUtils.h
@ -18,8 +18,8 @@
 #define MATHUTILS_H

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


 namespace MathUtils
--- a/src/analysis/interpolation/NormVecDecorator.h
+++ b/src/analysis/interpolation/NormVecDecorator.h
@ -17,10 +17,10 @@
 #ifndef NORMVECDECORATOR_H
 #define NORMVECDECORATOR_H

-#include "TriDecorator.h"
-#include <TriangleInterpolator.h>
 #include <MathUtils.h>
+#include <TriangleInterpolator.h>
 #include "qgslogger.h"
+#include "TriDecorator.h"
 class QProgressDialog;

 /**Decorator class which adds the functionality of estimating normals at the data points*/
--- a/src/analysis/interpolation/ParametricLine.h
+++ b/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.*/
--- a/src/analysis/interpolation/Triangulation.h
+++ b/src/analysis/interpolation/Triangulation.h
@ -18,10 +18,10 @@
 #define TRIANGULATION_H

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

 /**Interface for Triangulation classes*/
 class ANALYSIS_EXPORT Triangulation
--- a/src/analysis/interpolation/qgsgridfilewriter.cpp
+++ b/src/analysis/interpolation/qgsgridfilewriter.cpp
@ -15,12 +15,12 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsgridfilewriter.h"
-#include "qgsinterpolator.h"
-#include "qgsvectorlayer.h"
 #include <QFile>
 #include <QFileInfo>
 #include <QProgressDialog>
+#include "qgsgridfilewriter.h"
+#include "qgsinterpolator.h"
+#include "qgsvectorlayer.h"

 QgsGridFileWriter::QgsGridFileWriter( QgsInterpolator* i, QString outputPath, QgsRectangle extent, int nCols, int nRows, double cellSizeX, double cellSizeY )
    : mInterpolator( i )
--- a/src/analysis/interpolation/qgsgridfilewriter.h
+++ b/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;

--- a/src/analysis/interpolation/qgsidwinterpolator.cpp
+++ b/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 )
 {
--- a/src/analysis/interpolation/qgsinterpolator.cpp
+++ b/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 )
--- a/src/analysis/interpolation/qgstininterpolator.cpp
+++ b/src/analysis/interpolation/qgstininterpolator.cpp
@ -15,17 +15,17 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgstininterpolator.h"
+#include <QProgressDialog>
 #include "CloughTocherInterpolator.h"
 #include "DualEdgeTriangulation.h"
-#include "NormVecDecorator.h"
 #include "LinTriangleInterpolator.h"
+#include "NormVecDecorator.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 )
--- a/src/analysis/interpolation/qgstininterpolator.h
+++ b/src/analysis/interpolation/qgstininterpolator.h
@ -18,8 +18,8 @@
 #ifndef QGSTININTERPOLATOR_H
 #define QGSTININTERPOLATOR_H

-#include "qgsinterpolator.h"
 #include <QString>
+#include "qgsinterpolator.h"

 class Triangulation;
 class TriangleInterpolator;
--- a/src/analysis/network/qgsgraph.h
+++ b/src/analysis/network/qgsgraph.h
@ -28,8 +28,8 @@

 // QT4 includes
 #include <QList>
-#include <QVector>
 #include <QVariant>
+#include <QVector>

 // QGIS includes
 #include "qgspoint.h"
--- a/src/analysis/network/qgsgraphanalyzer.cpp
+++ b/src/analysis/network/qgsgraphanalyzer.cpp
@ -19,12 +19,12 @@

 // QT includes
 #include <QMap>
-#include <QVector>
 #include <QPair>
+#include <QVector>

 //QGIS-uncludes
-#include "qgsgraph.h"
 #include "qgsgraphanalyzer.h"
+#include "qgsgraph.h"

 void QgsGraphAnalyzer::dijkstra( const QgsGraph* source, int startPointIdx, int criterionNum, QVector<int>* resultTree, QVector<double>* resultCost )
 {
--- a/src/analysis/network/qgsgraphbuilderintr.h
+++ b/src/analysis/network/qgsgraphbuilderintr.h
@ -16,13 +16,13 @@
 #define QGSGRAPHBUILDERINTERFACE

 //QT4 includes
-#include <QVector>
 #include <QVariant>
+#include <QVector>

 //QGIS includes
-#include <qgspoint.h>
 #include <qgscoordinatereferencesystem.h>
 #include <qgsdistancearea.h>
+#include <qgspoint.h>

 //forward declarations

--- a/src/analysis/network/qgsgraphdirector.h
+++ b/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>
--- a/src/analysis/network/qgslinevectorlayerdirector.cpp
+++ b/src/analysis/network/qgslinevectorlayerdirector.cpp
@ -14,23 +14,23 @@
 * \brief implementation of QgsLineVectorLayerDirector
 */

-#include "qgslinevectorlayerdirector.h"
 #include "qgsgraphbuilderintr.h"
+#include "qgslinevectorlayerdirector.h"

 // Qgis includes
-#include <qgsvectorlayer.h>
-#include <qgsvectordataprovider.h>
-#include <qgspoint.h>
-#include <qgsgeometry.h>
 #include <qgsdistancearea.h>
+#include <qgsgeometry.h>
+#include <qgspoint.h>
+#include <qgsvectordataprovider.h>
+#include <qgsvectorlayer.h>

 // QT includes
 #include <QString>
 #include <QtAlgorithms>

 //standard includes
-#include <limits>
 #include <algorithm>
+#include <limits>

 class QgsPointCompare
 {
--- a/src/analysis/openstreetmap/qgsosmdatabase.cpp
+++ b/src/analysis/openstreetmap/qgsosmdatabase.cpp
@ -13,10 +13,10 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsosmdatabase.h"
-#include "qgsslconnect.h"
 #include "qgsgeometry.h"
 #include "qgslogger.h"
+#include "qgsosmdatabase.h"
+#include "qgsslconnect.h"


 QgsOSMDatabase::QgsOSMDatabase( const QString& dbFileName )
--- a/src/analysis/openstreetmap/qgsosmdownload.cpp
+++ b/src/analysis/openstreetmap/qgsosmdownload.cpp
@ -1,8 +1,8 @@
 #include "qgsosmdownload.h"

 #include <QNetworkAccessManager>
-#include <QNetworkRequest>
 #include <QNetworkReply>
+#include <QNetworkRequest>

 #include "qgsnetworkaccessmanager.h"
 #include "qgsrectangle.h"
--- a/src/analysis/openstreetmap/qgsosmdownload.h
+++ b/src/analysis/openstreetmap/qgsosmdownload.h
@ -17,9 +17,9 @@
 #define OSMDOWNLOAD_H


-#include <QObject>
 #include <QFile>
 #include <QNetworkReply>
+#include <QObject>

 class QgsRectangle;

--- a/src/analysis/raster/qgsninecellfilter.cpp
+++ b/src/analysis/raster/qgsninecellfilter.cpp
@ -15,10 +15,10 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsninecellfilter.h"
-#include "cpl_string.h"
-#include <QProgressDialog>
 #include <QFile>
+#include <QProgressDialog>
+#include "cpl_string.h"
+#include "qgsninecellfilter.h"

 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
 #define TO8F(x) (x).toUtf8().constData()
--- a/src/analysis/raster/qgsrastercalcnode.cpp
+++ b/src/analysis/raster/qgsrastercalcnode.cpp
@ -12,9 +12,9 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
-#include "qgsrastercalcnode.h"
-#include "qgsrasterblock.h"
 #include <cfloat>
+#include "qgsrasterblock.h"
+#include "qgsrastercalcnode.h"

 QgsRasterCalcNode::QgsRasterCalcNode()
    : mType( tNumber )
--- a/src/analysis/raster/qgsrastercalcnode.h
+++ b/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;

--- a/src/analysis/raster/qgsrastercalculator.cpp
+++ b/src/analysis/raster/qgsrastercalculator.cpp
@ -15,13 +15,13 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsrastercalculator.h"
 #include "qgsrastercalcnode.h"
+#include "qgsrastercalculator.h"
 #include "qgsrasterlayer.h"
 #include "qgsrastermatrix.h"

-#include <QProgressDialog>
 #include <QFile>
+#include <QProgressDialog>

 #include <cpl_string.h>
 #include <gdalwarper.h>
--- a/src/analysis/raster/qgsrastercalculator.h
+++ b/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;
--- a/src/analysis/raster/qgsrastermatrix.cpp
+++ b/src/analysis/raster/qgsrastermatrix.cpp
@ -15,9 +15,9 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsrastermatrix.h"
-#include <string.h>
 #include <qmath.h>
+#include <string.h>
+#include "qgsrastermatrix.h"

 QgsRasterMatrix::QgsRasterMatrix()
    : mColumns( 0 )
--- a/src/analysis/raster/qgsrelief.cpp
+++ b/src/analysis/raster/qgsrelief.cpp
@ -15,14 +15,14 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsrelief.h"
+#include <cfloat>
+#include <QProgressDialog>
+#include "cpl_string.h"
+#include "qgis.h"
 #include "qgsaspectfilter.h"
 #include "qgshillshadefilter.h"
+#include "qgsrelief.h"
 #include "qgsslopefilter.h"
-#include "qgis.h"
-#include "cpl_string.h"
-#include <QProgressDialog>
-#include <cfloat>

 #include <QFile>
 #include <QTextStream>
--- a/src/analysis/vector/qgsgeometryanalyzer.cpp
+++ b/src/analysis/vector/qgsgeometryanalyzer.cpp
@ -17,15 +17,15 @@

 #include "qgsgeometryanalyzer.h"

-#include "qgsapplication.h"
-#include "qgsfield.h"
-#include "qgsfeature.h"
-#include "qgslogger.h"
-#include "qgscoordinatereferencesystem.h"
-#include "qgsvectorfilewriter.h"
-#include "qgsvectordataprovider.h"
-#include "qgsdistancearea.h"
 #include <QProgressDialog>
+#include "qgsapplication.h"
+#include "qgscoordinatereferencesystem.h"
+#include "qgsdistancearea.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgslogger.h"
+#include "qgsvectordataprovider.h"
+#include "qgsvectorfilewriter.h"

 bool QgsGeometryAnalyzer::simplify( QgsVectorLayer* layer,
                                    const QString& shapefileName,
--- a/src/analysis/vector/qgsgeometryanalyzer.h
+++ b/src/analysis/vector/qgsgeometryanalyzer.h
@ -18,11 +18,11 @@
 #ifndef QGSGEOMETRYANALYZERH
 #define QGSGEOMETRYANALYZERH

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

 class QgsVectorFileWriter;
 class QProgressDialog;
--- a/src/analysis/vector/qgsoverlayanalyzer.cpp
+++ b/src/analysis/vector/qgsoverlayanalyzer.cpp
@ -17,15 +17,15 @@

 #include "qgsoverlayanalyzer.h"

-#include "qgsapplication.h"
-#include "qgsfield.h"
-#include "qgsfeature.h"
-#include "qgslogger.h"
-#include "qgscoordinatereferencesystem.h"
-#include "qgsvectorfilewriter.h"
-#include "qgsvectordataprovider.h"
-#include "qgsdistancearea.h"
 #include <QProgressDialog>
+#include "qgsapplication.h"
+#include "qgscoordinatereferencesystem.h"
+#include "qgsdistancearea.h"
+#include "qgsfeature.h"
+#include "qgsfield.h"
+#include "qgslogger.h"
+#include "qgsvectordataprovider.h"
+#include "qgsvectorfilewriter.h"

 bool QgsOverlayAnalyzer::intersection( QgsVectorLayer* layerA, QgsVectorLayer* layerB,
                                       const QString& shapefileName, bool onlySelectedFeatures,
--- a/src/analysis/vector/qgsoverlayanalyzer.h
+++ b/src/analysis/vector/qgsoverlayanalyzer.h
@ -18,12 +18,12 @@
 #ifndef QGSOVERLAYANALYZERH
 #define QGSOVERLAYANALYZERH

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

 class QgsVectorFileWriter;
 class QProgressDialog;
--- a/src/analysis/vector/qgspointsample.cpp
+++ b/src/analysis/vector/qgspointsample.cpp
@ -1,10 +1,10 @@
-#include "qgspointsample.h"
+#include <QFile>
+#include "mersenne-twister.h"
 #include "qgsgeometry.h"
+#include "qgspointsample.h"
 #include "qgsspatialindex.h"
 #include "qgsvectorfilewriter.h"
 #include "qgsvectorlayer.h"
-#include <QFile>
-#include "mersenne-twister.h"


 QgsPointSample::QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, QString nPointsAttribute, QString minDistAttribute ): mInputLayer( inputLayer ),
--- a/src/analysis/vector/qgspointsample.h
+++ b/src/analysis/vector/qgspointsample.h
@ -1,8 +1,8 @@
 #ifndef QGSPOINTSAMPLE_H
 #define QGSPOINTSAMPLE_H

-#include "qgsfeature.h"
 #include <QString>
+#include "qgsfeature.h"

 class QgsFeature;
 class QgsPoint;
--- a/src/analysis/vector/qgstransectsample.cpp
+++ b/src/analysis/vector/qgstransectsample.cpp
@ -1,16 +1,16 @@
-#include "qgstransectsample.h"
+#include <QFileInfo>
+#include <QProgressDialog>
 #include "qgsdistancearea.h"
 #include "qgsgeometry.h"
 #include "qgsspatialindex.h"
+#include "qgstransectsample.h"
 #include "qgsvectorfilewriter.h"
 #include "qgsvectorlayer.h"
-#include <QProgressDialog>
-#include <QFileInfo>
 #ifndef _MSC_VER
 #include <stdint.h>
 #endif
-#include "mersenne-twister.h"
 #include <limits>
+#include "mersenne-twister.h"

 QgsTransectSample::QgsTransectSample( QgsVectorLayer* strataLayer, QString strataIdAttribute, QString minDistanceAttribute, QString nPointsAttribute, DistanceUnits minDistUnits,
                                      QgsVectorLayer* baselineLayer, bool shareBaseline, QString baselineStrataId, const QString& outputPointLayer,
--- a/src/analysis/vector/qgstransectsample.h
+++ b/src/analysis/vector/qgstransectsample.h
@ -1,9 +1,9 @@
 #ifndef QGSTRANSECTSAMPLE_H
 #define QGSTRANSECTSAMPLE_H

-#include "qgsfeature.h"
 #include <QMap>
 #include <QString>
+#include "qgsfeature.h"

 class QgsDistanceArea;
 class QgsGeometry;
--- a/src/analysis/vector/qgszonalstatistics.cpp
+++ b/src/analysis/vector/qgszonalstatistics.cpp
@ -15,15 +15,15 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgszonalstatistics.h"
+#include <QFile>
+#include <QProgressDialog>
+#include "cpl_string.h"
+#include "gdal.h"
 #include "qgsgeometry.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
+#include "qgszonalstatistics.h"
 #include "qmath.h"
-#include "gdal.h"
-#include "cpl_string.h"
-#include <QProgressDialog>
-#include <QFile>

 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
 #define TO8F(x) (x).toUtf8().constData()
--- a/src/analysis/vector/qgszonalstatistics.h
+++ b/src/analysis/vector/qgszonalstatistics.h
@ -18,8 +18,8 @@
 #ifndef QGSZONALSTATISTICS_H
 #define QGSZONALSTATISTICS_H

-#include "qgsrectangle.h"
 #include <QString>
+#include "qgsrectangle.h"

 class QgsGeometry;
 class QgsVectorLayer;
--- a/src/app/composer/qgsatlascompositionwidget.cpp
+++ b/src/app/composer/qgsatlascompositionwidget.cpp
@ -16,14 +16,14 @@

 #include <QMessageBox>

-#include "qgsatlascompositionwidget.h"
 #include "qgsatlascomposition.h"
-#include "qgscomposition.h"
-#include "qgsfieldmodel.h"
-#include "qgsmaplayerregistry.h"
-#include "qgsmaplayerproxymodel.h"
-#include "qgsexpressionbuilderdialog.h"
+#include "qgsatlascompositionwidget.h"
 #include "qgscomposermap.h"
+#include "qgscomposition.h"
+#include "qgsexpressionbuilderdialog.h"
+#include "qgsfieldmodel.h"
+#include "qgsmaplayerproxymodel.h"
+#include "qgsmaplayerregistry.h"

 QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c ):
    QWidget( parent ), mComposition( c )
--- a/src/app/composer/qgsattributeselectiondialog.cpp
+++ b/src/app/composer/qgsattributeselectiondialog.cpp
@ -15,13 +15,6 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsattributeselectiondialog.h"
-#include "qgscomposerattributetablev2.h"
-#include "qgscomposerattributetablemodel.h"
-#include "qgscomposerattributetablemodelv2.h"
-#include "qgsvectorlayer.h"
-#include "qgsfieldexpressionwidget.h"
-#include "qgsdoublespinbox.h"
 #include <QCheckBox>
 #include <QDialogButtonBox>
 #include <QGridLayout>
@ -30,8 +23,15 @@
 #include <QPushButton>
 #include <QScrollArea>
 #include <QSettings>
-#include <QSpinBox>
 #include <QSortFilterProxyModel>
+#include <QSpinBox>
+#include "qgsattributeselectiondialog.h"
+#include "qgscomposerattributetablemodel.h"
+#include "qgscomposerattributetablemodelv2.h"
+#include "qgscomposerattributetablev2.h"
+#include "qgsdoublespinbox.h"
+#include "qgsfieldexpressionwidget.h"
+#include "qgsvectorlayer.h"


 // QgsComposerColumnAlignmentDelegate
--- a/src/app/composer/qgsattributeselectiondialog.h
+++ b/src/app/composer/qgsattributeselectiondialog.h
@ -18,11 +18,11 @@
 #ifndef QGSATTRIBUTESELECTIONDIALOG_H
 #define QGSATTRIBUTESELECTIONDIALOG_H

+#include "ui_qgsattributeselectiondialogbase.h"
 #include <QDialog>
+#include <QItemDelegate>
 #include <QMap>
 #include <QSet>
-#include <QItemDelegate>
-#include "ui_qgsattributeselectiondialogbase.h"

 class QGridLayout;
 class QgsVectorLayer;
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@ -18,17 +18,16 @@

 #include <stdexcept>

+#include "ui_qgssvgexportoptions.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
-#include "qgsbusyindicatordialog.h"
-#include "qgscomposerruler.h"
-#include "qgscomposerview.h"
-#include "qgscomposition.h"
-#include "qgscompositionwidget.h"
-#include "qgscomposermodel.h"
+#include "qgsatlascomposition.h"
 #include "qgsatlascompositionwidget.h"
+#include "qgsbusyindicatordialog.h"
 #include "qgscomposerarrow.h"
 #include "qgscomposerarrowwidget.h"
+#include "qgscomposerattributetable.h"
+#include "qgscomposerattributetablev2.h"
 #include "qgscomposerattributetablewidget.h"
 #include "qgscomposerframe.h"
 #include "qgscomposerhtml.h"
@ -38,33 +37,34 @@
 #include "qgscomposerlegend.h"
 #include "qgscomposerlegendwidget.h"
 #include "qgscomposermap.h"
-#include "qgsatlascomposition.h"
 #include "qgscomposermapwidget.h"
+#include "qgscomposermodel.h"
 #include "qgscomposerpicture.h"
 #include "qgscomposerpicturewidget.h"
+#include "qgscomposerruler.h"
 #include "qgscomposerscalebar.h"
 #include "qgscomposerscalebarwidget.h"
 #include "qgscomposershape.h"
 #include "qgscomposershapewidget.h"
-#include "qgscomposerattributetable.h"
-#include "qgscomposerattributetablev2.h"
 #include "qgscomposertablewidget.h"
-#include "qgsexception.h"
-#include "qgslogger.h"
-#include "qgsproject.h"
-#include "qgsmapcanvas.h"
-#include "qgsmessageviewer.h"
+#include "qgscomposerview.h"
+#include "qgscomposition.h"
+#include "qgscompositionwidget.h"
 #include "qgscontexthelp.h"
 #include "qgscursors.h"
-#include "qgsmaplayeractionregistry.h"
+#include "qgsexception.h"
 #include "qgsgeometry.h"
-#include "qgspaperitem.h"
+#include "qgslogger.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayeractionregistry.h"
 #include "qgsmaplayerregistry.h"
+#include "qgsmessageviewer.h"
+#include "qgspaperitem.h"
 #include "qgsprevieweffect.h"
-#include "ui_qgssvgexportoptions.h"
+#include "qgsproject.h"

-#include <QCloseEvent>
 #include <QCheckBox>
+#include <QCloseEvent>
 #include <QDesktopWidget>
 #include <QDialog>
 #include <QFileDialog>
@ -76,21 +76,21 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QPageSetupDialog>
+#include <QPaintEngine>
 #include <QPainter>
 #include <QPixmap>
 #include <QPrintDialog>
 #include <QPrinter>
+#include <QProgressBar>
+#include <QProgressDialog>
 #include <QSettings>
+#include <QShortcut>
 #include <QSizeGrip>
 #include <QSvgGenerator>
 #include <QTimer>
 #include <QToolBar>
 #include <QToolButton>
 #include <QUndoView>
-#include <QPaintEngine>
-#include <QProgressBar>
-#include <QProgressDialog>
-#include <QShortcut>

 #ifdef ENABLE_MODELTEST
 #include "modeltest.h"
--- a/src/app/composer/qgscomposer.h
+++ b/src/app/composer/qgscomposer.h
@ -17,9 +17,9 @@
 #ifndef QGSCOMPOSER_H
 #define QGSCOMPOSER_H
 #include "ui_qgscomposerbase.h"
+#include <QDockWidget>
 #include "qgscomposermap.h"
 #include "qgscontexthelp.h"
-#include <QDockWidget>

 class QgisApp;
 class QgsComposerArrow;
--- a/src/app/composer/qgscomposerarrowwidget.cpp
+++ b/src/app/composer/qgscomposerarrowwidget.cpp
@ -15,15 +15,15 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerarrowwidget.h"
-#include "qgscomposerarrow.h"
-#include "qgscomposeritemwidget.h"
-#include "qgssymbolv2selectordialog.h"
-#include "qgsstylev2.h"
-#include "qgssymbolv2.h"
 #include <QColorDialog>
 #include <QFileDialog>
 #include <QFileInfo>
+#include "qgscomposerarrow.h"
+#include "qgscomposerarrowwidget.h"
+#include "qgscomposeritemwidget.h"
+#include "qgsstylev2.h"
+#include "qgssymbolv2.h"
+#include "qgssymbolv2selectordialog.h"

 QgsComposerArrowWidget::QgsComposerArrowWidget( QgsComposerArrow* arrow ): QgsComposerItemBaseWidget( 0, arrow ), mArrow( arrow )
 {
--- a/src/app/composer/qgscomposerattributetablewidget.cpp
+++ b/src/app/composer/qgscomposerattributetablewidget.cpp
@ -15,20 +15,20 @@
 *                                                                         *
 ***************************************************************************/

+#include "qgisgui.h"
+#include "qgsattributeselectiondialog.h"
+#include "qgscomposerattributetablev2.h"
 #include "qgscomposerattributetablewidget.h"
 #include "qgscomposerframe.h"
-#include "qgsattributeselectiondialog.h"
 #include "qgscomposeritemwidget.h"
-#include "qgscomposerattributetablev2.h"
+#include "qgscomposermap.h"
 #include "qgscomposermultiframecommand.h"
 #include "qgscomposertablecolumn.h"
-#include "qgscomposermap.h"
-#include "qgsmaplayerregistry.h"
-#include "qgsvectorlayer.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgsmaplayerregistry.h"
 #include "qgsproject.h"
 #include "qgsrelationmanager.h"
-#include "qgisgui.h"
+#include "qgsvectorlayer.h"

 QgsComposerAttributeTableWidget::QgsComposerAttributeTableWidget( QgsComposerAttributeTableV2* table, QgsComposerFrame* frame )
    : QgsComposerItemBaseWidget( 0, table )
--- a/src/app/composer/qgscomposerhtmlwidget.cpp
+++ b/src/app/composer/qgscomposerhtmlwidget.cpp
@ -12,17 +12,17 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
-#include "qgscomposerhtmlwidget.h"
-#include "qgscomposerframe.h"
-#include "qgscomposeritemwidget.h"
-#include "qgscomposermultiframecommand.h"
-#include "qgscomposerhtml.h"
-#include "qgscomposition.h"
-#include "qgsexpressionbuilderdialog.h"
-#include "qgscodeeditorhtml.h"
-#include "qgscodeeditorcss.h"
 #include <QFileDialog>
 #include <QSettings>
+#include "qgscodeeditorcss.h"
+#include "qgscodeeditorhtml.h"
+#include "qgscomposerframe.h"
+#include "qgscomposerhtml.h"
+#include "qgscomposerhtmlwidget.h"
+#include "qgscomposeritemwidget.h"
+#include "qgscomposermultiframecommand.h"
+#include "qgscomposition.h"
+#include "qgsexpressionbuilderdialog.h"


 QgsComposerHtmlWidget::QgsComposerHtmlWidget( QgsComposerHtml* html, QgsComposerFrame* frame )
--- a/src/app/composer/qgscomposeritemwidget.cpp
+++ b/src/app/composer/qgscomposeritemwidget.cpp
@ -15,15 +15,15 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposeritemwidget.h"
-#include "qgscomposeritem.h"
-#include "qgscomposermap.h"
-#include "qgsatlascomposition.h"
-#include "qgscomposition.h"
-#include "qgspoint.h"
-#include "qgsdatadefinedbutton.h"
 #include <QColorDialog>
 #include <QPen>
+#include "qgsatlascomposition.h"
+#include "qgscomposeritem.h"
+#include "qgscomposeritemwidget.h"
+#include "qgscomposermap.h"
+#include "qgscomposition.h"
+#include "qgsdatadefinedbutton.h"
+#include "qgspoint.h"


 //QgsComposerItemBaseWidget
--- a/src/app/composer/qgscomposerlabelwidget.cpp
+++ b/src/app/composer/qgscomposerlabelwidget.cpp
@ -15,9 +15,9 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerlabelwidget.h"
-#include "qgscomposerlabel.h"
 #include "qgscomposeritemwidget.h"
+#include "qgscomposerlabel.h"
+#include "qgscomposerlabelwidget.h"
 #include "qgscomposition.h"
 #include "qgsexpressionbuilderdialog.h"

--- a/src/app/composer/qgscomposerlegenditemdialog.cpp
+++ b/src/app/composer/qgscomposerlegenditemdialog.cpp
@ -15,8 +15,8 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerlegenditemdialog.h"
 #include <QStandardItem>
+#include "qgscomposerlegenditemdialog.h"

 QgsComposerLegendItemDialog::QgsComposerLegendItemDialog( const QStandardItem* item, QWidget* parent ): QDialog( parent )
 {
--- a/src/app/composer/qgscomposerlegendwidget.cpp
+++ b/src/app/composer/qgscomposerlegendwidget.cpp
@ -15,15 +15,15 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerlegendwidget.h"
-#include "qgscomposerlegend.h"
-#include "qgscomposerlegenditem.h"
-#include "qgscomposerlegenditemdialog.h"
-#include "qgscomposerlegendlayersdialog.h"
+#include "qgisgui.h"
 #include "qgscomposeritemwidget.h"
+#include "qgscomposerlegend.h"
+#include "qgscomposerlegenditemdialog.h"
+#include "qgscomposerlegenditem.h"
+#include "qgscomposerlegendlayersdialog.h"
+#include "qgscomposerlegendwidget.h"
 #include "qgscomposermap.h"
 #include "qgscomposition.h"
-#include "qgisgui.h"

 #include "qgisapp.h"
 #include "qgsapplication.h"
@ -38,8 +38,8 @@
 #include "qgsproject.h"
 #include "qgsvectorlayer.h"

-#include <QMessageBox>
 #include <QInputDialog>
+#include <QMessageBox>



--- a/src/app/composer/qgscomposerlegendwidget.h
+++ b/src/app/composer/qgscomposerlegendwidget.h
@ -19,9 +19,9 @@
 #define QGSCOMPOSERLEGENDWIDGET_H

 #include "ui_qgscomposerlegendwidgetbase.h"
-#include "qgscomposeritemwidget.h"
-#include <QWidget>
 #include <QItemDelegate>
+#include <QWidget>
+#include "qgscomposeritemwidget.h"

 class QgsComposerLegend;

--- a/src/app/composer/qgscomposermanager.cpp
+++ b/src/app/composer/qgscomposermanager.cpp
@ -14,11 +14,11 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposermanager.h"
 #include "qgisapp.h"
 #include "qgsapplication.h"
 #include "qgsbusyindicatordialog.h"
 #include "qgscomposer.h"
+#include "qgscomposermanager.h"
 #include "qgscomposition.h"
 #include "qgslogger.h"

@ -29,8 +29,8 @@
 #include <QInputDialog>
 #include <QListWidgetItem>
 #include <QMessageBox>
-#include <QUrl>
 #include <QSettings>
+#include <QUrl>

 QgsComposerManager::QgsComposerManager( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f )
 {
--- a/src/app/composer/qgscomposermapwidget.cpp
+++ b/src/app/composer/qgscomposermapwidget.cpp
@ -16,29 +16,29 @@
 ***************************************************************************/

 #include "qgisapp.h"
+#include "qgisgui.h"
 #include "qgsapplication.h"
-#include "qgsmapcanvas.h"
+#include "qgscomposeritemwidget.h"
 #include "qgscomposermapgrid.h"
 #include "qgscomposermapoverview.h"
 #include "qgscomposermapwidget.h"
-#include "qgscomposeritemwidget.h"
-#include "qgscomposition.h"
-#include "qgsmaplayerstylemanager.h"
-#include "qgsmaprenderer.h"
-#include "qgsstylev2.h"
-#include "qgssymbolv2.h"
-#include "qgssymbolv2selectordialog.h"
-#include "qgssymbollayerv2utils.h"
-#include "qgsvectorlayer.h"
-#include "qgsvectordataprovider.h"
-#include "qgsmaplayerregistry.h"
 #include "qgscomposershape.h"
-#include "qgspaperitem.h"
+#include "qgscomposition.h"
 #include "qgsexpressionbuilderdialog.h"
 #include "qgsgenericprojectionselector.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsmaplayerstylemanager.h"
+#include "qgsmaprenderer.h"
+#include "qgspaperitem.h"
 #include "qgsproject.h"
+#include "qgsstylev2.h"
+#include "qgssymbollayerv2utils.h"
+#include "qgssymbolv2.h"
+#include "qgssymbolv2selectordialog.h"
+#include "qgsvectordataprovider.h"
+#include "qgsvectorlayer.h"
 #include "qgsvisibilitypresets.h"
-#include "qgisgui.h"

 #include <QMessageBox>

--- a/src/app/composer/qgscomposermapwidget.h
+++ b/src/app/composer/qgscomposermapwidget.h
@ -19,9 +19,9 @@
 #define QGSCOMPOSERMAPWIDGET_H

 #include "ui_qgscomposermapwidgetbase.h"
-#include "qgscomposermap.h"
-#include "qgscomposermapgrid.h"
 #include "qgscomposeritemwidget.h"
+#include "qgscomposermapgrid.h"
+#include "qgscomposermap.h"

 class QgsMapLayer;

--- a/src/app/composer/qgscomposerpicturewidget.cpp
+++ b/src/app/composer/qgscomposerpicturewidget.cpp
@ -15,13 +15,6 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerpicturewidget.h"
-#include "qgsapplication.h"
-#include "qgscomposermap.h"
-#include "qgscomposerpicture.h"
-#include "qgscomposeritemwidget.h"
-#include "qgscomposition.h"
-#include "qgsexpressionbuilderdialog.h"
 #include <QDoubleValidator>
 #include <QFileDialog>
 #include <QFileInfo>
@ -31,6 +24,13 @@
 #include <QProgressDialog>
 #include <QSettings>
 #include <QSvgRenderer>
+#include "qgsapplication.h"
+#include "qgscomposeritemwidget.h"
+#include "qgscomposermap.h"
+#include "qgscomposerpicture.h"
+#include "qgscomposerpicturewidget.h"
+#include "qgscomposition.h"
+#include "qgsexpressionbuilderdialog.h"

 QgsComposerPictureWidget::QgsComposerPictureWidget( QgsComposerPicture* picture ): QgsComposerItemBaseWidget( 0, picture ), mPicture( picture ), mPreviewsLoaded( false )
 {
--- a/src/app/composer/qgscomposerscalebarwidget.cpp
+++ b/src/app/composer/qgscomposerscalebarwidget.cpp
@ -14,14 +14,14 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposerscalebarwidget.h"
-#include "qgscomposeritemwidget.h"
-#include "qgscomposermap.h"
-#include "qgscomposerscalebar.h"
-#include "qgscomposition.h"
 #include <QColorDialog>
 #include <QFontDialog>
 #include <QWidget>
+#include "qgscomposeritemwidget.h"
+#include "qgscomposermap.h"
+#include "qgscomposerscalebar.h"
+#include "qgscomposerscalebarwidget.h"
+#include "qgscomposition.h"

 QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scaleBar ): QgsComposerItemBaseWidget( 0, scaleBar ), mComposerScaleBar( scaleBar )
 {
--- a/src/app/composer/qgscomposershapewidget.cpp
+++ b/src/app/composer/qgscomposershapewidget.cpp
@ -15,14 +15,14 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposershapewidget.h"
-#include "qgscomposershape.h"
+#include <QColorDialog>
 #include "qgscomposeritemwidget.h"
+#include "qgscomposershape.h"
+#include "qgscomposershapewidget.h"
 #include "qgscomposition.h"
 #include "qgsstylev2.h"
-#include "qgssymbolv2selectordialog.h"
 #include "qgssymbollayerv2utils.h"
-#include <QColorDialog>
+#include "qgssymbolv2selectordialog.h"

 QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape ): QgsComposerItemBaseWidget( 0, composerShape ), mComposerShape( composerShape )
 {
--- a/src/app/composer/qgscomposertablewidget.cpp
+++ b/src/app/composer/qgscomposertablewidget.cpp
@ -15,16 +15,16 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgscomposertablewidget.h"
+#include "qgisgui.h"
 #include "qgsattributeselectiondialog.h"
-#include "qgscomposeritemwidget.h"
 #include "qgscomposerattributetable.h"
-#include "qgscomposertablecolumn.h"
+#include "qgscomposeritemwidget.h"
 #include "qgscomposermap.h"
+#include "qgscomposertablecolumn.h"
+#include "qgscomposertablewidget.h"
+#include "qgsexpressionbuilderdialog.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsvectorlayer.h"
-#include "qgsexpressionbuilderdialog.h"
-#include "qgisgui.h"

 QgsComposerTableWidget::QgsComposerTableWidget( QgsComposerAttributeTable* table ): QgsComposerItemBaseWidget( 0, table ), mComposerTable( table )
 {
--- a/src/app/composer/qgscompositionwidget.cpp
+++ b/src/app/composer/qgscompositionwidget.cpp
@ -14,17 +14,17 @@
 *                                                                         *
 ***************************************************************************/

-#include <qgis.h>
-#include "qgscompositionwidget.h"
-#include "qgscomposition.h"
-#include "qgscomposermap.h"
-#include "qgscomposeritem.h"
-#include "qgsstylev2.h"
-#include "qgssymbolv2selectordialog.h"
-#include "qgssymbollayerv2utils.h"
 #include <QColorDialog>
-#include <QWidget>
+#include <qgis.h>
 #include <QPrinter> //for screen resolution
+#include <QWidget>
+#include "qgscomposeritem.h"
+#include "qgscomposermap.h"
+#include "qgscomposition.h"
+#include "qgscompositionwidget.h"
+#include "qgsstylev2.h"
+#include "qgssymbollayerv2utils.h"
+#include "qgssymbolv2selectordialog.h"

 QgsCompositionWidget::QgsCompositionWidget( QWidget* parent, QgsComposition* c ): QWidget( parent ), mComposition( c )
 {
--- a/src/app/gps/qgsgpsinformationwidget.cpp
+++ b/src/app/gps/qgsgpsinformationwidget.cpp
@ -45,24 +45,24 @@
 #include <qwt_data.h>
 #endif
 #include <qwt_legend.h>
-#include <qwt_plot.h>
 #include <qwt_plot_grid.h>
+#include <qwt_plot.h>

 #if (WITH_QWTPOLAR)
 // QWT Polar plot add on
-#include <qwt_symbol.h>
-#include <qwt_polar_grid.h>
 #include <qwt_polar_curve.h>
+#include <qwt_polar_grid.h>
 #include <qwt_scale_engine.h>
+#include <qwt_symbol.h>
 #endif

-#include <QMessageBox>
-#include <QSettings>
-#include <QFileInfo>
 #include <QColorDialog>
 #include <QFileDialog>
-#include <QPixmap>
+#include <QFileInfo>
+#include <QMessageBox>
 #include <QPen>
+#include <QPixmap>
+#include <QSettings>

 QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWidget * parent, Qt::WindowFlags f )
    : QWidget( parent, f )
--- a/src/app/gps/qgsgpsinformationwidget.h
+++ b/src/app/gps/qgsgpsinformationwidget.h
@ -19,14 +19,14 @@

 #include "ui_qgsgpsinformationwidgetbase.h"

-#include <qgsmapcanvas.h>
 #include <qgsgpsmarker.h>
+#include <qgsmapcanvas.h>
 #include <qgsmaptoolcapture.h>
 #include <qwt_plot_curve.h>
 #if (WITH_QWTPOLAR)
-#include <qwt_polar_plot.h>
 #include <qwt_polar_grid.h>
 #include <qwt_polar_marker.h>
+#include <qwt_polar_plot.h>
 #endif

 class QextSerialPort;
--- a/src/app/gps/qgsgpsmarker.cpp
+++ b/src/app/gps/qgsgpsmarker.cpp
@ -15,8 +15,8 @@

 #include <QPainter>

-#include "qgsgpsmarker.h"
 #include "qgscoordinatetransform.h"
+#include "qgsgpsmarker.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaprenderer.h"

--- a/src/app/gps/qgsgpsmarker.h
+++ b/src/app/gps/qgsgpsmarker.h
@ -16,10 +16,10 @@
 #ifndef QGSGPSMARKER_H
 #define QGSGPSMARKER_H

-#include "qgsmapcanvasitem.h"
-#include "qgscoordinatereferencesystem.h"
-#include "qgspoint.h"
 #include <QSvgRenderer>
+#include "qgscoordinatereferencesystem.h"
+#include "qgsmapcanvasitem.h"
+#include "qgspoint.h"

 class QPainter;

--- a/src/app/legend/qgsapplegendinterface.cpp
+++ b/src/app/legend/qgsapplegendinterface.cpp
@ -19,10 +19,10 @@
 #include "qgsapplayertreeviewmenuprovider.h"
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"
+#include "qgslayertreeregistrybridge.h"
 #include "qgslayertreeview.h"
 #include "qgsmaplayer.h"
 #include "qgsproject.h"
-#include "qgslayertreeregistrybridge.h"


 QgsAppLegendInterface::QgsAppLegendInterface( QgsLayerTreeView * layerTreeView )
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@ -22,8 +22,8 @@
 #include <QFileInfo>
 #include <QFont>
 #include <QFontDatabase>
-#include <QPixmap>
 #include <QLocale>
+#include <QPixmap>
 #include <QSettings>
 #include <QSplashScreen>
 #include <QString>
@ -32,27 +32,27 @@
 #if QT_VERSION < 0x050000
 #include <QPlastiqueStyle>
 #endif
-#include <QTranslator>
 #include <QImageReader>
 #include <QMessageBox>
+#include <QTranslator>

 #include "qgscustomization.h"
 #include "qgsfontutils.h"
-#include "qgspluginregistry.h"
 #include "qgsmessagelog.h"
+#include "qgspluginregistry.h"
 #include "qgspythonrunner.h"

 #include <cstdio>
+#include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <stdarg.h>

 #ifdef WIN32
 // Open files in binary mode
-#include <fcntl.h> /*  _O_BINARY */
-#include <windows.h>
 #include <dbghelp.h>
+#include <fcntl.h> /*  _O_BINARY */
 #include <time.h>
+#include <windows.h>
 #ifdef MSVC
 #undef _fmode
 int _fmode = _O_BINARY;
@ -72,27 +72,27 @@ int _fmode = _O_BINARY;
 typedef SInt32 SRefCon;
 #endif
 // For setting the maximum open files limit higher
-#include <sys/resource.h>
 #include <limits.h>
+#include <sys/resource.h>
 #endif

-#include "qgisapp.h"
-#include "qgsmapcanvas.h"
-#include "qgsapplication.h"
 #include <qgsconfig.h>
 #include <qgscustomization.h>
 #include <qgsversion.h>
+#include "qgisapp.h"
+#include "qgsapplication.h"
 #include "qgsexception.h"
+#include "qgslogger.h"
+#include "qgsmapcanvas.h"
 #include "qgsproject.h"
 #include "qgsrectangle.h"
-#include "qgslogger.h"

 #if ((defined(linux) || defined(__linux__)) && !defined(ANDROID)) || defined(__FreeBSD__)
-#include <unistd.h>
+#include <errno.h>
 #include <execinfo.h>
 #include <signal.h>
 #include <sys/wait.h>
-#include <errno.h>
+#include <unistd.h>
 #endif

 /** print usage text
--- a/src/app/nodetool/qgsselectedfeature.cpp
+++ b/src/app/nodetool/qgsselectedfeature.cpp
@ -16,15 +16,15 @@
 #include "nodetool/qgsselectedfeature.h"
 #include "nodetool/qgsvertexentry.h"

-#include <qgslogger.h>
-#include <qgsvertexmarker.h>
-#include <qgsgeometryvalidator.h>
-#include <qgsvectorlayer.h>
-#include <qgsrubberband.h>
 #include <qgisapp.h>
-#include <qgsmaprenderer.h>
+#include <qgsgeometryvalidator.h>
 #include <qgslayertreeview.h>
+#include <qgslogger.h>
+#include <qgsmaprenderer.h>
 #include <qgsproject.h>
+#include <qgsrubberband.h>
+#include <qgsvectorlayer.h>
+#include <qgsvertexmarker.h>

 QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId,
                                        QgsVectorLayer *vlayer,
--- a/src/app/nodetool/qgsvertexentry.h
+++ b/src/app/nodetool/qgsvertexentry.h
@ -16,10 +16,10 @@
 #ifndef QGSVERTEXENTRY_H
 #define QGSVERTEXENTRY_H

-#include <qgspoint.h>
-#include <qgsvertexmarker.h>
 #include <qgsmapcanvas.h>
 #include <qgsmaplayer.h>
+#include <qgspoint.h>
+#include <qgsvertexmarker.h>

 class QgsVertexEntry
 {
--- a/src/app/ogr/qgsnewogrconnection.cpp
+++ b/src/app/ogr/qgsnewogrconnection.cpp
@ -14,16 +14,16 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
-#include <QSettings>
 #include <QMessageBox>
+#include <QSettings>

-#include "qgsnewogrconnection.h"
+#include <cpl_error.h>
+#include <ogr_api.h>
 #include "qgscontexthelp.h"
 #include "qgslogger.h"
-#include "qgsproviderregistry.h"
+#include "qgsnewogrconnection.h"
 #include "qgsogrhelperfunctions.h"
-#include <ogr_api.h>
-#include <cpl_error.h>
+#include "qgsproviderregistry.h"

 #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800
 #define TO8F(x) (x).toUtf8().constData()
--- a/src/app/ogr/qgsogrhelperfunctions.cpp
+++ b/src/app/ogr/qgsogrhelperfunctions.cpp
@ -16,9 +16,9 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsogrhelperfunctions.h"
-#include "qgslogger.h"
 #include <QRegExp>
+#include "qgslogger.h"
+#include "qgsogrhelperfunctions.h"

 QString createDatabaseURI( QString connectionType, QString host, QString database, QString port, QString user, QString password )
 {
--- a/src/app/ogr/qgsopenvectorlayerdialog.cpp
+++ b/src/app/ogr/qgsopenvectorlayerdialog.cpp
@ -16,10 +16,10 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
-#include <QSettings>
 #include <QFileDialog>
-#include <QMessageBox>
 #include <QInputDialog>
+#include <QMessageBox>
+#include <QSettings>
 #include <QTextCodec>

 #include "qgslogger.h"
@ -27,10 +27,10 @@
 #include "qgsvectordataprovider.h"

 #include <ogr_api.h>
-#include "qgsproviderregistry.h"
+#include "qgscontexthelp.h"
 #include "qgsnewogrconnection.h"
 #include "qgsogrhelperfunctions.h"
-#include "qgscontexthelp.h"
+#include "qgsproviderregistry.h"

 QgsOpenVectorLayerDialog::QgsOpenVectorLayerDialog( QWidget* parent, Qt::WindowFlags fl )
    : QDialog( parent, fl )
--- a/src/app/ogr/qgsopenvectorlayerdialog.h
+++ b/src/app/ogr/qgsopenvectorlayerdialog.h
@ -19,8 +19,8 @@
 #ifndef QGSOPENVECTORLAYERDIALOG_H
 #define QGSOPENVECTORLAYERDIALOG_H

-#include <ui_qgsopenvectorlayerdialogbase.h>
 #include <QDialog>
+#include <ui_qgsopenvectorlayerdialogbase.h>
 #include "qgscontexthelp.h"

 /**
--- a/src/app/ogr/qgsvectorlayersaveasdialog.cpp
+++ b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@ -15,14 +15,14 @@
 *   (at your option) any later version.                                   *
 *                                                                         *
 ***************************************************************************/
-#include "qgslogger.h"
-#include "qgsvectorlayersaveasdialog.h"
-#include "qgsgenericprojectionselector.h"
-#include "qgsvectordataprovider.h"
 #include "qgscoordinatereferencesystem.h"
+#include "qgsgenericprojectionselector.h"
+#include "qgslogger.h"
+#include "qgsvectordataprovider.h"
+#include "qgsvectorlayersaveasdialog.h"

-#include <QSettings>
 #include <QFileDialog>
+#include <QSettings>
 #include <QTextCodec>

 QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent, Qt::WindowFlags fl )
--- a/src/app/ogr/qgsvectorlayersaveasdialog.h
+++ b/src/app/ogr/qgsvectorlayersaveasdialog.h
@ -18,8 +18,8 @@
 #ifndef QGSVECTORLAYERSAVEASDIALOG_H
 #define QGSVECTORLAYERSAVEASDIALOG_H

-#include <ui_qgsvectorlayersaveasdialogbase.h>
 #include <QDialog>
+#include <ui_qgsvectorlayersaveasdialogbase.h>
 #include "qgscontexthelp.h"
 #include "qgsvectorfilewriter.h"

--- a/src/app/openstreetmap/qgsosmdownloaddialog.cpp
+++ b/src/app/openstreetmap/qgsosmdownloaddialog.cpp
@ -19,13 +19,13 @@
 #include <QMessageBox>
 #include <QPushButton>

-#include "qgis.h"
 #include "qgisapp.h"
+#include "qgis.h"
+#include "qgscoordinatetransform.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsrectangle.h"
-#include "qgscoordinatetransform.h"

 #include "qgsosmdownload.h"

--- a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
+++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp
@ -14,8 +14,8 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsapppluginmanagerinterface.h"
 #include <qgslogger.h>
+#include "qgsapppluginmanagerinterface.h"


 QgsAppPluginManagerInterface::QgsAppPluginManagerInterface( QgsPluginManager * pluginManager )
--- a/src/app/pluginmanager/qgsapppluginmanagerinterface.h
+++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.h
@ -17,8 +17,8 @@
 #ifndef QGSPLUGINMANAGERAPPIFACE_H
 #define QGSPLUGINMANAGERAPPIFACE_H

-#include "qgspluginmanagerinterface.h"
 #include "qgspluginmanager.h"
+#include "qgspluginmanagerinterface.h"

 /** \ingroup gui
 * QgsPluginManagerInterface
--- a/src/app/pluginmanager/qgspluginitemdelegate.cpp
+++ b/src/app/pluginmanager/qgspluginitemdelegate.cpp
@ -15,12 +15,12 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgspluginitemdelegate.h"
-#include <QPainter>
-#include <QFont>
-#include <QStyleOptionViewItem>
-#include <QModelIndex>
 #include <QApplication>
+#include <QFont>
+#include <QModelIndex>
+#include <QPainter>
+#include <QStyleOptionViewItem>
+#include "qgspluginitemdelegate.h"
 #include "qgspluginsortfilterproxymodel.h"


--- a/src/app/pluginmanager/qgspluginmanager.cpp
+++ b/src/app/pluginmanager/qgspluginmanager.cpp
@ -17,32 +17,32 @@

 #include <math.h>

+#include <QActionGroup>
 #include <QApplication>
+#include <QDesktopServices>
 #include <QFileDialog>
+#include <QLibrary>
 #include <QLineEdit>
 #include <QMessageBox>
-#include <QLibrary>
-#include <QSettings>
-#include <QStandardItem>
 #include <QPushButton>
 #include <QRegExp>
+#include <QSettings>
 #include <QSortFilterProxyModel>
-#include <QActionGroup>
+#include <QStandardItem>
 #include <QTextStream>
 #include <QTimer>
-#include <QDesktopServices>

-#include "qgis.h"
 #include "qgisapp.h"
+#include "qgis.h"
+#include "qgisplugin.h"
 #include "qgsapplication.h"
 #include "qgsconfig.h"
-#include "qgsproviderregistry.h"
-#include "qgspluginregistry.h"
-#include "qgspythonrunner.h"
-#include "qgspluginmanager.h"
-#include "qgisplugin.h"
 #include "qgslogger.h"
 #include "qgspluginitemdelegate.h"
+#include "qgspluginmanager.h"
+#include "qgspluginregistry.h"
+#include "qgsproviderregistry.h"
+#include "qgspythonrunner.h"

 // Do we need this?
 // #define TESTLIB
--- a/src/app/pluginmanager/qgspluginmanager.h
+++ b/src/app/pluginmanager/qgspluginmanager.h
@ -17,19 +17,19 @@
 ***************************************************************************/
 #ifndef QGSPLUGINMANAGER_H
 #define QGSPLUGINMANAGER_H
-#include <vector>
-#include <QMap>
-#include <QString>
-#include <QStandardItemModel>
-#include <QStandardItem>
-#include <QHeaderView>
 #include "ui_qgspluginmanagerbase.h"
-#include "qgsoptionsdialogbase.h"
+#include <QHeaderView>
+#include <QMap>
+#include <QStandardItem>
+#include <QStandardItemModel>
+#include <QString>
+#include <vector>
 #include "qgisgui.h"
 #include "qgscontexthelp.h"
-#include "qgspythonutils.h"
-#include "qgspluginsortfilterproxymodel.h"
 #include "qgsmessagebar.h"
+#include "qgsoptionsdialogbase.h"
+#include "qgspluginsortfilterproxymodel.h"
+#include "qgspythonutils.h"

 const int PLUGMAN_TAB_ALL = 0;
 const int PLUGMAN_TAB_INSTALLED = 1;
--- a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
+++ b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h
@ -18,8 +18,8 @@
 #define QGSPLUGINSORTFILTERPROXYMODEL_H

 #include <QSortFilterProxyModel>
-#include <QStringList>
 #include <QString>
+#include <QStringList>

 const int PLUGIN_BASE_NAME_ROLE = Qt::UserRole + 1;
 const int PLUGIN_DESCRIPTION_ROLE = Qt::UserRole + 2;  // for filtering
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@ -24,7 +24,6 @@
 #include <QApplication>
 #include <QBitmap>
 #include <QCheckBox>
-#include <QSpinBox>
 #include <QClipboard>
 #include <QColor>
 #include <QCursor>
@ -55,27 +54,28 @@
 #include <QRegExp>
 #include <QRegExpValidator>
 #include <QSettings>
+#include <QSpinBox>
 #include <QSplashScreen>
 #include <QStatusBar>
 #include <QStringList>
 #include <QTcpSocket>
 #include <QTextStream>
 #include <QtGlobal>
+#include <QThread>
 #include <QTimer>
 #include <QToolButton>
 #include <QUuid>
 #include <QVBoxLayout>
 #include <QWhatsThis>
-#include <QThread>

-#include <qgsnetworkaccessmanager.h>
 #include <qgsapplication.h>
 #include <qgscomposition.h>
+#include <qgsnetworkaccessmanager.h>

-#include <QNetworkReply>
-#include <QNetworkProxy>
 #include <QAuthenticator>
 #include <QNetworkDiskCache>
+#include <QNetworkProxy>
+#include <QNetworkReply>

 //
 // Mac OS X Includes
@ -100,13 +100,14 @@
 #include "qgis.h"
 #include "qgisplugin.h"
 #include "qgsabout.h"
+#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsapplayertreeviewmenuprovider.h"
 #include "qgsapplication.h"
 #include "qgsattributeaction.h"
 #include "qgsattributetabledialog.h"
 #include "qgsbookmarks.h"
+#include "qgsbrightnesscontrastfilter.h"
 #include "qgsbrowserdockwidget.h"
-#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsclipboard.h"
 #include "qgscomposer.h"
 #include "qgscomposermanager.h"
@ -118,26 +119,28 @@
 #include "qgscustomization.h"
 #include "qgscustomlayerorderwidget.h"
 #include "qgscustomprojectiondialog.h"
+#include "qgsdataitem.h"
 #include "qgsdatasourceuri.h"
 #include "qgsdatumtransformdialog.h"
-#include "qgsdxfexport.h"
-#include "qgsdxfexportdialog.h"
 #include "qgsdecorationcopyright.h"
+#include "qgsdecorationgrid.h"
 #include "qgsdecorationnortharrow.h"
 #include "qgsdecorationscalebar.h"
-#include "qgsdecorationgrid.h"
+#include "qgsdxfexportdialog.h"
+#include "qgsdxfexport.h"
 #include "qgsencodingfiledialog.h"
-#include "qgserror.h"
 #include "qgserrordialog.h"
+#include "qgserror.h"
 #include "qgsexception.h"
 #include "qgsexpressionselectiondialog.h"
 #include "qgsfeature.h"
-#include "qgsformannotationitem.h"
 #include "qgsfieldcalculator.h"
-#include "qgshtmlannotationitem.h"
+#include "qgsformannotationitem.h"
 #include "qgsgenericprojectionselector.h"
 #include "qgsgpsinformationwidget.h"
 #include "qgsguivectorlayertools.h"
+#include "qgshandlebadlayers.h"
+#include "qgshtmlannotationitem.h"
 #include "qgslabelinggui.h"
 #include "qgslayerdefinition.h"
 #include "qgslayertree.h"
@ -145,11 +148,12 @@
 #include "qgslayertreemodel.h"
 #include "qgslayertreeregistrybridge.h"
 #include "qgslayertreeutils.h"
-#include "qgslayertreeview.h"
 #include "qgslayertreeviewdefaultactions.h"
+#include "qgslayertreeview.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
 #include "qgsmapcanvassnappingutils.h"
+#include "qgsmaplayeractionregistry.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmaplayerstyleguiutils.h"
@ -158,21 +162,21 @@
 #include "qgsmapsettings.h"
 #include "qgsmaptip.h"
 #include "qgsmergeattributesdialog.h"
-#include "qgsmessageviewer.h"
 #include "qgsmessagebar.h"
 #include "qgsmessagebaritem.h"
-#include "qgsmimedatautils.h"
 #include "qgsmessagelog.h"
+#include "qgsmessagelogviewer.h"
+#include "qgsmessageviewer.h"
+#include "qgsmimedatautils.h"
 #include "qgsmultibandcolorrenderer.h"
-#include "qgsnewvectorlayerdialog.h"
 #include "qgsnewmemorylayerdialog.h"
+#include "qgsnewvectorlayerdialog.h"
 #include "qgsoptions.h"
 #include "qgspluginlayer.h"
 #include "qgspluginlayerregistry.h"
 #include "qgspluginmanager.h"
 #include "qgspluginregistry.h"
 #include "qgspoint.h"
-#include "qgshandlebadlayers.h"
 #include "qgsproject.h"
 #include "qgsprojectlayergroupdialog.h"
 #include "qgsprojectproperties.h"
@ -184,10 +188,9 @@
 #include "qgsrasteriterator.h"
 #include "qgsrasterlayer.h"
 #include "qgsrasterlayerproperties.h"
-#include "qgsrasternuller.h"
-#include "qgsbrightnesscontrastfilter.h"
-#include "qgsrasterrenderer.h"
 #include "qgsrasterlayersaveasdialog.h"
+#include "qgsrasternuller.h"
+#include "qgsrasterrenderer.h"
 #include "qgsrectangle.h"
 #include "qgsscalecombobox.h"
 #include "qgsscalevisibilitydialog.h"
@ -206,17 +209,14 @@
 #include "qgsvectorlayer.h"
 #include "qgsvectorlayerproperties.h"
 #include "qgsvisibilitypresets.h"
-#include "qgsmessagelogviewer.h"
-#include "qgsdataitem.h"
-#include "qgsmaplayeractionregistry.h"

-#include "qgssublayersdialog.h"
 #include "ogr/qgsopenvectorlayerdialog.h"
 #include "ogr/qgsvectorlayersaveasdialog.h"
+#include "qgssublayersdialog.h"

 #include "qgsosmdownloaddialog.h"
-#include "qgsosmimportdialog.h"
 #include "qgsosmexportdialog.h"
+#include "qgsosmimportdialog.h"

 #ifdef ENABLE_MODELTEST
 #include "modeltest.h"
@ -246,38 +246,38 @@
 #include "qgsmaptooladdfeature.h"
 #include "qgsmaptooladdpart.h"
 #include "qgsmaptooladdring.h"
-#include "qgsmaptoolfillring.h"
 #include "qgsmaptoolannotation.h"
-#include "qgsmaptooldeletering.h"
+#include "qgsmaptoolchangelabelproperties.h"
 #include "qgsmaptooldeletepart.h"
+#include "qgsmaptooldeletering.h"
 #include "qgsmaptoolfeatureaction.h"
+#include "qgsmaptoolfillring.h"
 #include "qgsmaptoolformannotation.h"
 #include "qgsmaptoolhtmlannotation.h"
 #include "qgsmaptoolidentifyaction.h"
 #include "qgsmaptoolmeasureangle.h"
 #include "qgsmaptoolmovefeature.h"
-#include "qgsmaptoolrotatefeature.h"
+#include "qgsmaptoolmovelabel.h"
 #include "qgsmaptooloffsetcurve.h"
 #include "qgsmaptoolpan.h"
-#include "qgsmaptoolselect.h"
-#include "qgsmaptoolselectrectangle.h"
+#include "qgsmaptoolpinlabels.h"
+#include "qgsmaptoolreshape.h"
+#include "qgsmaptoolrotatefeature.h"
+#include "qgsmaptoolrotatelabel.h"
+#include "qgsmaptoolrotatepointsymbols.h"
 #include "qgsmaptoolselectfreehand.h"
+#include "qgsmaptoolselect.h"
 #include "qgsmaptoolselectpolygon.h"
 #include "qgsmaptoolselectradius.h"
-#include "qgsmaptoolsvgannotation.h"
-#include "qgsmaptoolreshape.h"
-#include "qgsmaptoolrotatepointsymbols.h"
+#include "qgsmaptoolselectrectangle.h"
+#include "qgsmaptoolshowhidelabels.h"
+#include "qgsmaptoolsimplify.h"
 #include "qgsmaptoolsplitfeatures.h"
 #include "qgsmaptoolsplitparts.h"
+#include "qgsmaptoolsvgannotation.h"
 #include "qgsmaptooltextannotation.h"
 #include "qgsmaptoolzoom.h"
-#include "qgsmaptoolsimplify.h"
 #include "qgsmeasuretool.h"
-#include "qgsmaptoolpinlabels.h"
-#include "qgsmaptoolshowhidelabels.h"
-#include "qgsmaptoolmovelabel.h"
-#include "qgsmaptoolrotatelabel.h"
-#include "qgsmaptoolchangelabelproperties.h"

 #include "nodetool/qgsmaptoolnodetool.h"

@ -311,8 +311,8 @@ extern "C"
 #ifndef Q_OS_WIN
 #include <dlfcn.h>
 #else
-#include <windows.h>
 #include <DbgHelp.h>
+#include <windows.h>
 #endif

 #ifdef HAVE_TOUCH
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@ -88,21 +88,21 @@ class QgsScaleComboBox;
 class QgsDataItem;
 class QgsTileScaleWidget;

-#include <QMainWindow>
-#include <QToolBar>
 #include <QAbstractSocket>
+#include <QDateTime>
+#include <QMainWindow>
 #include <QPointer>
 #include <QSslError>
-#include <QDateTime>
+#include <QToolBar>

 #include "qgsconfig.h"
 #include "qgsfeature.h"
 #include "qgsfeaturestore.h"
+#include "qgsmessagebar.h"
+#include "qgspluginmanager.h"
 #include "qgspoint.h"
 #include "qgsrasterlayer.h"
 #include "qgssnappingdialog.h"
-#include "qgspluginmanager.h"
-#include "qgsmessagebar.h"

 #include "ui_qgisapp.h"

--- a/src/app/qgisappinterface.cpp
+++ b/src/app/qgisappinterface.cpp
@ -16,33 +16,33 @@
 *                                                                         *
 ***************************************************************************/

-#include <QFileInfo>
-#include <QString>
-#include <QMenu>
-#include <QDialog>
 #include <QAbstractButton>
+#include <QDialog>
+#include <QFileInfo>
+#include <QMenu>
 #include <QSignalMapper>
+#include <QString>
 #include <QTimer>
 #include <QUiLoader>

+#include "qgisapp.h"
 #include "qgisappinterface.h"
 #include "qgisappstylesheet.h"
-#include "qgisapp.h"
+#include "qgsattributeaction.h"
+#include "qgsattributedialog.h"
+#include "qgsattributetabledialog.h"
 #include "qgscomposer.h"
 #include "qgscomposerview.h"
+#include "qgsfeatureaction.h"
+#include "qgsfield.h"
+#include "qgslayertreeview.h"
+#include "qgsmapcanvas.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmaptooladvanceddigitizing.h"
-#include "qgsmapcanvas.h"
 #include "qgsproject.h"
-#include "qgslayertreeview.h"
 #include "qgsshortcutsmanager.h"
-#include "qgsattributedialog.h"
-#include "qgsfield.h"
 #include "qgsvectordataprovider.h"
-#include "qgsfeatureaction.h"
-#include "qgsattributeaction.h"
-#include "qgsattributetabledialog.h"


 QgisAppInterface::QgisAppInterface( QgisApp * _qgis )
--- a/src/app/qgisappstylesheet.cpp
+++ b/src/app/qgisappstylesheet.cpp
@ -16,9 +16,9 @@
 *                                                                         *
 ***************************************************************************/

+#include "qgisapp.h"
 #include "qgisappstylesheet.h"
 #include "qgsapplication.h"
-#include "qgisapp.h"
 #include "qgslogger.h"

 #include <QFont>
--- a/src/app/qgisappstylesheet.h
+++ b/src/app/qgisappstylesheet.h
@ -18,9 +18,9 @@
 #ifndef QGISAPPSTYLESHEET_H
 #define QGISAPPSTYLESHEET_H

-#include <QObject>
 #include <QFont>
 #include <QMap>
+#include <QObject>

 /** @class QgisAppStyleSheet
 * @brief Adjustable stylesheet for the Qgis application
--- a/src/app/qgsabout.cpp
+++ b/src/app/qgsabout.cpp
@ -15,16 +15,16 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsabout.h"
-#include "qgsapplication.h"
-#include "qgsproviderregistry.h"
-#include "qgslogger.h"
 #include <QDesktopServices>
 #include <QFile>
-#include <QTextStream>
 #include <QImageReader>
 #include <QSqlDatabase>
 #include <QTcpSocket>
+#include <QTextStream>
+#include "qgsabout.h"
+#include "qgsapplication.h"
+#include "qgslogger.h"
+#include "qgsproviderregistry.h"

 /* Uncomment this block to use preloaded images
 #include <map>
--- a/src/app/qgsaddattrdialog.cpp
+++ b/src/app/qgsaddattrdialog.cpp
@ -16,9 +16,9 @@
 ***************************************************************************/

 #include "qgsaddattrdialog.h"
-#include "qgsvectorlayer.h"
-#include "qgsvectordataprovider.h"
 #include "qgslogger.h"
+#include "qgsvectordataprovider.h"
+#include "qgsvectorlayer.h"

 #include <QMessageBox>

--- a/src/app/qgsaddtaborgroup.cpp
+++ b/src/app/qgsaddtaborgroup.cpp
@ -17,12 +17,12 @@
 ***************************************************************************/

 #include "qgisapp.h"
+#include "qgsaddtaborgroup.h"
 #include "qgsapplication.h"
 #include "qgsvectorlayer.h"
-#include "qgsaddtaborgroup.h"

-#include <QTreeWidgetItem>
 #include <QComboBox>
+#include <QTreeWidgetItem>

 QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, QList < TabPair > tabList, QWidget * parent )
    : QDialog( parent )
--- a/src/app/qgsadvanceddigitizingcanvasitem.cpp
+++ b/src/app/qgsadvanceddigitizingcanvasitem.cpp
@ -15,8 +15,8 @@

 #include <QPainter>

-#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsadvanceddigitizingcanvasitem.h"
+#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsmapcanvas.h"


--- a/src/app/qgsadvanceddigitizingdockwidget.cpp
+++ b/src/app/qgsadvanceddigitizingdockwidget.cpp
@ -18,14 +18,14 @@
 #include "math.h"

 #include "qgisapp.h"
-#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsadvanceddigitizingcanvasitem.h"
+#include "qgsadvanceddigitizingdockwidget.h"
 #include "qgsapplication.h"
 #include "qgsexpression.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
-#include "qgsmaptoolcapture.h"
 #include "qgsmaptooladvanceddigitizing.h"
+#include "qgsmaptoolcapture.h"
 #include "qgsmessagebaritem.h"
 #include "qgspoint.h"

--- a/src/app/qgsannotationwidget.cpp
+++ b/src/app/qgsannotationwidget.cpp
@ -15,13 +15,13 @@
 *                                                                         *
 ***************************************************************************/

-#include "qgsannotationwidget.h"
+#include <QColorDialog>
 #include "qgsannotationitem.h"
+#include "qgsannotationwidget.h"
 #include "qgsstylev2.h"
 #include "qgssymbollayerv2utils.h"
 #include "qgssymbolv2.h"
 #include "qgssymbolv2selectordialog.h"
-#include <QColorDialog>


 QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): QWidget( parent, f ), mItem( item ), mMarkerSymbol( 0 )
--- a/src/app/qgsapplayertreeviewmenuprovider.cpp
+++ b/src/app/qgsapplayertreeviewmenuprovider.cpp
@ -6,13 +6,13 @@
 #include "qgsclipboard.h"
 #include "qgslayertree.h"
 #include "qgslayertreemodel.h"
+#include "qgslayertreeregistrybridge.h"
 #include "qgslayertreeviewdefaultactions.h"
 #include "qgsmaplayerstyleguiutils.h"
 #include "qgsproject.h"
 #include "qgsrasterlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
-#include "qgslayertreeregistrybridge.h"


 QgsAppLayerTreeViewMenuProvider::QgsAppLayerTreeViewMenuProvider( QgsLayerTreeView* view, QgsMapCanvas* canvas )
--- a/src/app/qgsattributeactiondialog.cpp
+++ b/src/app/qgsattributeactiondialog.cpp
@ -20,18 +20,18 @@ back to QgsVectorLayer.
 *                                                                         *
 ***************************************************************************/

+#include "qgisapp.h"
 #include "qgsattributeactiondialog.h"
 #include "qgsattributeaction.h"
 #include "qgsexpressionbuilderdialog.h"
-#include "qgisapp.h"
-#include "qgsproject.h"
 #include "qgsmapcanvas.h"
+#include "qgsproject.h"

 #include <QFileDialog>
 #include <QHeaderView>
+#include <QImageWriter>
 #include <QMessageBox>
 #include <QSettings>
-#include <QImageWriter>

 QgsAttributeActionDialog::QgsAttributeActionDialog( QgsAttributeAction* actions,
    const QgsFields& fields,
--- a/src/app/qgsattributeactiondialog.h
+++ b/src/app/qgsattributeactiondialog.h
@ -24,9 +24,9 @@ back to QgsVectorLayer.
 #define QGSATTRIBUTEACTIONDIALOG_H

 #include "ui_qgsattributeactiondialogbase.h"
+#include <QMap>
 #include "qgsattributeaction.h"
 #include "qgsfield.h"
-#include <QMap>

 class QgsAttributeAction;

--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@ -18,32 +18,32 @@
 #include <QMessageBox>

 #include "qgsattributetabledialog.h"
-#include "qgsattributetablemodel.h"
 #include "qgsattributetablefiltermodel.h"
+#include "qgsattributetablemodel.h"
 #include "qgsattributetableview.h"

 #include <qgsapplication.h>
+#include <qgsexpression.h>
 #include <qgsvectordataprovider.h>
 #include <qgsvectorlayer.h>
-#include <qgsexpression.h>

 #include "qgisapp.h"
 #include "qgsaddattrdialog.h"
+#include "qgsattributeaction.h"
 #include "qgsdelattrdialog.h"
-#include "qgssearchquerybuilder.h"
+#include "qgseditorwidgetregistry.h"
+#include "qgsexpressionbuilderdialog.h"
+#include "qgsexpressionselectiondialog.h"
+#include "qgsfeatureaction.h"
+#include "qgsfeaturelistmodel.h"
+#include "qgsfieldcalculator.h"
+#include "qgsfield.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
-#include "qgsproject.h"
-#include "qgsfieldcalculator.h"
-#include "qgsfeatureaction.h"
-#include "qgsattributeaction.h"
-#include "qgsexpressionbuilderdialog.h"
 #include "qgsmessagebar.h"
-#include "qgsexpressionselectiondialog.h"
-#include "qgsfeaturelistmodel.h"
+#include "qgsproject.h"
 #include "qgsrubberband.h"
-#include "qgsfield.h"
-#include "qgseditorwidgetregistry.h"
+#include "qgssearchquerybuilder.h"

 class QgsAttributeTableDock : public QDockWidget
 {
--- a/src/app/qgsattributetabledialog.h
+++ b/src/app/qgsattributetabledialog.h
@ -18,8 +18,8 @@
 #define QGSATTRIBUTETABLEDIALOG_H_

 #include <QDialog>
-#include <QModelIndex>
 #include <QItemSelectionModel>
+#include <QModelIndex>

 #include <time.h>

@ -27,9 +27,9 @@
 #include "qgscontexthelp.h"

 #include "qgsattributedialog.h"
-#include "qgsvectorlayer.h" //QgsFeatureIds
-#include "qgsfieldmodel.h"
 #include "qgseditorwidgetwrapper.h"
+#include "qgsfieldmodel.h"
+#include "qgsvectorlayer.h" //QgsFeatureIds

 class QDialogButtonBox;
 class QPushButton;
--- a/src/app/qgsattributetypedialog.cpp
+++ b/src/app/qgsattributetypedialog.cpp
@ -15,27 +15,27 @@
 *                                                                         *
 ***************************************************************************/

+#include "qgisapp.h"
 #include "qgsattributetypedialog.h"
 #include "qgsattributetypeloaddialog.h"
-#include "qgsvectordataprovider.h"
-#include "qgsmaplayerregistry.h"
-#include "qgsmapcanvas.h"
-#include "qgsexpressionbuilderdialog.h"
-#include "qgisapp.h"
-#include "qgsproject.h"
-#include "qgslogger.h"
 #include "qgseditorwidgetfactory.h"
 #include "qgseditorwidgetregistry.h"
+#include "qgsexpressionbuilderdialog.h"
+#include "qgslogger.h"
+#include "qgsmapcanvas.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsproject.h"
+#include "qgsvectordataprovider.h"

-#include <QTableWidgetItem>
 #include <QFile>
-#include <QMessageBox>
 #include <QFileDialog>
-#include <QTextStream>
+#include <QMessageBox>
 #include <QScrollBar>
+#include <QTableWidgetItem>
+#include <QTextStream>

-#include <climits>
 #include <cfloat>
+#include <climits>

 QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx )
    : QDialog()
--- a/src/app/qgsattributetypedialog.h
+++ b/src/app/qgsattributetypedialog.h
@ -19,8 +19,8 @@

 #include "ui_qgsattributetypeedit.h"

-#include "qgsvectorlayer.h"
 #include "qgseditorconfigwidget.h"
+#include "qgsvectorlayer.h"

 class QDialog;
 class QLayout;
--- a/Show More
+++ b/Show More