From 2b7d3d3c73b50ba6dc74abec6dd652ff1b87c0ec Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Wed, 10 Jun 2015 13:59:08 +0200 Subject: [PATCH] sort includes --- src/analysis/interpolation/Bezier3D.h | 4 +- .../interpolation/CloughTocherInterpolator.h | 10 +-- .../interpolation/DualEdgeTriangulation.h | 26 +++--- .../interpolation/LinTriangleInterpolator.h | 2 +- src/analysis/interpolation/Line3D.h | 2 +- src/analysis/interpolation/MathUtils.h | 2 +- src/analysis/interpolation/NormVecDecorator.h | 4 +- src/analysis/interpolation/ParametricLine.h | 2 +- src/analysis/interpolation/Triangulation.h | 4 +- .../interpolation/qgsgridfilewriter.cpp | 6 +- .../interpolation/qgsgridfilewriter.h | 2 +- .../interpolation/qgsidwinterpolator.cpp | 2 +- .../interpolation/qgsinterpolator.cpp | 2 +- .../interpolation/qgstininterpolator.cpp | 6 +- .../interpolation/qgstininterpolator.h | 2 +- src/analysis/network/qgsgraph.h | 2 +- src/analysis/network/qgsgraphanalyzer.cpp | 4 +- src/analysis/network/qgsgraphbuilderintr.h | 4 +- src/analysis/network/qgsgraphdirector.h | 2 +- .../network/qgslinevectorlayerdirector.cpp | 12 +-- src/analysis/openstreetmap/qgsosmdatabase.cpp | 4 +- src/analysis/openstreetmap/qgsosmdownload.cpp | 2 +- src/analysis/openstreetmap/qgsosmdownload.h | 2 +- src/analysis/raster/qgsninecellfilter.cpp | 6 +- src/analysis/raster/qgsrastercalcnode.cpp | 4 +- src/analysis/raster/qgsrastercalcnode.h | 2 +- src/analysis/raster/qgsrastercalculator.cpp | 4 +- src/analysis/raster/qgsrastercalculator.h | 6 +- src/analysis/raster/qgsrastermatrix.cpp | 4 +- src/analysis/raster/qgsrelief.cpp | 10 +-- src/analysis/vector/qgsgeometryanalyzer.cpp | 16 ++-- src/analysis/vector/qgsgeometryanalyzer.h | 8 +- src/analysis/vector/qgsoverlayanalyzer.cpp | 16 ++-- src/analysis/vector/qgsoverlayanalyzer.h | 10 +-- src/analysis/vector/qgspointsample.cpp | 6 +- src/analysis/vector/qgspointsample.h | 2 +- src/analysis/vector/qgstransectsample.cpp | 8 +- src/analysis/vector/qgstransectsample.h | 2 +- src/analysis/vector/qgszonalstatistics.cpp | 10 +-- src/analysis/vector/qgszonalstatistics.h | 2 +- .../composer/qgsatlascompositionwidget.cpp | 12 +-- .../composer/qgsattributeselectiondialog.cpp | 16 ++-- .../composer/qgsattributeselectiondialog.h | 4 +- src/app/composer/qgscomposer.cpp | 44 +++++----- src/app/composer/qgscomposer.h | 2 +- src/app/composer/qgscomposerarrowwidget.cpp | 12 +-- .../qgscomposerattributetablewidget.cpp | 12 +-- src/app/composer/qgscomposerhtmlwidget.cpp | 18 ++--- src/app/composer/qgscomposeritemwidget.cpp | 14 ++-- src/app/composer/qgscomposerlabelwidget.cpp | 4 +- .../composer/qgscomposerlegenditemdialog.cpp | 2 +- src/app/composer/qgscomposerlegendwidget.cpp | 14 ++-- src/app/composer/qgscomposerlegendwidget.h | 4 +- src/app/composer/qgscomposermanager.cpp | 4 +- src/app/composer/qgscomposermapwidget.cpp | 28 +++---- src/app/composer/qgscomposermapwidget.h | 4 +- src/app/composer/qgscomposerpicturewidget.cpp | 14 ++-- .../composer/qgscomposerscalebarwidget.cpp | 10 +-- src/app/composer/qgscomposershapewidget.cpp | 8 +- src/app/composer/qgscomposertablewidget.cpp | 10 +-- src/app/composer/qgscompositionwidget.cpp | 18 ++--- src/app/gps/qgsgpsinformationwidget.cpp | 14 ++-- src/app/gps/qgsgpsinformationwidget.h | 4 +- src/app/gps/qgsgpsmarker.cpp | 2 +- src/app/gps/qgsgpsmarker.h | 6 +- src/app/legend/qgsapplegendinterface.cpp | 2 +- src/app/main.cpp | 26 +++--- src/app/nodetool/qgsselectedfeature.cpp | 12 +-- src/app/nodetool/qgsvertexentry.h | 4 +- src/app/ogr/qgsnewogrconnection.cpp | 10 +-- src/app/ogr/qgsogrhelperfunctions.cpp | 4 +- src/app/ogr/qgsopenvectorlayerdialog.cpp | 8 +- src/app/ogr/qgsopenvectorlayerdialog.h | 2 +- src/app/ogr/qgsvectorlayersaveasdialog.cpp | 10 +-- src/app/ogr/qgsvectorlayersaveasdialog.h | 2 +- .../openstreetmap/qgsosmdownloaddialog.cpp | 4 +- .../qgsapppluginmanagerinterface.cpp | 2 +- .../qgsapppluginmanagerinterface.h | 2 +- .../pluginmanager/qgspluginitemdelegate.cpp | 10 +-- src/app/pluginmanager/qgspluginmanager.cpp | 22 ++--- src/app/pluginmanager/qgspluginmanager.h | 18 ++--- .../qgspluginsortfilterproxymodel.h | 2 +- src/app/qgisapp.cpp | 80 +++++++++---------- src/app/qgisapp.h | 10 +-- src/app/qgisappinterface.cpp | 24 +++--- src/app/qgisappstylesheet.cpp | 2 +- src/app/qgisappstylesheet.h | 2 +- src/app/qgsabout.cpp | 10 +-- src/app/qgsaddattrdialog.cpp | 4 +- src/app/qgsaddtaborgroup.cpp | 4 +- src/app/qgsadvanceddigitizingcanvasitem.cpp | 2 +- src/app/qgsadvanceddigitizingdockwidget.cpp | 4 +- src/app/qgsannotationwidget.cpp | 4 +- src/app/qgsapplayertreeviewmenuprovider.cpp | 2 +- src/app/qgsattributeactiondialog.cpp | 6 +- src/app/qgsattributeactiondialog.h | 2 +- src/app/qgsattributetabledialog.cpp | 24 +++--- src/app/qgsattributetabledialog.h | 6 +- src/app/qgsattributetypedialog.cpp | 22 ++--- src/app/qgsattributetypedialog.h | 2 +- src/app/qgsbookmarks.cpp | 8 +- src/app/qgsbrowserdockwidget.cpp | 14 ++-- src/app/qgsbrowserdockwidget.h | 2 +- src/app/qgsclipboard.cpp | 8 +- src/app/qgsclipboard.h | 4 +- src/app/qgsconfigureshortcutsdialog.cpp | 2 +- src/app/qgscustomization.cpp | 12 +-- src/app/qgscustomprojectiondialog.cpp | 8 +- src/app/qgsdecorationcopyright.cpp | 12 +-- src/app/qgsdecorationcopyrightdialog.cpp | 2 +- src/app/qgsdecorationgrid.cpp | 30 +++---- src/app/qgsdecorationgrid.h | 4 +- src/app/qgsdecorationgriddialog.cpp | 6 +- src/app/qgsdecorationitem.cpp | 14 ++-- src/app/qgsdecorationnortharrow.cpp | 10 +-- src/app/qgsdecorationnortharrowdialog.cpp | 4 +- src/app/qgsdecorationscalebar.cpp | 16 ++-- src/app/qgsdecorationscalebardialog.cpp | 2 +- src/app/qgsdelattrdialog.h | 2 +- src/app/qgsdiagramproperties.cpp | 10 +-- src/app/qgsdisplayangle.cpp | 4 +- src/app/qgsdisplayangle.h | 2 +- src/app/qgsdxfexportdialog.cpp | 12 +-- src/app/qgsdxfexportdialog.h | 2 +- src/app/qgsfeatureaction.h | 2 +- src/app/qgsfieldcalculator.cpp | 2 +- src/app/qgsfieldsproperties.cpp | 20 ++--- src/app/qgsfieldsproperties.h | 2 +- src/app/qgsformannotationdialog.cpp | 6 +- src/app/qgsguivectorlayertools.cpp | 10 +-- src/app/qgshandlebadlayers.cpp | 8 +- src/app/qgshtmlannotationdialog.cpp | 6 +- src/app/qgsidentifyresultsdialog.cpp | 34 ++++---- src/app/qgsidentifyresultsdialog.h | 6 +- src/app/qgsjoindialog.cpp | 4 +- src/app/qgslabeldialog.cpp | 12 +-- src/app/qgslabelengineconfigdialog.cpp | 2 +- src/app/qgslabelinggui.cpp | 12 +-- src/app/qgslabelpreview.cpp | 2 +- src/app/qgslabelpropertydialog.cpp | 4 +- src/app/qgslabelpropertydialog.h | 2 +- src/app/qgsloadstylefromdbdialog.cpp | 2 +- src/app/qgsmapmouseevent.cpp | 2 +- src/app/qgsmaptooladdfeature.cpp | 6 +- src/app/qgsmaptooladdfeature.h | 2 +- src/app/qgsmaptooladdpart.cpp | 4 +- src/app/qgsmaptooladdpart.h | 2 +- src/app/qgsmaptooladdring.cpp | 2 +- src/app/qgsmaptooladdring.h | 2 +- src/app/qgsmaptooladvanceddigitizing.cpp | 2 +- src/app/qgsmaptoolannotation.cpp | 22 ++--- src/app/qgsmaptoolannotation.h | 2 +- src/app/qgsmaptoolcapture.cpp | 2 +- src/app/qgsmaptoolcapture.h | 4 +- src/app/qgsmaptoolchangelabelproperties.cpp | 2 +- src/app/qgsmaptooldeletepart.cpp | 6 +- src/app/qgsmaptooldeletering.cpp | 4 +- src/app/qgsmaptooledit.cpp | 2 +- src/app/qgsmaptoolfeatureaction.cpp | 14 ++-- src/app/qgsmaptoolfillring.cpp | 6 +- src/app/qgsmaptoolfillring.h | 2 +- src/app/qgsmaptoolformannotation.cpp | 4 +- src/app/qgsmaptoolhtmlannotation.cpp | 4 +- src/app/qgsmaptoolidentifyaction.cpp | 20 ++--- src/app/qgsmaptoolidentifyaction.h | 6 +- src/app/qgsmaptoollabel.cpp | 6 +- src/app/qgsmaptoollabel.h | 2 +- src/app/qgsmaptoolmeasureangle.cpp | 8 +- src/app/qgsmaptoolmeasureangle.h | 2 +- src/app/qgsmaptoolmovefeature.cpp | 10 +-- src/app/qgsmaptoolmovelabel.cpp | 4 +- src/app/qgsmaptooloffsetcurve.cpp | 2 +- src/app/qgsmaptooloffsetcurve.h | 2 +- src/app/qgsmaptoolpinlabels.cpp | 4 +- src/app/qgsmaptoolpinlabels.h | 2 +- src/app/qgsmaptoolreshape.cpp | 4 +- src/app/qgsmaptoolreshape.h | 2 +- src/app/qgsmaptoolrotatefeature.cpp | 14 ++-- src/app/qgsmaptoolrotatelabel.cpp | 4 +- src/app/qgsmaptoolrotatepointsymbols.cpp | 6 +- src/app/qgsmaptoolrotatepointsymbols.h | 2 +- src/app/qgsmaptoolselect.cpp | 12 +-- src/app/qgsmaptoolselectfreehand.cpp | 6 +- src/app/qgsmaptoolselectpolygon.cpp | 6 +- src/app/qgsmaptoolselectradius.cpp | 8 +- src/app/qgsmaptoolselectrectangle.cpp | 14 ++-- src/app/qgsmaptoolselectutils.cpp | 16 ++-- src/app/qgsmaptoolselectutils.h | 4 +- src/app/qgsmaptoolshowhidelabels.cpp | 2 +- src/app/qgsmaptoolshowhidelabels.h | 2 +- src/app/qgsmaptoolsimplify.cpp | 4 +- src/app/qgsmaptoolsimplify.h | 2 +- src/app/qgsmaptoolsplitfeatures.cpp | 2 +- src/app/qgsmaptoolsplitfeatures.h | 2 +- src/app/qgsmaptoolsplitparts.cpp | 4 +- src/app/qgsmaptoolsplitparts.h | 2 +- src/app/qgsmaptoolsvgannotation.cpp | 2 +- src/app/qgsmaptooltextannotation.cpp | 2 +- src/app/qgsmeasuredialog.cpp | 6 +- src/app/qgsmeasuredialog.h | 4 +- src/app/qgsmeasuretool.cpp | 4 +- src/app/qgsmergeattributesdialog.cpp | 6 +- src/app/qgsnewspatialitelayerdialog.cpp | 16 ++-- src/app/qgsoptions.cpp | 42 +++++----- src/app/qgsoptions.h | 4 +- src/app/qgspluginregistry.cpp | 14 ++-- src/app/qgspointrotationitem.cpp | 4 +- src/app/qgspointrotationitem.h | 2 +- src/app/qgsprojectlayergroupdialog.cpp | 4 +- src/app/qgsprojectlayergroupdialog.h | 2 +- src/app/qgsprojectproperties.cpp | 30 +++---- src/app/qgsprojectproperties.h | 4 +- src/app/qgsrastercalcdialog.cpp | 8 +- src/app/qgsrasterlayerproperties.cpp | 16 ++-- src/app/qgsrasterlayerproperties.h | 4 +- src/app/qgssavestyletodbdialog.cpp | 8 +- src/app/qgsshortcutsmanager.h | 2 +- src/app/qgssnappingdialog.cpp | 14 ++-- src/app/qgssnappingdialog.h | 2 +- src/app/qgssponsors.cpp | 4 +- src/app/qgsstatisticalsummarydockwidget.cpp | 8 +- src/app/qgsstatisticalsummarydockwidget.h | 2 +- src/app/qgssvgannotationdialog.cpp | 6 +- src/app/qgstextannotationdialog.cpp | 6 +- src/app/qgstipfactory.cpp | 2 +- src/app/qgstipfactory.h | 2 +- src/app/qgstipgui.cpp | 8 +- src/app/qgsundowidget.cpp | 2 +- src/app/qgsundowidget.h | 6 +- src/app/qgsvectorlayerproperties.cpp | 32 ++++---- src/app/qgsvectorlayerproperties.h | 10 +-- src/app/qgsvisibilitypresets.cpp | 2 +- src/app/qtmain_android.cpp | 4 +- src/browser/main.cpp | 14 ++-- src/browser/qgsbrowser.cpp | 18 ++--- src/browser/qgsbrowser.h | 2 +- src/core/composer/qgsaddremoveitemcommand.cpp | 2 +- src/core/composer/qgsatlascomposition.cpp | 8 +- src/core/composer/qgsatlascomposition.h | 4 +- src/core/composer/qgscomposerarrow.cpp | 8 +- src/core/composer/qgscomposerarrow.h | 2 +- .../composer/qgscomposerattributetable.cpp | 2 +- .../qgscomposerattributetablemodel.cpp | 2 +- .../qgscomposerattributetablemodelv2.cpp | 4 +- .../composer/qgscomposerattributetablev2.cpp | 16 ++-- .../composer/qgscomposerattributetablev2.h | 2 +- src/core/composer/qgscomposerhtml.cpp | 18 ++--- src/core/composer/qgscomposerhtml.h | 2 +- src/core/composer/qgscomposeritem.cpp | 16 ++-- src/core/composer/qgscomposeritem.h | 8 +- src/core/composer/qgscomposeritemcommand.cpp | 4 +- src/core/composer/qgscomposeritemcommand.h | 2 +- src/core/composer/qgscomposeritemgroup.cpp | 8 +- src/core/composer/qgscomposeritemgroup.h | 2 +- src/core/composer/qgscomposerlabel.cpp | 12 +-- src/core/composer/qgscomposerlabel.h | 2 +- src/core/composer/qgscomposerlegend.cpp | 12 +-- src/core/composer/qgscomposerlegend.h | 2 +- src/core/composer/qgscomposerlegenditem.cpp | 12 +-- src/core/composer/qgscomposerlegenditem.h | 2 +- src/core/composer/qgscomposerlegendstyle.cpp | 10 +-- src/core/composer/qgscomposerlegendstyle.h | 4 +- src/core/composer/qgscomposermap.cpp | 16 ++-- src/core/composer/qgscomposermap.h | 4 +- src/core/composer/qgscomposermapgrid.cpp | 10 +-- src/core/composer/qgscomposermapgrid.h | 4 +- src/core/composer/qgscomposermapitem.cpp | 4 +- src/core/composer/qgscomposermapoverview.cpp | 2 +- src/core/composer/qgscomposermapoverview.h | 4 +- src/core/composer/qgscomposermodel.cpp | 18 ++--- src/core/composer/qgscomposermodel.h | 2 +- src/core/composer/qgscomposermousehandles.cpp | 12 +-- src/core/composer/qgscomposermultiframe.cpp | 6 +- src/core/composer/qgscomposermultiframe.h | 4 +- .../composer/qgscomposermultiframecommand.h | 2 +- src/core/composer/qgscomposerobject.cpp | 4 +- src/core/composer/qgscomposerobject.h | 4 +- src/core/composer/qgscomposerpicture.cpp | 30 +++---- src/core/composer/qgscomposerpicture.h | 2 +- src/core/composer/qgscomposerscalebar.cpp | 30 +++---- src/core/composer/qgscomposerscalebar.h | 4 +- src/core/composer/qgscomposershape.cpp | 6 +- src/core/composer/qgscomposershape.h | 2 +- src/core/composer/qgscomposertable.cpp | 8 +- src/core/composer/qgscomposertable.h | 4 +- src/core/composer/qgscomposertablecolumn.h | 2 +- src/core/composer/qgscomposertablev2.cpp | 4 +- src/core/composer/qgscomposertablev2.h | 4 +- src/core/composer/qgscomposertexttable.cpp | 2 +- src/core/composer/qgscomposerutils.cpp | 2 +- src/core/composer/qgscomposerutils.h | 2 +- src/core/composer/qgscomposition.cpp | 32 ++++---- src/core/composer/qgscomposition.h | 12 +-- .../composer/qgsdoubleboxscalebarstyle.cpp | 6 +- src/core/composer/qgslegendmodel.cpp | 14 ++-- src/core/composer/qgslegendmodel.h | 2 +- src/core/composer/qgsnumericscalebarstyle.cpp | 6 +- src/core/composer/qgspaperitem.cpp | 8 +- src/core/composer/qgspaperitem.h | 2 +- src/core/composer/qgsscalebarstyle.cpp | 6 +- .../composer/qgssingleboxscalebarstyle.cpp | 6 +- src/core/composer/qgsticksscalebarstyle.cpp | 4 +- src/core/diagram/qgsdiagram.cpp | 2 +- src/core/diagram/qgsdiagram.h | 4 +- src/core/diagram/qgshistogramdiagram.cpp | 4 +- src/core/diagram/qgshistogramdiagram.h | 4 +- src/core/diagram/qgspiediagram.cpp | 4 +- src/core/diagram/qgspiediagram.h | 4 +- src/core/diagram/qgstextdiagram.cpp | 4 +- src/core/diagram/qgstextdiagram.h | 4 +- src/core/dxf/qgsdxfexport.cpp | 8 +- src/core/dxf/qgsdxfexport.h | 4 +- src/core/dxf/qgsdxfpaintengine.cpp | 2 +- src/core/dxf/qgsdxfpallabeling.cpp | 6 +- src/core/dxf/qgsdxfpallabeling.h | 2 +- src/core/effects/qgsblureffect.h | 4 +- src/core/effects/qgscoloreffect.h | 6 +- src/core/effects/qgseffectstack.cpp | 2 +- src/core/effects/qgsgloweffect.cpp | 2 +- src/core/effects/qgsgloweffect.h | 2 +- src/core/effects/qgsimageoperation.cpp | 12 +-- src/core/effects/qgsimageoperation.h | 2 +- src/core/effects/qgspainteffect.cpp | 4 +- src/core/effects/qgspainteffect.h | 6 +- src/core/effects/qgspainteffectregistry.cpp | 6 +- src/core/effects/qgspainteffectregistry.h | 4 +- src/core/effects/qgsshadoweffect.cpp | 2 +- src/core/effects/qgsshadoweffect.h | 6 +- src/core/effects/qgstransformeffect.cpp | 4 +- src/core/effects/qgstransformeffect.h | 4 +- src/core/geometry/qgsabstractgeometryv2.cpp | 10 +-- src/core/geometry/qgsabstractgeometryv2.h | 2 +- src/core/geometry/qgscircularstringv2.cpp | 6 +- src/core/geometry/qgscircularstringv2.h | 2 +- src/core/geometry/qgscompoundcurvev2.cpp | 6 +- src/core/geometry/qgscurvepolygonv2.cpp | 6 +- src/core/geometry/qgsgeometry.cpp | 16 ++-- src/core/geometry/qgsgeometry.h | 4 +- src/core/geometry/qgsgeometrycollectionv2.cpp | 6 +- src/core/geometry/qgsgeometrycollectionv2.h | 2 +- src/core/geometry/qgsgeometryeditutils.cpp | 10 +-- src/core/geometry/qgsgeometryeditutils.h | 2 +- src/core/geometry/qgsgeometryengine.h | 2 +- src/core/geometry/qgsgeometryimport.cpp | 6 +- src/core/geometry/qgsgeometryimport.h | 2 +- src/core/geometry/qgsgeometryutils.cpp | 2 +- src/core/geometry/qgsgeometryutils.h | 2 +- src/core/geometry/qgsgeos.cpp | 6 +- src/core/geometry/qgsgeos.h | 2 +- src/core/geometry/qgslinestringv2.cpp | 8 +- src/core/geometry/qgslinestringv2.h | 2 +- src/core/geometry/qgsmulticurvev2.cpp | 4 +- src/core/geometry/qgsmultilinestringv2.cpp | 4 +- src/core/geometry/qgsmultipointv2.cpp | 2 +- src/core/geometry/qgsmultipolygonv2.cpp | 10 +-- src/core/geometry/qgsmultisurfacev2.cpp | 10 +-- src/core/geometry/qgspointv2.cpp | 4 +- src/core/geometry/qgspolygonv2.cpp | 2 +- src/core/geometry/qgswkbptr.h | 4 +- src/core/gps/qgsgpsconnection.cpp | 8 +- src/core/gps/qgsgpsconnectionregistry.cpp | 2 +- src/core/gps/qgsgpsdetector.cpp | 8 +- src/core/gps/qgsgpsdetector.h | 2 +- src/core/gps/qgsnmeaconnection.cpp | 6 +- src/core/gps/qgsqtlocationconnection.cpp | 4 +- src/core/layertree/qgslayertree.h | 2 +- .../layertree/qgslayertreemodellegendnode.cpp | 2 +- .../layertree/qgslayertreeregistrybridge.cpp | 2 +- src/core/layertree/qgslayertreeutils.h | 2 +- src/core/pal/costcalculator.cpp | 6 +- src/core/pal/feature.cpp | 6 +- src/core/pal/feature.h | 6 +- src/core/pal/labelposition.cpp | 6 +- src/core/pal/layer.cpp | 12 +-- src/core/pal/layer.h | 2 +- src/core/pal/pal.cpp | 12 +-- src/core/pal/pal.h | 4 +- src/core/pal/pointset.h | 4 +- src/core/pal/problem.cpp | 18 ++--- src/core/pal/util.cpp | 10 +-- src/core/pal/util.h | 4 +- src/core/qgis.cpp | 6 +- src/core/qgis.h | 12 +-- src/core/qgsapplication.cpp | 6 +- src/core/qgsattributeaction.cpp | 16 ++-- src/core/qgsattributeaction.h | 2 +- src/core/qgsbrowsermodel.cpp | 4 +- src/core/qgsbrowsermodel.h | 4 +- src/core/qgscacheindexfeatureid.cpp | 2 +- src/core/qgsclipper.h | 2 +- src/core/qgscolorscheme.cpp | 4 +- src/core/qgscolorscheme.h | 2 +- src/core/qgscolorschemeregistry.cpp | 6 +- src/core/qgscolorschemeregistry.h | 2 +- src/core/qgsconnectionpool.h | 2 +- src/core/qgscontexthelp.cpp | 6 +- src/core/qgscontexthelp.h | 2 +- src/core/qgscoordinatereferencesystem.cpp | 14 ++-- src/core/qgscoordinatereferencesystem.h | 4 +- src/core/qgscoordinatetransform.cpp | 8 +- src/core/qgscoordinatetransform.h | 4 +- src/core/qgscredentials.h | 6 +- src/core/qgscrscache.cpp | 2 +- src/core/qgscrscache.h | 2 +- src/core/qgsdatadefined.cpp | 2 +- src/core/qgsdatadefined.h | 4 +- src/core/qgsdatadefined_p.h | 2 +- src/core/qgsdataitem.cpp | 12 +-- src/core/qgsdataitem.h | 2 +- src/core/qgsdatasourceuri.cpp | 2 +- src/core/qgsdiagramrendererv2.cpp | 10 +-- src/core/qgsdiagramrendererv2.h | 2 +- src/core/qgsdistancearea.cpp | 12 +-- src/core/qgserror.cpp | 2 +- src/core/qgserror.h | 2 +- src/core/qgsexpression.cpp | 14 ++-- src/core/qgsexpression.h | 4 +- src/core/qgsexpressionfieldbuffer.h | 4 +- src/core/qgsfeature.h | 6 +- src/core/qgsfeaturerequest.h | 2 +- src/core/qgsfeaturestore.h | 10 +-- src/core/qgsfield.h | 2 +- src/core/qgsfield_p.h | 2 +- src/core/qgsgeometrycache.h | 2 +- src/core/qgsgeometryvalidator.cpp | 2 +- src/core/qgsgml.cpp | 16 ++-- src/core/qgsgml.h | 4 +- src/core/qgsgmlschema.cpp | 16 ++-- src/core/qgsgmlschema.h | 16 ++-- src/core/qgshistogram.cpp | 2 +- src/core/qgshttptransaction.cpp | 4 +- src/core/qgslabel.cpp | 18 ++--- src/core/qgslabelattributes.cpp | 8 +- src/core/qgslabelsearchtree.cpp | 2 +- src/core/qgslabelsearchtree.h | 8 +- src/core/qgslayerdefinition.cpp | 10 +-- src/core/qgslogger.cpp | 2 +- src/core/qgslogger.h | 2 +- src/core/qgsmaphittest.cpp | 2 +- src/core/qgsmaplayerlegend.cpp | 2 +- src/core/qgsmaplayerregistry.cpp | 4 +- src/core/qgsmaplayerregistry.h | 2 +- src/core/qgsmaprenderer.cpp | 16 ++-- src/core/qgsmaprenderer.h | 6 +- src/core/qgsmaprenderercache.cpp | 2 +- src/core/qgsmaprenderercache.h | 2 +- src/core/qgsmaprendererjob.cpp | 8 +- src/core/qgsmaprendererjob.h | 4 +- src/core/qgsmapsettings.cpp | 6 +- src/core/qgsmaptopixel.cpp | 2 +- src/core/qgsmaptopixel.h | 2 +- src/core/qgsmaptopixelgeometrysimplifier.cpp | 2 +- src/core/qgsmaptopixelgeometrysimplifier.h | 2 +- src/core/qgsmessagelog.cpp | 8 +- src/core/qgsmessagelog.h | 2 +- src/core/qgsmessageoutput.cpp | 2 +- src/core/qgsmessageoutput.h | 2 +- src/core/qgsnetworkaccessmanager.cpp | 12 +-- src/core/qgsnetworkaccessmanager.h | 2 +- src/core/qgsnetworkcontentfetcher.cpp | 8 +- src/core/qgsofflineediting.cpp | 2 +- src/core/qgsogcutils.h | 2 +- src/core/qgsowsconnection.cpp | 4 +- src/core/qgsowsconnection.h | 2 +- src/core/qgspalgeometry.h | 4 +- src/core/qgspallabeling.cpp | 32 ++++---- src/core/qgspallabeling.h | 8 +- src/core/qgspluginlayerregistry.cpp | 4 +- src/core/qgspluginlayerregistry.h | 2 +- src/core/qgspoint.cpp | 6 +- src/core/qgspoint.h | 2 +- src/core/qgsproject.cpp | 4 +- src/core/qgsproject.h | 2 +- src/core/qgsprojectfiletransform.cpp | 16 ++-- src/core/qgsprojectfiletransform.h | 2 +- src/core/qgsprojectproperty.cpp | 2 +- src/core/qgsprojectproperty.h | 2 +- src/core/qgsprovidercountcalcevent.cpp | 2 +- src/core/qgsproviderextentcalcevent.cpp | 2 +- src/core/qgsproviderregistry.cpp | 6 +- src/core/qgspythonrunner.cpp | 2 +- src/core/qgsrectangle.cpp | 6 +- src/core/qgsrelation.h | 4 +- src/core/qgsrelationmanager.h | 4 +- src/core/qgsrenderchecker.cpp | 14 ++-- src/core/qgsrenderchecker.h | 8 +- src/core/qgsrunprocess.cpp | 4 +- src/core/qgsscaleexpression.cpp | 6 +- src/core/qgsscaleutils.cpp | 2 +- src/core/qgssimplifymethod.cpp | 4 +- src/core/qgssnapper.cpp | 12 +-- src/core/qgssnapper.h | 2 +- src/core/qgssnappingutils.h | 2 +- src/core/qgsspatialindex.cpp | 4 +- src/core/qgsstatisticalsummary.cpp | 4 +- src/core/qgstolerance.cpp | 6 +- src/core/qgstolerance.h | 4 +- src/core/qgstransaction.cpp | 2 +- src/core/qgsvectordataprovider.cpp | 2 +- src/core/qgsvectordataprovider.h | 6 +- src/core/qgsvectorfilewriter.cpp | 20 ++--- src/core/qgsvectorfilewriter.h | 4 +- src/core/qgsvectorlayer.cpp | 14 ++-- src/core/qgsvectorlayer.h | 8 +- src/core/qgsvectorlayercache.cpp | 4 +- src/core/qgsvectorlayereditbuffer.cpp | 2 +- src/core/qgsvectorlayereditbuffer.h | 2 +- src/core/qgsvectorlayereditpassthrough.cpp | 2 +- src/core/qgsvectorlayereditutils.cpp | 4 +- src/core/qgsvectorlayerimport.cpp | 8 +- src/core/qgsvectorlayerrenderer.cpp | 8 +- src/core/qgsvectorlayerrenderer.h | 2 +- src/core/qgsvectorlayerundocommand.cpp | 4 +- src/core/qgsvectorlayerundocommand.h | 8 +- src/core/qgsvectorsimplifymethod.cpp | 2 +- src/core/qgswebview.h | 2 +- .../raster/qgsbilinearrasterresampler.cpp | 4 +- src/core/raster/qgsbilinearrasterresampler.h | 2 +- .../raster/qgsbrightnesscontrastfilter.cpp | 4 +- src/core/raster/qgscontrastenhancement.cpp | 10 +-- src/core/raster/qgscubicrasterresampler.cpp | 2 +- src/core/raster/qgscubicrasterresampler.h | 2 +- src/core/raster/qgshuesaturationfilter.cpp | 2 +- src/core/raster/qgsmultibandcolorrenderer.cpp | 8 +- src/core/raster/qgspalettedrasterrenderer.cpp | 6 +- src/core/raster/qgsrasterchecker.cpp | 16 ++-- src/core/raster/qgsrasterchecker.h | 2 +- src/core/raster/qgsrasterdataprovider.cpp | 6 +- src/core/raster/qgsrasterdataprovider.h | 2 +- src/core/raster/qgsrasterdrawer.cpp | 10 +-- src/core/raster/qgsrasterdrawer.h | 2 +- src/core/raster/qgsrasterfilewriter.cpp | 4 +- src/core/raster/qgsrasterfilewriter.h | 6 +- src/core/raster/qgsrasteridentifyresult.cpp | 2 +- src/core/raster/qgsrasteriterator.cpp | 2 +- src/core/raster/qgsrasteriterator.h | 2 +- src/core/raster/qgsrasterlayer.h | 2 +- src/core/raster/qgsrasternuller.h | 2 +- src/core/raster/qgsrasterprojector.cpp | 4 +- src/core/raster/qgsrasterprojector.h | 4 +- src/core/raster/qgsrasterrendererregistry.cpp | 4 +- src/core/raster/qgsrasterrendererregistry.h | 2 +- src/core/raster/qgsrasterresamplefilter.cpp | 4 +- src/core/raster/qgsrastershader.cpp | 6 +- src/core/raster/qgsrastertransparency.cpp | 4 +- .../raster/qgssinglebandcolordatarenderer.cpp | 6 +- src/core/raster/qgssinglebandgrayrenderer.cpp | 6 +- .../qgssinglebandpseudocolorrenderer.cpp | 8 +- .../qgscategorizedsymbolrendererv2.cpp | 12 +-- .../qgscategorizedsymbolrendererv2.h | 4 +- src/core/symbology-ng/qgscolorbrewerpalette.h | 2 +- src/core/symbology-ng/qgscptcityarchive.cpp | 10 +-- src/core/symbology-ng/qgscptcityarchive.h | 2 +- .../symbology-ng/qgsellipsesymbollayerv2.cpp | 10 +-- .../symbology-ng/qgsellipsesymbollayerv2.h | 2 +- .../symbology-ng/qgsfillsymbollayerv2.cpp | 20 ++--- src/core/symbology-ng/qgsfillsymbollayerv2.h | 2 +- .../qgsgraduatedsymbolrendererv2.cpp | 24 +++--- .../qgsgraduatedsymbolrendererv2.h | 8 +- src/core/symbology-ng/qgsheatmaprenderer.cpp | 12 +-- src/core/symbology-ng/qgsheatmaprenderer.h | 6 +- .../qgsinvertedpolygonrenderer.cpp | 8 +- .../symbology-ng/qgsinvertedpolygonrenderer.h | 6 +- .../symbology-ng/qgslinesymbollayerv2.cpp | 12 +-- .../symbology-ng/qgsmarkersymbollayerv2.cpp | 8 +- .../symbology-ng/qgsmarkersymbollayerv2.h | 4 +- .../qgspointdisplacementrenderer.cpp | 12 +-- .../qgspointdisplacementrenderer.h | 8 +- src/core/symbology-ng/qgsrendererv2.cpp | 22 ++--- src/core/symbology-ng/qgsrendererv2.h | 10 +-- .../symbology-ng/qgsrendererv2registry.cpp | 8 +- src/core/symbology-ng/qgsrendererv2registry.h | 2 +- .../symbology-ng/qgsrulebasedrendererv2.cpp | 18 ++--- .../symbology-ng/qgsrulebasedrendererv2.h | 4 +- .../qgssinglesymbolrendererv2.cpp | 20 ++--- .../symbology-ng/qgssinglesymbolrendererv2.h | 4 +- src/core/symbology-ng/qgsstylev2.cpp | 2 +- src/core/symbology-ng/qgssvgcache.cpp | 10 +-- src/core/symbology-ng/qgssymbollayerv2.cpp | 14 ++-- src/core/symbology-ng/qgssymbollayerv2.h | 8 +- .../symbology-ng/qgssymbollayerv2registry.cpp | 4 +- .../symbology-ng/qgssymbollayerv2registry.h | 2 +- .../symbology-ng/qgssymbollayerv2utils.cpp | 26 +++--- src/core/symbology-ng/qgssymbollayerv2utils.h | 8 +- .../symbology-ng/qgssymbologyv2conversion.cpp | 10 +-- src/core/symbology-ng/qgssymbolv2.cpp | 8 +- src/core/symbology-ng/qgssymbolv2.h | 2 +- .../symbology-ng/qgsvectorcolorrampv2.cpp | 6 +- src/core/symbology-ng/qgsvectorcolorrampv2.h | 2 +- src/crssync/main.cpp | 2 +- .../qgscollapsiblegroupboxplugin.h | 2 +- src/customwidgets/qgscolorbuttonplugin.cpp | 2 +- src/customwidgets/qgscolorbuttonplugin.h | 2 +- src/customwidgets/qgscolorbuttonv2plugin.cpp | 2 +- src/customwidgets/qgscolorbuttonv2plugin.h | 2 +- .../qgsdatadefinedbuttonplugin.cpp | 2 +- .../qgsdatadefinedbuttonplugin.h | 2 +- src/customwidgets/qgsdatetimeeditplugin.cpp | 2 +- src/customwidgets/qgsdatetimeeditplugin.h | 2 +- src/customwidgets/qgsdoublespinboxplugin.cpp | 2 +- src/customwidgets/qgsdoublespinboxplugin.h | 2 +- src/customwidgets/qgsfieldcomboboxplugin.h | 2 +- .../qgsfieldexpressionwidgetplugin.cpp | 2 +- .../qgsfieldexpressionwidgetplugin.h | 2 +- src/customwidgets/qgsfilterlineeditplugin.h | 2 +- src/customwidgets/qgsmaplayercomboboxplugin.h | 2 +- .../qgsprojectionselectionwidgetplugin.h | 2 +- .../qgsrelationeditorwidgetplugin.h | 2 +- .../qgsrelationreferencewidgetplugin.cpp | 2 +- .../qgsrelationreferencewidgetplugin.h | 2 +- .../qgsscalerangewidgetplugin.cpp | 2 +- src/customwidgets/qgsscalerangewidgetplugin.h | 2 +- src/customwidgets/qgsscalewidgetplugin.cpp | 2 +- src/customwidgets/qgsscalewidgetplugin.h | 2 +- src/customwidgets/qgsspinboxplugin.cpp | 2 +- src/customwidgets/qgsspinboxplugin.h | 2 +- .../qgsattributetabledelegate.cpp | 2 +- .../qgsattributetablefiltermodel.cpp | 4 +- .../qgsattributetablefiltermodel.h | 4 +- .../attributetable/qgsattributetablemodel.cpp | 2 +- .../attributetable/qgsattributetablemodel.h | 8 +- .../attributetable/qgsattributetableview.cpp | 18 ++--- .../attributetable/qgsattributetableview.h | 2 +- .../attributetable/qgsfeaturelistmodel.cpp | 10 +-- src/gui/attributetable/qgsfeaturelistmodel.h | 4 +- src/gui/attributetable/qgsfeaturelistview.h | 2 +- .../qgsfeaturelistviewdelegate.cpp | 14 ++-- src/gui/attributetable/qgsfeaturemodel.h | 2 +- .../qgsfeatureselectionmodel.cpp | 4 +- .../core/qgsdefaultsearchwidgetwrapper.h | 2 +- .../core/qgseditorwidgetfactory.cpp | 2 +- .../core/qgseditorwidgetfactory.h | 2 +- .../core/qgseditorwidgetregistry.cpp | 28 +++---- .../core/qgseditorwidgetregistry.h | 2 +- .../core/qgseditorwidgetwrapper.cpp | 4 +- .../core/qgseditorwidgetwrapper.h | 4 +- .../editorwidgets/core/qgswidgetwrapper.cpp | 2 +- src/gui/editorwidgets/core/qgswidgetwrapper.h | 4 +- .../qgscheckboxwidgetfactory.cpp | 2 +- src/gui/editorwidgets/qgsdatetimeeditconfig.h | 2 +- .../editorwidgets/qgsdatetimeeditfactory.cpp | 2 +- .../editorwidgets/qgsdatetimeeditwrapper.cpp | 6 +- .../editorwidgets/qgsdatetimeeditwrapper.h | 4 +- src/gui/editorwidgets/qgsdoublespinbox.cpp | 2 +- .../qgsenumerationwidgetfactory.cpp | 4 +- .../qgsenumerationwidgetwrapper.cpp | 2 +- .../qgsfilenamewidgetfactory.cpp | 2 +- .../qgsfilenamewidgetwrapper.cpp | 2 +- .../editorwidgets/qgsfilenamewidgetwrapper.h | 2 +- .../editorwidgets/qgshiddenwidgetfactory.cpp | 2 +- .../editorwidgets/qgsphotowidgetfactory.cpp | 2 +- .../editorwidgets/qgsphotowidgetwrapper.cpp | 2 +- src/gui/editorwidgets/qgsphotowidgetwrapper.h | 2 +- .../editorwidgets/qgsrangewidgetfactory.cpp | 2 +- .../editorwidgets/qgsrangewidgetwrapper.cpp | 2 +- src/gui/editorwidgets/qgsrangewidgetwrapper.h | 2 +- .../qgsrelationreferenceconfigdlg.cpp | 2 +- .../qgsrelationreferencefactory.cpp | 2 +- .../qgsrelationreferencewidget.cpp | 8 +- .../qgsrelationreferencewidget.h | 10 +-- .../qgsrelationreferencewidgetwrapper.cpp | 2 +- .../qgsrelationreferencewidgetwrapper.h | 2 +- .../qgsrelationwidgetwrapper.cpp | 2 +- src/gui/editorwidgets/qgsspinbox.cpp | 4 +- .../qgstexteditwidgetfactory.cpp | 2 +- .../qgsuniquevaluewidgetfactory.cpp | 2 +- .../qgsuniquevaluewidgetwrapper.cpp | 2 +- .../editorwidgets/qgsuuidwidgetfactory.cpp | 2 +- src/gui/editorwidgets/qgsuuidwidgetwrapper.h | 2 +- .../editorwidgets/qgsvaluemapconfigdlg.cpp | 2 +- .../qgsvaluemapwidgetfactory.cpp | 2 +- .../qgsvaluerelationconfigdlg.cpp | 6 +- .../qgsvaluerelationwidgetwrapper.cpp | 4 +- .../qgsvaluerelationwidgetwrapper.h | 2 +- .../editorwidgets/qgswebviewwidgetfactory.cpp | 2 +- .../editorwidgets/qgswebviewwidgetwrapper.cpp | 2 +- .../editorwidgets/qgswebviewwidgetwrapper.h | 2 +- src/gui/effects/qgseffectdrawmodecombobox.cpp | 2 +- .../qgseffectstackpropertieswidget.cpp | 20 ++--- .../effects/qgseffectstackpropertieswidget.h | 6 +- .../qgspainteffectpropertieswidget.cpp | 10 +-- src/gui/effects/qgspainteffectwidget.cpp | 10 +-- .../layertree/qgslayertreemapcanvasbridge.cpp | 2 +- src/gui/layertree/qgslayertreeview.cpp | 2 +- src/gui/qgisgui.cpp | 2 +- src/gui/qgisgui.h | 2 +- src/gui/qgisinterface.h | 6 +- src/gui/qgsannotationitem.cpp | 4 +- src/gui/qgsattributedialog.cpp | 4 +- src/gui/qgsattributedialog.h | 4 +- src/gui/qgsattributeeditor.cpp | 32 ++++---- src/gui/qgsattributeeditor.h | 4 +- src/gui/qgsattributeform.h | 6 +- src/gui/qgsattributeformlegacyinterface.cpp | 4 +- src/gui/qgsattributetypeloaddialog.cpp | 20 ++--- src/gui/qgsattributetypeloaddialog.h | 2 +- src/gui/qgsblendmodecombobox.cpp | 4 +- src/gui/qgsbusyindicatordialog.cpp | 2 +- src/gui/qgscharacterselectdialog.h | 6 +- src/gui/qgscodeeditor.cpp | 4 +- src/gui/qgscodeeditorcss.cpp | 4 +- src/gui/qgscodeeditorhtml.cpp | 4 +- src/gui/qgscodeeditorpython.cpp | 8 +- src/gui/qgscodeeditorsql.cpp | 4 +- src/gui/qgscollapsiblegroupbox.cpp | 6 +- src/gui/qgscollapsiblegroupbox.h | 6 +- src/gui/qgscolorbutton.cpp | 14 ++-- src/gui/qgscolorbuttonv2.cpp | 28 +++---- src/gui/qgscolorbuttonv2.h | 2 +- src/gui/qgscolordialog.cpp | 22 ++--- src/gui/qgscolordialog.h | 2 +- src/gui/qgscolorschemelist.cpp | 14 ++-- src/gui/qgscolorschemelist.h | 6 +- src/gui/qgscolorswatchgrid.cpp | 10 +-- src/gui/qgscolorswatchgrid.h | 2 +- src/gui/qgscolorwidgets.cpp | 28 +++---- src/gui/qgscomposerruler.cpp | 8 +- src/gui/qgscomposerruler.h | 2 +- src/gui/qgscomposerview.cpp | 28 +++---- src/gui/qgscredentialdialog.h | 2 +- src/gui/qgsdatadefinedbutton.h | 2 +- src/gui/qgsdatumtransformdialog.cpp | 2 +- src/gui/qgsdetaileditemdata.h | 2 +- src/gui/qgsdetaileditemdelegate.cpp | 14 ++-- src/gui/qgsdetaileditemwidget.h | 2 +- src/gui/qgsencodingfiledialog.cpp | 6 +- src/gui/qgsexpressionbuilderdialog.cpp | 2 +- src/gui/qgsexpressionbuilderdialog.h | 2 +- src/gui/qgsexpressionbuilderwidget.cpp | 18 ++--- src/gui/qgsexpressionbuilderwidget.h | 10 +-- src/gui/qgsexpressionhighlighter.h | 4 +- src/gui/qgsexpressionselectiondialog.cpp | 2 +- src/gui/qgsexpressionselectiondialog.h | 2 +- src/gui/qgsfeatureselectiondlg.cpp | 2 +- src/gui/qgsfieldexpressionwidget.cpp | 6 +- src/gui/qgsfieldexpressionwidget.h | 8 +- src/gui/qgsfieldmodel.cpp | 2 +- src/gui/qgsfieldmodel.h | 2 +- src/gui/qgsfieldproxymodel.cpp | 2 +- src/gui/qgsfieldvalidator.cpp | 8 +- src/gui/qgsfieldvalidator.h | 2 +- src/gui/qgsfiledropedit.cpp | 4 +- src/gui/qgsfilterlineedit.cpp | 6 +- src/gui/qgsformannotationitem.cpp | 18 ++--- src/gui/qgsformannotationitem.h | 2 +- src/gui/qgsgenericprojectionselector.cpp | 2 +- src/gui/qgsgenericprojectionselector.h | 2 +- src/gui/qgshighlight.cpp | 2 +- src/gui/qgshighlight.h | 12 +-- src/gui/qgshistogramwidget.cpp | 16 ++-- src/gui/qgshistogramwidget.h | 6 +- src/gui/qgshtmlannotationitem.cpp | 8 +- src/gui/qgshtmlannotationitem.h | 2 +- src/gui/qgslegendinterface.h | 2 +- src/gui/qgslonglongvalidator.h | 2 +- src/gui/qgsmanageconnectionsdialog.h | 2 +- src/gui/qgsmapcanvas.cpp | 20 ++--- src/gui/qgsmapcanvas.h | 6 +- src/gui/qgsmapcanvasitem.cpp | 14 ++-- src/gui/qgsmapcanvasmap.cpp | 2 +- src/gui/qgsmapcanvassnapper.cpp | 10 +-- src/gui/qgsmaplayeractionregistry.h | 4 +- src/gui/qgsmaplayermodel.cpp | 2 +- src/gui/qgsmaplayerproxymodel.cpp | 4 +- src/gui/qgsmapoverviewcanvas.cpp | 4 +- src/gui/qgsmapoverviewcanvas.h | 4 +- src/gui/qgsmaptip.cpp | 6 +- src/gui/qgsmaptool.cpp | 14 ++-- src/gui/qgsmaptool.h | 2 +- src/gui/qgsmaptoolemitpoint.cpp | 4 +- src/gui/qgsmaptoolemitpoint.h | 2 +- src/gui/qgsmaptoolidentify.cpp | 18 ++--- src/gui/qgsmaptoolidentify.h | 2 +- src/gui/qgsmaptoolidentifyfeature.cpp | 2 +- src/gui/qgsmaptoolpan.cpp | 8 +- src/gui/qgsmaptooltouch.cpp | 10 +-- src/gui/qgsmaptooltouch.h | 2 +- src/gui/qgsmaptoolzoom.cpp | 10 +-- src/gui/qgsmaptoolzoom.h | 2 +- src/gui/qgsmessagebar.cpp | 16 ++-- src/gui/qgsmessagebar.h | 4 +- src/gui/qgsmessagebaritem.cpp | 2 +- src/gui/qgsmessagebaritem.h | 6 +- src/gui/qgsmessagelogviewer.cpp | 14 ++-- src/gui/qgsmessagelogviewer.h | 2 +- src/gui/qgsmessageviewer.cpp | 2 +- src/gui/qgsmessageviewer.h | 2 +- src/gui/qgsnewhttpconnection.cpp | 8 +- src/gui/qgsnewmemorylayerdialog.cpp | 8 +- src/gui/qgsnewmemorylayerdialog.h | 2 +- src/gui/qgsnewvectorlayerdialog.cpp | 12 +-- src/gui/qgsoptionsdialogbase.cpp | 2 +- src/gui/qgsowssourceselect.cpp | 14 ++-- src/gui/qgsowssourceselect.h | 6 +- src/gui/qgspluginmanagerinterface.h | 2 +- src/gui/qgsprojectbadlayerguihandler.cpp | 2 +- src/gui/qgsprojectionselectionwidget.cpp | 4 +- src/gui/qgsprojectionselectionwidget.h | 4 +- src/gui/qgsprojectionselector.cpp | 4 +- src/gui/qgsquerybuilder.cpp | 8 +- src/gui/qgsquerybuilder.h | 12 +-- src/gui/qgsrasterformatsaveoptionswidget.cpp | 14 ++-- src/gui/qgsrasterlayersaveasdialog.cpp | 8 +- src/gui/qgsrasterlayersaveasdialog.h | 2 +- src/gui/qgsrasterpyramidsoptionswidget.cpp | 16 ++-- src/gui/qgsrelationadddlg.h | 2 +- src/gui/qgsrelationeditorwidget.cpp | 2 +- src/gui/qgsrelationeditorwidget.h | 4 +- src/gui/qgsrelationmanagerdialog.h | 2 +- src/gui/qgsrubberband.cpp | 4 +- src/gui/qgsrubberband.h | 4 +- src/gui/qgsscalecombobox.cpp | 2 +- src/gui/qgsscalerangewidget.cpp | 2 +- src/gui/qgsscalerangewidget.h | 2 +- src/gui/qgsscalevisibilitydialog.cpp | 2 +- src/gui/qgsscalewidget.cpp | 2 +- src/gui/qgsscalewidget.h | 2 +- src/gui/qgssearchquerybuilder.cpp | 6 +- src/gui/qgssearchquerybuilder.h | 4 +- src/gui/qgssublayersdialog.cpp | 2 +- src/gui/qgssvgannotationitem.cpp | 4 +- src/gui/qgssvgannotationitem.h | 2 +- src/gui/qgstextannotationitem.cpp | 2 +- src/gui/qgstextannotationitem.h | 2 +- src/gui/qgsunitselectionwidget.h | 4 +- src/gui/qgsuserinputdockwidget.cpp | 2 +- .../qgsmultibandcolorrendererwidget.cpp | 2 +- .../raster/qgsmultibandcolorrendererwidget.h | 2 +- src/gui/raster/qgspalettedrendererwidget.cpp | 8 +- src/gui/raster/qgspalettedrendererwidget.h | 2 +- src/gui/raster/qgsrasterhistogramwidget.cpp | 18 ++--- src/gui/raster/qgsrasterminmaxwidget.cpp | 2 +- src/gui/raster/qgsrasterrendererwidget.cpp | 2 +- .../qgssinglebandgrayrendererwidget.cpp | 4 +- .../raster/qgssinglebandgrayrendererwidget.h | 2 +- ...qgssinglebandpseudocolorrendererwidget.cpp | 6 +- .../qgssinglebandpseudocolorrendererwidget.h | 4 +- src/gui/raster/qwt5_histogram_item.cpp | 2 +- src/gui/raster/qwt5_histogram_item.h | 10 +-- src/gui/symbology-ng/characterwidget.cpp | 2 +- .../qgscategorizedsymbolrendererv2widget.cpp | 18 ++--- .../qgscategorizedsymbolrendererv2widget.h | 4 +- src/gui/symbology-ng/qgscolorrampcombobox.cpp | 4 +- .../qgscptcitycolorrampv2dialog.cpp | 10 +-- src/gui/symbology-ng/qgsdashspacedialog.cpp | 4 +- .../qgsdatadefinedsymboldialog.cpp | 2 +- .../qgsellipsesymbollayerv2widget.cpp | 4 +- .../qgsgraduatedhistogramwidget.cpp | 16 ++-- .../qgsgraduatedsymbolrendererv2widget.cpp | 14 ++-- .../qgsgraduatedsymbolrendererv2widget.h | 4 +- .../symbology-ng/qgsheatmaprendererwidget.cpp | 14 ++-- .../qgsinvertedpolygonrendererwidget.cpp | 2 +- .../symbology-ng/qgslayerpropertieswidget.cpp | 6 +- .../qgspointdisplacementrendererwidget.cpp | 16 ++-- .../qgsrendererv2propertiesdialog.cpp | 10 +-- src/gui/symbology-ng/qgsrendererv2widget.cpp | 8 +- src/gui/symbology-ng/qgsrendererv2widget.h | 4 +- .../qgsrulebasedrendererv2widget.cpp | 26 +++--- src/gui/symbology-ng/qgssizescalewidget.cpp | 12 +-- src/gui/symbology-ng/qgssizescalewidget.h | 6 +- .../qgssmartgroupeditordialog.cpp | 4 +- .../qgsstylev2exportimportdialog.cpp | 10 +-- .../qgsstylev2exportimportdialog.h | 6 +- .../symbology-ng/qgsstylev2managerdialog.cpp | 14 ++-- .../symbology-ng/qgsstylev2managerdialog.h | 4 +- .../symbology-ng/qgssymbollayerv2widget.cpp | 12 +-- .../symbology-ng/qgssymbollevelsv2dialog.cpp | 4 +- src/gui/symbology-ng/qgssymbolslistwidget.cpp | 22 ++--- .../qgssymbolv2selectordialog.cpp | 18 ++--- .../qgsvectorfieldsymbollayerwidget.cpp | 2 +- .../qgsvectorfieldsymbollayerwidget.h | 2 +- .../qgsvectorgradientcolorrampv2dialog.cpp | 4 +- src/helpviewer/main.cpp | 6 +- src/helpviewer/qgshelpviewer.cpp | 4 +- src/plugins/compass/compass.h | 2 +- src/plugins/compass/qgscompassplugin.cpp | 6 +- src/plugins/compass/qgscompassplugin.h | 2 +- src/plugins/compass/qgscompassplugingui.cpp | 4 +- .../coordinate_capture/coordinatecapture.cpp | 24 +++--- .../coordinate_capture/coordinatecapture.h | 4 +- .../coordinatecapturemaptool.cpp | 4 +- .../dxf2shp_converter/dxf2shpconverter.cpp | 4 +- .../dxf2shp_converter/dxf2shpconvertergui.cpp | 6 +- .../evisdatabaseconnection.h | 2 +- .../evisdatabaseconnectiongui.cpp | 8 +- .../evisdatabaseconnectiongui.h | 2 +- .../evisgenericeventbrowsergui.cpp | 16 ++-- .../eventbrowser/evisgenericeventbrowsergui.h | 6 +- .../eventbrowser/evisimagedisplaywidget.cpp | 2 +- .../eventbrowser/evisimagedisplaywidget.h | 8 +- src/plugins/evis/evis.cpp | 20 ++--- src/plugins/evis/evis.h | 2 +- src/plugins/evis/idtool/eviseventidtool.cpp | 6 +- src/plugins/evis/idtool/eviseventidtool.h | 2 +- src/plugins/georeferencer/qgsgcplist.cpp | 2 +- src/plugins/georeferencer/qgsgcplistmodel.cpp | 4 +- src/plugins/georeferencer/qgsgcplistmodel.h | 2 +- .../georeferencer/qgsgcplistwidget.cpp | 8 +- .../georeferencer/qgsgeorefdatapoint.cpp | 2 +- .../georeferencer/qgsgeorefdelegates.cpp | 2 +- src/plugins/georeferencer/qgsgeorefplugin.h | 2 +- .../georeferencer/qgsgeorefplugingui.cpp | 18 ++--- .../georeferencer/qgsgeorefplugingui.h | 2 +- .../georeferencer/qgsgeoreftransform.cpp | 2 +- .../georeferencer/qgsgeoreftransform.h | 2 +- src/plugins/georeferencer/qgsimagewarper.cpp | 2 +- src/plugins/georeferencer/qgsleastsquares.cpp | 2 +- src/plugins/georeferencer/qgsleastsquares.h | 2 +- .../georeferencer/qgsmapcoordsdialog.cpp | 2 +- .../georeferencer/qgsopenrasterdialog.cpp | 2 +- .../georeferencer/qgsrasterchangecoords.cpp | 2 +- .../georeferencer/qgsresidualplotitem.cpp | 8 +- src/plugins/globe/globe_plugin.cpp | 32 ++++---- src/plugins/globe/globe_plugin.h | 14 ++-- src/plugins/globe/globe_plugin_dialog.cpp | 20 ++--- src/plugins/globe/globe_plugin_dialog.h | 10 +-- src/plugins/globe/qgsosgearthtilesource.cpp | 12 +-- .../gps_importer/qgsgpsdevicedialog.cpp | 2 +- src/plugins/gps_importer/qgsgpsplugin.cpp | 16 ++-- src/plugins/gps_importer/qgsgpsplugin.h | 2 +- src/plugins/gps_importer/qgsgpsplugingui.cpp | 10 +-- src/plugins/gps_importer/qgsgpsplugingui.h | 4 +- src/plugins/grass/qgis.g.browser.cpp | 6 +- src/plugins/grass/qgsgrassedit.cpp | 10 +-- src/plugins/grass/qgsgrassedittools.cpp | 2 +- src/plugins/grass/qgsgrassmapcalc.cpp | 4 +- src/plugins/grass/qgsgrassmodule.cpp | 10 +-- src/plugins/grass/qgsgrassmodule.h | 2 +- src/plugins/grass/qgsgrassnewmapset.cpp | 2 +- src/plugins/grass/qgsgrassplugin.cpp | 8 +- src/plugins/grass/qgsgrassplugin.h | 4 +- src/plugins/grass/qgsgrassregion.cpp | 4 +- src/plugins/grass/qgsgrassregion.h | 2 +- src/plugins/grass/qgsgrassselect.cpp | 2 +- src/plugins/grass/qgsgrassshell.cpp | 12 +-- src/plugins/grass/qgsgrasstools.cpp | 10 +-- src/plugins/grass/qgsgrassutils.cpp | 4 +- src/plugins/heatmap/heatmap.cpp | 20 ++--- src/plugins/heatmap/heatmap.h | 2 +- src/plugins/heatmap/heatmapgui.cpp | 20 ++--- src/plugins/heatmap/heatmapgui.h | 2 +- .../interpolation/qgsinterpolationdialog.cpp | 20 ++--- .../interpolation/qgsinterpolationdialog.h | 4 +- .../interpolation/qgsinterpolationplugin.cpp | 4 +- .../interpolation/qgsinterpolationplugin.h | 2 +- .../interpolation/qgsinterpolatordialog.h | 2 +- .../qgstininterpolatordialog.cpp | 4 +- .../interpolation/qgstininterpolatordialog.h | 2 +- .../offline_editing_plugin.cpp | 6 +- .../offline_editing/offline_editing_plugin.h | 2 +- .../offline_editing_progress_dialog.h | 2 +- src/plugins/oracle_raster/qgsoracle_plugin.h | 6 +- .../oracle_raster/qgsoracleconnect_ui.cpp | 2 +- .../oracle_raster/qgsselectgeoraster_ui.cpp | 4 +- .../oracle_raster/qgsselectgeoraster_ui.h | 4 +- src/plugins/plugin_template/plugin.cpp | 4 +- .../qgsrasterterrainanalysisdialog.cpp | 6 +- .../qgsrasterterrainanalysisplugin.cpp | 24 +++--- .../qgsrasterterrainanalysisplugin.h | 2 +- src/plugins/roadgraph/exportdlg.cpp | 12 +-- .../roadgraph/linevectorlayersettings.cpp | 2 +- .../roadgraph/linevectorlayerwidget.cpp | 16 ++-- src/plugins/roadgraph/roadgraphplugin.cpp | 22 ++--- src/plugins/roadgraph/settingsdlg.cpp | 10 +-- src/plugins/roadgraph/shortestpathwidget.cpp | 44 +++++----- .../qgsgeometrycoordinatetransform.h | 2 +- src/plugins/spatialquery/qgsreaderfeatures.h | 2 +- src/plugins/spatialquery/qgsrubberselectid.h | 2 +- src/plugins/spatialquery/qgsspatialquery.cpp | 2 +- src/plugins/spatialquery/qgsspatialquery.h | 2 +- .../spatialquery/qgsspatialquerydialog.cpp | 6 +- .../spatialquery/qgsspatialqueryplugin.cpp | 2 +- src/plugins/spit/qgsshapefile.cpp | 16 ++-- src/plugins/spit/qgsshapefile.h | 6 +- src/plugins/spit/qgsspit.cpp | 22 ++--- src/plugins/spit/qgsspit.h | 8 +- src/plugins/spit/qgsspitplugin.cpp | 2 +- src/plugins/topology/checkDock.cpp | 26 +++--- src/plugins/topology/checkDock.h | 4 +- src/plugins/topology/rulesDialog.cpp | 10 +-- src/plugins/topology/topol.cpp | 10 +-- src/plugins/topology/topolError.cpp | 2 +- src/plugins/topology/topolError.h | 2 +- src/plugins/topology/topolTest.cpp | 20 ++--- src/plugins/topology/topolTest.h | 2 +- .../qgszonalstatisticsdialog.cpp | 6 +- .../qgszonalstatisticsplugin.cpp | 10 +-- .../qgszonalstatisticsplugin.h | 2 +- .../qgsdelimitedtextfeatureiterator.cpp | 2 +- .../qgsdelimitedtextfeatureiterator.h | 2 +- .../delimitedtext/qgsdelimitedtextfile.cpp | 10 +-- .../delimitedtext/qgsdelimitedtextfile.h | 2 +- .../qgsdelimitedtextprovider.cpp | 14 ++-- .../delimitedtext/qgsdelimitedtextprovider.h | 2 +- .../qgsdelimitedtextsourceselect.cpp | 6 +- .../qgsdelimitedtextsourceselect.h | 2 +- src/providers/gdal/qgsgdalprovider.cpp | 32 ++++---- src/providers/gdal/qgsgdalprovider.h | 10 +-- src/providers/gdal/qgsgdalproviderbase.cpp | 2 +- src/providers/gdal/qgsgdalproviderbase.h | 2 +- src/providers/gpx/gpsdata.cpp | 8 +- src/providers/gpx/gpsdata.h | 2 +- src/providers/gpx/qgsgpxfeatureiterator.cpp | 2 +- src/providers/gpx/qgsgpxprovider.cpp | 8 +- src/providers/gpx/qgsgpxprovider.h | 2 +- src/providers/grass/qgis.r.in.cpp | 16 ++-- src/providers/grass/qgis.v.in.cpp | 18 ++--- src/providers/grass/qgsgrass.cpp | 12 +-- src/providers/grass/qgsgrass.h | 20 ++--- src/providers/grass/qgsgrassgislib.cpp | 12 +-- src/providers/grass/qgsgrassgislib.h | 8 +- src/providers/grass/qgsgrassimport.cpp | 4 +- src/providers/grass/qgsgrassoptions.cpp | 2 +- src/providers/grass/qgsgrassprovider.cpp | 12 +-- src/providers/grass/qgsgrassprovider.h | 2 +- .../grass/qgsgrassprovidermodule.cpp | 10 +-- .../grass/qgsgrassrasterprovider.cpp | 20 ++--- src/providers/grass/qgsgrassrasterprovider.h | 14 ++-- .../memory/qgsmemoryfeatureiterator.cpp | 2 +- src/providers/memory/qgsmemoryprovider.cpp | 6 +- src/providers/memory/qgsmemoryprovider.h | 2 +- src/providers/mssql/qgsmssqldataitems.cpp | 10 +-- .../mssql/qgsmssqlfeatureiterator.cpp | 4 +- src/providers/mssql/qgsmssqlfeatureiterator.h | 6 +- .../mssql/qgsmssqlgeometryparser.cpp | 4 +- src/providers/mssql/qgsmssqlnewconnection.cpp | 6 +- src/providers/mssql/qgsmssqlprovider.cpp | 24 +++--- src/providers/mssql/qgsmssqlprovider.h | 6 +- src/providers/mssql/qgsmssqlsourceselect.cpp | 14 ++-- src/providers/mssql/qgsmssqlsourceselect.h | 6 +- src/providers/mssql/qgsmssqltablemodel.cpp | 4 +- src/providers/ogr/qgsogrconnpool.h | 2 +- src/providers/ogr/qgsogrdataitems.cpp | 6 +- src/providers/ogr/qgsogrfeatureiterator.cpp | 4 +- .../ogr/qgsogrgeometrysimplifier.cpp | 2 +- src/providers/ogr/qgsogrprovider.cpp | 16 ++-- .../oracle/ocispatial/qsql_ocispatial.cpp | 4 +- .../oracle/ocispatial/qsql_ocispatial.h | 2 +- .../oracle/qgsoraclecolumntypethread.cpp | 2 +- src/providers/oracle/qgsoracleconn.cpp | 10 +-- src/providers/oracle/qgsoracleconn.h | 6 +- src/providers/oracle/qgsoracledataitems.cpp | 10 +-- src/providers/oracle/qgsoracledataitems.h | 6 +- .../oracle/qgsoraclefeatureiterator.cpp | 2 +- .../oracle/qgsoraclenewconnection.cpp | 6 +- src/providers/oracle/qgsoracleprovider.cpp | 18 ++--- src/providers/oracle/qgsoracleprovider.h | 12 +-- .../oracle/qgsoraclesourceselect.cpp | 18 ++--- src/providers/oracle/qgsoraclesourceselect.h | 6 +- src/providers/oracle/qgsoracletablemodel.cpp | 2 +- src/providers/ows/qgsowsdataitems.cpp | 10 +-- src/providers/ows/qgsowsprovider.cpp | 2 +- src/providers/ows/qgsowsprovider.h | 2 +- .../postgres/qgscolumntypethread.cpp | 2 +- src/providers/postgres/qgspgnewconnection.cpp | 6 +- src/providers/postgres/qgspgsourceselect.cpp | 20 ++--- src/providers/postgres/qgspgsourceselect.h | 6 +- src/providers/postgres/qgspgtablemodel.cpp | 2 +- src/providers/postgres/qgspostgresconn.cpp | 8 +- src/providers/postgres/qgspostgresconn.h | 4 +- .../postgres/qgspostgresconnpool.cpp | 2 +- .../postgres/qgspostgresdataitems.cpp | 14 ++-- src/providers/postgres/qgspostgresdataitems.h | 4 +- .../postgres/qgspostgresprovider.cpp | 16 ++-- src/providers/postgres/qgspostgresprovider.h | 6 +- .../postgres/qgspostgrestransaction.cpp | 6 +- .../spatialite/qgsspatialiteconnection.cpp | 2 +- .../spatialite/qgsspatialiteconnection.h | 2 +- .../spatialite/qgsspatialitedataitems.cpp | 4 +- .../spatialite/qgsspatialiteprovider.cpp | 14 ++-- .../spatialite/qgsspatialiteprovider.h | 8 +- .../spatialite/qgsspatialitesourceselect.cpp | 16 ++-- .../spatialite/qgsspatialitesourceselect.h | 8 +- .../spatialite/qgsspatialitetablemodel.cpp | 2 +- src/providers/wcs/qgswcscapabilities.cpp | 24 +++--- src/providers/wcs/qgswcscapabilities.h | 6 +- src/providers/wcs/qgswcsdataitems.cpp | 8 +- src/providers/wcs/qgswcsprovider.cpp | 32 ++++---- src/providers/wcs/qgswcsprovider.h | 10 +-- src/providers/wcs/qgswcssourceselect.cpp | 4 +- src/providers/wcs/qgswcssourceselect.h | 6 +- src/providers/wfs/qgswfscapabilities.cpp | 12 +-- src/providers/wfs/qgswfscapabilities.h | 4 +- src/providers/wfs/qgswfsdataitems.cpp | 2 +- src/providers/wfs/qgswfsfeatureiterator.cpp | 8 +- src/providers/wfs/qgswfsprovider.cpp | 22 ++--- src/providers/wfs/qgswfsprovider.h | 4 +- src/providers/wfs/qgswfssourceselect.cpp | 22 ++--- src/providers/wfs/qgswfssourceselect.h | 2 +- src/providers/wms/qgstilescalewidget.cpp | 10 +-- src/providers/wms/qgswmscapabilities.cpp | 2 +- src/providers/wms/qgswmsconnection.cpp | 4 +- src/providers/wms/qgswmsdataitems.cpp | 4 +- src/providers/wms/qgswmsprovider.cpp | 36 ++++----- src/providers/wms/qgswmsprovider.h | 8 +- src/providers/wms/qgswmssourceselect.cpp | 12 +-- src/providers/wms/qgswmssourceselect.h | 4 +- src/providers/wms/qgswmtsdimensions.cpp | 2 +- src/python/qgspythonutilsimpl.cpp | 2 +- src/server/qgis_map_serv.cpp | 28 +++---- src/server/qgscapabilitiescache.cpp | 2 +- src/server/qgsconfigcache.cpp | 2 +- src/server/qgsconfigparserutils.cpp | 2 +- src/server/qgsftptransaction.cpp | 2 +- src/server/qgsgetrequesthandler.cpp | 6 +- src/server/qgshostedrdsbuilder.cpp | 4 +- src/server/qgshostedvdsbuilder.cpp | 10 +-- src/server/qgshttprequesthandler.cpp | 14 ++-- src/server/qgshttprequesthandler.h | 2 +- src/server/qgsinterpolationlayerbuilder.cpp | 4 +- src/server/qgsmslayercache.cpp | 4 +- src/server/qgsmslayercache.h | 2 +- src/server/qgsmsutils.cpp | 8 +- src/server/qgspostrequesthandler.cpp | 6 +- src/server/qgsremotedatasourcebuilder.cpp | 8 +- src/server/qgsremoteowsbuilder.cpp | 6 +- src/server/qgsremoteowsbuilder.h | 2 +- src/server/qgssentdatasourcebuilder.cpp | 8 +- src/server/qgsserverfilter.cpp | 2 +- src/server/qgsserverinterfaceimpl.h | 6 +- src/server/qgsserverlogger.cpp | 2 +- src/server/qgsserverplugins.cpp | 6 +- src/server/qgsserverplugins.h | 2 +- src/server/qgsserverprojectparser.cpp | 4 +- src/server/qgsserverprojectparser.h | 2 +- src/server/qgssldconfigparser.cpp | 10 +-- src/server/qgssoaprequesthandler.cpp | 8 +- src/server/qgswcsprojectparser.cpp | 2 +- src/server/qgswcsserver.cpp | 10 +-- src/server/qgswcsserver.h | 2 +- src/server/qgswfsprojectparser.cpp | 2 +- src/server/qgswfsserver.cpp | 28 +++---- src/server/qgswfsserver.h | 2 +- src/server/qgswmsconfigparser.cpp | 8 +- src/server/qgswmsprojectparser.cpp | 8 +- src/server/qgswmsprojectparser.h | 4 +- src/server/qgswmsserver.cpp | 30 +++---- src/server/qgswmsserver.h | 6 +- tests/bench/main.cpp | 6 +- tests/bench/qgsbench.cpp | 4 +- tests/qt_modeltest/modeltest.h | 2 +- tests/qt_modeltest/tst_modeltest.cpp | 4 +- tests/src/analysis/testopenstreetmap.cpp | 2 +- .../src/analysis/testqgsrastercalculator.cpp | 4 +- tests/src/analysis/testqgsvectoranalyzer.cpp | 2 +- tests/src/app/testqgisappclipboard.cpp | 3 +- tests/src/core/qgscompositionchecker.cpp | 4 +- tests/src/core/qgscompositionchecker.h | 2 +- tests/src/core/regression1141.cpp | 25 +++--- tests/src/core/regression992.cpp | 25 +++--- tests/src/core/test_template.cpp | 3 +- tests/src/core/testcontrastenhancements.cpp | 6 +- tests/src/core/testmaprendererjob.cpp | 2 +- tests/src/core/testqgis.cpp | 4 +- tests/src/core/testqgsapplication.cpp | 2 +- tests/src/core/testqgsatlascomposition.cpp | 28 +++---- tests/src/core/testqgsblendmodes.cpp | 16 ++-- tests/src/core/testqgsclipper.cpp | 6 +- tests/src/core/testqgscolorscheme.cpp | 2 +- tests/src/core/testqgscolorschemeregistry.cpp | 4 +- tests/src/core/testqgscomposerdd.cpp | 14 ++-- tests/src/core/testqgscomposereffects.cpp | 14 ++-- tests/src/core/testqgscomposergroup.cpp | 8 +- tests/src/core/testqgscomposerhtml.cpp | 12 +-- tests/src/core/testqgscomposerlabel.cpp | 4 +- tests/src/core/testqgscomposermap.cpp | 8 +- tests/src/core/testqgscomposermapgrid.cpp | 16 ++-- tests/src/core/testqgscomposermapoverview.cpp | 10 +-- tests/src/core/testqgscomposermodel.cpp | 8 +- tests/src/core/testqgscomposermultiframe.cpp | 10 +-- tests/src/core/testqgscomposerobject.cpp | 10 +-- tests/src/core/testqgscomposerpaper.cpp | 12 +-- tests/src/core/testqgscomposerpicture.cpp | 12 +-- tests/src/core/testqgscomposerrotation.cpp | 26 +++--- tests/src/core/testqgscomposerscalebar.cpp | 10 +-- tests/src/core/testqgscomposershapes.cpp | 20 ++--- tests/src/core/testqgscomposertable.cpp | 10 +-- tests/src/core/testqgscomposertablev2.cpp | 14 ++-- tests/src/core/testqgscomposerutils.cpp | 14 ++-- tests/src/core/testqgscomposition.cpp | 8 +- .../core/testqgscoordinatereferencesystem.cpp | 8 +- tests/src/core/testqgscoordinatetransform.cpp | 4 +- tests/src/core/testqgsdatadefined.cpp | 6 +- tests/src/core/testqgsdataitem.cpp | 8 +- tests/src/core/testqgsdiagram.cpp | 31 ++++--- tests/src/core/testqgsdiagramexpression.cpp | 31 ++++--- tests/src/core/testqgsdistancearea.cpp | 6 +- tests/src/core/testqgsexpression.cpp | 7 +- tests/src/core/testqgsfeature.cpp | 6 +- tests/src/core/testqgsfield.cpp | 6 +- tests/src/core/testqgsfields.cpp | 6 +- tests/src/core/testqgsgeometry.cpp | 17 ++-- tests/src/core/testqgsgeometryimport.cpp | 4 +- tests/src/core/testqgsgeometryutils.cpp | 2 +- tests/src/core/testqgsgradients.cpp | 25 +++--- tests/src/core/testqgshistogram.cpp | 4 +- tests/src/core/testqgsimageoperation.cpp | 4 +- .../core/testqgsinvertedpolygonrenderer.cpp | 19 +++-- tests/src/core/testqgslegendrenderer.cpp | 4 +- tests/src/core/testqgsmaplayer.cpp | 15 ++-- .../src/core/testqgsmaplayerstylemanager.cpp | 2 +- tests/src/core/testqgsmaprenderer.cpp | 33 ++++---- tests/src/core/testqgsmaprotation.cpp | 17 ++-- tests/src/core/testqgsmapsettings.cpp | 7 +- tests/src/core/testqgsmaptopixel.cpp | 5 +- .../src/core/testqgsnetworkcontentfetcher.cpp | 6 +- tests/src/core/testqgsogcutils.cpp | 2 +- tests/src/core/testqgspainteffect.cpp | 42 +++++----- tests/src/core/testqgspainteffectregistry.cpp | 4 +- tests/src/core/testqgspallabeling.cpp | 4 +- tests/src/core/testqgspoint.cpp | 11 ++- tests/src/core/testqgspointlocator.cpp | 6 +- tests/src/core/testqgsproject.cpp | 2 +- tests/src/core/testqgsrasterfilewriter.cpp | 25 +++--- tests/src/core/testqgsrasterfill.cpp | 25 +++--- tests/src/core/testqgsrasterlayer.cpp | 31 ++++--- tests/src/core/testqgsrastersublayer.cpp | 29 +++---- tests/src/core/testqgsrectangle.cpp | 5 +- tests/src/core/testqgsrenderers.cpp | 19 +++-- tests/src/core/testqgsrulebasedrenderer.cpp | 2 +- tests/src/core/testqgsscaleexpression.cpp | 3 +- tests/src/core/testqgsshapeburst.cpp | 25 +++--- tests/src/core/testqgssnappingutils.cpp | 6 +- tests/src/core/testqgsspatialindex.cpp | 3 +- tests/src/core/testqgsstatisticalsummary.cpp | 8 +- tests/src/core/testqgsstylev2.cpp | 19 +++-- tests/src/core/testqgsvectordataprovider.cpp | 5 +- tests/src/core/testqgsvectorfilewriter.cpp | 17 ++-- tests/src/core/testqgsvectorlayer.cpp | 23 +++--- tests/src/core/testqgsvectorlayercache.cpp | 12 +-- .../src/core/testqgsvectorlayerjoinbuffer.cpp | 8 +- tests/src/core/testziplayer.cpp | 13 ++- tests/src/gui/testprojectionissues.cpp | 4 +- tests/src/gui/testqgsdualview.cpp | 6 +- tests/src/gui/testqgsgui.cpp | 2 +- tests/src/gui/testqgsmaptoolzoom.cpp | 11 ++- tests/src/gui/testqgsquickprint.cpp | 19 +++-- tests/src/gui/testqgsrasterhistogram.cpp | 13 ++- tests/src/gui/testqgsrubberband.cpp | 13 ++- tests/src/gui/testqgsscalecombobox.cpp | 10 +-- tests/src/gui/testrendererv2gui.cpp | 2 +- tests/src/providers/testqgsgdalprovider.cpp | 9 +-- tests/src/providers/testqgswcsprovider.cpp | 15 ++-- .../src/providers/testqgswcspublicservers.cpp | 6 +- 1244 files changed, 4266 insertions(+), 4306 deletions(-) diff --git a/src/analysis/interpolation/Bezier3D.h b/src/analysis/interpolation/Bezier3D.h index d597907f6bb..dd0ba15ea85 100644 --- 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 diff --git a/src/analysis/interpolation/CloughTocherInterpolator.h b/src/analysis/interpolation/CloughTocherInterpolator.h index b4180fb0281..a9131700a28 100644 --- 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 diff --git a/src/analysis/interpolation/DualEdgeTriangulation.h b/src/analysis/interpolation/DualEdgeTriangulation.h index 770dc6c7095..bbbe8eab196 100644 --- 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 -#include -#include -#include "MathUtils.h" -#include "TriangleInterpolator.h" -#include -#include -#include -#include #include #include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#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 diff --git a/src/analysis/interpolation/LinTriangleInterpolator.h b/src/analysis/interpolation/LinTriangleInterpolator.h index 498aa117b62..7b2dbc5eb9d 100644 --- 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 diff --git a/src/analysis/interpolation/Line3D.h b/src/analysis/interpolation/Line3D.h index 6730cc2ba03..f13d5869553 100644 --- 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 diff --git a/src/analysis/interpolation/MathUtils.h b/src/analysis/interpolation/MathUtils.h index fb30d50605b..20273b32a9e 100644 --- a/src/analysis/interpolation/MathUtils.h +++ b/src/analysis/interpolation/MathUtils.h @@ -18,8 +18,8 @@ #define MATHUTILS_H #include -#include "Vector3D.h" #include "Point3D.h" +#include "Vector3D.h" namespace MathUtils diff --git a/src/analysis/interpolation/NormVecDecorator.h b/src/analysis/interpolation/NormVecDecorator.h index 0282afbdaae..14a686dba1d 100644 --- 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 #include +#include #include "qgslogger.h" +#include "TriDecorator.h" class QProgressDialog; /**Decorator class which adds the functionality of estimating normals at the data points*/ diff --git a/src/analysis/interpolation/ParametricLine.h b/src/analysis/interpolation/ParametricLine.h index 0088ce20dde..6a699b7f7e0 100644 --- a/src/analysis/interpolation/ParametricLine.h +++ b/src/analysis/interpolation/ParametricLine.h @@ -17,9 +17,9 @@ #ifndef PARAMETRICLINE_H #define PARAMETRICLINE_H +#include #include "Point3D.h" #include "Vector3D.h" -#include 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.*/ diff --git a/src/analysis/interpolation/Triangulation.h b/src/analysis/interpolation/Triangulation.h index e6633f00034..2d4ef1bf027 100644 --- a/src/analysis/interpolation/Triangulation.h +++ b/src/analysis/interpolation/Triangulation.h @@ -18,10 +18,10 @@ #define TRIANGULATION_H #include -#include "Line3D.h" -#include "Vector3D.h" #include #include +#include "Line3D.h" +#include "Vector3D.h" /**Interface for Triangulation classes*/ class ANALYSIS_EXPORT Triangulation diff --git a/src/analysis/interpolation/qgsgridfilewriter.cpp b/src/analysis/interpolation/qgsgridfilewriter.cpp index b04b70b2451..8f04c966599 100644 --- 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 #include #include +#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 ) diff --git a/src/analysis/interpolation/qgsgridfilewriter.h b/src/analysis/interpolation/qgsgridfilewriter.h index 602f7b73eae..d303ff76e69 100644 --- 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 #include +#include "qgsrectangle.h" class QgsInterpolator; diff --git a/src/analysis/interpolation/qgsidwinterpolator.cpp b/src/analysis/interpolation/qgsidwinterpolator.cpp index d75b4584da5..c1b99fa4f4d 100644 --- a/src/analysis/interpolation/qgsidwinterpolator.cpp +++ b/src/analysis/interpolation/qgsidwinterpolator.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsidwinterpolator.h" #include #include +#include "qgsidwinterpolator.h" QgsIDWInterpolator::QgsIDWInterpolator( const QList& layerData ): QgsInterpolator( layerData ), mDistanceCoefficient( 2.0 ) { diff --git a/src/analysis/interpolation/qgsinterpolator.cpp b/src/analysis/interpolation/qgsinterpolator.cpp index df742ebf917..7ee2918ce56 100644 --- 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 ) diff --git a/src/analysis/interpolation/qgstininterpolator.cpp b/src/analysis/interpolation/qgstininterpolator.cpp index 05822cafcd0..0e7006e7ad5 100644 --- a/src/analysis/interpolation/qgstininterpolator.cpp +++ b/src/analysis/interpolation/qgstininterpolator.cpp @@ -15,17 +15,17 @@ * * ***************************************************************************/ -#include "qgstininterpolator.h" +#include #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 QgsTINInterpolator::QgsTINInterpolator( const QList& inputData, TIN_INTERPOLATION interpolation, bool showProgressDialog ) : QgsInterpolator( inputData ) diff --git a/src/analysis/interpolation/qgstininterpolator.h b/src/analysis/interpolation/qgstininterpolator.h index c5d8783144b..80e8b5d0108 100644 --- 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 +#include "qgsinterpolator.h" class Triangulation; class TriangleInterpolator; diff --git a/src/analysis/network/qgsgraph.h b/src/analysis/network/qgsgraph.h index f6525a3e426..6b6519699f6 100644 --- a/src/analysis/network/qgsgraph.h +++ b/src/analysis/network/qgsgraph.h @@ -28,8 +28,8 @@ // QT4 includes #include -#include #include +#include // QGIS includes #include "qgspoint.h" diff --git a/src/analysis/network/qgsgraphanalyzer.cpp b/src/analysis/network/qgsgraphanalyzer.cpp index 50db65121e4..feab56dded4 100644 --- a/src/analysis/network/qgsgraphanalyzer.cpp +++ b/src/analysis/network/qgsgraphanalyzer.cpp @@ -19,12 +19,12 @@ // QT includes #include -#include #include +#include //QGIS-uncludes -#include "qgsgraph.h" #include "qgsgraphanalyzer.h" +#include "qgsgraph.h" void QgsGraphAnalyzer::dijkstra( const QgsGraph* source, int startPointIdx, int criterionNum, QVector* resultTree, QVector* resultCost ) { diff --git a/src/analysis/network/qgsgraphbuilderintr.h b/src/analysis/network/qgsgraphbuilderintr.h index 96fd739857e..70001160b15 100644 --- a/src/analysis/network/qgsgraphbuilderintr.h +++ b/src/analysis/network/qgsgraphbuilderintr.h @@ -16,13 +16,13 @@ #define QGSGRAPHBUILDERINTERFACE //QT4 includes -#include #include +#include //QGIS includes -#include #include #include +#include //forward declarations diff --git a/src/analysis/network/qgsgraphdirector.h b/src/analysis/network/qgsgraphdirector.h index b9afaac814a..9f3c80767d3 100644 --- a/src/analysis/network/qgsgraphdirector.h +++ b/src/analysis/network/qgsgraphdirector.h @@ -16,9 +16,9 @@ #define QGSGRAPHDIRECTORH //QT4 includes +#include #include #include -#include //QGIS includes #include diff --git a/src/analysis/network/qgslinevectorlayerdirector.cpp b/src/analysis/network/qgslinevectorlayerdirector.cpp index bb4e6eb0f3e..50db55a85df 100644 --- 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 -#include -#include -#include #include +#include +#include +#include +#include // QT includes #include #include //standard includes -#include #include +#include class QgsPointCompare { diff --git a/src/analysis/openstreetmap/qgsosmdatabase.cpp b/src/analysis/openstreetmap/qgsosmdatabase.cpp index 6a8a5b75f93..48b30eb868a 100644 --- 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 ) diff --git a/src/analysis/openstreetmap/qgsosmdownload.cpp b/src/analysis/openstreetmap/qgsosmdownload.cpp index c3d0b3d7228..5f20e018a1b 100644 --- a/src/analysis/openstreetmap/qgsosmdownload.cpp +++ b/src/analysis/openstreetmap/qgsosmdownload.cpp @@ -1,8 +1,8 @@ #include "qgsosmdownload.h" #include -#include #include +#include #include "qgsnetworkaccessmanager.h" #include "qgsrectangle.h" diff --git a/src/analysis/openstreetmap/qgsosmdownload.h b/src/analysis/openstreetmap/qgsosmdownload.h index 18705d6bb9c..7106d465ea8 100644 --- a/src/analysis/openstreetmap/qgsosmdownload.h +++ b/src/analysis/openstreetmap/qgsosmdownload.h @@ -17,9 +17,9 @@ #define OSMDOWNLOAD_H -#include #include #include +#include class QgsRectangle; diff --git a/src/analysis/raster/qgsninecellfilter.cpp b/src/analysis/raster/qgsninecellfilter.cpp index 204bcd61dbe..1a44689a851 100644 --- a/src/analysis/raster/qgsninecellfilter.cpp +++ b/src/analysis/raster/qgsninecellfilter.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgsninecellfilter.h" -#include "cpl_string.h" -#include #include +#include +#include "cpl_string.h" +#include "qgsninecellfilter.h" #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 #define TO8F(x) (x).toUtf8().constData() diff --git a/src/analysis/raster/qgsrastercalcnode.cpp b/src/analysis/raster/qgsrastercalcnode.cpp index 31708d14685..74df19ccf5e 100644 --- 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 +#include "qgsrasterblock.h" +#include "qgsrastercalcnode.h" QgsRasterCalcNode::QgsRasterCalcNode() : mType( tNumber ) diff --git a/src/analysis/raster/qgsrastercalcnode.h b/src/analysis/raster/qgsrastercalcnode.h index be381fe8f6c..f1a25e4edfb 100644 --- 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 #include +#include "qgsrastermatrix.h" class QgsRasterBlock; diff --git a/src/analysis/raster/qgsrastercalculator.cpp b/src/analysis/raster/qgsrastercalculator.cpp index 0ccf81137a3..a7108077df0 100644 --- 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 #include +#include #include #include diff --git a/src/analysis/raster/qgsrastercalculator.h b/src/analysis/raster/qgsrastercalculator.h index 2fdebf27303..f2987cdff33 100644 --- 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 #include #include "gdal.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsfield.h" +#include "qgsrectangle.h" class QgsRasterLayer; class QProgressDialog; diff --git a/src/analysis/raster/qgsrastermatrix.cpp b/src/analysis/raster/qgsrastermatrix.cpp index b21a4a1d795..781f451757a 100644 --- a/src/analysis/raster/qgsrastermatrix.cpp +++ b/src/analysis/raster/qgsrastermatrix.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsrastermatrix.h" -#include #include +#include +#include "qgsrastermatrix.h" QgsRasterMatrix::QgsRasterMatrix() : mColumns( 0 ) diff --git a/src/analysis/raster/qgsrelief.cpp b/src/analysis/raster/qgsrelief.cpp index 4c8764e4e05..386070bc941 100644 --- a/src/analysis/raster/qgsrelief.cpp +++ b/src/analysis/raster/qgsrelief.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsrelief.h" +#include +#include +#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 -#include #include #include diff --git a/src/analysis/vector/qgsgeometryanalyzer.cpp b/src/analysis/vector/qgsgeometryanalyzer.cpp index 82a81d7bbc1..411a43a4054 100644 --- 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 +#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, diff --git a/src/analysis/vector/qgsgeometryanalyzer.h b/src/analysis/vector/qgsgeometryanalyzer.h index 96bcc385e1d..3f3b3f2eb8d 100644 --- 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; diff --git a/src/analysis/vector/qgsoverlayanalyzer.cpp b/src/analysis/vector/qgsoverlayanalyzer.cpp index 9b695863626..5fc89c7bf74 100644 --- 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 +#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, diff --git a/src/analysis/vector/qgsoverlayanalyzer.h b/src/analysis/vector/qgsoverlayanalyzer.h index da19a7e6fd8..eefd6f8723c 100644 --- 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; diff --git a/src/analysis/vector/qgspointsample.cpp b/src/analysis/vector/qgspointsample.cpp index 23958424ba8..c89406dde61 100644 --- a/src/analysis/vector/qgspointsample.cpp +++ b/src/analysis/vector/qgspointsample.cpp @@ -1,10 +1,10 @@ -#include "qgspointsample.h" +#include +#include "mersenne-twister.h" #include "qgsgeometry.h" +#include "qgspointsample.h" #include "qgsspatialindex.h" #include "qgsvectorfilewriter.h" #include "qgsvectorlayer.h" -#include -#include "mersenne-twister.h" QgsPointSample::QgsPointSample( QgsVectorLayer* inputLayer, const QString& outputLayer, QString nPointsAttribute, QString minDistAttribute ): mInputLayer( inputLayer ), diff --git a/src/analysis/vector/qgspointsample.h b/src/analysis/vector/qgspointsample.h index 7df28675faa..adc0bf3d025 100644 --- 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 +#include "qgsfeature.h" class QgsFeature; class QgsPoint; diff --git a/src/analysis/vector/qgstransectsample.cpp b/src/analysis/vector/qgstransectsample.cpp index 258abef1e44..638b62eac27 100644 --- a/src/analysis/vector/qgstransectsample.cpp +++ b/src/analysis/vector/qgstransectsample.cpp @@ -1,16 +1,16 @@ -#include "qgstransectsample.h" +#include +#include #include "qgsdistancearea.h" #include "qgsgeometry.h" #include "qgsspatialindex.h" +#include "qgstransectsample.h" #include "qgsvectorfilewriter.h" #include "qgsvectorlayer.h" -#include -#include #ifndef _MSC_VER #include #endif -#include "mersenne-twister.h" #include +#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, diff --git a/src/analysis/vector/qgstransectsample.h b/src/analysis/vector/qgstransectsample.h index b49a7f33afa..a0eecf61c43 100644 --- 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 #include +#include "qgsfeature.h" class QgsDistanceArea; class QgsGeometry; diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp index 1adf56c8aec..a4554e0ffad 100644 --- a/src/analysis/vector/qgszonalstatistics.cpp +++ b/src/analysis/vector/qgszonalstatistics.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgszonalstatistics.h" +#include +#include +#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 -#include #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 #define TO8F(x) (x).toUtf8().constData() diff --git a/src/analysis/vector/qgszonalstatistics.h b/src/analysis/vector/qgszonalstatistics.h index 3ae8ea1267a..effd41372fb 100644 --- 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 +#include "qgsrectangle.h" class QgsGeometry; class QgsVectorLayer; diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp index 30e4fb168c7..4ffe041cae6 100644 --- a/src/app/composer/qgsatlascompositionwidget.cpp +++ b/src/app/composer/qgsatlascompositionwidget.cpp @@ -16,14 +16,14 @@ #include -#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 ) diff --git a/src/app/composer/qgsattributeselectiondialog.cpp b/src/app/composer/qgsattributeselectiondialog.cpp index 4b045665a62..012ab193e4c 100644 --- 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 #include #include @@ -30,8 +23,15 @@ #include #include #include -#include #include +#include +#include "qgsattributeselectiondialog.h" +#include "qgscomposerattributetablemodel.h" +#include "qgscomposerattributetablemodelv2.h" +#include "qgscomposerattributetablev2.h" +#include "qgsdoublespinbox.h" +#include "qgsfieldexpressionwidget.h" +#include "qgsvectorlayer.h" // QgsComposerColumnAlignmentDelegate diff --git a/src/app/composer/qgsattributeselectiondialog.h b/src/app/composer/qgsattributeselectiondialog.h index f7bceae38da..19b87b830ea 100644 --- 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 +#include #include #include -#include -#include "ui_qgsattributeselectiondialogbase.h" class QGridLayout; class QgsVectorLayer; diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp index e8661ac7f32..34eb5ffc663 100644 --- a/src/app/composer/qgscomposer.cpp +++ b/src/app/composer/qgscomposer.cpp @@ -18,17 +18,16 @@ #include +#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 #include +#include #include #include #include @@ -76,21 +76,21 @@ #include #include #include +#include #include #include #include #include +#include +#include #include +#include #include #include #include #include #include #include -#include -#include -#include -#include #ifdef ENABLE_MODELTEST #include "modeltest.h" diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h index ebc5d740f03..2beab6f578e 100644 --- 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 #include "qgscomposermap.h" #include "qgscontexthelp.h" -#include class QgisApp; class QgsComposerArrow; diff --git a/src/app/composer/qgscomposerarrowwidget.cpp b/src/app/composer/qgscomposerarrowwidget.cpp index d3e7a7f939f..698f863a522 100644 --- 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 #include #include +#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 ) { diff --git a/src/app/composer/qgscomposerattributetablewidget.cpp b/src/app/composer/qgscomposerattributetablewidget.cpp index dcb950b218e..3e317409757 100644 --- 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 ) diff --git a/src/app/composer/qgscomposerhtmlwidget.cpp b/src/app/composer/qgscomposerhtmlwidget.cpp index 9228880d7ff..88b710852e1 100644 --- 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 #include +#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 ) diff --git a/src/app/composer/qgscomposeritemwidget.cpp b/src/app/composer/qgscomposeritemwidget.cpp index 2d88eaee48e..0fcb8cf1ae9 100644 --- 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 #include +#include "qgsatlascomposition.h" +#include "qgscomposeritem.h" +#include "qgscomposeritemwidget.h" +#include "qgscomposermap.h" +#include "qgscomposition.h" +#include "qgsdatadefinedbutton.h" +#include "qgspoint.h" //QgsComposerItemBaseWidget diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp index 723dafbd0bc..ff45ced52cd 100644 --- 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" diff --git a/src/app/composer/qgscomposerlegenditemdialog.cpp b/src/app/composer/qgscomposerlegenditemdialog.cpp index 90f8cf90d32..8911c74bc34 100644 --- a/src/app/composer/qgscomposerlegenditemdialog.cpp +++ b/src/app/composer/qgscomposerlegenditemdialog.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgscomposerlegenditemdialog.h" #include +#include "qgscomposerlegenditemdialog.h" QgsComposerLegendItemDialog::QgsComposerLegendItemDialog( const QStandardItem* item, QWidget* parent ): QDialog( parent ) { diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp index de62a7e7487..8f1005e47f8 100644 --- 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 #include +#include diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h index f724d9496ee..7527ec63d04 100644 --- 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 #include +#include +#include "qgscomposeritemwidget.h" class QgsComposerLegend; diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp index 8a9c83e9bd0..9db01b8b7e7 100644 --- 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 #include #include -#include #include +#include QgsComposerManager::QgsComposerManager( QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ) { diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp index 770e4bd6e5a..c3d0628c012 100644 --- 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 diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h index 46a3e1a1ee8..1b1b6e2f1db 100644 --- 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; diff --git a/src/app/composer/qgscomposerpicturewidget.cpp b/src/app/composer/qgscomposerpicturewidget.cpp index 307a600f86f..59bc9215fdd 100644 --- 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 #include #include @@ -31,6 +24,13 @@ #include #include #include +#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 ) { diff --git a/src/app/composer/qgscomposerscalebarwidget.cpp b/src/app/composer/qgscomposerscalebarwidget.cpp index 1b86f9508e8..4e9e17fee2a 100644 --- 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 #include #include +#include "qgscomposeritemwidget.h" +#include "qgscomposermap.h" +#include "qgscomposerscalebar.h" +#include "qgscomposerscalebarwidget.h" +#include "qgscomposition.h" QgsComposerScaleBarWidget::QgsComposerScaleBarWidget( QgsComposerScaleBar* scaleBar ): QgsComposerItemBaseWidget( 0, scaleBar ), mComposerScaleBar( scaleBar ) { diff --git a/src/app/composer/qgscomposershapewidget.cpp b/src/app/composer/qgscomposershapewidget.cpp index c4b353275c9..15e77d64d50 100644 --- a/src/app/composer/qgscomposershapewidget.cpp +++ b/src/app/composer/qgscomposershapewidget.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgscomposershapewidget.h" -#include "qgscomposershape.h" +#include #include "qgscomposeritemwidget.h" +#include "qgscomposershape.h" +#include "qgscomposershapewidget.h" #include "qgscomposition.h" #include "qgsstylev2.h" -#include "qgssymbolv2selectordialog.h" #include "qgssymbollayerv2utils.h" -#include +#include "qgssymbolv2selectordialog.h" QgsComposerShapeWidget::QgsComposerShapeWidget( QgsComposerShape* composerShape ): QgsComposerItemBaseWidget( 0, composerShape ), mComposerShape( composerShape ) { diff --git a/src/app/composer/qgscomposertablewidget.cpp b/src/app/composer/qgscomposertablewidget.cpp index bf736af4ac9..568e9ca5c53 100644 --- 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 ) { diff --git a/src/app/composer/qgscompositionwidget.cpp b/src/app/composer/qgscompositionwidget.cpp index 13c072ac7ae..f2e697fbdc4 100644 --- a/src/app/composer/qgscompositionwidget.cpp +++ b/src/app/composer/qgscompositionwidget.cpp @@ -14,17 +14,17 @@ * * ***************************************************************************/ -#include -#include "qgscompositionwidget.h" -#include "qgscomposition.h" -#include "qgscomposermap.h" -#include "qgscomposeritem.h" -#include "qgsstylev2.h" -#include "qgssymbolv2selectordialog.h" -#include "qgssymbollayerv2utils.h" #include -#include +#include #include //for screen resolution +#include +#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 ) { diff --git a/src/app/gps/qgsgpsinformationwidget.cpp b/src/app/gps/qgsgpsinformationwidget.cpp index 21a3705b46b..4e6ba7329d4 100644 --- a/src/app/gps/qgsgpsinformationwidget.cpp +++ b/src/app/gps/qgsgpsinformationwidget.cpp @@ -45,24 +45,24 @@ #include #endif #include -#include #include +#include #if (WITH_QWTPOLAR) // QWT Polar plot add on -#include -#include #include +#include #include +#include #endif -#include -#include -#include #include #include -#include +#include +#include #include +#include +#include QgsGPSInformationWidget::QgsGPSInformationWidget( QgsMapCanvas * thepCanvas, QWidget * parent, Qt::WindowFlags f ) : QWidget( parent, f ) diff --git a/src/app/gps/qgsgpsinformationwidget.h b/src/app/gps/qgsgpsinformationwidget.h index 05605f05abd..5b7a3a99028 100644 --- a/src/app/gps/qgsgpsinformationwidget.h +++ b/src/app/gps/qgsgpsinformationwidget.h @@ -19,14 +19,14 @@ #include "ui_qgsgpsinformationwidgetbase.h" -#include #include +#include #include #include #if (WITH_QWTPOLAR) -#include #include #include +#include #endif class QextSerialPort; diff --git a/src/app/gps/qgsgpsmarker.cpp b/src/app/gps/qgsgpsmarker.cpp index c1ef6a21624..9fce53f25ef 100644 --- a/src/app/gps/qgsgpsmarker.cpp +++ b/src/app/gps/qgsgpsmarker.cpp @@ -15,8 +15,8 @@ #include -#include "qgsgpsmarker.h" #include "qgscoordinatetransform.h" +#include "qgsgpsmarker.h" #include "qgsmapcanvas.h" #include "qgsmaprenderer.h" diff --git a/src/app/gps/qgsgpsmarker.h b/src/app/gps/qgsgpsmarker.h index 8199e118d88..f383a81caba 100644 --- 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 +#include "qgscoordinatereferencesystem.h" +#include "qgsmapcanvasitem.h" +#include "qgspoint.h" class QPainter; diff --git a/src/app/legend/qgsapplegendinterface.cpp b/src/app/legend/qgsapplegendinterface.cpp index cf93a7e36cf..1dc7f3f4c4e 100644 --- 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 ) diff --git a/src/app/main.cpp b/src/app/main.cpp index ffd19d2e52b..a400d60ca2b 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -32,27 +32,27 @@ #if QT_VERSION < 0x050000 #include #endif -#include #include #include +#include #include "qgscustomization.h" #include "qgsfontutils.h" -#include "qgspluginregistry.h" #include "qgsmessagelog.h" +#include "qgspluginregistry.h" #include "qgspythonrunner.h" #include +#include #include #include -#include #ifdef WIN32 // Open files in binary mode -#include /* _O_BINARY */ -#include #include +#include /* _O_BINARY */ #include +#include #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 #include +#include #endif -#include "qgisapp.h" -#include "qgsmapcanvas.h" -#include "qgsapplication.h" #include #include #include +#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 +#include #include #include #include -#include +#include #endif /** print usage text diff --git a/src/app/nodetool/qgsselectedfeature.cpp b/src/app/nodetool/qgsselectedfeature.cpp index ec8a0d1cf73..3d2b754f0cf 100644 --- 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 -#include -#include -#include -#include #include -#include +#include #include +#include +#include #include +#include +#include +#include QgsSelectedFeature::QgsSelectedFeature( QgsFeatureId featureId, QgsVectorLayer *vlayer, diff --git a/src/app/nodetool/qgsvertexentry.h b/src/app/nodetool/qgsvertexentry.h index 2a1a7d9ac23..32ff1cb5096 100644 --- a/src/app/nodetool/qgsvertexentry.h +++ b/src/app/nodetool/qgsvertexentry.h @@ -16,10 +16,10 @@ #ifndef QGSVERTEXENTRY_H #define QGSVERTEXENTRY_H -#include -#include #include #include +#include +#include class QgsVertexEntry { diff --git a/src/app/ogr/qgsnewogrconnection.cpp b/src/app/ogr/qgsnewogrconnection.cpp index 8fbd2c5da86..1c076625dbf 100644 --- a/src/app/ogr/qgsnewogrconnection.cpp +++ b/src/app/ogr/qgsnewogrconnection.cpp @@ -14,16 +14,16 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include -#include "qgsnewogrconnection.h" +#include +#include #include "qgscontexthelp.h" #include "qgslogger.h" -#include "qgsproviderregistry.h" +#include "qgsnewogrconnection.h" #include "qgsogrhelperfunctions.h" -#include -#include +#include "qgsproviderregistry.h" #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 #define TO8F(x) (x).toUtf8().constData() diff --git a/src/app/ogr/qgsogrhelperfunctions.cpp b/src/app/ogr/qgsogrhelperfunctions.cpp index b3d94541314..6e7a196d167 100644 --- a/src/app/ogr/qgsogrhelperfunctions.cpp +++ b/src/app/ogr/qgsogrhelperfunctions.cpp @@ -16,9 +16,9 @@ * * ***************************************************************************/ -#include "qgsogrhelperfunctions.h" -#include "qgslogger.h" #include +#include "qgslogger.h" +#include "qgsogrhelperfunctions.h" QString createDatabaseURI( QString connectionType, QString host, QString database, QString port, QString user, QString password ) { diff --git a/src/app/ogr/qgsopenvectorlayerdialog.cpp b/src/app/ogr/qgsopenvectorlayerdialog.cpp index be87d2e78d9..2c75d25e7fb 100644 --- a/src/app/ogr/qgsopenvectorlayerdialog.cpp +++ b/src/app/ogr/qgsopenvectorlayerdialog.cpp @@ -16,10 +16,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include #include +#include +#include #include #include "qgslogger.h" @@ -27,10 +27,10 @@ #include "qgsvectordataprovider.h" #include -#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 ) diff --git a/src/app/ogr/qgsopenvectorlayerdialog.h b/src/app/ogr/qgsopenvectorlayerdialog.h index 0a6473fd4b9..4519b11c9ef 100644 --- a/src/app/ogr/qgsopenvectorlayerdialog.h +++ b/src/app/ogr/qgsopenvectorlayerdialog.h @@ -19,8 +19,8 @@ #ifndef QGSOPENVECTORLAYERDIALOG_H #define QGSOPENVECTORLAYERDIALOG_H -#include #include +#include #include "qgscontexthelp.h" /** diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp index b8a37a2948a..d9b063aab15 100644 --- 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 #include +#include #include QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* parent, Qt::WindowFlags fl ) diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.h b/src/app/ogr/qgsvectorlayersaveasdialog.h index 230d236cfb2..b2d29d1bcc4 100644 --- a/src/app/ogr/qgsvectorlayersaveasdialog.h +++ b/src/app/ogr/qgsvectorlayersaveasdialog.h @@ -18,8 +18,8 @@ #ifndef QGSVECTORLAYERSAVEASDIALOG_H #define QGSVECTORLAYERSAVEASDIALOG_H -#include #include +#include #include "qgscontexthelp.h" #include "qgsvectorfilewriter.h" diff --git a/src/app/openstreetmap/qgsosmdownloaddialog.cpp b/src/app/openstreetmap/qgsosmdownloaddialog.cpp index 671883afbce..79bfcf957ea 100644 --- a/src/app/openstreetmap/qgsosmdownloaddialog.cpp +++ b/src/app/openstreetmap/qgsosmdownloaddialog.cpp @@ -19,13 +19,13 @@ #include #include -#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" diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp index 36a5f784d79..8d6e5c1b8ab 100644 --- a/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp +++ b/src/app/pluginmanager/qgsapppluginmanagerinterface.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include "qgsapppluginmanagerinterface.h" #include +#include "qgsapppluginmanagerinterface.h" QgsAppPluginManagerInterface::QgsAppPluginManagerInterface( QgsPluginManager * pluginManager ) diff --git a/src/app/pluginmanager/qgsapppluginmanagerinterface.h b/src/app/pluginmanager/qgsapppluginmanagerinterface.h index 60407c71af6..9968b78d70a 100644 --- 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 diff --git a/src/app/pluginmanager/qgspluginitemdelegate.cpp b/src/app/pluginmanager/qgspluginitemdelegate.cpp index 554cc63698c..677f3f4f11d 100644 --- a/src/app/pluginmanager/qgspluginitemdelegate.cpp +++ b/src/app/pluginmanager/qgspluginitemdelegate.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgspluginitemdelegate.h" -#include -#include -#include -#include #include +#include +#include +#include +#include +#include "qgspluginitemdelegate.h" #include "qgspluginsortfilterproxymodel.h" diff --git a/src/app/pluginmanager/qgspluginmanager.cpp b/src/app/pluginmanager/qgspluginmanager.cpp index 12cbbc5edf7..f74a4268450 100644 --- a/src/app/pluginmanager/qgspluginmanager.cpp +++ b/src/app/pluginmanager/qgspluginmanager.cpp @@ -17,32 +17,32 @@ #include +#include #include +#include #include +#include #include #include -#include -#include -#include #include #include +#include #include -#include +#include #include #include -#include -#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 diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h index e0619ae72ee..32863c9f738 100644 --- a/src/app/pluginmanager/qgspluginmanager.h +++ b/src/app/pluginmanager/qgspluginmanager.h @@ -17,19 +17,19 @@ ***************************************************************************/ #ifndef QGSPLUGINMANAGER_H #define QGSPLUGINMANAGER_H -#include -#include -#include -#include -#include -#include #include "ui_qgspluginmanagerbase.h" -#include "qgsoptionsdialogbase.h" +#include +#include +#include +#include +#include +#include #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; diff --git a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h index 00d45032e68..ffb02622ba8 100644 --- a/src/app/pluginmanager/qgspluginsortfilterproxymodel.h +++ b/src/app/pluginmanager/qgspluginsortfilterproxymodel.h @@ -18,8 +18,8 @@ #define QGSPLUGINSORTFILTERPROXYMODEL_H #include -#include #include +#include const int PLUGIN_BASE_NAME_ROLE = Qt::UserRole + 1; const int PLUGIN_DESCRIPTION_ROLE = Qt::UserRole + 2; // for filtering diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp index 0443e9dcbf7..e134303f173 100644 --- a/src/app/qgisapp.cpp +++ b/src/app/qgisapp.cpp @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include @@ -55,27 +54,28 @@ #include #include #include +#include #include #include #include #include #include #include +#include #include #include #include #include #include -#include -#include #include #include +#include -#include -#include #include #include +#include +#include // // 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 #else -#include #include +#include #endif #ifdef HAVE_TOUCH diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h index af342f38282..2f73a0295ae 100644 --- a/src/app/qgisapp.h +++ b/src/app/qgisapp.h @@ -88,21 +88,21 @@ class QgsScaleComboBox; class QgsDataItem; class QgsTileScaleWidget; -#include -#include #include +#include +#include #include #include -#include +#include #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" diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp index 894fe6c42fa..eccf0be3d1a 100644 --- a/src/app/qgisappinterface.cpp +++ b/src/app/qgisappinterface.cpp @@ -16,33 +16,33 @@ * * ***************************************************************************/ -#include -#include -#include -#include #include +#include +#include +#include #include +#include #include #include +#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 ) diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp index 23ab79b8a16..349ced0714c 100644 --- 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 diff --git a/src/app/qgisappstylesheet.h b/src/app/qgisappstylesheet.h index 71472d492b9..4eb569721de 100644 --- a/src/app/qgisappstylesheet.h +++ b/src/app/qgisappstylesheet.h @@ -18,9 +18,9 @@ #ifndef QGISAPPSTYLESHEET_H #define QGISAPPSTYLESHEET_H -#include #include #include +#include /** @class QgisAppStyleSheet * @brief Adjustable stylesheet for the Qgis application diff --git a/src/app/qgsabout.cpp b/src/app/qgsabout.cpp index 1ee284b632b..403c25ff8b3 100644 --- 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 #include -#include #include #include #include +#include +#include "qgsabout.h" +#include "qgsapplication.h" +#include "qgslogger.h" +#include "qgsproviderregistry.h" /* Uncomment this block to use preloaded images #include diff --git a/src/app/qgsaddattrdialog.cpp b/src/app/qgsaddattrdialog.cpp index 1b29e33ba32..9f734846858 100644 --- 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 diff --git a/src/app/qgsaddtaborgroup.cpp b/src/app/qgsaddtaborgroup.cpp index 91b2cd63bbc..b0da5be417e 100644 --- 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 #include +#include QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, QList < TabPair > tabList, QWidget * parent ) : QDialog( parent ) diff --git a/src/app/qgsadvanceddigitizingcanvasitem.cpp b/src/app/qgsadvanceddigitizingcanvasitem.cpp index 4fb3709e958..d62cabc1a81 100644 --- a/src/app/qgsadvanceddigitizingcanvasitem.cpp +++ b/src/app/qgsadvanceddigitizingcanvasitem.cpp @@ -15,8 +15,8 @@ #include -#include "qgsadvanceddigitizingdockwidget.h" #include "qgsadvanceddigitizingcanvasitem.h" +#include "qgsadvanceddigitizingdockwidget.h" #include "qgsmapcanvas.h" diff --git a/src/app/qgsadvanceddigitizingdockwidget.cpp b/src/app/qgsadvanceddigitizingdockwidget.cpp index 113c1324569..d82ed144bc7 100644 --- 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" diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp index 458ec50adab..c9a92dce1aa 100644 --- a/src/app/qgsannotationwidget.cpp +++ b/src/app/qgsannotationwidget.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgsannotationwidget.h" +#include #include "qgsannotationitem.h" +#include "qgsannotationwidget.h" #include "qgsstylev2.h" #include "qgssymbollayerv2utils.h" #include "qgssymbolv2.h" #include "qgssymbolv2selectordialog.h" -#include QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): QWidget( parent, f ), mItem( item ), mMarkerSymbol( 0 ) diff --git a/src/app/qgsapplayertreeviewmenuprovider.cpp b/src/app/qgsapplayertreeviewmenuprovider.cpp index b24610529c0..5e11c507fd7 100644 --- 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 ) diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp index bb2fbc83275..a6592b67a54 100644 --- 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 #include +#include #include #include -#include QgsAttributeActionDialog::QgsAttributeActionDialog( QgsAttributeAction* actions, const QgsFields& fields, diff --git a/src/app/qgsattributeactiondialog.h b/src/app/qgsattributeactiondialog.h index db476baacec..ad7baa0f1f2 100644 --- 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 #include "qgsattributeaction.h" #include "qgsfield.h" -#include class QgsAttributeAction; diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp index 9830abddd07..c2c3fa5e39f 100644 --- a/src/app/qgsattributetabledialog.cpp +++ b/src/app/qgsattributetabledialog.cpp @@ -18,32 +18,32 @@ #include #include "qgsattributetabledialog.h" -#include "qgsattributetablemodel.h" #include "qgsattributetablefiltermodel.h" +#include "qgsattributetablemodel.h" #include "qgsattributetableview.h" #include +#include #include #include -#include #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 { diff --git a/src/app/qgsattributetabledialog.h b/src/app/qgsattributetabledialog.h index 3278610c7ef..2cee3b3b8c2 100644 --- a/src/app/qgsattributetabledialog.h +++ b/src/app/qgsattributetabledialog.h @@ -18,8 +18,8 @@ #define QGSATTRIBUTETABLEDIALOG_H_ #include -#include #include +#include #include @@ -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; diff --git a/src/app/qgsattributetypedialog.cpp b/src/app/qgsattributetypedialog.cpp index 6a4ccd0560e..1b9e18b486c 100644 --- 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 #include -#include #include -#include +#include #include +#include +#include -#include #include +#include QgsAttributeTypeDialog::QgsAttributeTypeDialog( QgsVectorLayer *vl, int fieldIdx ) : QDialog() diff --git a/src/app/qgsattributetypedialog.h b/src/app/qgsattributetypedialog.h index 578d2a00319..a615147ab23 100644 --- 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; diff --git a/src/app/qgsbookmarks.cpp b/src/app/qgsbookmarks.cpp index 7706d4820a1..00e3183cd9f 100644 --- a/src/app/qgsbookmarks.cpp +++ b/src/app/qgsbookmarks.cpp @@ -14,9 +14,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsbookmarks.h" #include "qgisapp.h" #include "qgsapplication.h" +#include "qgsbookmarks.h" #include "qgscontexthelp.h" #include "qgsmapcanvas.h" #include "qgsmaprenderer.h" @@ -24,14 +24,14 @@ #include "qgslogger.h" -#include #include +#include #include -#include #include -#include +#include #include #include +#include QgsBookmarks *QgsBookmarks::sInstance = 0; diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp index 202b73bd37e..6a05230db7b 100644 --- a/src/app/qgsbrowserdockwidget.cpp +++ b/src/app/qgsbrowserdockwidget.cpp @@ -15,23 +15,23 @@ #include "qgsbrowserdockwidget.h" #include -#include -#include -#include -#include -#include #include +#include +#include #include +#include #include +#include +#include +#include "qgisapp.h" #include "qgsbrowsermodel.h" #include "qgsbrowsertreeview.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" +#include "qgsproject.h" #include "qgsrasterlayer.h" #include "qgsvectorlayer.h" -#include "qgisapp.h" -#include "qgsproject.h" // browser layer properties dialog #include "qgsapplication.h" diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h index 038b0abdbfe..0589c63ed9f 100644 --- a/src/app/qgsbrowserdockwidget.h +++ b/src/app/qgsbrowserdockwidget.h @@ -16,9 +16,9 @@ #define QGSBROWSERDOCKWIDGET_H #include +#include #include #include -#include #include #include "qgsdataitem.h" diff --git a/src/app/qgsclipboard.cpp b/src/app/qgsclipboard.cpp index 0357eefb781..a0a8c6715c7 100644 --- a/src/app/qgsclipboard.cpp +++ b/src/app/qgsclipboard.cpp @@ -18,18 +18,18 @@ #include #include +#include +#include #include +#include #include #include -#include -#include -#include #include "qgsclipboard.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgscoordinatereferencesystem.h" #include "qgslogger.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsclipboard.h b/src/app/qgsclipboard.h index 6e3279a0e5e..65f7cb0d291 100644 --- a/src/app/qgsclipboard.h +++ b/src/app/qgsclipboard.h @@ -22,10 +22,10 @@ #include #include -#include "qgsfield.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfeaturestore.h" -#include "qgscoordinatereferencesystem.h" +#include "qgsfield.h" /** \brief QGIS internal clipboard for features. diff --git a/src/app/qgsconfigureshortcutsdialog.cpp b/src/app/qgsconfigureshortcutsdialog.cpp index da7174a6a12..2a23da3a958 100644 --- a/src/app/qgsconfigureshortcutsdialog.cpp +++ b/src/app/qgsconfigureshortcutsdialog.cpp @@ -25,8 +25,8 @@ #include #include -#include #include +#include QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget* parent ) : QDialog( parent ), mGettingShortcut( false ) diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp index 73247d8e29c..fd06877b44a 100644 --- a/src/app/qgscustomization.cpp +++ b/src/app/qgscustomization.cpp @@ -14,9 +14,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgscustomization.h" #include "qgisapp.h" #include "qgsapplication.h" +#include "qgscustomization.h" #include "qgslogger.h" #include @@ -28,13 +28,13 @@ #include #include #include -#include -#include -#include #include -#include -#include +#include #include +#include +#include +#include +#include #ifdef Q_OS_MACX QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent, QSettings* settings ) diff --git a/src/app/qgscustomprojectiondialog.cpp b/src/app/qgscustomprojectiondialog.cpp index 83589f1c7d5..c2312936a1a 100644 --- a/src/app/qgscustomprojectiondialog.cpp +++ b/src/app/qgscustomprojectiondialog.cpp @@ -19,17 +19,17 @@ #include "qgscustomprojectiondialog.h" //qgis includes -#include "qgis.h" //<--magick numbers #include "qgisapp.h" //<--theme icons +#include "qgis.h" //<--magick numbers #include "qgsapplication.h" -#include "qgslogger.h" -#include "qgsgenericprojectionselector.h" #include "qgscrscache.h" +#include "qgsgenericprojectionselector.h" +#include "qgslogger.h" //qt includes #include -#include #include +#include #include //stdc++ includes diff --git a/src/app/qgsdecorationcopyright.cpp b/src/app/qgsdecorationcopyright.cpp index b1dcb07aec8..1128e26e3e2 100644 --- a/src/app/qgsdecorationcopyright.cpp +++ b/src/app/qgsdecorationcopyright.cpp @@ -21,21 +21,21 @@ email : tim@linfiniti.com // includes -#include "qgsdecorationcopyright.h" #include "qgsdecorationcopyrightdialog.h" +#include "qgsdecorationcopyright.h" +#include "qgisapp.h" #include "qgsapplication.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsproject.h" -#include "qgisapp.h" -#include -#include #include -#include -#include #include +#include +#include +#include +#include //non qt includes #include diff --git a/src/app/qgsdecorationcopyrightdialog.cpp b/src/app/qgsdecorationcopyrightdialog.cpp index 109acf22792..89192c12fcd 100644 --- a/src/app/qgsdecorationcopyrightdialog.cpp +++ b/src/app/qgsdecorationcopyrightdialog.cpp @@ -16,8 +16,8 @@ #include "qgscontexthelp.h" //qt includes -#include #include +#include #include #include diff --git a/src/app/qgsdecorationgrid.cpp b/src/app/qgsdecorationgrid.cpp index ba7735d7b9c..4739dbd4920 100644 --- a/src/app/qgsdecorationgrid.cpp +++ b/src/app/qgsdecorationgrid.cpp @@ -16,36 +16,36 @@ * * ***************************************************************************/ -#include "qgsdecorationgrid.h" #include "qgsdecorationgriddialog.h" +#include "qgsdecorationgrid.h" #include "qgisapp.h" #include "qgslogger.h" +#include "qgsmapcanvas.h" #include "qgsmaplayer.h" -#include "qgsrasterlayer.h" +#include "qgsmaprenderer.h" #include "qgsmaptopixel.h" +#include "qgsmarkersymbollayerv2.h" #include "qgspoint.h" #include "qgsproject.h" +#include "qgsrasterlayer.h" +#include "qgsrendercontext.h" #include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance #include "qgssymbolv2.h" //for symbology -#include "qgsmarkersymbollayerv2.h" -#include "qgsrendercontext.h" -#include "qgsmapcanvas.h" -#include "qgsmaprenderer.h" -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include //non qt includes #include diff --git a/src/app/qgsdecorationgrid.h b/src/app/qgsdecorationgrid.h index 3ad7ebf9fbe..6d8700f0124 100644 --- a/src/app/qgsdecorationgrid.h +++ b/src/app/qgsdecorationgrid.h @@ -18,16 +18,16 @@ #ifndef QGSDECORATIONGRID_H #define QGSDECORATIONGRID_H -#include "qgsdecorationitem.h" #include +#include "qgsdecorationitem.h" class QPainter; class QgsLineSymbolV2; class QgsMarkerSymbolV2; #include -#include #include +#include class APP_EXPORT QgsDecorationGrid: public QgsDecorationItem { diff --git a/src/app/qgsdecorationgriddialog.cpp b/src/app/qgsdecorationgriddialog.cpp index 2c99ba18bbd..eeaf3ddc583 100644 --- a/src/app/qgsdecorationgriddialog.cpp +++ b/src/app/qgsdecorationgriddialog.cpp @@ -19,13 +19,13 @@ #include "qgsdecorationgrid.h" -#include "qgslogger.h" +#include "qgisapp.h" +#include "qgisgui.h" #include "qgscontexthelp.h" +#include "qgslogger.h" #include "qgsstylev2.h" #include "qgssymbolv2.h" #include "qgssymbolv2selectordialog.h" -#include "qgisapp.h" -#include "qgisgui.h" #include diff --git a/src/app/qgsdecorationitem.cpp b/src/app/qgsdecorationitem.cpp index 606fd434b9f..5543d0e361f 100644 --- a/src/app/qgsdecorationitem.cpp +++ b/src/app/qgsdecorationitem.cpp @@ -27,17 +27,17 @@ #include "qgsproject.h" #include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance -#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include //non qt includes #include diff --git a/src/app/qgsdecorationnortharrow.cpp b/src/app/qgsdecorationnortharrow.cpp index ed4a6162256..71fcc5aaac3 100644 --- a/src/app/qgsdecorationnortharrow.cpp +++ b/src/app/qgsdecorationnortharrow.cpp @@ -26,21 +26,21 @@ email : tim@linfiniti.com #include "qgisapp.h" #include "qgscoordinatetransform.h" -#include "qgsmaplayer.h" -#include "qgsproject.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaplayer.h" #include "qgsmaprenderer.h" +#include "qgsproject.h" // qt includes -#include -#include #include #include +#include +#include //non qt includes -#include #include +#include const double QgsDecorationNorthArrow::PI = 3.14159265358979323846; diff --git a/src/app/qgsdecorationnortharrowdialog.cpp b/src/app/qgsdecorationnortharrowdialog.cpp index 620e8e8cd08..49a6d604451 100644 --- a/src/app/qgsdecorationnortharrowdialog.cpp +++ b/src/app/qgsdecorationnortharrowdialog.cpp @@ -14,12 +14,12 @@ #include "qgsdecorationnortharrow.h" -#include "qgslogger.h" #include "qgscontexthelp.h" +#include "qgslogger.h" +#include #include #include -#include QgsDecorationNorthArrowDialog::QgsDecorationNorthArrowDialog( QgsDecorationNorthArrow& deco, QWidget* parent ) : QDialog( parent ), mDeco( deco ) diff --git a/src/app/qgsdecorationscalebar.cpp b/src/app/qgsdecorationscalebar.cpp index 740c4b9601e..5ccfa9e9e78 100644 --- a/src/app/qgsdecorationscalebar.cpp +++ b/src/app/qgsdecorationscalebar.cpp @@ -23,8 +23,8 @@ email : sbr00pwb@users.sourceforge.net #include "qgsdecorationscalebardialog.h" -#include "qgis.h" #include "qgisapp.h" +#include "qgis.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayer.h" @@ -33,17 +33,17 @@ email : sbr00pwb@users.sourceforge.net #include "qgsproject.h" -#include #include +#include +#include +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include -#include //non qt includes #include diff --git a/src/app/qgsdecorationscalebardialog.cpp b/src/app/qgsdecorationscalebardialog.cpp index 595e215996c..0bdcfa7b745 100644 --- a/src/app/qgsdecorationscalebardialog.cpp +++ b/src/app/qgsdecorationscalebardialog.cpp @@ -14,8 +14,8 @@ #include "qgsdecorationscalebar.h" -#include "qgslogger.h" #include "qgscontexthelp.h" +#include "qgslogger.h" #include #include diff --git a/src/app/qgsdelattrdialog.h b/src/app/qgsdelattrdialog.h index f3460f04744..dcdf9b68810 100644 --- a/src/app/qgsdelattrdialog.h +++ b/src/app/qgsdelattrdialog.h @@ -19,8 +19,8 @@ #define QGSDELATTRDIALOG_H #include "ui_qgsdelattrdialogbase.h" -#include #include +#include class QgsVectorLayer; diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp index a1bdb751cd6..53bee8b965d 100644 --- a/src/app/qgsdiagramproperties.cpp +++ b/src/app/qgsdiagramproperties.cpp @@ -20,17 +20,17 @@ #include "diagram/qgstextdiagram.h" #include "qgisapp.h" -#include "qgsproject.h" +#include "qgisgui.h" #include "qgsapplication.h" +#include "qgscolordialog.h" #include "qgsdiagramproperties.h" #include "qgsdiagramrendererv2.h" +#include "qgsfeatureiterator.h" #include "qgslabelengineconfigdialog.h" #include "qgsmessagebar.h" -#include "qgsvectorlayerproperties.h" +#include "qgsproject.h" #include "qgsvectordataprovider.h" -#include "qgsfeatureiterator.h" -#include "qgscolordialog.h" -#include "qgisgui.h" +#include "qgsvectorlayerproperties.h" #include #include diff --git a/src/app/qgsdisplayangle.cpp b/src/app/qgsdisplayangle.cpp index be54b70bdf9..3ea33c33ddf 100644 --- a/src/app/qgsdisplayangle.cpp +++ b/src/app/qgsdisplayangle.cpp @@ -14,11 +14,11 @@ ***************************************************************************/ #include "qgsdisplayangle.h" -#include "qgsmapcanvas.h" #include "qgslogger.h" +#include "qgsmapcanvas.h" -#include #include +#include QgsDisplayAngle::QgsDisplayAngle( QgsMapToolMeasureAngle * tool, Qt::WindowFlags f ) : QDialog( tool->canvas()->topLevelWidget(), f ) diff --git a/src/app/qgsdisplayangle.h b/src/app/qgsdisplayangle.h index 93b705c3dc3..117ff3f321b 100644 --- a/src/app/qgsdisplayangle.h +++ b/src/app/qgsdisplayangle.h @@ -16,8 +16,8 @@ #ifndef QGSDISPLAYANGLE_H #define QGSDISPLAYANGLE_H -#include "qgsmaptoolmeasureangle.h" #include "ui_qgsdisplayanglebase.h" +#include "qgsmaptoolmeasureangle.h" /**A class that displays results of angle measurements with the proper unit*/ class APP_EXPORT QgsDisplayAngle: public QDialog, private Ui::QgsDisplayAngleBase diff --git a/src/app/qgsdxfexportdialog.cpp b/src/app/qgsdxfexportdialog.cpp index 9a37bbfdfe2..f96eb72e1f7 100644 --- a/src/app/qgsdxfexportdialog.cpp +++ b/src/app/qgsdxfexportdialog.cpp @@ -17,15 +17,15 @@ #include "qgsdxfexportdialog.h" -#include "qgsmaplayer.h" -#include "qgslayertree.h" -#include "qgslayertreegroup.h" -#include "qgsvectorlayer.h" -#include "qgsproject.h" +#include "qgisapp.h" #include "qgis.h" #include "qgsfieldcombobox.h" -#include "qgisapp.h" +#include "qgslayertreegroup.h" +#include "qgslayertree.h" #include "qgsmapcanvas.h" +#include "qgsmaplayer.h" +#include "qgsproject.h" +#include "qgsvectorlayer.h" #include "qgsvisibilitypresets.h" #include diff --git a/src/app/qgsdxfexportdialog.h b/src/app/qgsdxfexportdialog.h index 0ea5a23a18f..d0d142427b9 100644 --- a/src/app/qgsdxfexportdialog.h +++ b/src/app/qgsdxfexportdialog.h @@ -22,10 +22,10 @@ #include "qgsdxfexport.h" #include "qgslayertreemodel.h" +#include #include #include #include -#include class QgsLayerTreeGroup; class QgsLayerTreeNode; diff --git a/src/app/qgsfeatureaction.h b/src/app/qgsfeatureaction.h index 450a8cb53c6..235c6ecec04 100644 --- a/src/app/qgsfeatureaction.h +++ b/src/app/qgsfeatureaction.h @@ -20,9 +20,9 @@ #include "qgsfeature.h" #include "qgsvectorlayertools.h" +#include #include #include -#include class QgsIdentifyResultsDialog; class QgsVectorLayer; diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp index c2ba279eb09..a558d65990d 100644 --- a/src/app/qgsfieldcalculator.cpp +++ b/src/app/qgsfieldcalculator.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ #include "qgisapp.h" -#include "qgsfieldcalculator.h" #include "qgsdistancearea.h" #include "qgsexpression.h" +#include "qgsfieldcalculator.h" #include "qgsmapcanvas.h" #include "qgsproject.h" #include "qgsvectordataprovider.h" diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp index 0c3ecf54825..be915f0baf8 100644 --- a/src/app/qgsfieldsproperties.cpp +++ b/src/app/qgsfieldsproperties.cpp @@ -13,14 +13,14 @@ * * ***************************************************************************/ -#include "qgseditorwidgetfactory.h" -#include "qgseditorwidgetregistry.h" #include "qgsaddattrdialog.h" #include "qgsaddtaborgroup.h" #include "qgsapplication.h" #include "qgsattributetypedialog.h" -#include "qgsfieldcalculator.h" +#include "qgseditorwidgetfactory.h" +#include "qgseditorwidgetregistry.h" #include "qgsexpressionbuilderdialog.h" +#include "qgsfieldcalculator.h" #include "qgsfieldsproperties.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" @@ -29,16 +29,16 @@ #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include -#include -#include #include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent ) : QWidget( parent ) diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h index ef43f35c1cf..43e701fd21a 100644 --- a/src/app/qgsfieldsproperties.h +++ b/src/app/qgsfieldsproperties.h @@ -23,8 +23,8 @@ #include -#include "qgsvectorlayer.h" #include "ui_qgsfieldspropertiesbase.h" +#include "qgsvectorlayer.h" class APP_EXPORT QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase { diff --git a/src/app/qgsformannotationdialog.cpp b/src/app/qgsformannotationdialog.cpp index 4fea10c00e3..4eb66135a86 100644 --- a/src/app/qgsformannotationdialog.cpp +++ b/src/app/qgsformannotationdialog.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsformannotationdialog.h" -#include "qgsannotationwidget.h" -#include "qgsvectorlayer.h" #include #include #include +#include "qgsannotationwidget.h" +#include "qgsformannotationdialog.h" +#include "qgsvectorlayer.h" QgsFormAnnotationDialog::QgsFormAnnotationDialog( QgsFormAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ) : QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 ) diff --git a/src/app/qgsguivectorlayertools.cpp b/src/app/qgsguivectorlayertools.cpp index 1f73a20da7b..6fc35b69d47 100644 --- a/src/app/qgsguivectorlayertools.cpp +++ b/src/app/qgsguivectorlayertools.cpp @@ -16,16 +16,16 @@ #include #include -#include "qgsguivectorlayertools.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsmessagebar.h" #include "qgisapp.h" #include "qgsapplication.h" -#include "qgsmessageviewer.h" #include "qgsfeatureaction.h" +#include "qgsguivectorlayertools.h" #include "qgsmapcanvas.h" +#include "qgsmessagebar.h" #include "qgsmessagebaritem.h" +#include "qgsmessageviewer.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsGuiVectorLayerTools::QgsGuiVectorLayerTools() diff --git a/src/app/qgshandlebadlayers.cpp b/src/app/qgshandlebadlayers.cpp index 7d4f54971e2..da2fb7c49b3 100644 --- a/src/app/qgshandlebadlayers.cpp +++ b/src/app/qgshandlebadlayers.cpp @@ -15,20 +15,20 @@ * * ***************************************************************************/ -#include "qgshandlebadlayers.h" #include "qgisapp.h" #include "qgisgui.h" #include "qgsdatasourceuri.h" +#include "qgshandlebadlayers.h" #include "qgslogger.h" -#include "qgsrasterlayer.h" -#include "qgsproviderregistry.h" #include "qgsmessagebar.h" +#include "qgsproviderregistry.h" +#include "qgsrasterlayer.h" #include #include #include -#include #include +#include #include #include diff --git a/src/app/qgshtmlannotationdialog.cpp b/src/app/qgshtmlannotationdialog.cpp index 798e6328da4..5727d0e6256 100644 --- a/src/app/qgshtmlannotationdialog.cpp +++ b/src/app/qgshtmlannotationdialog.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgshtmlannotationdialog.h" -#include "qgsannotationwidget.h" -#include "qgsvectorlayer.h" #include #include #include +#include "qgsannotationwidget.h" +#include "qgshtmlannotationdialog.h" +#include "qgsvectorlayer.h" QgsHtmlAnnotationDialog::QgsHtmlAnnotationDialog( QgsHtmlAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ) : QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 ) diff --git a/src/app/qgsidentifyresultsdialog.cpp b/src/app/qgsidentifyresultsdialog.cpp index 7f5bf796cba..646330138b8 100644 --- a/src/app/qgsidentifyresultsdialog.cpp +++ b/src/app/qgsidentifyresultsdialog.cpp @@ -33,31 +33,31 @@ #include "qgsproject.h" #include "qgsrasterlayer.h" #include "qgsvectorlayer.h" -#include "qgswebview.h" #include "qgswebframe.h" +#include "qgswebview.h" -#include -#include #include -#include -#include -#include -#include #include -#include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include //graph -#include -#include -#include #include +#include +#include +#include #include "qgsvectorcolorrampv2.h" // for random colors diff --git a/src/app/qgsidentifyresultsdialog.h b/src/app/qgsidentifyresultsdialog.h index 471fbc7eeb2..e5bd2fa85fa 100644 --- a/src/app/qgsidentifyresultsdialog.h +++ b/src/app/qgsidentifyresultsdialog.h @@ -21,16 +21,16 @@ #include "ui_qgsidentifyresultsbase.h" #include "qgsattributeaction.h" #include "qgscontexthelp.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfeaturestore.h" #include "qgsfield.h" -#include "qgsmaptoolidentify.h" -#include "qgscoordinatereferencesystem.h" #include "qgsmaplayeractionregistry.h" +#include "qgsmaptoolidentify.h" #include "qgswebview.h" -#include #include +#include class QCloseEvent; class QTreeWidgetItem; diff --git a/src/app/qgsjoindialog.cpp b/src/app/qgsjoindialog.cpp index 94473d621f7..bfd15966af1 100644 --- a/src/app/qgsjoindialog.cpp +++ b/src/app/qgsjoindialog.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ +#include "qgsfieldcombobox.h" #include "qgsjoindialog.h" +#include "qgsmaplayercombobox.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgsmaplayercombobox.h" -#include "qgsfieldcombobox.h" #include diff --git a/src/app/qgslabeldialog.cpp b/src/app/qgslabeldialog.cpp index 5478b9c83ee..f21d95b9428 100644 --- a/src/app/qgslabeldialog.cpp +++ b/src/app/qgslabeldialog.cpp @@ -16,16 +16,16 @@ #include -#include "qgslabeldialog.h" -#include "qgsfield.h" -#include "qgslabel.h" -#include "qgslabelattributes.h" -#include "qgslogger.h" #include "qgisgui.h" +#include "qgsfield.h" +#include "qgslabelattributes.h" +#include "qgslabeldialog.h" +#include "qgslabel.h" +#include "qgslogger.h" #include -#include #include +#include QgsLabelDialog::QgsLabelDialog( QgsLabel *label, QWidget *parent ) diff --git a/src/app/qgslabelengineconfigdialog.cpp b/src/app/qgslabelengineconfigdialog.cpp index 730d86a9e37..81a0ebc2e24 100644 --- a/src/app/qgslabelengineconfigdialog.cpp +++ b/src/app/qgslabelengineconfigdialog.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgslabelengineconfigdialog.h" -#include "qgspallabeling.h" #include +#include "qgspallabeling.h" #include diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp index 4f00421f7db..e5a1465fb22 100644 --- a/src/app/qgslabelinggui.cpp +++ b/src/app/qgslabelinggui.cpp @@ -18,22 +18,22 @@ #include "qgslabelinggui.h" #include -#include -#include #include +#include +#include +#include "qgisapp.h" +#include "qgscharacterselectdialog.h" #include "qgsdatadefinedbutton.h" -#include "qgslabelengineconfigdialog.h" #include "qgsexpressionbuilderdialog.h" #include "qgsexpression.h" #include "qgsfontutils.h" -#include "qgisapp.h" +#include "qgslabelengineconfigdialog.h" #include "qgsmaprenderer.h" #include "qgsproject.h" #include "qgssvgcache.h" -#include "qgssymbollayerv2utils.h" -#include "qgscharacterselectdialog.h" #include "qgssvgselectorwidget.h" +#include "qgssymbollayerv2utils.h" #include #include diff --git a/src/app/qgslabelpreview.cpp b/src/app/qgslabelpreview.cpp index 347bf0f1510..757ae1c5fcf 100644 --- a/src/app/qgslabelpreview.cpp +++ b/src/app/qgslabelpreview.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgslabelpreview.h" -#include #include +#include #include "qgspallabeling.h" diff --git a/src/app/qgslabelpropertydialog.cpp b/src/app/qgslabelpropertydialog.cpp index 7a7d2433f12..5b827b731b1 100644 --- a/src/app/qgslabelpropertydialog.cpp +++ b/src/app/qgslabelpropertydialog.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgslabelpropertydialog.h" #include #include #include +#include "qgslabelpropertydialog.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsvectorlayer.h" #include +#include #include #include -#include QgsLabelPropertyDialog::QgsLabelPropertyDialog( const QString& layerId, int featureId, const QFont& labelFont, const QString& labelText, QWidget * parent, Qt::WindowFlags f ): diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h index 13655d237c9..d8c151b42b0 100644 --- a/src/app/qgslabelpropertydialog.h +++ b/src/app/qgslabelpropertydialog.h @@ -19,9 +19,9 @@ #define QGSLABELPROPERTYDIALOG_H #include "ui_qgslabelpropertydialogbase.h" +#include #include "qgsfeature.h" #include "qgspallabeling.h" -#include /**A dialog to enter data defined label attributes*/ diff --git a/src/app/qgsloadstylefromdbdialog.cpp b/src/app/qgsloadstylefromdbdialog.cpp index acc1faff51d..dbe4ad76378 100644 --- a/src/app/qgsloadstylefromdbdialog.cpp +++ b/src/app/qgsloadstylefromdbdialog.cpp @@ -10,8 +10,8 @@ #include "qgsloadstylefromdbdialog.h" #include "qgslogger.h" -#include #include +#include #include QgsLoadStyleFromDBDialog::QgsLoadStyleFromDBDialog( QWidget *parent ) diff --git a/src/app/qgsmapmouseevent.cpp b/src/app/qgsmapmouseevent.cpp index 631c750f5ac..e2b4b49edf0 100644 --- a/src/app/qgsmapmouseevent.cpp +++ b/src/app/qgsmapmouseevent.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ +#include "qgsmapcanvas.h" #include "qgsmapmouseevent.h" #include "qgsmaptooladvanceddigitizing.h" -#include "qgsmapcanvas.h" #include "qgisapp.h" #include "qgssnappingutils.h" diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp index a5156ca6616..9afd8cf4e8e 100644 --- a/src/app/qgsmaptooladdfeature.cpp +++ b/src/app/qgsmaptooladdfeature.cpp @@ -13,20 +13,20 @@ * * ***************************************************************************/ -#include "qgsmaptooladdfeature.h" #include "qgsapplication.h" #include "qgsattributedialog.h" #include "qgscsexception.h" +#include "qgsfeatureaction.h" #include "qgsfield.h" #include "qgsgeometry.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" #include "qgsmapmouseevent.h" +#include "qgsmaptooladdfeature.h" #include "qgsproject.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgslogger.h" -#include "qgsfeatureaction.h" #include #include diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h index 4b8d0cbb5a2..afaa465ab31 100644 --- a/src/app/qgsmaptooladdfeature.h +++ b/src/app/qgsmaptooladdfeature.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsmaptoolcapture.h" #include "qgsfeature.h" +#include "qgsmaptoolcapture.h" /**This tool adds new point/line/polygon features to already existing vector layers*/ class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp index d0f9110d2fb..641022ac8f3 100644 --- a/src/app/qgsmaptooladdpart.cpp +++ b/src/app/qgsmaptooladdpart.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include "qgsmaptooladdpart.h" #include "qgsgeometry.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaptooladdpart.h" #include "qgsproject.h" #include "qgsvectorlayer.h" -#include "qgslogger.h" #include diff --git a/src/app/qgsmaptooladdpart.h b/src/app/qgsmaptooladdpart.h index 934822cf41b..a6283dc69cf 100644 --- a/src/app/qgsmaptooladdpart.h +++ b/src/app/qgsmaptooladdpart.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /**A map tool that adds new parts to multipart features*/ class APP_EXPORT QgsMapToolAddPart : public QgsMapToolCapture diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp index 15b0b84cb82..04fed67170b 100644 --- a/src/app/qgsmaptooladdring.cpp +++ b/src/app/qgsmaptooladdring.cpp @@ -15,9 +15,9 @@ #include -#include "qgsmaptooladdring.h" #include "qgsgeometry.h" #include "qgsmapcanvas.h" +#include "qgsmaptooladdring.h" #include "qgsproject.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptooladdring.h b/src/app/qgsmaptooladdring.h index 9a600a66a24..933bd4e9e88 100644 --- a/src/app/qgsmaptooladdring.h +++ b/src/app/qgsmaptooladdring.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /**A tool to cut holes into polygons and multipolygon features*/ class APP_EXPORT QgsMapToolAddRing: public QgsMapToolCapture diff --git a/src/app/qgsmaptooladvanceddigitizing.cpp b/src/app/qgsmaptooladvanceddigitizing.cpp index 32597aba59a..956eba35d25 100644 --- a/src/app/qgsmaptooladvanceddigitizing.cpp +++ b/src/app/qgsmaptooladvanceddigitizing.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ +#include "qgisapp.h" #include "qgsmapmouseevent.h" #include "qgsmaptooladvanceddigitizing.h" -#include "qgisapp.h" QgsMapToolAdvancedDigitizing::QgsMapToolAdvancedDigitizing( QgsMapCanvas* canvas ) diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp index 600b3689a61..ad33220991d 100644 --- a/src/app/qgsmaptoolannotation.cpp +++ b/src/app/qgsmaptoolannotation.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgsmaptoolannotation.h" -#include "qgsformannotationdialog.h" -#include "qgsformannotationitem.h" -#include "qgshtmlannotationitem.h" -#include "qgshtmlannotationdialog.h" -#include "qgslogger.h" -#include "qgsmapcanvas.h" -#include "qgstextannotationdialog.h" -#include "qgstextannotationitem.h" -#include "qgssvgannotationdialog.h" -#include "qgssvgannotationitem.h" #include #include +#include "qgsformannotationdialog.h" +#include "qgsformannotationitem.h" +#include "qgshtmlannotationdialog.h" +#include "qgshtmlannotationitem.h" +#include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmaptoolannotation.h" +#include "qgssvgannotationdialog.h" +#include "qgssvgannotationitem.h" +#include "qgstextannotationdialog.h" +#include "qgstextannotationitem.h" QgsMapToolAnnotation::QgsMapToolAnnotation( QgsMapCanvas* canvas ) : QgsMapTool( canvas ) diff --git a/src/app/qgsmaptoolannotation.h b/src/app/qgsmaptoolannotation.h index b07f70f3ca5..8966f1b0879 100644 --- a/src/app/qgsmaptoolannotation.h +++ b/src/app/qgsmaptoolannotation.h @@ -18,8 +18,8 @@ #ifndef QGSMAPTOOLANNOTATION_H #define QGSMAPTOOLANNOTATION_H -#include "qgsmaptool.h" #include "qgsannotationitem.h" +#include "qgsmaptool.h" class APP_EXPORT QgsMapToolAnnotation: public QgsMapTool { diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp index 9fb23b5b72b..1d99244883e 100644 --- a/src/app/qgsmaptoolcapture.cpp +++ b/src/app/qgsmaptoolcapture.cpp @@ -28,8 +28,8 @@ #include "qgsvertexmarker.h" #include -#include #include +#include #include diff --git a/src/app/qgsmaptoolcapture.h b/src/app/qgsmaptoolcapture.h index a80abe0690e..fcd02a014d8 100644 --- a/src/app/qgsmaptoolcapture.h +++ b/src/app/qgsmaptoolcapture.h @@ -17,12 +17,12 @@ #define QGSMAPTOOLCAPTURE_H +#include "qgsgeometry.h" #include "qgsmaptooledit.h" #include "qgspoint.h" -#include "qgsgeometry.h" -#include #include +#include class QgsRubberBand; class QgsVertexMarker; diff --git a/src/app/qgsmaptoolchangelabelproperties.cpp b/src/app/qgsmaptoolchangelabelproperties.cpp index 8736c52cf86..ce8fd5345c4 100644 --- a/src/app/qgsmaptoolchangelabelproperties.cpp +++ b/src/app/qgsmaptoolchangelabelproperties.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsmaptoolchangelabelproperties.h" #include "qgslabelpropertydialog.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolchangelabelproperties.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptooldeletepart.cpp b/src/app/qgsmaptooldeletepart.cpp index 547c6a3aeca..8fa0811d311 100644 --- a/src/app/qgsmaptooldeletepart.cpp +++ b/src/app/qgsmaptooldeletepart.cpp @@ -15,12 +15,12 @@ #include "qgsmaptooldeletepart.h" -#include "qgsmapcanvas.h" -#include "qgsvertexmarker.h" -#include "qgsvectorlayer.h" #include "qgsgeometry.h" +#include "qgsmapcanvas.h" #include "qgssnappingutils.h" #include "qgstolerance.h" +#include "qgsvectorlayer.h" +#include "qgsvertexmarker.h" #include diff --git a/src/app/qgsmaptooldeletering.cpp b/src/app/qgsmaptooldeletering.cpp index 168fcd17b69..1d7f8740f3d 100644 --- a/src/app/qgsmaptooldeletering.cpp +++ b/src/app/qgsmaptooldeletering.cpp @@ -16,11 +16,11 @@ #include "qgsmaptooldeletering.h" #include "qgsmapcanvas.h" -#include "qgsvertexmarker.h" #include "qgsvectorlayer.h" +#include "qgsvertexmarker.h" -#include #include +#include QgsMapToolDeleteRing::QgsMapToolDeleteRing( QgsMapCanvas* canvas ) : QgsMapToolEdit( canvas ) diff --git a/src/app/qgsmaptooledit.cpp b/src/app/qgsmaptooledit.cpp index 4a3a4fbf2e1..2eff3559bd9 100644 --- a/src/app/qgsmaptooledit.cpp +++ b/src/app/qgsmaptooledit.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ +#include "qgsmapcanvas.h" #include "qgsmaptooledit.h" #include "qgsproject.h" -#include "qgsmapcanvas.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptoolfeatureaction.cpp b/src/app/qgsmaptoolfeatureaction.cpp index dfef6408561..8975ffff64e 100644 --- a/src/app/qgsmaptoolfeatureaction.cpp +++ b/src/app/qgsmaptoolfeatureaction.cpp @@ -15,24 +15,24 @@ #include "qgsmaptoolfeatureaction.h" +#include "qgisapp.h" +#include "qgsattributeaction.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaplayeractionregistry.h" +#include "qgsmaplayerregistry.h" #include "qgsmaptopixel.h" #include "qgsmessageviewer.h" -#include "qgsattributeaction.h" -#include "qgscoordinatereferencesystem.h" +#include "qgsproject.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgsproject.h" -#include "qgsmaplayerregistry.h" -#include "qgsmaplayeractionregistry.h" -#include "qgisapp.h" -#include #include +#include #include QgsMapToolFeatureAction::QgsMapToolFeatureAction( QgsMapCanvas* canvas ) diff --git a/src/app/qgsmaptoolfillring.cpp b/src/app/qgsmaptoolfillring.cpp index 47167deebfb..9538f7c80d2 100644 --- a/src/app/qgsmaptoolfillring.cpp +++ b/src/app/qgsmaptoolfillring.cpp @@ -14,12 +14,12 @@ * * ***************************************************************************/ -#include "qgsmaptoolfillring.h" +#include +#include "qgsattributedialog.h" #include "qgsgeometry.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolfillring.h" #include "qgsvectorlayer.h" -#include "qgsattributedialog.h" -#include #include diff --git a/src/app/qgsmaptoolfillring.h b/src/app/qgsmaptoolfillring.h index fd1169a0be6..1c23d5a7f27 100644 --- a/src/app/qgsmaptoolfillring.h +++ b/src/app/qgsmaptoolfillring.h @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /** A tool to cut holes into polygon and multipolygon features and fill them * with new feature. Attributes are copied from parent feature. diff --git a/src/app/qgsmaptoolformannotation.cpp b/src/app/qgsmaptoolformannotation.cpp index 4eb0a655355..0bb745fbf01 100644 --- a/src/app/qgsmaptoolformannotation.cpp +++ b/src/app/qgsmaptoolformannotation.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgsmaptoolformannotation.h" +#include #include "qgsformannotationitem.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolformannotation.h" #include "qgsvectorlayer.h" -#include QgsMapToolFormAnnotation::QgsMapToolFormAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas ) { diff --git a/src/app/qgsmaptoolhtmlannotation.cpp b/src/app/qgsmaptoolhtmlannotation.cpp index 0a7fb4a453b..fb98c53051b 100644 --- a/src/app/qgsmaptoolhtmlannotation.cpp +++ b/src/app/qgsmaptoolhtmlannotation.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgsmaptoolhtmlannotation.h" +#include #include "qgshtmlannotationitem.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolhtmlannotation.h" #include "qgsvectorlayer.h" -#include QgsMapToolHtmlAnnotation::QgsMapToolHtmlAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas ) { diff --git a/src/app/qgsmaptoolidentifyaction.cpp b/src/app/qgsmaptoolidentifyaction.cpp index 6c8d6af9433..953832238c4 100644 --- a/src/app/qgsmaptoolidentifyaction.cpp +++ b/src/app/qgsmaptoolidentifyaction.cpp @@ -13,33 +13,33 @@ * * ***************************************************************************/ +#include "qgisapp.h" #include "qgsapplication.h" #include "qgsattributetabledialog.h" +#include "qgscoordinatereferencesystem.h" #include "qgscursors.h" #include "qgsdistancearea.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgslogger.h" -#include "qgsidentifyresultsdialog.h" #include "qgsidentifymenu.h" +#include "qgsidentifyresultsdialog.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaptoolidentifyaction.h" #include "qgsmaptopixel.h" #include "qgsmessageviewer.h" -#include "qgsmaptoolidentifyaction.h" +#include "qgsproject.h" #include "qgsrasterlayer.h" -#include "qgscoordinatereferencesystem.h" +#include "qgsrendererv2.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgsproject.h" -#include "qgsmaplayerregistry.h" -#include "qgisapp.h" -#include "qgsrendererv2.h" -#include -#include #include +#include #include +#include #include #include diff --git a/src/app/qgsmaptoolidentifyaction.h b/src/app/qgsmaptoolidentifyaction.h index 796bbe7afc7..55b609517ac 100644 --- a/src/app/qgsmaptoolidentifyaction.h +++ b/src/app/qgsmaptoolidentifyaction.h @@ -17,12 +17,12 @@ #define QGSMAPTOOLIDENTIFYACTION_H #include "qgis.h" -#include "qgsmaptoolidentify.h" -#include "qgspoint.h" +#include "qgsdistancearea.h" #include "qgsfeature.h" #include "qgsfeaturestore.h" #include "qgsfield.h" -#include "qgsdistancearea.h" +#include "qgsmaptoolidentify.h" +#include "qgspoint.h" #include #include diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp index 335db536bba..ff5cc7f2b80 100644 --- a/src/app/qgsmaptoollabel.cpp +++ b/src/app/qgsmaptoollabel.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgsmaptoollabel.h" +#include #include "qgsdatadefined.h" +#include "qgsdiagramrendererv2.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" +#include "qgsmaptoollabel.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" -#include "qgsdiagramrendererv2.h" -#include QgsMapToolLabel::QgsMapToolLabel( QgsMapCanvas* canvas ) : QgsMapTool( canvas ) diff --git a/src/app/qgsmaptoollabel.h b/src/app/qgsmaptoollabel.h index 885d4c8cec2..347b08b31ba 100644 --- a/src/app/qgsmaptoollabel.h +++ b/src/app/qgsmaptoollabel.h @@ -18,8 +18,8 @@ #ifndef QGSMAPTOOLLABEL_H #define QGSMAPTOOLLABEL_H -#include "qgsmaptool.h" #include "qgsmaprenderer.h" +#include "qgsmaptool.h" #include "qgspallabeling.h" #include "qgspoint.h" class QgsRubberBand; diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp index 3d9a03a9426..5b80cd59c72 100644 --- a/src/app/qgsmaptoolmeasureangle.cpp +++ b/src/app/qgsmaptoolmeasureangle.cpp @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#include "qgsmaptoolmeasureangle.h" +#include +#include +#include #include "qgsdisplayangle.h" #include "qgsdistancearea.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolmeasureangle.h" #include "qgsmaptopixel.h" #include "qgsproject.h" #include "qgsrubberband.h" #include "qgssnappingutils.h" -#include -#include -#include QgsMapToolMeasureAngle::QgsMapToolMeasureAngle( QgsMapCanvas* canvas ) : QgsMapTool( canvas ) diff --git a/src/app/qgsmaptoolmeasureangle.h b/src/app/qgsmaptoolmeasureangle.h index 9b7cc43f8f3..815200f5e08 100644 --- a/src/app/qgsmaptoolmeasureangle.h +++ b/src/app/qgsmaptoolmeasureangle.h @@ -16,9 +16,9 @@ #ifndef QGSMAPTOOLMEASUREANGLE_H #define QGSMAPTOOLMEASUREANGLE_H +#include "qgsdistancearea.h" #include "qgsmaptool.h" #include "qgspoint.h" -#include "qgsdistancearea.h" class QgsDisplayAngle; class QgsRubberBand; diff --git a/src/app/qgsmaptoolmovefeature.cpp b/src/app/qgsmaptoolmovefeature.cpp index b003e9565eb..d17d0734d41 100644 --- a/src/app/qgsmaptoolmovefeature.cpp +++ b/src/app/qgsmaptoolmovefeature.cpp @@ -13,17 +13,17 @@ * * ***************************************************************************/ -#include "qgsmaptoolmovefeature.h" +#include +#include +#include #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolmovefeature.h" #include "qgsrubberband.h" +#include "qgstolerance.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgstolerance.h" -#include -#include -#include QgsMapToolMoveFeature::QgsMapToolMoveFeature( QgsMapCanvas* canvas ) : QgsMapToolEdit( canvas ) , mRubberBand( 0 ) diff --git a/src/app/qgsmaptoolmovelabel.cpp b/src/app/qgsmaptoolmovelabel.cpp index 7eb0e7f06ab..31511c60545 100644 --- a/src/app/qgsmaptoolmovelabel.cpp +++ b/src/app/qgsmaptoolmovelabel.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsmaptoolmovelabel.h" +#include #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" +#include "qgsmaptoolmovelabel.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" -#include QgsMapToolMoveLabel::QgsMapToolMoveLabel( QgsMapCanvas* canvas ) : QgsMapToolLabel( canvas ) diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp index 8a63c0c92f9..78b6bd6c124 100644 --- a/src/app/qgsmaptooloffsetcurve.cpp +++ b/src/app/qgsmaptooloffsetcurve.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ #include "qgsdoublespinbox.h" -#include "qgsmaptooloffsetcurve.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" +#include "qgsmaptooloffsetcurve.h" #include "qgsrubberband.h" #include "qgssnappingutils.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptooloffsetcurve.h b/src/app/qgsmaptooloffsetcurve.h index dfd5ebaa5a0..b9a6571d953 100644 --- a/src/app/qgsmaptooloffsetcurve.h +++ b/src/app/qgsmaptooloffsetcurve.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLOFFSETCURVE_H #define QGSMAPTOOLOFFSETCURVE_H -#include "qgsmaptooledit.h" #include "qgsgeometry.h" +#include "qgsmaptooledit.h" #include "qgspointlocator.h" class QgsVertexMarker; diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp index d50f99da96f..a78e17262c4 100644 --- a/src/app/qgsmaptoolpinlabels.cpp +++ b/src/app/qgsmaptoolpinlabels.cpp @@ -23,10 +23,10 @@ #include "qgsmaplayerregistry.h" #include "qgsvectorlayer.h" -#include "qgsmaptoolselectutils.h" -#include "qgsrubberband.h" #include #include +#include "qgsmaptoolselectutils.h" +#include "qgsrubberband.h" QgsMapToolPinLabels::QgsMapToolPinLabels( QgsMapCanvas* canvas ) : QgsMapToolLabel( canvas ) diff --git a/src/app/qgsmaptoolpinlabels.h b/src/app/qgsmaptoolpinlabels.h index 2ba80124278..5f3695931d0 100644 --- a/src/app/qgsmaptoolpinlabels.h +++ b/src/app/qgsmaptoolpinlabels.h @@ -18,9 +18,9 @@ #ifndef QGSMAPTOOLPINLABELS_H #define QGSMAPTOOLPINLABELS_H +#include "qgscoordinatetransform.h" #include "qgsmaptoollabel.h" #include "qgsrectangle.h" -#include "qgscoordinatetransform.h" class QgsRubberBand; class QgsLabelPosition; diff --git a/src/app/qgsmaptoolreshape.cpp b/src/app/qgsmaptoolreshape.cpp index 123e585bf5d..8e734feba42 100644 --- a/src/app/qgsmaptoolreshape.cpp +++ b/src/app/qgsmaptoolreshape.cpp @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include "qgsmaptoolreshape.h" +#include #include "qgsgeometry.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolreshape.h" #include "qgsvectorlayer.h" -#include QgsMapToolReshape::QgsMapToolReshape( QgsMapCanvas* canvas ): QgsMapToolCapture( canvas, QgsMapToolCapture::CaptureLine ) { diff --git a/src/app/qgsmaptoolreshape.h b/src/app/qgsmaptoolreshape.h index cda99d47503..3cec04929d2 100644 --- a/src/app/qgsmaptoolreshape.h +++ b/src/app/qgsmaptoolreshape.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLRESHAPE_H #define QGSMAPTOOLRESHAPE_H -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /**A map tool that draws a line and splits the features cut by the line*/ class APP_EXPORT QgsMapToolReshape: public QgsMapToolCapture diff --git a/src/app/qgsmaptoolrotatefeature.cpp b/src/app/qgsmaptoolrotatefeature.cpp index 75cee369e7e..d2033520061 100644 --- a/src/app/qgsmaptoolrotatefeature.cpp +++ b/src/app/qgsmaptoolrotatefeature.cpp @@ -13,25 +13,25 @@ * * ***************************************************************************/ -#include "qgsmaptoolrotatefeature.h" +#include "qgisapp.h" +#include "qgsdoublespinbox.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolrotatefeature.h" #include "qgsrubberband.h" +#include "qgsspinbox.h" +#include "qgstolerance.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgstolerance.h" #include "qgsvertexmarker.h" -#include "qgisapp.h" -#include "qgsspinbox.h" -#include "qgsdoublespinbox.h" -#include -#include #include #include #include #include +#include +#include #include #include diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp index 0ce18adacbe..9e185eea0c4 100644 --- a/src/app/qgsmaptoolrotatelabel.cpp +++ b/src/app/qgsmaptoolrotatelabel.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsmaptoolrotatelabel.h" +#include #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" +#include "qgsmaptoolrotatelabel.h" #include "qgspallabeling.h" #include "qgspointrotationitem.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" -#include #include "qgisapp.h" #include "qgsapplication.h" diff --git a/src/app/qgsmaptoolrotatepointsymbols.cpp b/src/app/qgsmaptoolrotatepointsymbols.cpp index 598d1bbe45c..c353e326eb5 100644 --- a/src/app/qgsmaptoolrotatepointsymbols.cpp +++ b/src/app/qgsmaptoolrotatepointsymbols.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include "qgsmaptoolrotatepointsymbols.h" +#include +#include #include "qgsapplication.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolrotatepointsymbols.h" #include "qgspointrotationitem.h" #include "qgsrendererv2.h" #include "qgssnappingutils.h" #include "qgssymbolv2.h" #include "qgsvectorlayer.h" -#include -#include QgsMapToolRotatePointSymbols::QgsMapToolRotatePointSymbols( QgsMapCanvas* canvas ): QgsMapToolEdit( canvas ), mActiveLayer( 0 ), mFeatureNumber( 0 ), mCurrentMouseAzimut( 0.0 ), mCurrentRotationFeature( 0.0 ), diff --git a/src/app/qgsmaptoolrotatepointsymbols.h b/src/app/qgsmaptoolrotatepointsymbols.h index 2aec88c43ca..e4a8d4c46cb 100644 --- a/src/app/qgsmaptoolrotatepointsymbols.h +++ b/src/app/qgsmaptoolrotatepointsymbols.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLROTATEPOINTSYMBOLS_H #define QGSMAPTOOLROTATEPOINTSYMBOLS_H -#include "qgsmaptooledit.h" #include "qgsfeature.h" +#include "qgsmaptooledit.h" class QgsPointRotationItem; diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp index 2359c6c986f..4a7b86fb6aa 100644 --- a/src/app/qgsmaptoolselect.cpp +++ b/src/app/qgsmaptoolselect.cpp @@ -14,18 +14,18 @@ ***************************************************************************/ +#include "qgis.h" +#include "qgsgeometry.h" +#include "qgsmapcanvas.h" #include "qgsmaptoolselect.h" #include "qgsmaptoolselectutils.h" -#include "qgsrubberband.h" -#include "qgsmapcanvas.h" -#include "qgsvectorlayer.h" -#include "qgsgeometry.h" #include "qgspoint.h" -#include "qgis.h" +#include "qgsrubberband.h" +#include "qgsvectorlayer.h" +#include #include #include -#include QgsMapToolSelect::QgsMapToolSelect( QgsMapCanvas* canvas ) diff --git a/src/app/qgsmaptoolselectfreehand.cpp b/src/app/qgsmaptoolselectfreehand.cpp index 7cdcfddf3c7..6edb9a212f7 100644 --- a/src/app/qgsmaptoolselectfreehand.cpp +++ b/src/app/qgsmaptoolselectfreehand.cpp @@ -13,12 +13,12 @@ email : jpalmer at linz dot govt dot nz * * ***************************************************************************/ +#include "qgis.h" +#include "qgsgeometry.h" +#include "qgsmapcanvas.h" #include "qgsmaptoolselectfreehand.h" #include "qgsmaptoolselectutils.h" -#include "qgsgeometry.h" #include "qgsrubberband.h" -#include "qgsmapcanvas.h" -#include "qgis.h" #include diff --git a/src/app/qgsmaptoolselectpolygon.cpp b/src/app/qgsmaptoolselectpolygon.cpp index ed70f7d4bc3..2bb3f1870fa 100644 --- a/src/app/qgsmaptoolselectpolygon.cpp +++ b/src/app/qgsmaptoolselectpolygon.cpp @@ -13,12 +13,12 @@ email : jpalmer at linz dot govt dot nz * * ***************************************************************************/ +#include "qgis.h" +#include "qgsgeometry.h" +#include "qgsmapcanvas.h" #include "qgsmaptoolselectpolygon.h" #include "qgsmaptoolselectutils.h" -#include "qgsgeometry.h" #include "qgsrubberband.h" -#include "qgsmapcanvas.h" -#include "qgis.h" #include diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp index 014083a7baf..75a82e96335 100644 --- a/src/app/qgsmaptoolselectradius.cpp +++ b/src/app/qgsmaptoolselectradius.cpp @@ -13,13 +13,13 @@ email : jpalmer at linz dot govt dot nz * * ***************************************************************************/ +#include "qgis.h" +#include "qgsgeometry.h" +#include "qgslogger.h" +#include "qgsmapcanvas.h" #include "qgsmaptoolselectradius.h" #include "qgsmaptoolselectutils.h" -#include "qgsgeometry.h" #include "qgsrubberband.h" -#include "qgsmapcanvas.h" -#include "qgis.h" -#include "qgslogger.h" #include #include diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp index a336a2130e2..3e3f94b15d1 100644 --- a/src/app/qgsmaptoolselectrectangle.cpp +++ b/src/app/qgsmaptoolselectrectangle.cpp @@ -14,16 +14,16 @@ * * ***************************************************************************/ -#include "qgsmaptoolselectrectangle.h" -#include "qgsmaptoolselectutils.h" -#include "qgsrubberband.h" -#include "qgsmapcanvas.h" -#include "qgsmaptopixel.h" -#include "qgsvectorlayer.h" +#include "qgis.h" #include "qgscursors.h" #include "qgsgeometry.h" +#include "qgsmapcanvas.h" +#include "qgsmaptoolselectrectangle.h" +#include "qgsmaptoolselectutils.h" +#include "qgsmaptopixel.h" #include "qgspoint.h" -#include "qgis.h" +#include "qgsrubberband.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp index ec07fa1c0bc..d8d7a6cf366 100644 --- a/src/app/qgsmaptoolselectutils.cpp +++ b/src/app/qgsmaptoolselectutils.cpp @@ -15,21 +15,21 @@ email : jpalmer at linz dot govt dot nz #include -#include "qgsmaptoolselectutils.h" #include "qgisapp.h" -#include "qgsmessagebar.h" -#include "qgsmapcanvas.h" -#include "qgsvectorlayer.h" +#include "qgis.h" +#include "qgscsexception.h" #include "qgsfeature.h" #include "qgsgeometry.h" +#include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmaptoolselectutils.h" +#include "qgsmessagebar.h" #include "qgsrendererv2.h" #include "qgsrubberband.h" -#include "qgscsexception.h" -#include "qgslogger.h" -#include "qgis.h" +#include "qgsvectorlayer.h" -#include #include +#include QgsVectorLayer* QgsMapToolSelectUtils::getCurrentVectorLayer( QgsMapCanvas* canvas ) { diff --git a/src/app/qgsmaptoolselectutils.h b/src/app/qgsmaptoolselectutils.h index 08a06026560..56ae1e78d74 100644 --- a/src/app/qgsmaptoolselectutils.h +++ b/src/app/qgsmaptoolselectutils.h @@ -16,9 +16,9 @@ email : jpalmer at linz dot govt dot nz #ifndef QGSMAPTOOLSELECTUTILS_H #define QGSMAPTOOLSELECTUTILS_H -#include -#include #include +#include +#include class QMouseEvent; class QgsMapCanvas; diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp index cda0aac7ca7..d34ece11080 100644 --- a/src/app/qgsmaptoolshowhidelabels.cpp +++ b/src/app/qgsmaptoolshowhidelabels.cpp @@ -21,9 +21,9 @@ #include "qgsmapcanvas.h" #include "qgsvectorlayer.h" +#include #include "qgsmaptoolselectutils.h" #include "qgsrubberband.h" -#include #include diff --git a/src/app/qgsmaptoolshowhidelabels.h b/src/app/qgsmaptoolshowhidelabels.h index 803bf2b09e6..dbff54e48fa 100644 --- a/src/app/qgsmaptoolshowhidelabels.h +++ b/src/app/qgsmaptoolshowhidelabels.h @@ -18,8 +18,8 @@ #ifndef QGSMAPTOOLSHOWHIDELABELS_H #define QGSMAPTOOLSHOWHIDELABELS_H -#include "qgsmaptoollabel.h" #include "qgsfeature.h" +#include "qgsmaptoollabel.h" /**A map tool for showing or hidding a feature's label*/ diff --git a/src/app/qgsmaptoolsimplify.cpp b/src/app/qgsmaptoolsimplify.cpp index 689def3024f..b41e93496c8 100644 --- a/src/app/qgsmaptoolsimplify.cpp +++ b/src/app/qgsmaptoolsimplify.cpp @@ -18,13 +18,13 @@ #include "qgsgeometry.h" #include "qgsmapcanvas.h" #include "qgsrubberband.h" -#include "qgsvectorlayer.h" #include "qgstolerance.h" +#include "qgsvectorlayer.h" #include -#include #include +#include QgsSimplifyDialog::QgsSimplifyDialog( QgsMapToolSimplify* tool, QWidget* parent ) : QDialog( parent ) diff --git a/src/app/qgsmaptoolsimplify.h b/src/app/qgsmaptoolsimplify.h index adc41c78bc7..299cdcf7601 100644 --- a/src/app/qgsmaptoolsimplify.h +++ b/src/app/qgsmaptoolsimplify.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLSIMPLIFY_H #define QGSMAPTOOLSIMPLIFY_H -#include "qgsmaptooledit.h" #include "ui_qgssimplifytolerancedialog.h" +#include "qgsmaptooledit.h" #include #include "qgsfeature.h" diff --git a/src/app/qgsmaptoolsplitfeatures.cpp b/src/app/qgsmaptoolsplitfeatures.cpp index f098bc7627e..3bb3c87afdf 100644 --- a/src/app/qgsmaptoolsplitfeatures.cpp +++ b/src/app/qgsmaptoolsplitfeatures.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ #include "qgisapp.h" -#include "qgsmessagebar.h" #include "qgsmapcanvas.h" #include "qgsmaptoolsplitfeatures.h" +#include "qgsmessagebar.h" #include "qgsproject.h" #include "qgssnappingutils.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptoolsplitfeatures.h b/src/app/qgsmaptoolsplitfeatures.h index 06147377661..6253c305a65 100644 --- a/src/app/qgsmaptoolsplitfeatures.h +++ b/src/app/qgsmaptoolsplitfeatures.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLSPLITFEATURES_H #define QGSMAPTOOLSPLITFEATURES_H -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /**A map tool that draws a line and splits the features cut by the line*/ class APP_EXPORT QgsMapToolSplitFeatures: public QgsMapToolCapture diff --git a/src/app/qgsmaptoolsplitparts.cpp b/src/app/qgsmaptoolsplitparts.cpp index de0d181f6f9..1a2b12fb5ac 100644 --- a/src/app/qgsmaptoolsplitparts.cpp +++ b/src/app/qgsmaptoolsplitparts.cpp @@ -14,10 +14,10 @@ ***************************************************************************/ #include "qgisapp.h" -#include "qgsmessagebar.h" #include "qgsmapcanvas.h" -#include "qgsproject.h" #include "qgsmaptoolsplitparts.h" +#include "qgsmessagebar.h" +#include "qgsproject.h" #include "qgssnappingutils.h" #include "qgsvectorlayer.h" diff --git a/src/app/qgsmaptoolsplitparts.h b/src/app/qgsmaptoolsplitparts.h index d7d0d79be3a..e9caa50f36c 100644 --- a/src/app/qgsmaptoolsplitparts.h +++ b/src/app/qgsmaptoolsplitparts.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLSPLITPARTS_H #define QGSMAPTOOLSPLITPARTS_H -#include "qgsmaptoolcapture.h" #include "qgsmapmouseevent.h" +#include "qgsmaptoolcapture.h" /**A map tool that draws a line and splits the parts cut by the line*/ class QgsMapToolSplitParts: public QgsMapToolCapture diff --git a/src/app/qgsmaptoolsvgannotation.cpp b/src/app/qgsmaptoolsvgannotation.cpp index 7fe67c46b0f..bc77bf370df 100644 --- a/src/app/qgsmaptoolsvgannotation.cpp +++ b/src/app/qgsmaptoolsvgannotation.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ +#include #include "qgsmaptoolsvgannotation.h" #include "qgssvgannotationitem.h" -#include QgsMapToolSvgAnnotation::QgsMapToolSvgAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas ) { diff --git a/src/app/qgsmaptooltextannotation.cpp b/src/app/qgsmaptooltextannotation.cpp index 1c985a7dd22..52627ff440e 100644 --- a/src/app/qgsmaptooltextannotation.cpp +++ b/src/app/qgsmaptooltextannotation.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ +#include #include "qgsmaptooltextannotation.h" #include "qgstextannotationitem.h" -#include QgsMapToolTextAnnotation::QgsMapToolTextAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas ) { diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp index 15eb4a4edc7..7783c731d4d 100644 --- a/src/app/qgsmeasuredialog.cpp +++ b/src/app/qgsmeasuredialog.cpp @@ -17,18 +17,18 @@ #include "qgsmeasuredialog.h" #include "qgsmeasuretool.h" -#include "qgslogger.h" #include "qgscontexthelp.h" +#include "qgscoordinatereferencesystem.h" #include "qgsdistancearea.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaprenderer.h" #include "qgsproject.h" -#include "qgscoordinatereferencesystem.h" #include #include -#include #include +#include QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool* tool, Qt::WindowFlags f ) diff --git a/src/app/qgsmeasuredialog.h b/src/app/qgsmeasuredialog.h index ec0830d0259..21b9e7fc44d 100644 --- a/src/app/qgsmeasuredialog.h +++ b/src/app/qgsmeasuredialog.h @@ -19,9 +19,9 @@ #include "ui_qgsmeasurebase.h" -#include "qgspoint.h" -#include "qgsdistancearea.h" #include "qgscontexthelp.h" +#include "qgsdistancearea.h" +#include "qgspoint.h" class QCloseEvent; class QgsMeasureTool; diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp index daf45e1e440..5ecd529337e 100644 --- a/src/app/qgsmeasuretool.cpp +++ b/src/app/qgsmeasuretool.cpp @@ -19,13 +19,13 @@ #include "qgsmaprenderer.h" #include "qgsmaptopixel.h" #include "qgsrubberband.h" -#include "qgsvectorlayer.h" #include "qgssnappingutils.h" #include "qgstolerance.h" +#include "qgsvectorlayer.h" +#include "qgscursors.h" #include "qgsmeasuredialog.h" #include "qgsmeasuretool.h" -#include "qgscursors.h" #include #include diff --git a/src/app/qgsmergeattributesdialog.cpp b/src/app/qgsmergeattributesdialog.cpp index e4f338b2717..58b17bb267b 100644 --- a/src/app/qgsmergeattributesdialog.cpp +++ b/src/app/qgsmergeattributesdialog.cpp @@ -16,15 +16,15 @@ ***************************************************************************/ -#include "qgsmergeattributesdialog.h" #include "qgisapp.h" #include "qgsapplication.h" +#include "qgsattributeeditor.h" #include "qgsfield.h" #include "qgsmapcanvas.h" +#include "qgsmergeattributesdialog.h" #include "qgsrubberband.h" -#include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" -#include "qgsattributeeditor.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/app/qgsnewspatialitelayerdialog.cpp b/src/app/qgsnewspatialitelayerdialog.cpp index 07d3ba4816a..8bbc6d54c05 100644 --- a/src/app/qgsnewspatialitelayerdialog.cpp +++ b/src/app/qgsnewspatialitelayerdialog.cpp @@ -20,24 +20,24 @@ #include "qgsnewspatialitelayerdialog.h" +#include "qgisapp.h" // <- for theme icons #include "qgis.h" #include "qgsapplication.h" -#include "qgsproviderregistry.h" -#include "qgisapp.h" // <- for theme icons -#include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" #include "qgscoordinatereferencesystem.h" #include "qgsgenericprojectionselector.h" +#include "qgsmaplayerregistry.h" +#include "qgsproviderregistry.h" #include "qgsslconnect.h" +#include "qgsvectorlayer.h" #include "qgslogger.h" -#include -#include -#include -#include #include #include +#include +#include +#include +#include #include diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp index 5555c57898f..e22a8316201 100644 --- a/src/app/qgsoptions.cpp +++ b/src/app/qgsoptions.cpp @@ -15,52 +15,52 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgsdistancearea.h" -#include "qgsoptions.h" -#include "qgis.h" #include "qgisapp.h" #include "qgisappstylesheet.h" +#include "qgis.h" +#include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsdistancearea.h" +#include "qgsgenericprojectionselector.h" #include "qgshighlight.h" #include "qgsmapcanvas.h" #include "qgsmaprenderer.h" -#include "qgsgenericprojectionselector.h" -#include "qgscoordinatereferencesystem.h" -#include "qgstolerance.h" -#include "qgsscaleutils.h" #include "qgsnetworkaccessmanager.h" +#include "qgsoptions.h" #include "qgsproject.h" +#include "qgsscaleutils.h" +#include "qgstolerance.h" #include "qgsattributetablefiltermodel.h" +#include "qgscolordialog.h" +#include "qgscolorschemeregistry.h" +#include "qgscomposer.h" +#include "qgsdialog.h" #include "qgsrasterformatsaveoptionswidget.h" #include "qgsrasterpyramidsoptionswidget.h" -#include "qgsdialog.h" -#include "qgscomposer.h" -#include "qgscolorschemeregistry.h" #include "qgssymbollayerv2utils.h" -#include "qgscolordialog.h" -#include -#include -#include #include +#include +#include #include -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include #include #include #include "qgslogger.h" #define CPL_SUPRESS_CPLUSPLUS +#include // for setting gdal options #include #include -#include // for setting gdal options #include "qgsconfig.h" diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h index 32b7002e59e..3c4de71d952 100644 --- a/src/app/qgsoptions.h +++ b/src/app/qgsoptions.h @@ -18,12 +18,12 @@ #ifndef QGSOPTIONS_H #define QGSOPTIONS_H -#include "qgsoptionsdialogbase.h" #include "ui_qgsoptionsbase.h" -#include "qgisgui.h" #include "qgisapp.h" #include "qgisappstylesheet.h" +#include "qgisgui.h" #include "qgscontexthelp.h" +#include "qgsoptionsdialogbase.h" #include diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp index bf053ade06d..2e87a27576c 100644 --- a/src/app/qgspluginregistry.cpp +++ b/src/app/qgspluginregistry.cpp @@ -22,16 +22,16 @@ #include #include -#include "qgis.h" -#include "qgsapplication.h" -#include "qgisinterface.h" -#include "qgspluginregistry.h" -#include "qgspluginmetadata.h" -#include "qgisplugin.h" -#include "qgspythonutils.h" #include "qgisapp.h" +#include "qgis.h" +#include "qgisinterface.h" +#include "qgisplugin.h" +#include "qgsapplication.h" #include "qgslogger.h" #include "qgsmessagelog.h" +#include "qgspluginmetadata.h" +#include "qgspluginregistry.h" +#include "qgspythonutils.h" /* typedefs for plugins */ typedef QgisPlugin *create_ui( QgisInterface * qI ); diff --git a/src/app/qgspointrotationitem.cpp b/src/app/qgspointrotationitem.cpp index fa7a89ffb88..c97e0f15ba2 100644 --- a/src/app/qgspointrotationitem.cpp +++ b/src/app/qgspointrotationitem.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgspointrotationitem.h" -#include #include +#include +#include "qgspointrotationitem.h" QgsPointRotationItem::QgsPointRotationItem( QgsMapCanvas* canvas ) : QgsMapCanvasItem( canvas ) diff --git a/src/app/qgspointrotationitem.h b/src/app/qgspointrotationitem.h index fe23ab59bad..8b3362f613d 100644 --- a/src/app/qgspointrotationitem.h +++ b/src/app/qgspointrotationitem.h @@ -16,9 +16,9 @@ #ifndef QGSPOINTROTATIONITEM_H #define QGSPOINTROTATIONITEM_H -#include "qgsmapcanvasitem.h" #include #include +#include "qgsmapcanvasitem.h" /**An item that shows a rotated point symbol (e.g. arrow) centered to a map location together with a text displaying the rotation value*/ class APP_EXPORT QgsPointRotationItem: public QgsMapCanvasItem diff --git a/src/app/qgsprojectlayergroupdialog.cpp b/src/app/qgsprojectlayergroupdialog.cpp index ca0efbda9e1..7b84d116ec9 100644 --- a/src/app/qgsprojectlayergroupdialog.cpp +++ b/src/app/qgsprojectlayergroupdialog.cpp @@ -12,10 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsprojectlayergroupdialog.h" -#include "qgsproject.h" #include "qgisapp.h" #include "qgsapplication.h" +#include "qgsproject.h" +#include "qgsprojectlayergroupdialog.h" #include "qgslayertree.h" #include "qgslayertreemodel.h" diff --git a/src/app/qgsprojectlayergroupdialog.h b/src/app/qgsprojectlayergroupdialog.h index 00771377967..c2f788df605 100644 --- a/src/app/qgsprojectlayergroupdialog.h +++ b/src/app/qgsprojectlayergroupdialog.h @@ -15,8 +15,8 @@ #ifndef QGSPROJECTLAYERGROUPDIALOG_H #define QGSPROJECTLAYERGROUPDIALOG_H -#include "QDialog" #include "ui_qgsprojectlayergroupdialogbase.h" +#include "QDialog" class QDomElement; diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp index f2c40a78cbe..56fca172ae0 100644 --- a/src/app/qgsprojectproperties.cpp +++ b/src/app/qgsprojectproperties.cpp @@ -19,12 +19,15 @@ #include "qgsprojectproperties.h" //qgis includes -#include "qgsapplication.h" -#include "qgsdistancearea.h" #include "qgisapp.h" +#include "qgsapplication.h" +#include "qgscolordialog.h" +#include "qgscolorschemeregistry.h" #include "qgscomposer.h" #include "qgscontexthelp.h" #include "qgscoordinatetransform.h" +#include "qgsdistancearea.h" +#include "qgsgenericprojectionselector.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayer.h" @@ -32,27 +35,24 @@ #include "qgsmaprenderer.h" #include "qgsproject.h" #include "qgsprojectlayergroupdialog.h" -#include "qgssnappingdialog.h" #include "qgsrasterlayer.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsscaleutils.h" -#include "qgsgenericprojectionselector.h" -#include "qgsstylev2.h" -#include "qgssymbolv2.h" -#include "qgsstylev2managerdialog.h" -#include "qgsvectorcolorrampv2.h" -#include "qgssymbolv2selectordialog.h" #include "qgsrelationmanagerdialog.h" #include "qgsrelationmanager.h" -#include "qgscolorschemeregistry.h" +#include "qgsscaleutils.h" +#include "qgssnappingdialog.h" +#include "qgsstylev2.h" +#include "qgsstylev2managerdialog.h" #include "qgssymbollayerv2utils.h" -#include "qgscolordialog.h" +#include "qgssymbolv2.h" +#include "qgssymbolv2selectordialog.h" +#include "qgsvectorcolorrampv2.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" //qt includes -#include #include #include // Qt 4.4 +#include #include const char * QgsProjectProperties::GEO_NONE_DESC = QT_TRANSLATE_NOOP( "QgsOptions", "None / Planimetric" ); diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h index aef07f6b5c4..3f9ea714079 100644 --- a/src/app/qgsprojectproperties.h +++ b/src/app/qgsprojectproperties.h @@ -17,11 +17,11 @@ ***************************************************************************/ -#include "qgsoptionsdialogbase.h" #include "ui_qgsprojectpropertiesbase.h" -#include "qgis.h" #include "qgisgui.h" +#include "qgis.h" #include "qgscontexthelp.h" +#include "qgsoptionsdialogbase.h" class QgsMapCanvas; class QgsRelationManagerDialog; diff --git a/src/app/qgsrastercalcdialog.cpp b/src/app/qgsrastercalcdialog.cpp index 8bb42047f51..b94f70f8e19 100644 --- a/src/app/qgsrastercalcdialog.cpp +++ b/src/app/qgsrastercalcdialog.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsrastercalcdialog.h" -#include "qgsmaplayerregistry.h" -#include "qgsrastercalcnode.h" -#include "qgsrasterlayer.h" #include "cpl_string.h" #include "gdal.h" +#include "qgsmaplayerregistry.h" +#include "qgsrastercalcdialog.h" +#include "qgsrastercalcnode.h" +#include "qgsrasterlayer.h" #include #include diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp index d2bee7308d2..6bba25edc54 100644 --- a/src/app/qgsrasterlayerproperties.cpp +++ b/src/app/qgsrasterlayerproperties.cpp @@ -26,6 +26,7 @@ #include "qgscoordinatetransform.h" #include "qgscubicrasterresampler.h" #include "qgsgenericprojectionselector.h" +#include "qgshuesaturationfilter.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" @@ -50,22 +51,21 @@ #include "qgsrastertransparency.h" #include "qgssinglebandgrayrendererwidget.h" #include "qgssinglebandpseudocolorrendererwidget.h" -#include "qgshuesaturationfilter.h" -#include #include +#include -#include +#include #include -#include -#include #include +#include +#include +#include +#include #include #include -#include -#include #include -#include +#include #include QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanvas* theCanvas, QWidget *parent, Qt::WindowFlags fl ) diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h index 608037734ba..a96c00d6357 100644 --- a/src/app/qgsrasterlayerproperties.h +++ b/src/app/qgsrasterlayerproperties.h @@ -19,12 +19,12 @@ #ifndef QGSRASTERLAYERPROPERTIES_H #define QGSRASTERLAYERPROPERTIES_H -#include "qgsoptionsdialogbase.h" #include "ui_qgsrasterlayerpropertiesbase.h" #include "qgisgui.h" -#include "qgsmaptool.h" #include "qgscolorrampshader.h" #include "qgscontexthelp.h" +#include "qgsmaptool.h" +#include "qgsoptionsdialogbase.h" class QgsMapLayer; class QgsMapCanvas; diff --git a/src/app/qgssavestyletodbdialog.cpp b/src/app/qgssavestyletodbdialog.cpp index a4d25968d79..0614dc35f53 100644 --- a/src/app/qgssavestyletodbdialog.cpp +++ b/src/app/qgssavestyletodbdialog.cpp @@ -9,11 +9,11 @@ #include "qgssavestyletodbdialog.h" -#include -#include -#include -#include #include +#include +#include +#include +#include QgsSaveStyleToDbDialog::QgsSaveStyleToDbDialog( QWidget *parent ) : QDialog( parent ) diff --git a/src/app/qgsshortcutsmanager.h b/src/app/qgsshortcutsmanager.h index 768a7382d37..4381183c76c 100644 --- a/src/app/qgsshortcutsmanager.h +++ b/src/app/qgsshortcutsmanager.h @@ -16,9 +16,9 @@ #ifndef QGSSHORTCUTSMANAGER_H #define QGSSHORTCUTSMANAGER_H +#include #include #include -#include /** Shortcuts manager is a singleton class that contains a list of actions from main window diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp index 7475eeb5d0f..b68fd2a281d 100644 --- a/src/app/qgssnappingdialog.cpp +++ b/src/app/qgssnappingdialog.cpp @@ -15,22 +15,22 @@ * * ***************************************************************************/ -#include "qgssnappingdialog.h" +#include "qgisapp.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayer.h" -#include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" -#include "qgisapp.h" #include "qgsproject.h" -#include "qgslogger.h" +#include "qgssnappingdialog.h" +#include "qgsvectorlayer.h" #include -#include #include -#include #include -#include #include +#include +#include +#include class QgsSnappingDock : public QDockWidget diff --git a/src/app/qgssnappingdialog.h b/src/app/qgssnappingdialog.h index 9846f14d18c..1bf4a059b05 100644 --- a/src/app/qgssnappingdialog.h +++ b/src/app/qgssnappingdialog.h @@ -18,8 +18,8 @@ #ifndef QGSSNAPPINGDIALOG_H #define QGSSNAPPINGDIALOG_H -#include "qgsmaplayer.h" #include "ui_qgssnappingdialogbase.h" +#include "qgsmaplayer.h" class QDockWidget; diff --git a/src/app/qgssponsors.cpp b/src/app/qgssponsors.cpp index 16c896c3397..7292ff8ca85 100644 --- a/src/app/qgssponsors.cpp +++ b/src/app/qgssponsors.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgssponsors.h" -#include "qgsapplication.h" #include #include +#include "qgsapplication.h" +#include "qgssponsors.h" #ifdef Q_OS_MACX QgsSponsors::QgsSponsors( QWidget *parent ) diff --git a/src/app/qgsstatisticalsummarydockwidget.cpp b/src/app/qgsstatisticalsummarydockwidget.cpp index 70cfe6fb4f1..5705d94e40b 100644 --- a/src/app/qgsstatisticalsummarydockwidget.cpp +++ b/src/app/qgsstatisticalsummarydockwidget.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsstatisticalsummarydockwidget.h" -#include "qgsstatisticalsummary.h" -#include "qgsmaplayerregistry.h" -#include #include #include +#include +#include "qgsmaplayerregistry.h" +#include "qgsstatisticalsummarydockwidget.h" +#include "qgsstatisticalsummary.h" QList< QgsStatisticalSummary::Statistic > QgsStatisticalSummaryDockWidget::mDisplayStats = QList< QgsStatisticalSummary::Statistic > () << QgsStatisticalSummary::Count diff --git a/src/app/qgsstatisticalsummarydockwidget.h b/src/app/qgsstatisticalsummarydockwidget.h index 41dd62b9be2..6edc088b522 100644 --- a/src/app/qgsstatisticalsummarydockwidget.h +++ b/src/app/qgsstatisticalsummarydockwidget.h @@ -15,9 +15,9 @@ #ifndef QGSSTATISTICALSUMMARYDOCKWIDGET_H #define QGSSTATISTICALSUMMARYDOCKWIDGET_H +#include "ui_qgsstatisticalsummarybase.h" #include #include -#include "ui_qgsstatisticalsummarybase.h" #include "qgsstatisticalsummary.h" diff --git a/src/app/qgssvgannotationdialog.cpp b/src/app/qgssvgannotationdialog.cpp index 7597765b8c0..1bd2bc08747 100644 --- a/src/app/qgssvgannotationdialog.cpp +++ b/src/app/qgssvgannotationdialog.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgssvgannotationdialog.h" -#include "qgsannotationwidget.h" -#include "qgssvgannotationitem.h" #include #include #include +#include "qgsannotationwidget.h" +#include "qgssvgannotationdialog.h" +#include "qgssvgannotationitem.h" QgsSvgAnnotationDialog::QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 ) diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp index 1b683544405..a0db2ef442e 100644 --- a/src/app/qgstextannotationdialog.cpp +++ b/src/app/qgstextannotationdialog.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgstextannotationdialog.h" -#include "qgsannotationwidget.h" -#include "qgstextannotationitem.h" #include #include +#include "qgsannotationwidget.h" +#include "qgstextannotationdialog.h" +#include "qgstextannotationitem.h" QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsTextAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ), mItem( item ), mTextDocument( 0 ) { diff --git a/src/app/qgstipfactory.cpp b/src/app/qgstipfactory.cpp index 5ec38361065..25e544cd61b 100644 --- a/src/app/qgstipfactory.cpp +++ b/src/app/qgstipfactory.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgstipfactory.h" #include +#include "qgstipfactory.h" //for rand & srand #include diff --git a/src/app/qgstipfactory.h b/src/app/qgstipfactory.h index 7f3fe9c719f..38d6d0f57a9 100644 --- a/src/app/qgstipfactory.h +++ b/src/app/qgstipfactory.h @@ -16,8 +16,8 @@ #ifndef QGSTIPFACTORY #define QGSTIPFACTORY -#include "qgstip.h" #include +#include "qgstip.h" /** \ingroup app * \brief A factory class to serve up tips to the user. diff --git a/src/app/qgstipgui.cpp b/src/app/qgstipgui.cpp index f91ebc33277..4eb4bbf976d 100644 --- a/src/app/qgstipgui.cpp +++ b/src/app/qgstipgui.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include #include +#include -#include "qgstipgui.h" -#include "qgsapplication.h" -#include #include +#include +#include "qgsapplication.h" +#include "qgstipgui.h" #ifdef Q_OS_MACX QgsTipGui::QgsTipGui() diff --git a/src/app/qgsundowidget.cpp b/src/app/qgsundowidget.cpp index f16260433a4..5a864e84304 100644 --- a/src/app/qgsundowidget.cpp +++ b/src/app/qgsundowidget.cpp @@ -17,8 +17,8 @@ #include "qgisapp.h" #include "qgsapplication.h" #include "qgslayertreeview.h" -#include "qgsmaplayer.h" #include "qgsmapcanvas.h" +#include "qgsmaplayer.h" QgsUndoWidget::QgsUndoWidget( QWidget * parent, QgsMapCanvas * mapCanvas ) diff --git a/src/app/qgsundowidget.h b/src/app/qgsundowidget.h index 46c345c52dd..10e76870c1b 100644 --- a/src/app/qgsundowidget.h +++ b/src/app/qgsundowidget.h @@ -15,7 +15,6 @@ #ifndef QGSUNDOWIDGET_H #define QGSUNDOWIDGET_H -#include #include #include #include @@ -23,9 +22,10 @@ #include #include #include -#include -#include #include +#include +#include +#include class QgsMapCanvas; class QgsMapLayer; diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp index 21a286edc63..6f5b666fd3b 100644 --- a/src/app/qgsvectorlayerproperties.cpp +++ b/src/app/qgsvectorlayerproperties.cpp @@ -16,24 +16,27 @@ * * ***************************************************************************/ -#include #include +#include #include "qgisapp.h" -#include "qgsjoindialog.h" #include "qgsapplication.h" -#include "qgsattributeactiondialog.h" #include "qgsapplydialog.h" +#include "qgsattributeactiondialog.h" +#include "qgsconfig.h" #include "qgscontexthelp.h" #include "qgscoordinatetransform.h" +#include "qgsdatasourceuri.h" #include "qgsdiagramproperties.h" #include "qgsdiagramrendererv2.h" #include "qgsfieldcalculator.h" #include "qgsfieldsproperties.h" -#include "qgslabeldialog.h" -#include "qgslabelinggui.h" -#include "qgslabel.h" #include "qgsgenericprojectionselector.h" +#include "qgsjoindialog.h" +#include "qgslabeldialog.h" +#include "qgslabel.h" +#include "qgslabelinggui.h" +#include "qgsloadstylefromdbdialog.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" #include "qgsmaplayerstyleguiutils.h" @@ -41,26 +44,23 @@ #include "qgspluginmetadata.h" #include "qgspluginregistry.h" #include "qgsproject.h" +#include "qgsquerybuilder.h" #include "qgssavestyletodbdialog.h" -#include "qgsloadstylefromdbdialog.h" +#include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" #include "qgsvectorlayerproperties.h" -#include "qgsconfig.h" -#include "qgsvectordataprovider.h" -#include "qgsquerybuilder.h" -#include "qgsdatasourceuri.h" -#include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include -#include +#include +#include #include "qgsrendererv2propertiesdialog.h" #include "qgsstylev2.h" diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h index 7ba69d15230..689f1239acc 100644 --- a/src/app/qgsvectorlayerproperties.h +++ b/src/app/qgsvectorlayerproperties.h @@ -19,17 +19,17 @@ #ifndef QGSVECTORLAYERPROPERTIES #define QGSVECTORLAYERPROPERTIES -#include "qgsoptionsdialogbase.h" -#include "qgsscalerangewidget.h" #include "ui_qgsvectorlayerpropertiesbase.h" #include "qgisgui.h" #include "qgsaddattrdialog.h" -#include "qgsdelattrdialog.h" #include "qgsattributetypedialog.h" +#include "qgscontexthelp.h" +#include "qgsdelattrdialog.h" +#include "qgsexpressionbuilderdialog.h" #include "qgsfield.h" #include "qgsmapcanvas.h" -#include "qgscontexthelp.h" -#include "qgsexpressionbuilderdialog.h" +#include "qgsoptionsdialogbase.h" +#include "qgsscalerangewidget.h" class QgsMapLayer; diff --git a/src/app/qgsvisibilitypresets.cpp b/src/app/qgsvisibilitypresets.cpp index e71ed7c030a..f850c9aba1a 100644 --- a/src/app/qgsvisibilitypresets.cpp +++ b/src/app/qgsvisibilitypresets.cpp @@ -15,6 +15,7 @@ #include "qgsvisibilitypresets.h" +#include "qgisapp.h" #include "qgslayertree.h" #include "qgslayertreemapcanvasbridge.h" #include "qgslayertreemodel.h" @@ -25,7 +26,6 @@ #include "qgsproject.h" #include "qgsrendererv2.h" #include "qgsvectorlayer.h" -#include "qgisapp.h" #include diff --git a/src/app/qtmain_android.cpp b/src/app/qtmain_android.cpp index a415ca4283b..72b26b749c4 100644 --- a/src/app/qtmain_android.cpp +++ b/src/app/qtmain_android.cpp @@ -27,10 +27,10 @@ #include #include -#include -#include #include +#include #include +#include #include diff --git a/src/browser/main.cpp b/src/browser/main.cpp index 23b385af5d8..2f1cf75cb33 100644 --- a/src/browser/main.cpp +++ b/src/browser/main.cpp @@ -15,18 +15,18 @@ * (at your option) any later version. * * * ***************************************************************************/ +#include +#include +#include #include +#include +#include #include #include -#include -#include -#include -#include -#include "qgsbrowser.h" #include "qgsapplication.h" -#include "qgslogger.h" +#include "qgsbrowser.h" #include "qgsconfig.h" -#include +#include "qgslogger.h" #include "qgseditorwidgetregistry.h" diff --git a/src/browser/qgsbrowser.cpp b/src/browser/qgsbrowser.cpp index 7210a17677b..3e6be4a4bc3 100644 --- a/src/browser/qgsbrowser.cpp +++ b/src/browser/qgsbrowser.cpp @@ -14,26 +14,26 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include #include +#include #include +#include #include "qgsapplication.h" -#include "qgsdataitem.h" +#include "qgsattributetablefiltermodel.h" +#include "qgsattributetablemodel.h" #include "qgsbrowser.h" #include "qgsbrowsermodel.h" +#include "qgscredentialdialog.h" +#include "qgsdataitem.h" #include "qgsencodingfiledialog.h" #include "qgsgenericprojectionselector.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" -#include "qgsproviderregistry.h" -#include "qgsvectorlayer.h" -#include "qgsrasterlayer.h" #include "qgsnewvectorlayerdialog.h" -#include "qgsattributetablemodel.h" -#include "qgsattributetablefiltermodel.h" -#include "qgscredentialdialog.h" +#include "qgsproviderregistry.h" +#include "qgsrasterlayer.h" +#include "qgsvectorlayer.h" #ifdef ANDROID #define QGIS_ICON_SIZE 32 diff --git a/src/browser/qgsbrowser.h b/src/browser/qgsbrowser.h index a8f74eccda5..54599f00d50 100644 --- a/src/browser/qgsbrowser.h +++ b/src/browser/qgsbrowser.h @@ -17,10 +17,10 @@ #ifndef QGSBROWSER_H #define QGSBROWSER_H +#include "ui_qgsbrowserbase.h" #include #include #include -#include "ui_qgsbrowserbase.h" class QgsBrowserModel; class QgsLayerItem; diff --git a/src/core/composer/qgsaddremoveitemcommand.cpp b/src/core/composer/qgsaddremoveitemcommand.cpp index 10f60f99fec..c57c5435037 100644 --- a/src/core/composer/qgsaddremoveitemcommand.cpp +++ b/src/core/composer/qgsaddremoveitemcommand.cpp @@ -17,9 +17,9 @@ #include "qgsaddremoveitemcommand.h" #include "qgscomposeritem.h" +#include "qgscomposermodel.h" #include "qgscomposition.h" #include "qgsproject.h" -#include "qgscomposermodel.h" QgsAddRemoveItemCommand::QgsAddRemoveItemCommand( State s, QgsComposerItem* item, QgsComposition* c, const QString& text, QUndoCommand* parent ): QUndoCommand( text, parent ), mItem( item ), mComposition( c ), mState( s ), mFirstRun( true ) diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp index c4813d59476..fafceeb0bed 100644 --- a/src/core/composer/qgsatlascomposition.cpp +++ b/src/core/composer/qgsatlascomposition.cpp @@ -14,19 +14,19 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include "qgsatlascomposition.h" -#include "qgsvectorlayer.h" #include "qgscomposermap.h" #include "qgscomposition.h" -#include "qgsvectordataprovider.h" #include "qgsexpression.h" #include "qgsgeometry.h" #include "qgsmaplayerregistry.h" -#include "qgsproject.h" #include "qgsmessagelog.h" +#include "qgsproject.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) : mComposition( composition ), diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h index 9537b2abedb..09a24cb57e3 100644 --- a/src/core/composer/qgsatlascomposition.h +++ b/src/core/composer/qgsatlascomposition.h @@ -20,9 +20,9 @@ #include "qgsfeature.h" #include -#include -#include #include +#include +#include #include class QgsComposerMap; diff --git a/src/core/composer/qgscomposerarrow.cpp b/src/core/composer/qgscomposerarrow.cpp index 5e54594c88d..4fccfa39ea6 100644 --- a/src/core/composer/qgscomposerarrow.cpp +++ b/src/core/composer/qgscomposerarrow.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgscomposerarrow.h" -#include "qgscomposition.h" -#include "qgscomposerutils.h" -#include "qgssymbollayerv2utils.h" #include #include #include +#include "qgscomposerarrow.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgssymbollayerv2utils.h" #include diff --git a/src/core/composer/qgscomposerarrow.h b/src/core/composer/qgscomposerarrow.h index 23c58ae1b21..9b8629f9d35 100644 --- a/src/core/composer/qgscomposerarrow.h +++ b/src/core/composer/qgscomposerarrow.h @@ -18,9 +18,9 @@ #ifndef QGSCOMPOSERARROW_H #define QGSCOMPOSERARROW_H -#include "qgscomposeritem.h" #include #include +#include "qgscomposeritem.h" class QgsLineSymbolV2; diff --git a/src/core/composer/qgscomposerattributetable.cpp b/src/core/composer/qgscomposerattributetable.cpp index 4700857a610..0a03d533d71 100644 --- a/src/core/composer/qgscomposerattributetable.cpp +++ b/src/core/composer/qgscomposerattributetable.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include "qgscomposerattributetable.h" -#include "qgscomposertablecolumn.h" #include "qgscomposermap.h" +#include "qgscomposertablecolumn.h" #include "qgscomposerutils.h" #include "qgsmaplayerregistry.h" #include "qgsvectorlayer.h" diff --git a/src/core/composer/qgscomposerattributetablemodel.cpp b/src/core/composer/qgscomposerattributetablemodel.cpp index 76b618f0bc8..51eeeece8ed 100644 --- a/src/core/composer/qgscomposerattributetablemodel.cpp +++ b/src/core/composer/qgscomposerattributetablemodel.cpp @@ -17,8 +17,8 @@ #include "qgscomposerattributetable.h" #include "qgscomposerattributetablemodel.h" -#include "qgscomposertable.h" #include "qgscomposertablecolumn.h" +#include "qgscomposertable.h" //QgsComposerAttributeTableColumnModel diff --git a/src/core/composer/qgscomposerattributetablemodelv2.cpp b/src/core/composer/qgscomposerattributetablemodelv2.cpp index 4b5aac6bd71..65c7678f557 100644 --- a/src/core/composer/qgscomposerattributetablemodelv2.cpp +++ b/src/core/composer/qgscomposerattributetablemodelv2.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgscomposerattributetablev2.h" #include "qgscomposerattributetablemodelv2.h" -#include "qgscomposertablev2.h" +#include "qgscomposerattributetablev2.h" #include "qgscomposertablecolumn.h" +#include "qgscomposertablev2.h" //QgsComposerAttributeTableColumnModelV2V2 diff --git a/src/core/composer/qgscomposerattributetablev2.cpp b/src/core/composer/qgscomposerattributetablev2.cpp index a86fba3680c..43de689b576 100644 --- a/src/core/composer/qgscomposerattributetablev2.cpp +++ b/src/core/composer/qgscomposerattributetablev2.cpp @@ -15,17 +15,17 @@ * * ***************************************************************************/ -#include "qgscomposerattributetablev2.h" -#include "qgscomposertablecolumn.h" -#include "qgscomposermap.h" -#include "qgscomposerutils.h" -#include "qgsmaplayerregistry.h" -#include "qgsvectorlayer.h" -#include "qgscomposerframe.h" #include "qgsatlascomposition.h" +#include "qgscomposerattributetablev2.h" +#include "qgscomposerframe.h" +#include "qgscomposermap.h" +#include "qgscomposertablecolumn.h" +#include "qgscomposerutils.h" +#include "qgsgeometry.h" +#include "qgsmaplayerregistry.h" #include "qgsproject.h" #include "qgsrelationmanager.h" -#include "qgsgeometry.h" +#include "qgsvectorlayer.h" //QgsComposerAttributeTableCompareV2 diff --git a/src/core/composer/qgscomposerattributetablev2.h b/src/core/composer/qgscomposerattributetablev2.h index 87a59e3106b..2bf07b083b2 100644 --- a/src/core/composer/qgscomposerattributetablev2.h +++ b/src/core/composer/qgscomposerattributetablev2.h @@ -18,8 +18,8 @@ #ifndef QGSCOMPOSERATTRIBUTETABLEV2_H #define QGSCOMPOSERATTRIBUTETABLEV2_H -#include "qgscomposertablev2.h" #include "qgscomposerattributetable.h" +#include "qgscomposertablev2.h" class QgsComposerMap; class QgsVectorLayer; diff --git a/src/core/composer/qgscomposerhtml.cpp b/src/core/composer/qgscomposerhtml.cpp index 1a6345a0449..04c422c361c 100644 --- a/src/core/composer/qgscomposerhtml.cpp +++ b/src/core/composer/qgscomposerhtml.cpp @@ -13,26 +13,26 @@ * * ***************************************************************************/ -#include "qgscomposerhtml.h" -#include "qgscomposerframe.h" -#include "qgscomposition.h" #include "qgsaddremovemultiframecommand.h" -#include "qgsnetworkaccessmanager.h" -#include "qgsmessagelog.h" +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" +#include "qgscomposition.h" +#include "qgsdistancearea.h" #include "qgsexpression.h" #include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsnetworkaccessmanager.h" #include "qgsnetworkcontentfetcher.h" -#include "qgsvectorlayer.h" #include "qgsproject.h" -#include "qgsdistancearea.h" +#include "qgsvectorlayer.h" -#include "qgswebpage.h" #include "qgswebframe.h" +#include "qgswebpage.h" #include -#include #include #include +#include QgsComposerHtml::QgsComposerHtml( QgsComposition* c, bool createUndoCommands ) : QgsComposerMultiFrame( c, createUndoCommands ) diff --git a/src/core/composer/qgscomposerhtml.h b/src/core/composer/qgscomposerhtml.h index 098bffef990..155843596d7 100644 --- a/src/core/composer/qgscomposerhtml.h +++ b/src/core/composer/qgscomposerhtml.h @@ -16,8 +16,8 @@ #ifndef QGSCOMPOSERHTML_H #define QGSCOMPOSERHTML_H -#include "qgscomposermultiframe.h" #include +#include "qgscomposermultiframe.h" class QWebPage; class QImage; diff --git a/src/core/composer/qgscomposeritem.cpp b/src/core/composer/qgscomposeritem.cpp index 003d9e01e6c..8ef6d7123db 100644 --- a/src/core/composer/qgscomposeritem.cpp +++ b/src/core/composer/qgscomposeritem.cpp @@ -14,32 +14,32 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include +#include #include #include #include #include #include #include -#include +#include #include "qgsproject.h" -#include "qgscomposition.h" -#include "qgscomposeritem.h" #include "qgscomposerframe.h" -#include "qgsdatadefined.h" -#include "qgscomposerutils.h" +#include "qgscomposeritem.h" #include "qgscomposermodel.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" #include #include "qgsapplication.h" -#include "qgsrectangle.h" //just for debugging #include "qgslogger.h" -#include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance #include "qgsmaprenderer.h" //for getCompositionMode +#include "qgsrectangle.h" //just for debugging +#include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance #include diff --git a/src/core/composer/qgscomposeritem.h b/src/core/composer/qgscomposeritem.h index a705316a9cf..8e518a70717 100644 --- a/src/core/composer/qgscomposeritem.h +++ b/src/core/composer/qgscomposeritem.h @@ -17,12 +17,12 @@ #ifndef QGSCOMPOSERITEM_H #define QGSCOMPOSERITEM_H -#include "qgscomposeritemcommand.h" -#include "qgscomposereffect.h" -#include "qgscomposerobject.h" -#include "qgsmaprenderer.h" // for blend mode functions & enums #include #include +#include "qgscomposereffect.h" +#include "qgscomposeritemcommand.h" +#include "qgscomposerobject.h" +#include "qgsmaprenderer.h" // for blend mode functions & enums class QWidget; class QDomDocument; diff --git a/src/core/composer/qgscomposeritemcommand.cpp b/src/core/composer/qgscomposeritemcommand.cpp index d97b4471d05..2fb9c1d20e5 100644 --- a/src/core/composer/qgscomposeritemcommand.cpp +++ b/src/core/composer/qgscomposeritemcommand.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ +#include "qgscomposerframe.h" #include "qgscomposeritemcommand.h" #include "qgscomposeritem.h" -#include "qgscomposerframe.h" #include "qgscomposermultiframe.h" -#include "qgsproject.h" #include "qgslogger.h" +#include "qgsproject.h" QgsComposerItemCommand::QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent ) : QUndoCommand( text, parent ) diff --git a/src/core/composer/qgscomposeritemcommand.h b/src/core/composer/qgscomposeritemcommand.h index 61119b00cbc..de98f48e2e1 100644 --- a/src/core/composer/qgscomposeritemcommand.h +++ b/src/core/composer/qgscomposeritemcommand.h @@ -18,8 +18,8 @@ #ifndef QGSCOMPOSERITEMCOMMAND_H #define QGSCOMPOSERITEMCOMMAND_H -#include #include +#include class QgsComposerItem; class QgsComposerMultiFrame; diff --git a/src/core/composer/qgscomposeritemgroup.cpp b/src/core/composer/qgscomposeritemgroup.cpp index 3874335ed53..19508c5221c 100644 --- a/src/core/composer/qgscomposeritemgroup.cpp +++ b/src/core/composer/qgscomposeritemgroup.cpp @@ -16,13 +16,13 @@ ***************************************************************************/ #include "qgscomposeritemgroup.h" -#include "qgscomposition.h" -#include "qgscomposerutils.h" -#include "qgslogger.h" #include "qgscomposermodel.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgslogger.h" -#include #include +#include QgsComposerItemGroup::QgsComposerItemGroup( QgsComposition* c ) : QgsComposerItem( c ) diff --git a/src/core/composer/qgscomposeritemgroup.h b/src/core/composer/qgscomposeritemgroup.h index c7621e7aa37..b920b9cdb70 100644 --- a/src/core/composer/qgscomposeritemgroup.h +++ b/src/core/composer/qgscomposeritemgroup.h @@ -17,8 +17,8 @@ #ifndef QGSCOMPOSERITEMGROUP_H #define QGSCOMPOSERITEMGROUP_H -#include "qgscomposeritem.h" #include +#include "qgscomposeritem.h" /** \ingroup MapComposer * A container for grouping several QgsComposerItems diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp index 731dc4607f7..f7e7ece84de 100644 --- a/src/core/composer/qgscomposerlabel.cpp +++ b/src/core/composer/qgscomposerlabel.cpp @@ -16,26 +16,26 @@ ***************************************************************************/ #include "qgscomposerlabel.h" -#include "qgscomposition.h" +#include "qgscomposermodel.h" #include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsdistancearea.h" #include "qgsexpression.h" #include "qgsnetworkaccessmanager.h" -#include "qgscomposermodel.h" -#include "qgsvectorlayer.h" #include "qgsproject.h" -#include "qgsdistancearea.h" +#include "qgsvectorlayer.h" -#include "qgswebview.h" #include "qgswebframe.h" #include "qgswebpage.h" +#include "qgswebview.h" #include #include #include +#include #include #include #include -#include QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ) : QgsComposerItem( composition ) diff --git a/src/core/composer/qgscomposerlabel.h b/src/core/composer/qgscomposerlabel.h index ac74636a9b0..29130beed19 100644 --- a/src/core/composer/qgscomposerlabel.h +++ b/src/core/composer/qgscomposerlabel.h @@ -17,8 +17,8 @@ #ifndef QGSCOMPOSERLABEL_H #define QGSCOMPOSERLABEL_H -#include "qgscomposeritem.h" #include +#include "qgscomposeritem.h" class QgsVectorLayer; class QgsFeature; diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp index 32505c9db9e..39ee4e8b116 100644 --- a/src/core/composer/qgscomposerlegend.cpp +++ b/src/core/composer/qgscomposerlegend.cpp @@ -16,21 +16,21 @@ ***************************************************************************/ #include -#include "qgscomposerlegendstyle.h" +#include +#include +#include #include "qgscomposerlegend.h" #include "qgscomposerlegenditem.h" +#include "qgscomposerlegendstyle.h" #include "qgscomposermap.h" -#include "qgscomposition.h" #include "qgscomposermodel.h" -#include "qgsmaplayerregistry.h" +#include "qgscomposition.h" #include "qgslayertree.h" #include "qgslayertreemodel.h" #include "qgslegendrenderer.h" #include "qgslogger.h" +#include "qgsmaplayerregistry.h" #include "qgsproject.h" -#include -#include -#include QgsComposerLegend::QgsComposerLegend( QgsComposition* composition ) : QgsComposerItem( composition ) diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h index 1045ac15014..42796624b0a 100644 --- a/src/core/composer/qgscomposerlegend.h +++ b/src/core/composer/qgscomposerlegend.h @@ -18,9 +18,9 @@ #ifndef QGSCOMPOSERLEGEND_H #define QGSCOMPOSERLEGEND_H -#include "qgscomposerlegendstyle.h" #include "qgscomposeritem.h" #include "qgscomposerlegenditem.h" +#include "qgscomposerlegendstyle.h" #include "qgslayertreemodel.h" #include "qgslegendmodel.h" #include "qgslegendsettings.h" diff --git a/src/core/composer/qgscomposerlegenditem.cpp b/src/core/composer/qgscomposerlegenditem.cpp index b726d4965df..b12d4889c15 100644 --- a/src/core/composer/qgscomposerlegenditem.cpp +++ b/src/core/composer/qgscomposerlegenditem.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgscomposerlegendstyle.h" -#include "qgscomposerlegenditem.h" +#include +#include +#include "qgsapplication.h" #include "qgscomposerlegend.h" +#include "qgscomposerlegenditem.h" +#include "qgscomposerlegendstyle.h" #include "qgsmaplayerregistry.h" #include "qgsrasterlayer.h" #include "qgsrendererv2.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" #include "qgsvectorlayer.h" -#include "qgsapplication.h" -#include -#include QgsComposerLegendItem::QgsComposerLegendItem( QgsComposerLegendStyle::Style s ): QStandardItem() , mStyle( s ) diff --git a/src/core/composer/qgscomposerlegenditem.h b/src/core/composer/qgscomposerlegenditem.h index d24e790c34d..f6a1d238016 100644 --- a/src/core/composer/qgscomposerlegenditem.h +++ b/src/core/composer/qgscomposerlegenditem.h @@ -18,8 +18,8 @@ #ifndef QGSCOMPOSERLEGENDITEM_H #define QGSCOMPOSERLEGENDITEM_H -#include "qgscomposerlegendstyle.h" #include +#include "qgscomposerlegendstyle.h" class QDomDocument; class QDomElement; diff --git a/src/core/composer/qgscomposerlegendstyle.cpp b/src/core/composer/qgscomposerlegendstyle.cpp index df7dd6eb2a2..e8389cca272 100644 --- a/src/core/composer/qgscomposerlegendstyle.cpp +++ b/src/core/composer/qgscomposerlegendstyle.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgscomposerlegendstyle.h" -#include "qgscomposition.h" +#include +#include +#include #include #include #include #include -#include -#include -#include +#include "qgscomposerlegendstyle.h" +#include "qgscomposition.h" QgsComposerLegendStyle::QgsComposerLegendStyle() { diff --git a/src/core/composer/qgscomposerlegendstyle.h b/src/core/composer/qgscomposerlegendstyle.h index fc2b7c970b4..10647206e8c 100644 --- a/src/core/composer/qgscomposerlegendstyle.h +++ b/src/core/composer/qgscomposerlegendstyle.h @@ -18,11 +18,11 @@ #ifndef QGSCOMPOSERLEGENDSTYLE_H #define QGSCOMPOSERLEGENDSTYLE_H +#include +#include #include #include #include -#include -#include /** \ingroup MapComposer * Composer legend components style diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp index eaae4d25d60..c9d6d61035b 100644 --- a/src/core/composer/qgscomposermap.cpp +++ b/src/core/composer/qgscomposermap.cpp @@ -15,34 +15,34 @@ * * ***************************************************************************/ -#include "qgscomposermap.h" #include "qgscomposermapgrid.h" +#include "qgscomposermap.h" #include "qgscomposermapoverview.h" -#include "qgscomposition.h" #include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsexpression.h" #include "qgslogger.h" -#include "qgsmaprenderer.h" -#include "qgsmaprenderercustompainterjob.h" #include "qgsmaplayerregistry.h" #include "qgsmaplayerstylemanager.h" +#include "qgsmaprenderercustompainterjob.h" +#include "qgsmaprenderer.h" #include "qgsmaptopixel.h" +#include "qgspallabeling.h" #include "qgsproject.h" #include "qgsrasterlayer.h" #include "qgsrendercontext.h" #include "qgsscalecalculator.h" #include "qgsvectorlayer.h" -#include "qgspallabeling.h" -#include "qgsexpression.h" -#include "qgslabel.h" #include "qgslabelattributes.h" +#include "qgslabel.h" #include "qgssymbollayerv2utils.h" //for pointOnLineWithDistance +#include #include #include #include #include -#include QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height ) : QgsComposerItem( x, y, width, height, composition ) diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h index 02c893ee0d9..ed3adf985c4 100644 --- a/src/core/composer/qgscomposermap.h +++ b/src/core/composer/qgscomposermap.h @@ -18,10 +18,10 @@ #define QGSCOMPOSERMAP_H //#include "ui_qgscomposermapbase.h" -#include "qgscomposeritem.h" -#include "qgsrectangle.h" #include #include +#include "qgscomposeritem.h" +#include "qgsrectangle.h" class QgsComposition; class QgsComposerMapOverviewStack; diff --git a/src/core/composer/qgscomposermapgrid.cpp b/src/core/composer/qgscomposermapgrid.cpp index bed0b012b6a..b47a707e991 100644 --- a/src/core/composer/qgscomposermapgrid.cpp +++ b/src/core/composer/qgscomposermapgrid.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgscomposermapgrid.h" -#include "qgscomposerutils.h" #include "qgsclipper.h" -#include "qgsgeometry.h" +#include "qgscomposermapgrid.h" #include "qgscomposermap.h" +#include "qgscomposerutils.h" #include "qgscomposition.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsgeometry.h" +#include "qgslogger.h" #include "qgsmaprenderer.h" #include "qgsrendercontext.h" #include "qgssymbollayerv2utils.h" #include "qgssymbolv2.h" -#include "qgscoordinatereferencesystem.h" -#include "qgslogger.h" #include #include diff --git a/src/core/composer/qgscomposermapgrid.h b/src/core/composer/qgscomposermapgrid.h index eb33b866b69..f79f2769585 100644 --- a/src/core/composer/qgscomposermapgrid.h +++ b/src/core/composer/qgscomposermapgrid.h @@ -18,12 +18,12 @@ #ifndef QGSCOMPOSERMAPGRID_H #define QGSCOMPOSERMAPGRID_H +#include +#include #include "qgscomposermapitem.h" #include "qgscoordinatereferencesystem.h" #include "qgsrectangle.h" #include "qgsrendercontext.h" -#include -#include class QgsCoordinateTransform; class QgsLineSymbolV2; diff --git a/src/core/composer/qgscomposermapitem.cpp b/src/core/composer/qgscomposermapitem.cpp index 7ef201aeb7c..959d65fcdd1 100644 --- a/src/core/composer/qgscomposermapitem.cpp +++ b/src/core/composer/qgscomposermapitem.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgscomposermapitem.h" -#include "qgscomposermap.h" #include +#include "qgscomposermap.h" +#include "qgscomposermapitem.h" QgsComposerMapItem::QgsComposerMapItem( const QString &name, QgsComposerMap *map ) : QgsComposerObject( map->composition() ) diff --git a/src/core/composer/qgscomposermapoverview.cpp b/src/core/composer/qgscomposermapoverview.cpp index 001875c6fcf..0e916642b49 100644 --- a/src/core/composer/qgscomposermapoverview.cpp +++ b/src/core/composer/qgscomposermapoverview.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgscomposermapoverview.h" #include "qgscomposermap.h" +#include "qgscomposermapoverview.h" #include "qgscomposition.h" #include "qgssymbollayerv2utils.h" #include "qgssymbolv2.h" diff --git a/src/core/composer/qgscomposermapoverview.h b/src/core/composer/qgscomposermapoverview.h index 47a01f73883..ab87c8cd2e5 100644 --- a/src/core/composer/qgscomposermapoverview.h +++ b/src/core/composer/qgscomposermapoverview.h @@ -18,10 +18,10 @@ #ifndef QGSCOMPOSERMAPOVERVIEW_H #define QGSCOMPOSERMAPOVERVIEW_H -#include "qgscomposermapitem.h" -#include #include #include +#include +#include "qgscomposermapitem.h" class QDomDocument; class QDomElement; diff --git a/src/core/composer/qgscomposermodel.cpp b/src/core/composer/qgscomposermodel.cpp index a6661c3de1a..4d8f95fbde2 100644 --- a/src/core/composer/qgscomposermodel.cpp +++ b/src/core/composer/qgscomposermodel.cpp @@ -15,20 +15,20 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposermodel.h" -#include "qgscomposition.h" -#include "qgscomposeritem.h" -#include "qgspaperitem.h" -#include "qgslogger.h" #include -#include #include #include +#include +#include +#include #include #include -#include -#include +#include "qgsapplication.h" +#include "qgscomposeritem.h" +#include "qgscomposermodel.h" +#include "qgscomposition.h" +#include "qgslogger.h" +#include "qgspaperitem.h" QgsComposerModel::QgsComposerModel( QgsComposition* composition, QObject *parent ) : QAbstractItemModel( parent ) diff --git a/src/core/composer/qgscomposermodel.h b/src/core/composer/qgscomposermodel.h index 31d5b43b59b..eeed6d3a96f 100644 --- a/src/core/composer/qgscomposermodel.h +++ b/src/core/composer/qgscomposermodel.h @@ -19,8 +19,8 @@ #define QGSCOMPOSERMODEL_H #include -#include #include +#include class QgsComposition; class QgsComposerItem; diff --git a/src/core/composer/qgscomposermousehandles.cpp b/src/core/composer/qgscomposermousehandles.cpp index 5ee2d4e87d9..09ff75be5ee 100644 --- a/src/core/composer/qgscomposermousehandles.cpp +++ b/src/core/composer/qgscomposermousehandles.cpp @@ -14,20 +14,20 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include #include #include -#include "qgscomposermousehandles.h" -#include "qgscomposeritem.h" -#include "qgscomposition.h" -#include "qgscomposerutils.h" -#include "qgspaperitem.h" #include "qgis.h" +#include "qgscomposeritem.h" +#include "qgscomposermousehandles.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" #include "qgslogger.h" +#include "qgspaperitem.h" #include "qgsproject.h" QgsComposerMouseHandles::QgsComposerMouseHandles( QgsComposition *composition ) diff --git a/src/core/composer/qgscomposermultiframe.cpp b/src/core/composer/qgscomposermultiframe.cpp index b42300442f3..a6c4b46410d 100644 --- a/src/core/composer/qgscomposermultiframe.cpp +++ b/src/core/composer/qgscomposermultiframe.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgscomposermultiframe.h" -#include "qgscomposerframe.h" -#include "qgscomposition.h" #include +#include "qgscomposerframe.h" +#include "qgscomposermultiframe.h" +#include "qgscomposition.h" QgsComposerMultiFrame::QgsComposerMultiFrame( QgsComposition* c, bool createUndoCommands ): QgsComposerObject( c ), diff --git a/src/core/composer/qgscomposermultiframe.h b/src/core/composer/qgscomposermultiframe.h index 5a2e9fd40a6..c3c52ce165c 100644 --- a/src/core/composer/qgscomposermultiframe.h +++ b/src/core/composer/qgscomposermultiframe.h @@ -16,10 +16,10 @@ #ifndef QGSCOMPOSERMULTIFRAME_H #define QGSCOMPOSERMULTIFRAME_H -#include "qgscomposerobject.h" #include -#include #include +#include +#include "qgscomposerobject.h" class QgsComposerFrame; class QgsComposerItem; diff --git a/src/core/composer/qgscomposermultiframecommand.h b/src/core/composer/qgscomposermultiframecommand.h index fe8c59a9dac..5cb6a920d58 100644 --- a/src/core/composer/qgscomposermultiframecommand.h +++ b/src/core/composer/qgscomposermultiframecommand.h @@ -18,8 +18,8 @@ #ifndef QGSCOMPOSERMULTIFRAMECOMMAND_H #define QGSCOMPOSERMULTIFRAMECOMMAND_H -#include #include +#include class QgsComposerMultiFrame; diff --git a/src/core/composer/qgscomposerobject.cpp b/src/core/composer/qgscomposerobject.cpp index 393c53b6ceb..4dd8980e3d0 100644 --- a/src/core/composer/qgscomposerobject.cpp +++ b/src/core/composer/qgscomposerobject.cpp @@ -17,9 +17,9 @@ #include -#include "qgscomposition.h" -#include "qgscomposerutils.h" #include "qgscomposerobject.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" #include "qgsdatadefined.h" #define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter diff --git a/src/core/composer/qgscomposerobject.h b/src/core/composer/qgscomposerobject.h index 01801f69e4e..7553d882b25 100644 --- a/src/core/composer/qgscomposerobject.h +++ b/src/core/composer/qgscomposerobject.h @@ -17,11 +17,11 @@ #ifndef QGSCOMPOSEROBJECT_H #define QGSCOMPOSEROBJECT_H -#include #include +#include +#include #include #include -#include class QgsComposition; class QPainter; diff --git a/src/core/composer/qgscomposerpicture.cpp b/src/core/composer/qgscomposerpicture.cpp index 387c653551d..6a544a3a095 100644 --- a/src/core/composer/qgscomposerpicture.cpp +++ b/src/core/composer/qgscomposerpicture.cpp @@ -15,27 +15,27 @@ * * ***************************************************************************/ -#include "qgscomposerpicture.h" -#include "qgscomposerutils.h" -#include "qgscomposermap.h" -#include "qgscomposition.h" -#include "qgsatlascomposition.h" -#include "qgsproject.h" -#include "qgsexpression.h" -#include "qgsvectorlayer.h" -#include "qgsmessagelog.h" -#include "qgsdatadefined.h" -#include "qgsnetworkcontentfetcher.h" +#include #include #include +#include #include #include +#include +#include #include #include -#include -#include -#include -#include +#include "qgsatlascomposition.h" +#include "qgscomposermap.h" +#include "qgscomposerpicture.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" +#include "qgsexpression.h" +#include "qgsmessagelog.h" +#include "qgsnetworkcontentfetcher.h" +#include "qgsproject.h" +#include "qgsvectorlayer.h" QgsComposerPicture::QgsComposerPicture( QgsComposition *composition ) : QgsComposerItem( composition ) diff --git a/src/core/composer/qgscomposerpicture.h b/src/core/composer/qgscomposerpicture.h index ca294bb21f2..c067eabc986 100644 --- a/src/core/composer/qgscomposerpicture.h +++ b/src/core/composer/qgscomposerpicture.h @@ -17,10 +17,10 @@ #ifndef QGSCOMPOSERPICTURE_H #define QGSCOMPOSERPICTURE_H -#include "qgscomposeritem.h" #include #include #include +#include "qgscomposeritem.h" class QgsComposerMap; class QgsExpression; diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp index 9ae7c0f5a28..c2ca6cb0938 100644 --- a/src/core/composer/qgscomposerscalebar.cpp +++ b/src/core/composer/qgscomposerscalebar.cpp @@ -14,26 +14,26 @@ * * ***************************************************************************/ -#include "qgscomposerscalebar.h" -#include "qgscomposermap.h" -#include "qgscomposition.h" -#include "qgscomposerutils.h" -#include "qgsdistancearea.h" -#include "qgsscalebarstyle.h" -#include "qgsdoubleboxscalebarstyle.h" -#include "qgsmaprenderer.h" -#include "qgsnumericscalebarstyle.h" -#include "qgssingleboxscalebarstyle.h" -#include "qgsticksscalebarstyle.h" -#include "qgsrectangle.h" -#include "qgsproject.h" -#include "qgssymbollayerv2utils.h" +#include #include #include #include #include #include -#include +#include "qgscomposermap.h" +#include "qgscomposerscalebar.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsdistancearea.h" +#include "qgsdoubleboxscalebarstyle.h" +#include "qgsmaprenderer.h" +#include "qgsnumericscalebarstyle.h" +#include "qgsproject.h" +#include "qgsrectangle.h" +#include "qgsscalebarstyle.h" +#include "qgssingleboxscalebarstyle.h" +#include "qgssymbollayerv2utils.h" +#include "qgsticksscalebarstyle.h" QgsComposerScaleBar::QgsComposerScaleBar( QgsComposition* composition ) : QgsComposerItem( composition ) diff --git a/src/core/composer/qgscomposerscalebar.h b/src/core/composer/qgscomposerscalebar.h index 1f2a6fd4eb3..e97b0f5d8e3 100644 --- a/src/core/composer/qgscomposerscalebar.h +++ b/src/core/composer/qgscomposerscalebar.h @@ -16,10 +16,10 @@ #ifndef QGSCOMPOSERSCALEBAR_H #define QGSCOMPOSERSCALEBAR_H -#include "qgscomposeritem.h" +#include #include #include -#include +#include "qgscomposeritem.h" class QgsComposerMap; class QgsScaleBarStyle; diff --git a/src/core/composer/qgscomposershape.cpp b/src/core/composer/qgscomposershape.cpp index 21a1f567ba9..d5498d2ec39 100644 --- a/src/core/composer/qgscomposershape.cpp +++ b/src/core/composer/qgscomposershape.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ +#include +#include "qgscomposermodel.h" #include "qgscomposershape.h" #include "qgscomposition.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" -#include "qgscomposermodel.h" -#include +#include "qgssymbolv2.h" QgsComposerShape::QgsComposerShape( QgsComposition* composition ): QgsComposerItem( composition ), mShape( Ellipse ), diff --git a/src/core/composer/qgscomposershape.h b/src/core/composer/qgscomposershape.h index 709189df064..4003bd5c8e6 100644 --- a/src/core/composer/qgscomposershape.h +++ b/src/core/composer/qgscomposershape.h @@ -18,9 +18,9 @@ #ifndef QGSCOMPOSERSHAPE_H #define QGSCOMPOSERSHAPE_H -#include "qgscomposeritem.h" #include #include +#include "qgscomposeritem.h" class QgsFillSymbolV2; diff --git a/src/core/composer/qgscomposertable.cpp b/src/core/composer/qgscomposertable.cpp index 569afdfd77e..39cec614109 100644 --- a/src/core/composer/qgscomposertable.cpp +++ b/src/core/composer/qgscomposertable.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgscomposertable.h" -#include "qgscomposertablecolumn.h" -#include "qgssymbollayerv2utils.h" -#include "qgscomposerutils.h" #include #include +#include "qgscomposertablecolumn.h" +#include "qgscomposertable.h" +#include "qgscomposerutils.h" +#include "qgssymbollayerv2utils.h" QgsComposerTable::QgsComposerTable( QgsComposition* composition ) diff --git a/src/core/composer/qgscomposertable.h b/src/core/composer/qgscomposertable.h index dfe2f3b7b93..1256a4cbc1f 100644 --- a/src/core/composer/qgscomposertable.h +++ b/src/core/composer/qgscomposertable.h @@ -18,11 +18,11 @@ #ifndef QGSCOMPOSERTABLE_H #define QGSCOMPOSERTABLE_H +#include +#include #include "qgscomposeritem.h" #include "qgscomposition.h" #include "qgsfeature.h" -#include -#include class QgsComposerTableColumn; diff --git a/src/core/composer/qgscomposertablecolumn.h b/src/core/composer/qgscomposertablecolumn.h index 76ab6b437c7..bf4166ae2fc 100644 --- a/src/core/composer/qgscomposertablecolumn.h +++ b/src/core/composer/qgscomposertablecolumn.h @@ -18,8 +18,8 @@ #ifndef QGSCOMPOSERTABLECOLUMN_H #define QGSCOMPOSERTABLECOLUMN_H -#include "qgscomposertable.h" #include +#include "qgscomposertable.h" /**Stores properties of a column in a QgsComposerTable. Some properties of a QgsComposerTableColumn are applicable only in certain contexts. For instance, the attribute and setAttribute methods only diff --git a/src/core/composer/qgscomposertablev2.cpp b/src/core/composer/qgscomposertablev2.cpp index fb46d516c3f..fb7f9e9de78 100644 --- a/src/core/composer/qgscomposertablev2.cpp +++ b/src/core/composer/qgscomposertablev2.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ +#include "qgscomposerframe.h" +#include "qgscomposertablecolumn.h" #include "qgscomposertablev2.h" #include "qgscomposerutils.h" -#include "qgscomposertablecolumn.h" #include "qgssymbollayerv2utils.h" -#include "qgscomposerframe.h" QgsComposerTableV2::QgsComposerTableV2( QgsComposition *composition, bool createUndoCommands ) : QgsComposerMultiFrame( composition, createUndoCommands ) diff --git a/src/core/composer/qgscomposertablev2.h b/src/core/composer/qgscomposertablev2.h index 75f602dde81..1ebf8bffcfb 100644 --- a/src/core/composer/qgscomposertablev2.h +++ b/src/core/composer/qgscomposertablev2.h @@ -18,10 +18,10 @@ #ifndef QGSCOMPOSERTABLEV2_H #define QGSCOMPOSERTABLEV2_H -#include "qgscomposermultiframe.h" -#include #include +#include #include +#include "qgscomposermultiframe.h" class QgsComposerTableColumn; diff --git a/src/core/composer/qgscomposertexttable.cpp b/src/core/composer/qgscomposertexttable.cpp index 5bedc1931bb..e5a54366ef1 100644 --- a/src/core/composer/qgscomposertexttable.cpp +++ b/src/core/composer/qgscomposertexttable.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgscomposertexttable.h" #include "qgscomposertablecolumn.h" +#include "qgscomposertexttable.h" QgsComposerTextTable::QgsComposerTextTable( QgsComposition* c ): QgsComposerTable( c ) { diff --git a/src/core/composer/qgscomposerutils.cpp b/src/core/composer/qgscomposerutils.cpp index 4f87c5004a4..41e6e13ab11 100644 --- a/src/core/composer/qgscomposerutils.cpp +++ b/src/core/composer/qgscomposerutils.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ +#include #include "qgscomposerutils.h" #include "qgscomposition.h" #include "qgsdatadefined.h" -#include #define FONT_WORKAROUND_SCALE 10 //scale factor for upscaling fontsize and downscaling painter diff --git a/src/core/composer/qgscomposerutils.h b/src/core/composer/qgscomposerutils.h index 880653fc663..a77b2957cda 100644 --- a/src/core/composer/qgscomposerutils.h +++ b/src/core/composer/qgscomposerutils.h @@ -17,9 +17,9 @@ #ifndef QGSCOMPOSERUTILS_H #define QGSCOMPOSERUTILS_H -#include "qgscomposition.h" //for page size and orientation enums #include #include +#include "qgscomposition.h" //for page size and orientation enums class QPainter; diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp index e61a7340b3c..2eeb3f33893 100644 --- a/src/core/composer/qgscomposition.cpp +++ b/src/core/composer/qgscomposition.cpp @@ -14,37 +14,38 @@ * * ***************************************************************************/ -#include "qgscomposition.h" -#include "qgscomposerutils.h" +#include "qgsaddremovemultiframecommand.h" #include "qgscomposerarrow.h" +#include "qgscomposerattributetable.h" +#include "qgscomposerattributetablev2.h" #include "qgscomposerframe.h" #include "qgscomposerhtml.h" +#include "qgscomposeritemgroup.h" #include "qgscomposerlabel.h" #include "qgscomposerlegend.h" #include "qgscomposermap.h" #include "qgscomposermapoverview.h" +#include "qgscomposermodel.h" #include "qgscomposermousehandles.h" -#include "qgscomposeritemgroup.h" +#include "qgscomposermultiframecommand.h" #include "qgscomposerpicture.h" #include "qgscomposerscalebar.h" #include "qgscomposershape.h" -#include "qgscomposermodel.h" -#include "qgscomposerattributetable.h" -#include "qgscomposerattributetablev2.h" -#include "qgsaddremovemultiframecommand.h" -#include "qgscomposermultiframecommand.h" +#include "qgscomposerutils.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" +#include "qgsexpression.h" +#include "qgsgeometry.h" +#include "qgslogger.h" #include "qgspaintenginehack.h" #include "qgspaperitem.h" #include "qgsproject.h" -#include "qgsgeometry.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsexpression.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" -#include "qgsdatadefined.h" -#include "qgslogger.h" +#include "qgssymbolv2.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" +#include #include #include #include @@ -52,7 +53,6 @@ #include #include #include -#include #include diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h index 8f30c4fb484..f61cb0c60ed 100644 --- a/src/core/composer/qgscomposition.h +++ b/src/core/composer/qgscomposition.h @@ -22,19 +22,19 @@ #include #include #include +#include #include +#include #include #include -#include -#include #include "qgsaddremoveitemcommand.h" -#include "qgscomposeritemcommand.h" -#include "qgscomposermultiframecommand.h" #include "qgsatlascomposition.h" -#include "qgspaperitem.h" -#include "qgscomposerobject.h" +#include "qgscomposeritemcommand.h" #include "qgscomposeritem.h" +#include "qgscomposermultiframecommand.h" +#include "qgscomposerobject.h" +#include "qgspaperitem.h" class QgisApp; class QgsComposerFrame; diff --git a/src/core/composer/qgsdoubleboxscalebarstyle.cpp b/src/core/composer/qgsdoubleboxscalebarstyle.cpp index 4f50fb2232e..0883697d176 100644 --- a/src/core/composer/qgsdoubleboxscalebarstyle.cpp +++ b/src/core/composer/qgsdoubleboxscalebarstyle.cpp @@ -14,11 +14,11 @@ * * ***************************************************************************/ -#include "qgsdoubleboxscalebarstyle.h" -#include "qgscomposerscalebar.h" -#include "qgscomposerutils.h" #include #include +#include "qgscomposerscalebar.h" +#include "qgscomposerutils.h" +#include "qgsdoubleboxscalebarstyle.h" QgsDoubleBoxScaleBarStyle::QgsDoubleBoxScaleBarStyle( const QgsComposerScaleBar* bar ): QgsScaleBarStyle( bar ) { diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp index 9c29667f0f5..e9e1cbade07 100644 --- a/src/core/composer/qgslegendmodel.cpp +++ b/src/core/composer/qgslegendmodel.cpp @@ -15,10 +15,16 @@ * * ***************************************************************************/ -#include "qgslegendmodel.h" +#include +#include +#include +#include +#include +#include #include "qgscomposerlegenditem.h" #include "qgsfield.h" #include "qgslayertree.h" +#include "qgslegendmodel.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" #include "qgsrasterlayer.h" @@ -26,12 +32,6 @@ #include "qgssymbollayerv2utils.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include -#include -#include -#include -#include -#include QgsLegendModel::QgsLegendModel(): QStandardItemModel(), mAutoUpdate( true ) { diff --git a/src/core/composer/qgslegendmodel.h b/src/core/composer/qgslegendmodel.h index d4a1ab8c20c..25d6ee3f306 100644 --- a/src/core/composer/qgslegendmodel.h +++ b/src/core/composer/qgslegendmodel.h @@ -18,9 +18,9 @@ #ifndef QGSLEGENDMODEL_H #define QGSLEGENDMODEL_H +#include #include #include -#include class QDomDocument; class QDomElement; diff --git a/src/core/composer/qgsnumericscalebarstyle.cpp b/src/core/composer/qgsnumericscalebarstyle.cpp index e2cc6e6667d..8f7b2954642 100644 --- a/src/core/composer/qgsnumericscalebarstyle.cpp +++ b/src/core/composer/qgsnumericscalebarstyle.cpp @@ -14,12 +14,12 @@ * * ***************************************************************************/ -#include "qgsnumericscalebarstyle.h" +#include +#include #include "qgscomposermap.h" #include "qgscomposerscalebar.h" #include "qgscomposerutils.h" -#include -#include +#include "qgsnumericscalebarstyle.h" QgsNumericScaleBarStyle::QgsNumericScaleBarStyle( QgsComposerScaleBar* bar ): QgsScaleBarStyle( bar ), mLastScaleBarWidth( 0 ) { diff --git a/src/core/composer/qgspaperitem.cpp b/src/core/composer/qgspaperitem.cpp index 302c6d12e03..81ee3bfe1d1 100644 --- a/src/core/composer/qgspaperitem.cpp +++ b/src/core/composer/qgspaperitem.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgspaperitem.h" -#include "qgscomposition.h" -#include "qgsstylev2.h" -#include "qgslogger.h" #include #include #include +#include "qgscomposition.h" +#include "qgslogger.h" +#include "qgspaperitem.h" +#include "qgsstylev2.h" //QgsPaperGrid diff --git a/src/core/composer/qgspaperitem.h b/src/core/composer/qgspaperitem.h index b54569e0fe5..4728e22d2aa 100644 --- a/src/core/composer/qgspaperitem.h +++ b/src/core/composer/qgspaperitem.h @@ -18,8 +18,8 @@ #ifndef QGSPAPERITEM_H #define QGSPAPERITEM_H -#include "qgscomposeritem.h" #include +#include "qgscomposeritem.h" /**Item representing a grid. This is drawn separately to the underlying paper item since the grid needs to be * drawn above all other composer items, while the paper item is drawn below all others.*/ diff --git a/src/core/composer/qgsscalebarstyle.cpp b/src/core/composer/qgsscalebarstyle.cpp index 222b7685e26..08a3ab643da 100644 --- a/src/core/composer/qgsscalebarstyle.cpp +++ b/src/core/composer/qgsscalebarstyle.cpp @@ -14,11 +14,11 @@ * * ***************************************************************************/ -#include "qgsscalebarstyle.h" -#include "qgscomposerscalebar.h" -#include "qgscomposerutils.h" #include #include +#include "qgscomposerscalebar.h" +#include "qgscomposerutils.h" +#include "qgsscalebarstyle.h" QgsScaleBarStyle::QgsScaleBarStyle( const QgsComposerScaleBar* bar ): mScaleBar( bar ) { diff --git a/src/core/composer/qgssingleboxscalebarstyle.cpp b/src/core/composer/qgssingleboxscalebarstyle.cpp index 1d4d826cec9..8e83936dc2f 100644 --- a/src/core/composer/qgssingleboxscalebarstyle.cpp +++ b/src/core/composer/qgssingleboxscalebarstyle.cpp @@ -14,11 +14,11 @@ * * ***************************************************************************/ -#include "qgssingleboxscalebarstyle.h" -#include "qgscomposerscalebar.h" -#include "qgscomposerutils.h" #include #include +#include "qgscomposerscalebar.h" +#include "qgscomposerutils.h" +#include "qgssingleboxscalebarstyle.h" QgsSingleBoxScaleBarStyle::QgsSingleBoxScaleBarStyle( const QgsComposerScaleBar* bar ): QgsScaleBarStyle( bar ) { diff --git a/src/core/composer/qgsticksscalebarstyle.cpp b/src/core/composer/qgsticksscalebarstyle.cpp index 4401b5ffe96..d2e92d6b359 100644 --- a/src/core/composer/qgsticksscalebarstyle.cpp +++ b/src/core/composer/qgsticksscalebarstyle.cpp @@ -14,10 +14,10 @@ * * ***************************************************************************/ -#include "qgsticksscalebarstyle.h" +#include #include "qgscomposerscalebar.h" #include "qgscomposerutils.h" -#include +#include "qgsticksscalebarstyle.h" QgsTicksScaleBarStyle::QgsTicksScaleBarStyle( const QgsComposerScaleBar* bar ): QgsScaleBarStyle( bar ) { diff --git a/src/core/diagram/qgsdiagram.cpp b/src/core/diagram/qgsdiagram.cpp index 574cf4d79d6..0b757aca706 100644 --- a/src/core/diagram/qgsdiagram.cpp +++ b/src/core/diagram/qgsdiagram.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgsdiagram.h" #include "qgsdiagramrendererv2.h" -#include "qgsrendercontext.h" #include "qgsexpression.h" +#include "qgsrendercontext.h" #include diff --git a/src/core/diagram/qgsdiagram.h b/src/core/diagram/qgsdiagram.h index e04b6c9fc79..0361111af0a 100644 --- a/src/core/diagram/qgsdiagram.h +++ b/src/core/diagram/qgsdiagram.h @@ -15,9 +15,9 @@ #ifndef QGSDIAGRAM_H #define QGSDIAGRAM_H -#include "qgsfeature.h" -#include #include +#include +#include "qgsfeature.h" class QPainter; class QPointF; diff --git a/src/core/diagram/qgshistogramdiagram.cpp b/src/core/diagram/qgshistogramdiagram.cpp index 022017d4ae9..db1b4c7a08f 100644 --- a/src/core/diagram/qgshistogramdiagram.cpp +++ b/src/core/diagram/qgshistogramdiagram.cpp @@ -12,10 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgshistogramdiagram.h" #include "qgsdiagramrendererv2.h" -#include "qgsrendercontext.h" #include "qgsexpression.h" +#include "qgshistogramdiagram.h" +#include "qgsrendercontext.h" #include diff --git a/src/core/diagram/qgshistogramdiagram.h b/src/core/diagram/qgshistogramdiagram.h index d5955596142..17a090b1dc7 100644 --- a/src/core/diagram/qgshistogramdiagram.h +++ b/src/core/diagram/qgshistogramdiagram.h @@ -18,10 +18,10 @@ #define DIAGRAM_NAME_HISTOGRAM "Histogram" +#include +#include #include "qgsdiagram.h" #include "qgsfeature.h" -#include -#include class QPainter; class QPointF; diff --git a/src/core/diagram/qgspiediagram.cpp b/src/core/diagram/qgspiediagram.cpp index 56f44392376..56379ffd425 100644 --- a/src/core/diagram/qgspiediagram.cpp +++ b/src/core/diagram/qgspiediagram.cpp @@ -12,10 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgspiediagram.h" #include "qgsdiagramrendererv2.h" -#include "qgsrendercontext.h" #include "qgsexpression.h" +#include "qgspiediagram.h" +#include "qgsrendercontext.h" #include diff --git a/src/core/diagram/qgspiediagram.h b/src/core/diagram/qgspiediagram.h index 69f63a98663..47a39e0210e 100644 --- a/src/core/diagram/qgspiediagram.h +++ b/src/core/diagram/qgspiediagram.h @@ -17,10 +17,10 @@ #define DIAGRAM_NAME_PIE "Pie" +#include +#include #include "qgsdiagram.h" #include "qgsfeature.h" -#include -#include class QPainter; class QPointF; diff --git a/src/core/diagram/qgstextdiagram.cpp b/src/core/diagram/qgstextdiagram.cpp index 64d4ff33a3e..7bc2c27d148 100644 --- a/src/core/diagram/qgstextdiagram.cpp +++ b/src/core/diagram/qgstextdiagram.cpp @@ -12,10 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgstextdiagram.h" #include "qgsdiagramrendererv2.h" -#include "qgsrendercontext.h" #include "qgsexpression.h" +#include "qgsrendercontext.h" +#include "qgstextdiagram.h" #include diff --git a/src/core/diagram/qgstextdiagram.h b/src/core/diagram/qgstextdiagram.h index 561bcb6419b..6b5a1bcc95a 100644 --- a/src/core/diagram/qgstextdiagram.h +++ b/src/core/diagram/qgstextdiagram.h @@ -17,10 +17,10 @@ #define DIAGRAM_NAME_TEXT "Text" +#include +#include #include "qgsdiagram.h" #include "qgsfeature.h" -#include -#include class QPainter; class QPointF; diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp index 81ae3a26019..746665925d9 100644 --- a/src/core/dxf/qgsdxfexport.cpp +++ b/src/core/dxf/qgsdxfexport.cpp @@ -28,14 +28,14 @@ #include "qgsdxfexport.h" #include "qgsdxfpallabeling.h" -#include "qgsvectordataprovider.h" +#include "qgsfillsymbollayerv2.h" +#include "qgslinesymbollayerv2.h" +#include "qgsmaplayerregistry.h" #include "qgspoint.h" #include "qgsrendererv2.h" #include "qgssymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" +#include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" #include diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h index 119a4572c2a..ae27a840ec5 100644 --- a/src/core/dxf/qgsdxfexport.h +++ b/src/core/dxf/qgsdxfexport.h @@ -18,11 +18,11 @@ #ifndef QGSDXFEXPORT_H #define QGSDXFEXPORT_H -#include "qgsgeometry.h" -#include "qgssymbolv2.h" #include #include #include +#include "qgsgeometry.h" +#include "qgssymbolv2.h" class QgsMapLayer; class QgsPoint; diff --git a/src/core/dxf/qgsdxfpaintengine.cpp b/src/core/dxf/qgsdxfpaintengine.cpp index 900353d2267..ad2826bc185 100644 --- a/src/core/dxf/qgsdxfpaintengine.cpp +++ b/src/core/dxf/qgsdxfpaintengine.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsdxfpaintengine.h" #include "qgsdxfexport.h" #include "qgsdxfpaintdevice.h" +#include "qgsdxfpaintengine.h" #include "qgslogger.h" QgsDxfPaintEngine::QgsDxfPaintEngine( const QgsDxfPaintDevice* dxfDevice, QgsDxfExport* dxf ) diff --git a/src/core/dxf/qgsdxfpallabeling.cpp b/src/core/dxf/qgsdxfpallabeling.cpp index 27c556f91cd..b561bfc46f9 100644 --- a/src/core/dxf/qgsdxfpallabeling.cpp +++ b/src/core/dxf/qgsdxfpallabeling.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgsdxfpallabeling.h" #include "qgsdxfexport.h" -#include "qgspalgeometry.h" +#include "qgsdxfpallabeling.h" #include "qgsmapsettings.h" +#include "qgspalgeometry.h" -#include "pal/pointset.h" #include "pal/labelposition.h" +#include "pal/pointset.h" using namespace pal; diff --git a/src/core/dxf/qgsdxfpallabeling.h b/src/core/dxf/qgsdxfpallabeling.h index 09aa707f232..961b7437c43 100644 --- a/src/core/dxf/qgsdxfpallabeling.h +++ b/src/core/dxf/qgsdxfpallabeling.h @@ -18,8 +18,8 @@ #ifndef QGSDXFPALLABELING_H #define QGSDXFPALLABELING_H -#include "qgspallabeling.h" #include "qgsmaprenderer.h" +#include "qgspallabeling.h" #include "qgsrendercontext.h" class QgsDxfExport; diff --git a/src/core/effects/qgsblureffect.h b/src/core/effects/qgsblureffect.h index 05f710eb119..2547dab3428 100644 --- a/src/core/effects/qgsblureffect.h +++ b/src/core/effects/qgsblureffect.h @@ -17,9 +17,9 @@ #ifndef QGSBLUREFFECT_H #define QGSBLUREFFECT_H -#include "qgspainteffect.h" -#include "qgis.h" #include +#include "qgis.h" +#include "qgspainteffect.h" /** \ingroup core * \class QgsBlurEffect diff --git a/src/core/effects/qgscoloreffect.h b/src/core/effects/qgscoloreffect.h index 802430887e1..f52c8b55314 100644 --- a/src/core/effects/qgscoloreffect.h +++ b/src/core/effects/qgscoloreffect.h @@ -17,10 +17,10 @@ #ifndef QGSCOLOREFFECT_H #define QGSCOLOREFFECT_H -#include "qgspainteffect.h" -#include "qgsimageoperation.h" -#include "qgis.h" #include +#include "qgis.h" +#include "qgsimageoperation.h" +#include "qgspainteffect.h" /** \ingroup core * \class QgsColorEffect diff --git a/src/core/effects/qgseffectstack.cpp b/src/core/effects/qgseffectstack.cpp index c472d2e74e0..a9f2df4d15b 100644 --- a/src/core/effects/qgseffectstack.cpp +++ b/src/core/effects/qgseffectstack.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ +#include #include "qgseffectstack.h" #include "qgspainteffectregistry.h" -#include QgsEffectStack::QgsEffectStack() : QgsPaintEffect() diff --git a/src/core/effects/qgsgloweffect.cpp b/src/core/effects/qgsgloweffect.cpp index 3a60a23e302..f6e7f04256d 100644 --- a/src/core/effects/qgsgloweffect.cpp +++ b/src/core/effects/qgsgloweffect.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include "qgsgloweffect.h" -#include "qgssymbollayerv2utils.h" #include "qgsimageoperation.h" +#include "qgssymbollayerv2utils.h" #include "qgsvectorcolorrampv2.h" QgsGlowEffect::QgsGlowEffect() diff --git a/src/core/effects/qgsgloweffect.h b/src/core/effects/qgsgloweffect.h index e8df61b772a..33eabe36a52 100644 --- a/src/core/effects/qgsgloweffect.h +++ b/src/core/effects/qgsgloweffect.h @@ -17,9 +17,9 @@ #ifndef QGSGLOWEFFECT_H #define QGSGLOWEFFECT_H +#include #include "qgspainteffect.h" #include "qgssymbolv2.h" -#include class QgsVectorColorRampV2; diff --git a/src/core/effects/qgsimageoperation.cpp b/src/core/effects/qgsimageoperation.cpp index b4edc7e2f50..b83025c5912 100644 --- a/src/core/effects/qgsimageoperation.cpp +++ b/src/core/effects/qgsimageoperation.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsimageoperation.h" -#include "qgis.h" -#include "qgsvectorcolorrampv2.h" -#include "qgslogger.h" -#include #include -#include #include +#include +#include +#include "qgis.h" +#include "qgsimageoperation.h" +#include "qgslogger.h" +#include "qgsvectorcolorrampv2.h" //determined via trial-and-error. Could possibly be optimised, or varied //depending on the image size. diff --git a/src/core/effects/qgsimageoperation.h b/src/core/effects/qgsimageoperation.h index 7b4ee210f19..e0bdf185fb4 100644 --- a/src/core/effects/qgsimageoperation.h +++ b/src/core/effects/qgsimageoperation.h @@ -18,8 +18,8 @@ #ifndef QGSIMAGEOPERATION_H #define QGSIMAGEOPERATION_H -#include #include +#include #include class QgsVectorColorRampV2; diff --git a/src/core/effects/qgspainteffect.cpp b/src/core/effects/qgspainteffect.cpp index 52b26196d43..b3be5bdba54 100644 --- a/src/core/effects/qgspainteffect.cpp +++ b/src/core/effects/qgspainteffect.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgspainteffect.h" +#include #include "qgsimageoperation.h" #include "qgslogger.h" -#include +#include "qgspainteffect.h" Q_GUI_EXPORT extern int qt_defaultDpiX(); Q_GUI_EXPORT extern int qt_defaultDpiY(); diff --git a/src/core/effects/qgspainteffect.h b/src/core/effects/qgspainteffect.h index e496a7abe61..f02e556d225 100644 --- a/src/core/effects/qgspainteffect.h +++ b/src/core/effects/qgspainteffect.h @@ -17,11 +17,11 @@ #ifndef QGSPAINTEFFECT_H #define QGSPAINTEFFECT_H -#include "qgis.h" -#include "qgsrendercontext.h" -#include #include #include +#include +#include "qgis.h" +#include "qgsrendercontext.h" /** \ingroup core * \class QgsPaintEffect diff --git a/src/core/effects/qgspainteffectregistry.cpp b/src/core/effects/qgspainteffectregistry.cpp index 7ea7177ea4c..12e07638497 100644 --- a/src/core/effects/qgspainteffectregistry.cpp +++ b/src/core/effects/qgspainteffectregistry.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ -#include "qgspainteffectregistry.h" #include "qgsblureffect.h" -#include "qgsshadoweffect.h" +#include "qgscoloreffect.h" #include "qgseffectstack.h" #include "qgsgloweffect.h" +#include "qgspainteffectregistry.h" +#include "qgsshadoweffect.h" #include "qgstransformeffect.h" -#include "qgscoloreffect.h" QgsPaintEffectAbstractMetadata::QgsPaintEffectAbstractMetadata( const QString& name, const QString& visibleName ) : mName( name ) diff --git a/src/core/effects/qgspainteffectregistry.h b/src/core/effects/qgspainteffectregistry.h index d59d4a3260a..654bd7b4a22 100644 --- a/src/core/effects/qgspainteffectregistry.h +++ b/src/core/effects/qgspainteffectregistry.h @@ -16,9 +16,9 @@ #ifndef QGSPAINTEFFECTREGISTRY_H #define QGSPAINTEFFECTREGISTRY_H -#include "qgis.h" -#include #include +#include +#include "qgis.h" class QgsPaintEffect; class QgsPaintEffectWidget; diff --git a/src/core/effects/qgsshadoweffect.cpp b/src/core/effects/qgsshadoweffect.cpp index d6a364f88ce..0f2a71d1364 100644 --- a/src/core/effects/qgsshadoweffect.cpp +++ b/src/core/effects/qgsshadoweffect.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsshadoweffect.h" #include "qgsimageoperation.h" +#include "qgsshadoweffect.h" #include "qgssymbollayerv2utils.h" QgsShadowEffect::QgsShadowEffect() diff --git a/src/core/effects/qgsshadoweffect.h b/src/core/effects/qgsshadoweffect.h index fcdf63656a8..b55c3fd8602 100644 --- a/src/core/effects/qgsshadoweffect.h +++ b/src/core/effects/qgsshadoweffect.h @@ -17,10 +17,10 @@ #ifndef QGSSHADOWEFFECT_H #define QGSSHADOWEFFECT_H -#include "qgspainteffect.h" -#include "qgis.h" -#include "qgssymbolv2.h" #include +#include "qgis.h" +#include "qgspainteffect.h" +#include "qgssymbolv2.h" /** \ingroup core * \class QgsShadowEffect diff --git a/src/core/effects/qgstransformeffect.cpp b/src/core/effects/qgstransformeffect.cpp index 108ddd586bb..b56b3115798 100644 --- a/src/core/effects/qgstransformeffect.cpp +++ b/src/core/effects/qgstransformeffect.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgstransformeffect.h" -#include "qgssymbollayerv2utils.h" #include #include +#include "qgssymbollayerv2utils.h" +#include "qgstransformeffect.h" QgsPaintEffect* QgsTransformEffect::create( const QgsStringMap &map ) { diff --git a/src/core/effects/qgstransformeffect.h b/src/core/effects/qgstransformeffect.h index 8bf822c6999..6d53cc1896a 100644 --- a/src/core/effects/qgstransformeffect.h +++ b/src/core/effects/qgstransformeffect.h @@ -17,11 +17,11 @@ #ifndef QGSTRANSFORMEFFECT_H #define QGSTRANSFORMEFFECT_H -#include "qgspainteffect.h" +#include #include "qgis.h" #include "qgsmapunitscale.h" +#include "qgspainteffect.h" #include "qgssymbolv2.h" -#include /** \ingroup core * \class QgsTransformEffect diff --git a/src/core/geometry/qgsabstractgeometryv2.cpp b/src/core/geometry/qgsabstractgeometryv2.cpp index 829a3cfce1b..abe332e6eb9 100644 --- a/src/core/geometry/qgsabstractgeometryv2.cpp +++ b/src/core/geometry/qgsabstractgeometryv2.cpp @@ -13,13 +13,13 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgsabstractgeometryv2.h" -#include "qgswkbptr.h" -#include "qgsgeos.h" -#include "qgsmaptopixel.h" #include #include +#include "qgsabstractgeometryv2.h" +#include "qgsapplication.h" +#include "qgsgeos.h" +#include "qgsmaptopixel.h" +#include "qgswkbptr.h" QgsAbstractGeometryV2::QgsAbstractGeometryV2(): mWkbType( QgsWKBTypes::Unknown ) { diff --git a/src/core/geometry/qgsabstractgeometryv2.h b/src/core/geometry/qgsabstractgeometryv2.h index 9d0790e8d5d..47247ef137f 100644 --- a/src/core/geometry/qgsabstractgeometryv2.h +++ b/src/core/geometry/qgsabstractgeometryv2.h @@ -16,9 +16,9 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSABSTRACTGEOMETRYV2 #define QGSABSTRACTGEOMETRYV2 +#include #include "qgsrectangle.h" #include "qgswkbtypes.h" -#include class QgsCoordinateTransform; class QgsMapToPixel; diff --git a/src/core/geometry/qgscircularstringv2.cpp b/src/core/geometry/qgscircularstringv2.cpp index fbc5ea7ff6c..bb3e37c16da 100644 --- a/src/core/geometry/qgscircularstringv2.cpp +++ b/src/core/geometry/qgscircularstringv2.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgscircularstringv2.h" +#include +#include #include "qgsapplication.h" +#include "qgscircularstringv2.h" #include "qgscoordinatetransform.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" #include "qgsmaptopixel.h" #include "qgspointv2.h" #include "qgswkbptr.h" -#include -#include QgsCircularStringV2::QgsCircularStringV2(): QgsCurveV2() { diff --git a/src/core/geometry/qgscircularstringv2.h b/src/core/geometry/qgscircularstringv2.h index b73fbb55606..9b1ef9832c9 100644 --- a/src/core/geometry/qgscircularstringv2.h +++ b/src/core/geometry/qgscircularstringv2.h @@ -18,8 +18,8 @@ #ifndef QGSCIRCULARSTRING_H #define QGSCIRCULARSTRING_H -#include "qgscurvev2.h" #include +#include "qgscurvev2.h" /**\ingroup core * \class QgsCircularStringV2 diff --git a/src/core/geometry/qgscompoundcurvev2.cpp b/src/core/geometry/qgscompoundcurvev2.cpp index e34ac10764c..f95fd789b59 100644 --- a/src/core/geometry/qgscompoundcurvev2.cpp +++ b/src/core/geometry/qgscompoundcurvev2.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgscompoundcurvev2.h" +#include +#include #include "qgsapplication.h" #include "qgscircularstringv2.h" +#include "qgscompoundcurvev2.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" #include "qgswkbptr.h" -#include -#include QgsCompoundCurveV2::QgsCompoundCurveV2(): QgsCurveV2() diff --git a/src/core/geometry/qgscurvepolygonv2.cpp b/src/core/geometry/qgscurvepolygonv2.cpp index e36be38cf0e..d5eb8260572 100644 --- a/src/core/geometry/qgscurvepolygonv2.cpp +++ b/src/core/geometry/qgscurvepolygonv2.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgscurvepolygonv2.h" +#include +#include #include "qgsapplication.h" #include "qgscircularstringv2.h" #include "qgscompoundcurvev2.h" +#include "qgscurvepolygonv2.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" #include "qgspolygonv2.h" #include "qgswkbptr.h" -#include -#include QgsCurvePolygonV2::QgsCurvePolygonV2(): QgsSurfaceV2(), mExteriorRing( 0 ) { diff --git a/src/core/geometry/qgsgeometry.cpp b/src/core/geometry/qgsgeometry.cpp index 18d841b35d4..6570c669abe 100644 --- a/src/core/geometry/qgsgeometry.cpp +++ b/src/core/geometry/qgsgeometry.cpp @@ -13,28 +13,29 @@ email : morb at ozemail dot com dot au * * ***************************************************************************/ -#include +#include #include #include -#include +#include #include "qgis.h" -#include "qgsgeometry.h" +#include "qgsapplication.h" #include "qgsgeometryeditutils.h" +#include "qgsgeometry.h" #include "qgsgeometryimport.h" #include "qgsgeometryutils.h" #include "qgsgeos.h" -#include "qgsapplication.h" #include "qgslogger.h" #include "qgsmessagelog.h" #include "qgspoint.h" #include "qgsrectangle.h" -#include "qgsmaplayerregistry.h" -#include "qgsvectorlayer.h" -#include "qgsproject.h" #include "qgsgeometryvalidator.h" +#include "qgsmaplayerregistry.h" +#include "qgsproject.h" +#include "qgsvectorlayer.h" +#include "qgslinestringv2.h" #include "qgsmulticurvev2.h" #include "qgsmultilinestringv2.h" #include "qgsmultipointv2.h" @@ -42,7 +43,6 @@ email : morb at ozemail dot com dot au #include "qgsmultisurfacev2.h" #include "qgspointv2.h" #include "qgspolygonv2.h" -#include "qgslinestringv2.h" #ifndef Q_WS_WIN #include diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h index 3a6dccadeb5..25615ebae5b 100644 --- a/src/core/geometry/qgsgeometry.h +++ b/src/core/geometry/qgsgeometry.h @@ -16,9 +16,9 @@ email : morb at ozemail dot com dot au #ifndef QGSGEOMETRY_H #define QGSGEOMETRY_H +#include #include #include -#include #include "qgis.h" @@ -30,9 +30,9 @@ email : morb at ozemail dot com dot au #endif #include "qgsabstractgeometryv2.h" -#include "qgspoint.h" #include "qgscoordinatetransform.h" #include "qgsfeature.h" +#include "qgspoint.h" #include diff --git a/src/core/geometry/qgsgeometrycollectionv2.cpp b/src/core/geometry/qgsgeometrycollectionv2.cpp index 63afb2a128e..baba25a0fb9 100644 --- a/src/core/geometry/qgsgeometrycollectionv2.cpp +++ b/src/core/geometry/qgsgeometrycollectionv2.cpp @@ -13,12 +13,12 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsgeometrycollectionv2.h" #include "qgsapplication.h" -#include "qgsgeometryimport.h" -#include "qgsgeometryutils.h" #include "qgscircularstringv2.h" #include "qgscompoundcurvev2.h" +#include "qgsgeometrycollectionv2.h" +#include "qgsgeometryimport.h" +#include "qgsgeometryutils.h" #include "qgslinestringv2.h" #include "qgspointv2.h" #include "qgspolygonv2.h" diff --git a/src/core/geometry/qgsgeometrycollectionv2.h b/src/core/geometry/qgsgeometrycollectionv2.h index 5a2c3e6b290..1f9e323b0ce 100644 --- a/src/core/geometry/qgsgeometrycollectionv2.h +++ b/src/core/geometry/qgsgeometrycollectionv2.h @@ -16,8 +16,8 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOMETRYCOLLECTIONV2_H #define QGSGEOMETRYCOLLECTIONV2_H -#include "qgsabstractgeometryv2.h" #include +#include "qgsabstractgeometryv2.h" /**\ingroup core * \class QgsGeometryCollectionV2 diff --git a/src/core/geometry/qgsgeometryeditutils.cpp b/src/core/geometry/qgsgeometryeditutils.cpp index a622b2ff674..c80f35388d8 100644 --- a/src/core/geometry/qgsgeometryeditutils.cpp +++ b/src/core/geometry/qgsgeometryeditutils.cpp @@ -13,18 +13,18 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsgeometryeditutils.h" -#include "qgscurvev2.h" +#include #include "qgscurvepolygonv2.h" -#include "qgspolygonv2.h" -#include "qgsgeometryutils.h" +#include "qgscurvev2.h" +#include "qgsgeometryeditutils.h" #include "qgsgeometry.h" +#include "qgsgeometryutils.h" #include "qgsgeos.h" #include "qgsmaplayerregistry.h" #include "qgsmultisurfacev2.h" +#include "qgspolygonv2.h" #include "qgsproject.h" #include "qgsvectorlayer.h" -#include int QgsGeometryEditUtils::addRing( QgsAbstractGeometryV2* geom, QgsCurveV2* ring ) { diff --git a/src/core/geometry/qgsgeometryeditutils.h b/src/core/geometry/qgsgeometryeditutils.h index b70346b9a4b..be481090ebf 100644 --- a/src/core/geometry/qgsgeometryeditutils.h +++ b/src/core/geometry/qgsgeometryeditutils.h @@ -21,8 +21,8 @@ class QgsCurveV2; class QgsGeometryEngine; class QgsVectorLayer; -#include "qgsfeature.h" #include +#include "qgsfeature.h" /**\ingroup core * \class QgsGeometryEditUtils diff --git a/src/core/geometry/qgsgeometryengine.h b/src/core/geometry/qgsgeometryengine.h index 7622b027205..1d010611c88 100644 --- a/src/core/geometry/qgsgeometryengine.h +++ b/src/core/geometry/qgsgeometryengine.h @@ -16,8 +16,8 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSVECTORTOPOLOGY_H #define QGSVECTORTOPOLOGY_H -#include "qgspointv2.h" #include "qgslinestringv2.h" +#include "qgspointv2.h" #include diff --git a/src/core/geometry/qgsgeometryimport.cpp b/src/core/geometry/qgsgeometryimport.cpp index df0a8a954a6..e77ee42ee35 100644 --- a/src/core/geometry/qgsgeometryimport.cpp +++ b/src/core/geometry/qgsgeometryimport.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgsgeometryimport.h" #include "qgscircularstringv2.h" #include "qgscompoundcurvev2.h" #include "qgscurvepolygonv2.h" -#include "qgspointv2.h" -#include "qgspolygonv2.h" +#include "qgsgeometryimport.h" #include "qgslinestringv2.h" #include "qgsmulticurvev2.h" #include "qgsmultilinestringv2.h" #include "qgsmultipointv2.h" #include "qgsmultipolygonv2.h" #include "qgsmultisurfacev2.h" +#include "qgspointv2.h" +#include "qgspolygonv2.h" #include "qgswkbtypes.h" QgsAbstractGeometryV2* QgsGeometryImport::geomFromWkb( const unsigned char* wkb ) diff --git a/src/core/geometry/qgsgeometryimport.h b/src/core/geometry/qgsgeometryimport.h index ccbe80705fb..e70dbcf8782 100644 --- a/src/core/geometry/qgsgeometryimport.h +++ b/src/core/geometry/qgsgeometryimport.h @@ -18,9 +18,9 @@ #ifndef QGSGEOMETRYIMPORT_H #define QGSGEOMETRYIMPORT_H +#include #include "qgsrectangle.h" #include "qgswkbtypes.h" -#include class QgsAbstractGeometryV2; class QgsLineStringV2; diff --git a/src/core/geometry/qgsgeometryutils.cpp b/src/core/geometry/qgsgeometryutils.cpp index b827196d5b3..9242aed0cc5 100644 --- a/src/core/geometry/qgsgeometryutils.cpp +++ b/src/core/geometry/qgsgeometryutils.cpp @@ -13,9 +13,9 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ +#include #include "qgsgeometryutils.h" #include "qgswkbptr.h" -#include QgsPointV2 QgsGeometryUtils::closestVertex( const QgsAbstractGeometryV2& geom, const QgsPointV2& pt, QgsVertexId& id ) { diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h index 3848a6f20e2..558897c1161 100644 --- a/src/core/geometry/qgsgeometryutils.h +++ b/src/core/geometry/qgsgeometryutils.h @@ -16,8 +16,8 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOMETRYUTILS_H #define QGSGEOMETRYUTILS_H -#include "qgspointv2.h" #include +#include "qgspointv2.h" /**\ingroup core * \class QgsGeometryUtils diff --git a/src/core/geometry/qgsgeos.cpp b/src/core/geometry/qgsgeos.cpp index 1a79e0ed6e1..e13b9bba66e 100644 --- a/src/core/geometry/qgsgeos.cpp +++ b/src/core/geometry/qgsgeos.cpp @@ -13,18 +13,18 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsgeos.h" +#include #include "qgsabstractgeometryv2.h" #include "qgsgeometrycollectionv2.h" #include "qgsgeometryimport.h" +#include "qgsgeos.h" #include "qgslinestringv2.h" +#include "qgslogger.h" #include "qgsmessagelog.h" #include "qgsmulticurvev2.h" #include "qgsmultipointv2.h" #include "qgsmultipolygonv2.h" -#include "qgslogger.h" #include "qgspolygonv2.h" -#include #define DEFAULT_QUADRANT_SEGMENTS 8 diff --git a/src/core/geometry/qgsgeos.h b/src/core/geometry/qgsgeos.h index 00b12d1084c..ace30225769 100644 --- a/src/core/geometry/qgsgeos.h +++ b/src/core/geometry/qgsgeos.h @@ -16,9 +16,9 @@ email : marco.hugentobler at sourcepole dot com #ifndef QGSGEOS_H #define QGSGEOS_H +#include #include "qgsgeometryengine.h" #include "qgspointv2.h" -#include class QgsLineStringV2; class QgsPolygonV2; diff --git a/src/core/geometry/qgslinestringv2.cpp b/src/core/geometry/qgslinestringv2.cpp index 4d1e4a87d08..d265951751e 100644 --- a/src/core/geometry/qgslinestringv2.cpp +++ b/src/core/geometry/qgslinestringv2.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgslinestringv2.h" +#include +#include +#include #include "qgsapplication.h" #include "qgscoordinatetransform.h" #include "qgsgeometryutils.h" +#include "qgslinestringv2.h" #include "qgsmaptopixel.h" #include "qgswkbptr.h" -#include -#include -#include QgsLineStringV2::QgsLineStringV2(): QgsCurveV2() { diff --git a/src/core/geometry/qgslinestringv2.h b/src/core/geometry/qgslinestringv2.h index 50d3b6fbb98..f74ae5b18ee 100644 --- a/src/core/geometry/qgslinestringv2.h +++ b/src/core/geometry/qgslinestringv2.h @@ -18,9 +18,9 @@ #ifndef QGSLINESTRINGV2_H #define QGSLINESTRINGV2_H +#include #include "qgscurvev2.h" #include "qgswkbptr.h" -#include class CORE_EXPORT QgsLineStringV2: public QgsCurveV2 { diff --git a/src/core/geometry/qgsmulticurvev2.cpp b/src/core/geometry/qgsmulticurvev2.cpp index 3a2133aca65..263bde1fb43 100644 --- a/src/core/geometry/qgsmulticurvev2.cpp +++ b/src/core/geometry/qgsmulticurvev2.cpp @@ -13,13 +13,13 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmulticurvev2.h" #include "qgsapplication.h" -#include "qgscurvev2.h" #include "qgscircularstringv2.h" #include "qgscompoundcurvev2.h" +#include "qgscurvev2.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" +#include "qgsmulticurvev2.h" QgsAbstractGeometryV2 *QgsMultiCurveV2::clone() const { diff --git a/src/core/geometry/qgsmultilinestringv2.cpp b/src/core/geometry/qgsmultilinestringv2.cpp index c53b39bacd7..45d95f0f8ce 100644 --- a/src/core/geometry/qgsmultilinestringv2.cpp +++ b/src/core/geometry/qgsmultilinestringv2.cpp @@ -13,13 +13,13 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultilinestringv2.h" #include "qgsapplication.h" -#include "qgscurvev2.h" #include "qgscircularstringv2.h" #include "qgscompoundcurvev2.h" +#include "qgscurvev2.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" +#include "qgsmultilinestringv2.h" QgsAbstractGeometryV2* QgsMultiLineStringV2::clone() const { diff --git a/src/core/geometry/qgsmultipointv2.cpp b/src/core/geometry/qgsmultipointv2.cpp index 140d17dd66b..3642043592c 100644 --- a/src/core/geometry/qgsmultipointv2.cpp +++ b/src/core/geometry/qgsmultipointv2.cpp @@ -13,9 +13,9 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultipointv2.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" +#include "qgsmultipointv2.h" #include "qgspointv2.h" #include "qgswkbptr.h" diff --git a/src/core/geometry/qgsmultipolygonv2.cpp b/src/core/geometry/qgsmultipolygonv2.cpp index 5ce406e09d9..7e9c498ef48 100644 --- a/src/core/geometry/qgsmultipolygonv2.cpp +++ b/src/core/geometry/qgsmultipolygonv2.cpp @@ -13,13 +13,13 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultipolygonv2.h" #include "qgsapplication.h" -#include "qgsgeometryutils.h" -#include "qgssurfacev2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" #include "qgscurvepolygonv2.h" +#include "qgsgeometryutils.h" +#include "qgslinestringv2.h" +#include "qgsmultipolygonv2.h" +#include "qgspolygonv2.h" +#include "qgssurfacev2.h" QgsAbstractGeometryV2 *QgsMultiPolygonV2::clone() const { diff --git a/src/core/geometry/qgsmultisurfacev2.cpp b/src/core/geometry/qgsmultisurfacev2.cpp index bbb7f1c8e8c..7d160186547 100644 --- a/src/core/geometry/qgsmultisurfacev2.cpp +++ b/src/core/geometry/qgsmultisurfacev2.cpp @@ -14,13 +14,13 @@ email : marco.hugentobler at sourcepole dot com * * ***************************************************************************/ -#include "qgsmultisurfacev2.h" #include "qgsapplication.h" -#include "qgsgeometryutils.h" -#include "qgssurfacev2.h" -#include "qgslinestringv2.h" -#include "qgspolygonv2.h" #include "qgscurvepolygonv2.h" +#include "qgsgeometryutils.h" +#include "qgslinestringv2.h" +#include "qgsmultisurfacev2.h" +#include "qgspolygonv2.h" +#include "qgssurfacev2.h" QgsAbstractGeometryV2 *QgsMultiSurfaceV2::clone() const { diff --git a/src/core/geometry/qgspointv2.cpp b/src/core/geometry/qgspointv2.cpp index 8a8076c63bf..111323955de 100644 --- a/src/core/geometry/qgspointv2.cpp +++ b/src/core/geometry/qgspointv2.cpp @@ -16,13 +16,13 @@ ***************************************************************************/ -#include "qgspointv2.h" +#include #include "qgsapplication.h" #include "qgscoordinatetransform.h" #include "qgsgeometryutils.h" #include "qgsmaptopixel.h" +#include "qgspointv2.h" #include "qgswkbptr.h" -#include QgsPointV2::QgsPointV2( double x, double y ): QgsAbstractGeometryV2(), mX( x ), mY( y ), mZ( 0.0 ), mM( 0.0 ) { diff --git a/src/core/geometry/qgspolygonv2.cpp b/src/core/geometry/qgspolygonv2.cpp index 6f2ec48ac13..a72d871ec32 100644 --- a/src/core/geometry/qgspolygonv2.cpp +++ b/src/core/geometry/qgspolygonv2.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgspolygonv2.h" #include "qgsapplication.h" #include "qgsgeometryutils.h" #include "qgslinestringv2.h" +#include "qgspolygonv2.h" #include "qgswkbptr.h" QgsAbstractGeometryV2* QgsPolygonV2::clone() const diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h index 987017d1493..8f5f4c6571e 100644 --- a/src/core/geometry/qgswkbptr.h +++ b/src/core/geometry/qgswkbptr.h @@ -1,9 +1,9 @@ #ifndef QGSWKBPTR_H #define QGSWKBPTR_H -#include "qgswkbtypes.h" -#include "qgsapplication.h" #include "qgis.h" +#include "qgsapplication.h" +#include "qgswkbtypes.h" class CORE_EXPORT QgsWkbPtr { diff --git a/src/core/gps/qgsgpsconnection.cpp b/src/core/gps/qgsgpsconnection.cpp index affe193fb0c..a47c955f994 100644 --- a/src/core/gps/qgsgpsconnection.cpp +++ b/src/core/gps/qgsgpsconnection.cpp @@ -18,16 +18,16 @@ #include "qgsgpsconnection.h" #include -#include +#include #include #include -#include +#include -#include "qextserialport.h" #include "qextserialenumerator.h" +#include "qextserialport.h" -#include "qgsnmeaconnection.h" #include "qgslogger.h" +#include "qgsnmeaconnection.h" QgsGPSConnection::QgsGPSConnection( QIODevice* dev ): QObject( 0 ), mSource( dev ), mStatus( NotConnected ) { diff --git a/src/core/gps/qgsgpsconnectionregistry.cpp b/src/core/gps/qgsgpsconnectionregistry.cpp index 2dbb1af0e71..2827c81a4a3 100644 --- a/src/core/gps/qgsgpsconnectionregistry.cpp +++ b/src/core/gps/qgsgpsconnectionregistry.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsgpsconnectionregistry.h" #include "qgsgpsconnection.h" +#include "qgsgpsconnectionregistry.h" QgsGPSConnectionRegistry::QgsGPSConnectionRegistry() { diff --git a/src/core/gps/qgsgpsdetector.cpp b/src/core/gps/qgsgpsdetector.cpp index 9d56b1a56cf..2771154a090 100644 --- a/src/core/gps/qgsgpsdetector.cpp +++ b/src/core/gps/qgsgpsdetector.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgsgpsdetector.h" #include "qextserialenumerator.h" -#include "qgslogger.h" #include "qgsgpsconnection.h" -#include "qgsnmeaconnection.h" #include "qgsgpsdconnection.h" +#include "qgsgpsdetector.h" +#include "qgslogger.h" +#include "qgsnmeaconnection.h" #if defined(HAVE_QT_MOBILITY_LOCATION ) || defined(QT_POSITIONING_LIB) #include "qgsqtlocationconnection.h" #endif -#include #include +#include #include QList< QPair > QgsGPSDetector::availablePorts() diff --git a/src/core/gps/qgsgpsdetector.h b/src/core/gps/qgsgpsdetector.h index c8d52b3b07d..1a15f774300 100644 --- a/src/core/gps/qgsgpsdetector.h +++ b/src/core/gps/qgsgpsdetector.h @@ -18,8 +18,8 @@ #ifndef QGSGPSDETECTOR_H #define QGSGPSDETECTOR_H -#include #include +#include #include #include "qextserialport.h" diff --git a/src/core/gps/qgsnmeaconnection.cpp b/src/core/gps/qgsnmeaconnection.cpp index 44e9efbc232..6e3767ba322 100644 --- a/src/core/gps/qgsnmeaconnection.cpp +++ b/src/core/gps/qgsnmeaconnection.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgsnmeaconnection.h" #include "qextserialport.h" #include "qgslogger.h" +#include "qgsnmeaconnection.h" -#include #include +#include #include //from libnmea -#include "parse.h" #include "gmath.h" #include "info.h" +#include "parse.h" #define KNOTS_TO_KMH 1.852 diff --git a/src/core/gps/qgsqtlocationconnection.cpp b/src/core/gps/qgsqtlocationconnection.cpp index 6ca5a1b4fef..b10f1c90ff4 100644 --- a/src/core/gps/qgsqtlocationconnection.cpp +++ b/src/core/gps/qgsqtlocationconnection.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsqtlocationconnection.h" #include "qgslogger.h" +#include "qgsqtlocationconnection.h" #include -#include #include +#include QgsQtLocationConnection::QgsQtLocationConnection(): QgsGPSConnection( new QLocalSocket() ) { diff --git a/src/core/layertree/qgslayertree.h b/src/core/layertree/qgslayertree.h index 6ba038a4860..5f5a3a32d8b 100644 --- a/src/core/layertree/qgslayertree.h +++ b/src/core/layertree/qgslayertree.h @@ -16,9 +16,9 @@ #ifndef QGSLAYERTREE_H #define QGSLAYERTREE_H -#include "qgslayertreenode.h" #include "qgslayertreegroup.h" #include "qgslayertreelayer.h" +#include "qgslayertreenode.h" /** * Namespace with helper functions for layer tree operations. diff --git a/src/core/layertree/qgslayertreemodellegendnode.cpp b/src/core/layertree/qgslayertreemodellegendnode.cpp index 54b5ae3b9c6..867cdbd849e 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.cpp +++ b/src/core/layertree/qgslayertreemodellegendnode.cpp @@ -18,13 +18,13 @@ #include "qgslayertreemodellegendnode.h" +#include "qgsimageoperation.h" #include "qgslayertree.h" #include "qgslayertreemodel.h" #include "qgslegendsettings.h" #include "qgsrasterlayer.h" #include "qgsrendererv2.h" #include "qgssymbollayerv2utils.h" -#include "qgsimageoperation.h" #include "qgsvectorlayer.h" diff --git a/src/core/layertree/qgslayertreeregistrybridge.cpp b/src/core/layertree/qgslayertreeregistrybridge.cpp index b22042f3e5f..56ab6cca087 100644 --- a/src/core/layertree/qgslayertreeregistrybridge.cpp +++ b/src/core/layertree/qgslayertreeregistrybridge.cpp @@ -19,8 +19,8 @@ #include "qgslayertree.h" -#include "qgsproject.h" #include "qgslogger.h" +#include "qgsproject.h" QgsLayerTreeRegistryBridge::QgsLayerTreeRegistryBridge( QgsLayerTreeGroup *root, QObject *parent ) : QObject( parent ) diff --git a/src/core/layertree/qgslayertreeutils.h b/src/core/layertree/qgslayertreeutils.h index a8357669ba5..c104c238b4b 100644 --- a/src/core/layertree/qgslayertreeutils.h +++ b/src/core/layertree/qgslayertreeutils.h @@ -16,8 +16,8 @@ #ifndef QGSLAYERTREEUTILS_H #define QGSLAYERTREEUTILS_H -#include #include +#include class QDomElement; class QDomDocument; diff --git a/src/core/pal/costcalculator.cpp b/src/core/pal/costcalculator.cpp index 8ac469d141d..38089285859 100644 --- a/src/core/pal/costcalculator.cpp +++ b/src/core/pal/costcalculator.cpp @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include -#include +#include #include #include -#include +#include +#include #include #include diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp index 4681125ddb7..3d65b59cd6f 100644 --- a/src/core/pal/feature.cpp +++ b/src/core/pal/feature.cpp @@ -40,17 +40,17 @@ #include +#include #include #include -#include -#include #include +#include -#include "linkedlist.hpp" #include "feature.h" #include "geomfunction.h" #include "labelposition.h" +#include "linkedlist.hpp" #include "pointset.h" #include "simplemutex.h" #include "util.h" diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h index b586b2aa08c..76a4769c638 100644 --- a/src/core/pal/feature.h +++ b/src/core/pal/feature.h @@ -34,17 +34,17 @@ #ifndef _FEATURE_H #define _FEATURE_H -#include -#include #include +#include +#include #include #include +#include "labelposition.h" #include "pointset.h" #include "util.h" -#include "labelposition.h" namespace pal { diff --git a/src/core/pal/labelposition.cpp b/src/core/pal/labelposition.cpp index 7ef689627ef..ff79f13fde0 100644 --- a/src/core/pal/labelposition.cpp +++ b/src/core/pal/labelposition.cpp @@ -33,11 +33,11 @@ #define _CRT_SECURE_NO_DEPRECATE -#include -#include +#include #include #include -#include +#include +#include #include #include diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp index b9280be7e0e..595563f0e1a 100644 --- a/src/core/pal/layer.cpp +++ b/src/core/pal/layer.cpp @@ -33,21 +33,21 @@ #define _CRT_SECURE_NO_DEPRECATE -#include #include +#include -#include -#include #include +#include +#include #include -#include +#include #include #include -#include +#include -#include "linkedlist.hpp" #include "hashtable.hpp" +#include "linkedlist.hpp" #include "feature.h" #include "geomfunction.h" diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h index 6130f097d6b..dec0bc4213f 100644 --- a/src/core/pal/layer.h +++ b/src/core/pal/layer.h @@ -36,8 +36,8 @@ #include -#include #include +#include namespace pal diff --git a/src/core/pal/pal.cpp b/src/core/pal/pal.cpp index 0aa6e9d15d9..f975f343ab8 100644 --- a/src/core/pal/pal.cpp +++ b/src/core/pal/pal.cpp @@ -37,18 +37,18 @@ #define _CRT_SECURE_NO_DEPRECATE -#include -#include -#include -#include #include +#include +#include +#include +#include #include //#include #include -#include #include #include +#include #include #include "linkedlist.hpp" @@ -58,8 +58,8 @@ #include "feature.h" #include "geomfunction.h" #include "labelposition.h" -#include "problem.h" #include "pointset.h" +#include "problem.h" #include "simplemutex.h" #include "util.h" diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h index f2a4e06fc33..5ef348349eb 100644 --- a/src/core/pal/pal.h +++ b/src/core/pal/pal.h @@ -35,10 +35,10 @@ #define _PAL_H -#include -#include #include #include +#include +#include // TODO ${MAJOR} ${MINOR} etc instead of 0.2 diff --git a/src/core/pal/pointset.h b/src/core/pal/pointset.h index f54efd1f5ad..c8abe88acfe 100644 --- a/src/core/pal/pointset.h +++ b/src/core/pal/pointset.h @@ -37,11 +37,11 @@ #include #include -#include #include +#include -#include "rtree.hpp" #include "linkedlist.hpp" +#include "rtree.hpp" namespace pal { diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp index 10ae82957b8..6947554d1fc 100644 --- a/src/core/pal/problem.cpp +++ b/src/core/pal/problem.cpp @@ -37,26 +37,26 @@ #include #endif -#include -#include -#include #include +#include #include -#include +#include +#include #include //for INT_MAX +#include +#include #include #include -#include -#include "linkedlist.hpp" -#include "rtree.hpp" #include "feature.h" #include "geomfunction.h" #include "labelposition.h" -#include "problem.h" -#include "util.h" +#include "linkedlist.hpp" #include "priorityqueue.h" +#include "problem.h" +#include "rtree.hpp" +#include "util.h" #define UNUSED(x) (void)x; diff --git a/src/core/pal/util.cpp b/src/core/pal/util.cpp index ef74d217e42..60638e02ec2 100644 --- a/src/core/pal/util.cpp +++ b/src/core/pal/util.cpp @@ -31,24 +31,24 @@ #include #endif -#include #include +#include #include -#include #include +#include //#include #include #include #include -#include "internalexception.h" -#include "util.h" -#include "labelposition.h" #include "feature.h" #include "geomfunction.h" +#include "internalexception.h" +#include "labelposition.h" +#include "util.h" #ifndef M_PI #define M_PI 3.14159265358979323846 diff --git a/src/core/pal/util.h b/src/core/pal/util.h index cb8a80020b3..e8615e35412 100644 --- a/src/core/pal/util.h +++ b/src/core/pal/util.h @@ -36,13 +36,13 @@ #include #include -#include #include +#include #include -#include "rtree.hpp" #include "pointset.h" +#include "rtree.hpp" namespace pal { diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp index 18716f23b5e..2d5eff86e2e 100644 --- a/src/core/qgis.cpp +++ b/src/core/qgis.cpp @@ -19,12 +19,12 @@ #ifndef QGSVERSION #include "qgsversion.h" #endif -#include #include +#include #include -#include -#include #include +#include +#include #include "qgsconfig.h" #include "qgslogger.h" diff --git a/src/core/qgis.h b/src/core/qgis.h index fb6dfd8dd84..6dbb903bd80 100644 --- a/src/core/qgis.h +++ b/src/core/qgis.h @@ -18,15 +18,15 @@ #ifndef QGIS_H #define QGIS_H -#include -#include -#include -#include -#include -#include #include #include +#include +#include #include +#include +#include +#include +#include /** \ingroup core * The QGis class provides global constants for use throughout the application. diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp index d240dc6ac9c..33bea1ddf29 100644 --- a/src/core/qgsapplication.cpp +++ b/src/core/qgsapplication.cpp @@ -26,12 +26,12 @@ #include #include #include +#include #include #include +#include #include #include -#include -#include #include #ifndef Q_OS_WIN @@ -42,9 +42,9 @@ #include "qgsconfig.h" +#include // for setting gdal options #include #include -#include // for setting gdal options #include QObject * ABISYM( QgsApplication::mFileOpenEventReceiver ); diff --git a/src/core/qgsattributeaction.cpp b/src/core/qgsattributeaction.cpp index d207b7764b1..4bbaea25faf 100644 --- a/src/core/qgsattributeaction.cpp +++ b/src/core/qgsattributeaction.cpp @@ -22,22 +22,22 @@ * * ***************************************************************************/ +#include #include "qgsattributeaction.h" +#include "qgsexpression.h" +#include "qgsproject.h" #include "qgspythonrunner.h" #include "qgsrunprocess.h" #include "qgsvectorlayer.h" -#include "qgsproject.h" -#include -#include "qgsexpression.h" -#include -#include -#include -#include #include -#include #include +#include #include +#include +#include +#include +#include void QgsAttributeAction::addAction( QgsAction::ActionType type, QString name, QString action, bool capture ) diff --git a/src/core/qgsattributeaction.h b/src/core/qgsattributeaction.h index cd13df5262e..bfaa4517fef 100644 --- a/src/core/qgsattributeaction.h +++ b/src/core/qgsattributeaction.h @@ -24,8 +24,8 @@ #ifndef QGSATTRIBUTEACTION_H #define QGSATTRIBUTEACTION_H -#include #include +#include #include diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp index 3fa9ed7f41c..0792516c4d8 100644 --- a/src/core/qgsbrowsermodel.cpp +++ b/src/core/qgsbrowsermodel.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include #include @@ -22,8 +22,8 @@ #include "qgsdataitemprovider.h" #include "qgsdataitemproviderregistry.h" #include "qgsdataprovider.h" -#include "qgsmimedatautils.h" #include "qgslogger.h" +#include "qgsmimedatautils.h" #include "qgsproviderregistry.h" #include "qgsbrowsermodel.h" diff --git a/src/core/qgsbrowsermodel.h b/src/core/qgsbrowsermodel.h index dcdc30cb0dc..c72b40b5fd3 100644 --- a/src/core/qgsbrowsermodel.h +++ b/src/core/qgsbrowsermodel.h @@ -16,11 +16,11 @@ #define QGSBROWSERMODEL_H #include +#include +#include #include #include #include -#include -#include #include "qgsdataitem.h" diff --git a/src/core/qgscacheindexfeatureid.cpp b/src/core/qgscacheindexfeatureid.cpp index 08f77934b9d..39015a8ef69 100644 --- a/src/core/qgscacheindexfeatureid.cpp +++ b/src/core/qgscacheindexfeatureid.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ +#include "qgscachedfeatureiterator.h" #include "qgscacheindexfeatureid.h" #include "qgsfeaturerequest.h" -#include "qgscachedfeatureiterator.h" #include "qgsvectorlayercache.h" QgsCacheIndexFeatureId::QgsCacheIndexFeatureId( QgsVectorLayerCache* cachedVectorLayer ) diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h index a5b2004f817..f9b26d16b22 100644 --- a/src/core/qgsclipper.h +++ b/src/core/qgsclipper.h @@ -23,8 +23,8 @@ #include "qgspoint.h" #include "qgsrectangle.h" -#include #include +#include /** \ingroup core * A class to trim lines and polygons to within a rectangular region. diff --git a/src/core/qgscolorscheme.cpp b/src/core/qgscolorscheme.cpp index 64cc7f03d30..b42896c00e8 100644 --- a/src/core/qgscolorscheme.cpp +++ b/src/core/qgscolorscheme.cpp @@ -17,12 +17,12 @@ #include "qgscolorscheme.h" +#include "qgsapplication.h" #include "qgsproject.h" #include "qgssymbollayerv2utils.h" -#include "qgsapplication.h" -#include #include +#include QgsColorScheme::QgsColorScheme() { diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h index 7944cbc4e8c..2010f47590e 100644 --- a/src/core/qgscolorscheme.h +++ b/src/core/qgscolorscheme.h @@ -18,9 +18,9 @@ #ifndef QGSCOLORSCHEME_H #define QGSCOLORSCHEME_H -#include #include #include +#include /**List of colors paired with a friendly display name identifying the color * \note Added in version 2.5 diff --git a/src/core/qgscolorschemeregistry.cpp b/src/core/qgscolorschemeregistry.cpp index dc42da867da..f9f1a2d7c3d 100644 --- a/src/core/qgscolorschemeregistry.cpp +++ b/src/core/qgscolorschemeregistry.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgscolorschemeregistry.h" -#include "qgscolorscheme.h" -#include "qgsapplication.h" #include #include +#include "qgsapplication.h" +#include "qgscolorscheme.h" +#include "qgscolorschemeregistry.h" // // Static calls to enforce singleton behaviour diff --git a/src/core/qgscolorschemeregistry.h b/src/core/qgscolorschemeregistry.h index b3d536569f9..7f563336970 100644 --- a/src/core/qgscolorschemeregistry.h +++ b/src/core/qgscolorschemeregistry.h @@ -18,8 +18,8 @@ #ifndef QGSCOLORSCHEMEREGISTRY_H #define QGSCOLORSCHEMEREGISTRY_H -#include "qgscolorscheme.h" #include +#include "qgscolorscheme.h" /** \ingroup core * \class QgsColorSchemeRegistry diff --git a/src/core/qgsconnectionpool.h b/src/core/qgsconnectionpool.h index 908b46fdb12..e266d1f21d1 100644 --- a/src/core/qgsconnectionpool.h +++ b/src/core/qgsconnectionpool.h @@ -21,9 +21,9 @@ #include #include #include +#include #include #include -#include #include "qgslogger.h" diff --git a/src/core/qgscontexthelp.cpp b/src/core/qgscontexthelp.cpp index d3a1a4ef5ae..0a395e8b303 100644 --- a/src/core/qgscontexthelp.cpp +++ b/src/core/qgscontexthelp.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ -#include #include +#include #include #include -#include "qgscontexthelp.h" -#include "qgsmessagelog.h" #include "qgsapplication.h" +#include "qgscontexthelp.h" #include "qgslogger.h" +#include "qgsmessagelog.h" QgsContextHelp *QgsContextHelp::gContextHelp = 0; // Singleton instance diff --git a/src/core/qgscontexthelp.h b/src/core/qgscontexthelp.h index 7abc5140115..e40ad392e43 100644 --- a/src/core/qgscontexthelp.h +++ b/src/core/qgscontexthelp.h @@ -19,8 +19,8 @@ #ifndef QGSCONTEXTHELP_H #define QGSCONTEXTHELP_H -#include #include +#include #include /** \ingroup core diff --git a/src/core/qgscoordinatereferencesystem.cpp b/src/core/qgscoordinatereferencesystem.cpp index f9e14df33c6..9143bf8b997 100644 --- a/src/core/qgscoordinatereferencesystem.cpp +++ b/src/core/qgscoordinatereferencesystem.cpp @@ -20,29 +20,29 @@ #include #include -#include -#include #include +#include +#include #include #include -#include -#include #include +#include +#include +#include "qgis.h" //const vals declared here #include "qgsapplication.h" #include "qgscrscache.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgis.h" //const vals declared here #include #include //gdal and ogr includes (needed for == operator) -#include -#include #include #include +#include +#include CUSTOM_CRS_VALIDATION QgsCoordinateReferenceSystem::mCustomSrsValidation = NULL; diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index 78729d0a987..efbf8235d5a 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -22,9 +22,9 @@ #include //qt includes -#include -#include #include +#include +#include class QDomNode; class QDomDocument; diff --git a/src/core/qgscoordinatetransform.cpp b/src/core/qgscoordinatetransform.cpp index 70c1415da6c..4adac43a57d 100644 --- a/src/core/qgscoordinatetransform.cpp +++ b/src/core/qgscoordinatetransform.cpp @@ -14,16 +14,16 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgscoordinatetransform.h" #include "qgsapplication.h" +#include "qgscoordinatetransform.h" #include "qgscrscache.h" -#include "qgsmessagelog.h" #include "qgslogger.h" +#include "qgsmessagelog.h" //qt includes -#include -#include #include +#include +#include #include #include #include diff --git a/src/core/qgscoordinatetransform.h b/src/core/qgscoordinatetransform.h index ca30c2f942d..2077fc2d919 100644 --- a/src/core/qgscoordinatetransform.h +++ b/src/core/qgscoordinatetransform.h @@ -21,10 +21,10 @@ #include //qgis includes +#include "qgscoordinatereferencesystem.h" +#include "qgscsexception.h" #include "qgspoint.h" #include "qgsrectangle.h" -#include "qgscsexception.h" -#include "qgscoordinatereferencesystem.h" class QDomNode; class QDomDocument; class QPolygonF; diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h index 4d144144df8..caf4da1f513 100644 --- a/src/core/qgscredentials.h +++ b/src/core/qgscredentials.h @@ -17,11 +17,11 @@ #ifndef QGSCREDENTIALS_H #define QGSCREDENTIALS_H -#include -#include -#include #include #include +#include +#include +#include /** \ingroup core * Interface for requesting credentials in QGIS in GUI independent way. diff --git a/src/core/qgscrscache.cpp b/src/core/qgscrscache.cpp index e2713e5a79a..09ae6199a1f 100644 --- a/src/core/qgscrscache.cpp +++ b/src/core/qgscrscache.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgscrscache.h" #include "qgscoordinatetransform.h" +#include "qgscrscache.h" QgsCoordinateTransformCache* QgsCoordinateTransformCache::instance() diff --git a/src/core/qgscrscache.h b/src/core/qgscrscache.h index 61952f5d78c..7be2323579d 100644 --- a/src/core/qgscrscache.h +++ b/src/core/qgscrscache.h @@ -18,8 +18,8 @@ #ifndef QGSCRSCACHE_H #define QGSCRSCACHE_H -#include "qgscoordinatereferencesystem.h" #include +#include "qgscoordinatereferencesystem.h" class QgsCoordinateTransform; diff --git a/src/core/qgsdatadefined.cpp b/src/core/qgsdatadefined.cpp index cbc42c94c41..0cf046e935f 100644 --- a/src/core/qgsdatadefined.cpp +++ b/src/core/qgsdatadefined.cpp @@ -16,9 +16,9 @@ #include "qgsdatadefined.h" #include "qgsdatadefined_p.h" -#include "qgslogger.h" #include "qgsexpression.h" #include "qgsfield.h" +#include "qgslogger.h" #include "qgsvectorlayer.h" QgsDataDefined::QgsDataDefined( bool active, diff --git a/src/core/qgsdatadefined.h b/src/core/qgsdatadefined.h index 17300f9289f..e732c8f0240 100644 --- a/src/core/qgsdatadefined.h +++ b/src/core/qgsdatadefined.h @@ -15,10 +15,10 @@ #ifndef QGSDATADEFINED_H #define QGSDATADEFINED_H -#include #include -#include #include +#include +#include #include "qgis.h" #include "qgsfield.h" diff --git a/src/core/qgsdatadefined_p.h b/src/core/qgsdatadefined_p.h index 5a06763ae0b..e98c5349605 100644 --- a/src/core/qgsdatadefined_p.h +++ b/src/core/qgsdatadefined_p.h @@ -26,9 +26,9 @@ // version without notice, or even be removed. // -#include #include #include +#include #include "qgsexpression.h" diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp index bbbbf63106d..fd17c24487b 100644 --- a/src/core/qgsdataitem.cpp +++ b/src/core/qgsdataitem.cpp @@ -16,32 +16,32 @@ ***************************************************************************/ #include -#include -#include #include #include #include #include #include +#include +#include +#include +#include #include #include #include -#include -#include #include "qgis.h" #include "qgsdataitem.h" +#include "qgsconfig.h" #include "qgsdataitemprovider.h" #include "qgsdataitemproviderregistry.h" #include "qgsdataprovider.h" #include "qgslogger.h" #include "qgsproviderregistry.h" -#include "qgsconfig.h" // use GDAL VSI mechanism -#include "cpl_vsi.h" #include "cpl_string.h" +#include "cpl_vsi.h" QgsAnimatedIcon::QgsAnimatedIcon( const QString & iconPath ) : QObject() diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index afe425acfa4..b0a818e768b 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -29,8 +29,8 @@ #include #include "qgsapplication.h" -#include "qgsmaplayer.h" #include "qgscoordinatereferencesystem.h" +#include "qgsmaplayer.h" class QgsDataProvider; class QgsDataItem; diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp index e527bf62aa8..63d0c45bb0e 100644 --- a/src/core/qgsdatasourceuri.cpp +++ b/src/core/qgsdatasourceuri.cpp @@ -20,8 +20,8 @@ #include "qgslogger.h" #include "qgswkbtypes.h" -#include #include +#include #include QgsDataSourceURI::QgsDataSourceURI() diff --git a/src/core/qgsdiagramrendererv2.cpp b/src/core/qgsdiagramrendererv2.cpp index 90f5ce08cd3..1521defd8e0 100644 --- a/src/core/qgsdiagramrendererv2.cpp +++ b/src/core/qgsdiagramrendererv2.cpp @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsdiagramrendererv2.h" -#include "qgsvectorlayer.h" -#include "diagram/qgstextdiagram.h" -#include "diagram/qgspiediagram.h" #include "diagram/qgshistogramdiagram.h" -#include "qgsrendercontext.h" +#include "diagram/qgspiediagram.h" +#include "diagram/qgstextdiagram.h" +#include "qgsdiagramrendererv2.h" #include "qgslayertreemodellegendnode.h" +#include "qgsrendercontext.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/qgsdiagramrendererv2.h b/src/core/qgsdiagramrendererv2.h index 42757e2496c..0ddfa808ebb 100644 --- a/src/core/qgsdiagramrendererv2.h +++ b/src/core/qgsdiagramrendererv2.h @@ -16,11 +16,11 @@ #define QGSDIAGRAMRENDERERV2_H #include +#include #include #include #include #include -#include #include "qgsfeature.h" diff --git a/src/core/qgsdistancearea.cpp b/src/core/qgsdistancearea.cpp index b1628d80c64..173bb1b04b6 100644 --- a/src/core/qgsdistancearea.cpp +++ b/src/core/qgsdistancearea.cpp @@ -16,19 +16,19 @@ #include #include #include -#include #include #include +#include #include "qgis.h" -#include "qgspoint.h" -#include "qgscoordinatetransform.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsgeometry.h" -#include "qgsdistancearea.h" #include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" +#include "qgscoordinatetransform.h" +#include "qgsdistancearea.h" +#include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagelog.h" +#include "qgspoint.h" #include "qgswkbptr.h" // MSVC compiler doesn't have defined M_PI in math.h diff --git a/src/core/qgserror.cpp b/src/core/qgserror.cpp index 2ccd2a4243c..860e5d28654 100644 --- a/src/core/qgserror.cpp +++ b/src/core/qgserror.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ #include "qgis.h" -#include "qgsversion.h" #include "qgsconfig.h" #include "qgserror.h" #include "qgslogger.h" +#include "qgsversion.h" #include diff --git a/src/core/qgserror.h b/src/core/qgserror.h index 82e6814dac4..192532e560c 100644 --- a/src/core/qgserror.h +++ b/src/core/qgserror.h @@ -17,8 +17,8 @@ #ifndef QGSERROR_H #define QGSERROR_H -#include #include +#include // Macro to create Error message including info about where it was created. #define QGS_ERROR_MESSAGE(message, tag) QgsErrorMessage(QString(message),QString(tag), QString(__FILE__), QString(__FUNCTION__), __LINE__) diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp index b3392c3c1b1..cfb17c59acb 100644 --- a/src/core/qgsexpression.cpp +++ b/src/core/qgsexpression.cpp @@ -15,15 +15,15 @@ #include "qgsexpression.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include -#include #include +#include #include "qgsdistancearea.h" #include "qgsfeature.h" @@ -31,10 +31,10 @@ #include "qgslogger.h" #include "qgsmaplayerregistry.h" #include "qgsogcutils.h" -#include "qgsvectorlayer.h" +#include "qgsstylev2.h" #include "qgssymbollayerv2utils.h" #include "qgsvectorcolorrampv2.h" -#include "qgsstylev2.h" +#include "qgsvectorlayer.h" // from parser extern QgsExpression::Node* parseExpression( const QString& str, QString& parserErrorMsg ); diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h index 9f1c7d69393..4603468c903 100644 --- a/src/core/qgsexpression.h +++ b/src/core/qgsexpression.h @@ -16,11 +16,11 @@ #ifndef QGSEXPRESSION_H #define QGSEXPRESSION_H +#include +#include #include #include #include -#include -#include class QgsFeature; class QgsGeometry; diff --git a/src/core/qgsexpressionfieldbuffer.h b/src/core/qgsexpressionfieldbuffer.h index 8022cea1e35..00d983a733f 100644 --- a/src/core/qgsexpressionfieldbuffer.h +++ b/src/core/qgsexpressionfieldbuffer.h @@ -18,9 +18,9 @@ #ifndef QGSEXPRESSIONFIELDBUFFER_H #define QGSEXPRESSIONFIELDBUFFER_H -#include -#include #include +#include +#include #include "qgsfield.h" diff --git a/src/core/qgsfeature.h b/src/core/qgsfeature.h index 7570285bf49..cb320c2b531 100644 --- a/src/core/qgsfeature.h +++ b/src/core/qgsfeature.h @@ -16,13 +16,13 @@ email : sherman at mrcc.com #ifndef QGSFEATURE_H #define QGSFEATURE_H +#include +#include #include +#include #include #include -#include -#include #include -#include class QgsGeometry; class QgsRectangle; diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h index e6b911e3a47..24995ed1018 100644 --- a/src/core/qgsfeaturerequest.h +++ b/src/core/qgsfeaturerequest.h @@ -17,9 +17,9 @@ #include +#include "qgsexpression.h" #include "qgsfeature.h" #include "qgsrectangle.h" -#include "qgsexpression.h" #include "qgssimplifymethod.h" #include diff --git a/src/core/qgsfeaturestore.h b/src/core/qgsfeaturestore.h index 13f4fefcaa1..353b165c863 100644 --- a/src/core/qgsfeaturestore.h +++ b/src/core/qgsfeaturestore.h @@ -15,14 +15,14 @@ #ifndef QGSFEATURESTORE_H #define QGSFEATURESTORE_H -#include "qgis.h" -#include "qgsfeature.h" -#include "qgsfield.h" -#include "qgslogger.h" -#include "qgscoordinatereferencesystem.h" #include #include #include +#include "qgis.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsfeature.h" +#include "qgsfield.h" +#include "qgslogger.h" /** \ingroup core * Container for features with the same fields and crs. diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h index aa873d67bef..c9c9b0c2623 100644 --- a/src/core/qgsfield.h +++ b/src/core/qgsfield.h @@ -16,10 +16,10 @@ #ifndef QGSFIELD_H #define QGSFIELD_H +#include #include #include #include -#include typedef QList QgsAttributeList; diff --git a/src/core/qgsfield_p.h b/src/core/qgsfield_p.h index 40b8f73980b..d79999b0cf6 100644 --- a/src/core/qgsfield_p.h +++ b/src/core/qgsfield_p.h @@ -27,9 +27,9 @@ // version without notice, or even be removed. // +#include #include #include -#include #include "qgsfield.h" class QgsFieldPrivate : public QSharedData diff --git a/src/core/qgsgeometrycache.h b/src/core/qgsgeometrycache.h index f23f939230f..a20331d6e5e 100644 --- a/src/core/qgsgeometrycache.h +++ b/src/core/qgsgeometrycache.h @@ -1,8 +1,8 @@ #ifndef QGSGEOMETRYCACHE_H #define QGSGEOMETRYCACHE_H -#include "qgsgeometry.h" #include "qgsfeature.h" +#include "qgsgeometry.h" #include "qgsrectangle.h" #include diff --git a/src/core/qgsgeometryvalidator.cpp b/src/core/qgsgeometryvalidator.cpp index 7ded76c5e1c..26bb3fed729 100644 --- a/src/core/qgsgeometryvalidator.cpp +++ b/src/core/qgsgeometryvalidator.cpp @@ -14,8 +14,8 @@ email : jef at norbit dot de ***************************************************************************/ #include "qgis.h" -#include "qgsgeometryvalidator.h" #include "qgsgeometry.h" +#include "qgsgeometryvalidator.h" #include "qgslogger.h" #include diff --git a/src/core/qgsgml.cpp b/src/core/qgsgml.cpp index e1fa87cd1de..cad75d4cd48 100644 --- a/src/core/qgsgml.cpp +++ b/src/core/qgsgml.cpp @@ -12,21 +12,21 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgml.h" -#include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsgeometry.h" -#include "qgslogger.h" -#include "qgsmessagelog.h" -#include "qgsnetworkaccessmanager.h" #include #include -#include #include +#include #include #include #include #include +#include "qgscoordinatereferencesystem.h" +#include "qgsgeometry.h" +#include "qgsgml.h" +#include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsnetworkaccessmanager.h" +#include "qgsrectangle.h" #include diff --git a/src/core/qgsgml.h b/src/core/qgsgml.h index 78c1dda2041..ca1b9a83baf 100644 --- a/src/core/qgsgml.h +++ b/src/core/qgsgml.h @@ -26,11 +26,11 @@ #include "qgspoint.h" #include "qgsrectangle.h" -#include #include #include -#include +#include #include +#include class QgsRectangle; diff --git a/src/core/qgsgmlschema.cpp b/src/core/qgsgmlschema.cpp index 1ee741db1d4..c8e2ea8cb10 100644 --- a/src/core/qgsgmlschema.cpp +++ b/src/core/qgsgmlschema.cpp @@ -12,21 +12,21 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgmlschema.h" -#include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgserror.h" -#include "qgsgeometry.h" -#include "qgslogger.h" -#include "qgsnetworkaccessmanager.h" #include #include -#include #include +#include #include #include #include #include +#include "qgscoordinatereferencesystem.h" +#include "qgserror.h" +#include "qgsgeometry.h" +#include "qgsgmlschema.h" +#include "qgslogger.h" +#include "qgsnetworkaccessmanager.h" +#include "qgsrectangle.h" #include diff --git a/src/core/qgsgmlschema.h b/src/core/qgsgmlschema.h index 7a72d44d9e5..c3ffb4ba0ba 100644 --- a/src/core/qgsgmlschema.h +++ b/src/core/qgsgmlschema.h @@ -16,6 +16,14 @@ #define QGSGMLSCHEMA_H #include +#include +#include +#include +#include +#include +#include +#include +#include #include "qgis.h" #include "qgsapplication.h" #include "qgsdataprovider.h" @@ -24,14 +32,6 @@ #include "qgsfield.h" #include "qgslogger.h" #include "qgspoint.h" -#include -#include -#include -#include -#include -#include -#include -#include class QgsRectangle; class QgsCoordinateReferenceSystem; diff --git a/src/core/qgshistogram.cpp b/src/core/qgshistogram.cpp index 4ede508a27e..52745307aab 100644 --- a/src/core/qgshistogram.cpp +++ b/src/core/qgshistogram.cpp @@ -17,9 +17,9 @@ #include "qgshistogram.h" +#include #include "qgsstatisticalsummary.h" #include "qgsvectorlayer.h" -#include QgsHistogram::QgsHistogram() : mMax( 0 ) diff --git a/src/core/qgshttptransaction.cpp b/src/core/qgshttptransaction.cpp index 13140c72f55..ed161b55a24 100644 --- a/src/core/qgshttptransaction.cpp +++ b/src/core/qgshttptransaction.cpp @@ -20,14 +20,14 @@ #include +#include "qgsconfig.h" #include "qgshttptransaction.h" #include "qgslogger.h" -#include "qgsconfig.h" #include -#include #include #include +#include static int HTTP_PORT_DEFAULT = 80; diff --git a/src/core/qgslabel.cpp b/src/core/qgslabel.cpp index 9edd28653ae..4347f1a585d 100644 --- a/src/core/qgslabel.cpp +++ b/src/core/qgslabel.cpp @@ -17,22 +17,22 @@ #include #include -#include #include #include +#include -#include -#include #include +#include +#include #include "qgis.h" -#include "qgsfeature.h" -#include "qgsgeometry.h" -#include "qgsfield.h" -#include "qgslogger.h" -#include "qgsrectangle.h" -#include "qgsmaptopixel.h" #include "qgscoordinatetransform.h" +#include "qgsfeature.h" +#include "qgsfield.h" +#include "qgsgeometry.h" +#include "qgslogger.h" +#include "qgsmaptopixel.h" +#include "qgsrectangle.h" #include "qgsrendercontext.h" #include "qgslabelattributes.h" diff --git a/src/core/qgslabelattributes.cpp b/src/core/qgslabelattributes.cpp index e2aa65feff5..82d8a406628 100644 --- a/src/core/qgslabelattributes.cpp +++ b/src/core/qgslabelattributes.cpp @@ -15,11 +15,11 @@ ***************************************************************************/ #include -#include -#include -#include -#include #include +#include +#include +#include +#include #include "qgslabelattributes.h" #include "qgslogger.h" diff --git a/src/core/qgslabelsearchtree.cpp b/src/core/qgslabelsearchtree.cpp index fe9c40a85e2..2fcb24f0ae0 100644 --- a/src/core/qgslabelsearchtree.cpp +++ b/src/core/qgslabelsearchtree.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgslabelsearchtree.h" #include "labelposition.h" +#include "qgslabelsearchtree.h" bool searchCallback( QgsLabelPosition* pos, void* context ) { diff --git a/src/core/qgslabelsearchtree.h b/src/core/qgslabelsearchtree.h index e4f0cb70f62..3c756eccd23 100644 --- a/src/core/qgslabelsearchtree.h +++ b/src/core/qgslabelsearchtree.h @@ -19,12 +19,12 @@ #ifndef QGSLABELSEARCHTREE_H #define QGSLABELSEARCHTREE_H -#include "qgspoint.h" -#include "qgsmaprenderer.h" +#include +#include #include #include -#include -#include +#include "qgsmaprenderer.h" +#include "qgspoint.h" #include "qgsrectangle.h" using namespace pal; diff --git a/src/core/qgslayerdefinition.cpp b/src/core/qgslayerdefinition.cpp index b4f6754417d..ea9252fe65b 100644 --- a/src/core/qgslayerdefinition.cpp +++ b/src/core/qgslayerdefinition.cpp @@ -1,14 +1,14 @@ -#include -#include -#include #include +#include +#include +#include #include +#include "qgslayerdefinition.h" +#include "qgslayertree.h" #include "qgslogger.h" #include "qgsmaplayer.h" -#include "qgslayertree.h" #include "qgsmaplayerregistry.h" -#include "qgslayerdefinition.h" bool QgsLayerDefinition::loadLayerDefinition( const QString &path, QgsLayerTreeGroup *rootGroup, QString &errorMessage ) { diff --git a/src/core/qgslogger.cpp b/src/core/qgslogger.cpp index 1d5fa9cfb39..bbfa8bd261d 100644 --- a/src/core/qgslogger.cpp +++ b/src/core/qgslogger.cpp @@ -19,8 +19,8 @@ #include "qgslogger.h" #include -#include #include +#include #include #include "qgsconfig.h" diff --git a/src/core/qgslogger.h b/src/core/qgslogger.h index dcba63e1d46..7a93f64a74b 100644 --- a/src/core/qgslogger.h +++ b/src/core/qgslogger.h @@ -19,9 +19,9 @@ #define QGSLOGGER_H #include -#include #include #include +#include class QFile; #ifdef QGISDEBUG diff --git a/src/core/qgsmaphittest.cpp b/src/core/qgsmaphittest.cpp index 4e52a8e4e39..b38ef9acc89 100644 --- a/src/core/qgsmaphittest.cpp +++ b/src/core/qgsmaphittest.cpp @@ -1,9 +1,9 @@ #include "qgsmaphittest.h" #include "qgsmaplayerregistry.h" +#include "qgspointdisplacementrenderer.h" #include "qgsrendercontext.h" #include "qgsrendererv2.h" -#include "qgspointdisplacementrenderer.h" #include "qgsvectorlayer.h" diff --git a/src/core/qgsmaplayerlegend.cpp b/src/core/qgsmaplayerlegend.cpp index dd7c5f788b1..9357137442c 100644 --- a/src/core/qgsmaplayerlegend.cpp +++ b/src/core/qgsmaplayerlegend.cpp @@ -17,13 +17,13 @@ #include +#include "qgsdiagramrendererv2.h" #include "qgslayertree.h" #include "qgslayertreemodellegendnode.h" #include "qgspluginlayer.h" #include "qgsrasterlayer.h" #include "qgsrendererv2.h" #include "qgsvectorlayer.h" -#include "qgsdiagramrendererv2.h" QgsMapLayerLegend::QgsMapLayerLegend( QObject *parent ) : diff --git a/src/core/qgsmaplayerregistry.cpp b/src/core/qgsmaplayerregistry.cpp index a6a29cbf5fc..fc6ea42d1e4 100644 --- a/src/core/qgsmaplayerregistry.cpp +++ b/src/core/qgsmaplayerregistry.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsmaplayerregistry.h" -#include "qgsmaplayer.h" #include "qgslogger.h" +#include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" // // Static calls to enforce singleton behaviour diff --git a/src/core/qgsmaplayerregistry.h b/src/core/qgsmaplayerregistry.h index a20f9d159bc..a6b7b6f7b1e 100644 --- a/src/core/qgsmaplayerregistry.h +++ b/src/core/qgsmaplayerregistry.h @@ -20,8 +20,8 @@ #define QGSMAPLAYERREGISTRY_H #include -#include #include +#include #include class QString; class QgsMapLayer; diff --git a/src/core/qgsmaprenderer.cpp b/src/core/qgsmaprenderer.cpp index bb9fa602ee8..2d2849ae38f 100644 --- a/src/core/qgsmaprenderer.cpp +++ b/src/core/qgsmaprenderer.cpp @@ -13,31 +13,31 @@ * * ***************************************************************************/ -#include #include +#include #include "qgscoordinatetransform.h" #include "qgscrscache.h" +#include "qgsdistancearea.h" #include "qgslogger.h" -#include "qgsmessagelog.h" -#include "qgsmaprenderer.h" -#include "qgsscalecalculator.h" -#include "qgsmaptopixel.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" +#include "qgsmaprenderer.h" #include "qgsmapsettings.h" -#include "qgsdistancearea.h" +#include "qgsmaptopixel.h" +#include "qgsmessagelog.h" #include "qgsproject.h" +#include "qgsscalecalculator.h" #include "qgsvectorlayer.h" +#include #include #include +#include #include #include -#include #include #include -#include QgsMapRenderer::QgsMapRenderer() { diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h index 8c0314b8974..e4bdf2ebe74 100644 --- a/src/core/qgsmaprenderer.h +++ b/src/core/qgsmaprenderer.h @@ -17,16 +17,16 @@ #define QGSMAPRENDER_H #include +#include #include #include #include -#include #include "qgis.h" -#include "qgsrectangle.h" -#include "qgsrendercontext.h" #include "qgsfeature.h" #include "qgsmapsettings.h" +#include "qgsrectangle.h" +#include "qgsrendercontext.h" class QDomDocument; class QDomNode; diff --git a/src/core/qgsmaprenderercache.cpp b/src/core/qgsmaprenderercache.cpp index aa85c417d08..d5107c26175 100644 --- a/src/core/qgsmaprenderercache.cpp +++ b/src/core/qgsmaprenderercache.cpp @@ -15,8 +15,8 @@ #include "qgsmaprenderercache.h" -#include "qgsmaplayerregistry.h" #include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" QgsMapRendererCache::QgsMapRendererCache() { diff --git a/src/core/qgsmaprenderercache.h b/src/core/qgsmaprenderercache.h index b7810959ed8..c8cc0c58679 100644 --- a/src/core/qgsmaprenderercache.h +++ b/src/core/qgsmaprenderercache.h @@ -16,8 +16,8 @@ #ifndef QGSMAPRENDERERCACHE_H #define QGSMAPRENDERERCACHE_H -#include #include +#include #include #include "qgsrectangle.h" diff --git a/src/core/qgsmaprendererjob.cpp b/src/core/qgsmaprendererjob.cpp index 028c91a68c2..5d03c04539c 100644 --- a/src/core/qgsmaprendererjob.cpp +++ b/src/core/qgsmaprendererjob.cpp @@ -16,22 +16,22 @@ #include "qgsmaprendererjob.h" #include +#include +#include #include #include -#include -#include #include "qgscrscache.h" #include "qgslogger.h" -#include "qgsrendercontext.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" #include "qgsmaplayerrenderer.h" #include "qgsmaplayerstylemanager.h" #include "qgsmaprenderercache.h" #include "qgspallabeling.h" -#include "qgsvectorlayerrenderer.h" +#include "qgsrendercontext.h" #include "qgsvectorlayer.h" +#include "qgsvectorlayerrenderer.h" QgsMapRendererJob::QgsMapRendererJob( const QgsMapSettings& settings ) : mSettings( settings ) diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h index 3275702256f..69d09469cf0 100644 --- a/src/core/qgsmaprendererjob.h +++ b/src/core/qgsmaprendererjob.h @@ -16,11 +16,11 @@ #ifndef QGSMAPRENDERERJOB_H #define QGSMAPRENDERERJOB_H -#include #include #include -#include #include +#include +#include #include #include "qgsrendercontext.h" diff --git a/src/core/qgsmapsettings.cpp b/src/core/qgsmapsettings.cpp index 3a1ef0261b7..8d6f0e8ee66 100644 --- a/src/core/qgsmapsettings.cpp +++ b/src/core/qgsmapsettings.cpp @@ -15,15 +15,15 @@ #include "qgsmapsettings.h" -#include "qgsscalecalculator.h" +#include "qgslogger.h" #include "qgsmaprendererjob.h" #include "qgsmaptopixel.h" -#include "qgslogger.h" +#include "qgsscalecalculator.h" #include "qgscrscache.h" -#include "qgsmessagelog.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" +#include "qgsmessagelog.h" #include "qgsxmlutils.h" diff --git a/src/core/qgsmaptopixel.cpp b/src/core/qgsmaptopixel.cpp index b7849c3be94..3063e769f8a 100644 --- a/src/core/qgsmaptopixel.cpp +++ b/src/core/qgsmaptopixel.cpp @@ -18,8 +18,8 @@ #include #include -#include #include +#include #include "qgslogger.h" diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h index 6463b71ca9c..b82d8f105d9 100644 --- a/src/core/qgsmaptopixel.h +++ b/src/core/qgsmaptopixel.h @@ -17,9 +17,9 @@ #ifndef QGSMAPTOPIXEL #define QGSMAPTOPIXEL -#include "qgspoint.h" #include #include +#include "qgspoint.h" #include diff --git a/src/core/qgsmaptopixelgeometrysimplifier.cpp b/src/core/qgsmaptopixelgeometrysimplifier.cpp index 6f6bc7cd6ed..919c2c11dad 100644 --- a/src/core/qgsmaptopixelgeometrysimplifier.cpp +++ b/src/core/qgsmaptopixelgeometrysimplifier.cpp @@ -15,8 +15,8 @@ ***************************************************************************/ #include -#include "qgsmaptopixelgeometrysimplifier.h" #include "qgsapplication.h" +#include "qgsmaptopixelgeometrysimplifier.h" QgsMapToPixelSimplifier::QgsMapToPixelSimplifier( int simplifyFlags, double tolerance ) : mSimplifyFlags( simplifyFlags ) diff --git a/src/core/qgsmaptopixelgeometrysimplifier.h b/src/core/qgsmaptopixelgeometrysimplifier.h index 38324dd3632..64fdc0c33da 100644 --- a/src/core/qgsmaptopixelgeometrysimplifier.h +++ b/src/core/qgsmaptopixelgeometrysimplifier.h @@ -17,8 +17,8 @@ #ifndef QGSMAPTOPIXELGEOMETRYSIMPLIFIER_H #define QGSMAPTOPIXELGEOMETRYSIMPLIFIER_H -#include "qgsgeometry.h" #include "qgscoordinatetransform.h" +#include "qgsgeometry.h" #include "qgsmaptopixel.h" #include "qgsgeometrysimplifier.h" diff --git a/src/core/qgsmessagelog.cpp b/src/core/qgsmessagelog.cpp index bcdf991af2a..c1cf4a87481 100644 --- a/src/core/qgsmessagelog.cpp +++ b/src/core/qgsmessagelog.cpp @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include "qgsmessagelog.h" -#include -#include -#include #include +#include +#include +#include +#include "qgsmessagelog.h" class QgsMessageLogConsole; diff --git a/src/core/qgsmessagelog.h b/src/core/qgsmessagelog.h index 34f39afd91b..e2a71da5283 100644 --- a/src/core/qgsmessagelog.h +++ b/src/core/qgsmessagelog.h @@ -16,8 +16,8 @@ #ifndef QGSMESSAGELOG_H #define QGSMESSAGELOG_H -#include #include +#include /** \ingroup core * Interface for logging messages from QGIS in GUI independent way. diff --git a/src/core/qgsmessageoutput.cpp b/src/core/qgsmessageoutput.cpp index 9f69b85c6ef..da91bab9add 100644 --- a/src/core/qgsmessageoutput.cpp +++ b/src/core/qgsmessageoutput.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsmessageoutput.h" #include "qgslogger.h" #include "qgsmessagelog.h" +#include "qgsmessageoutput.h" #include diff --git a/src/core/qgsmessageoutput.h b/src/core/qgsmessageoutput.h index 68a55ff5887..9178dfb0297 100644 --- a/src/core/qgsmessageoutput.h +++ b/src/core/qgsmessageoutput.h @@ -17,8 +17,8 @@ #ifndef QGSMESSAGEOUTPUT_H #define QGSMESSAGEOUTPUT_H -#include #include +#include class QgsMessageOutput; typedef QgsMessageOutput*( *MESSAGE_OUTPUT_CREATOR )(); diff --git a/src/core/qgsnetworkaccessmanager.cpp b/src/core/qgsnetworkaccessmanager.cpp index 950060a6c3c..7149bc01549 100644 --- a/src/core/qgsnetworkaccessmanager.cpp +++ b/src/core/qgsnetworkaccessmanager.cpp @@ -21,16 +21,16 @@ #include -#include -#include -#include #include +#include +#include +#include -#include +#include +#include #include #include -#include -#include +#include class QgsNetworkProxyFactory : public QNetworkProxyFactory { diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h index 1c9f2c86b63..adbfdcc0410 100644 --- a/src/core/qgsnetworkaccessmanager.h +++ b/src/core/qgsnetworkaccessmanager.h @@ -19,10 +19,10 @@ #define QGSNETWORKACCESSMANAGER_H #include -#include #include #include #include +#include /* * \class QgsNetworkAccessManager diff --git a/src/core/qgsnetworkcontentfetcher.cpp b/src/core/qgsnetworkcontentfetcher.cpp index 1780142eeba..f8de3b767d7 100644 --- a/src/core/qgsnetworkcontentfetcher.cpp +++ b/src/core/qgsnetworkcontentfetcher.cpp @@ -16,12 +16,12 @@ * * ***************************************************************************/ -#include "qgsnetworkcontentfetcher.h" -#include "qgsnetworkaccessmanager.h" -#include "qgsmessagelog.h" -#include "qgsapplication.h" #include #include +#include "qgsapplication.h" +#include "qgsmessagelog.h" +#include "qgsnetworkaccessmanager.h" +#include "qgsnetworkcontentfetcher.h" QgsNetworkContentFetcher::QgsNetworkContentFetcher() : mReply( 0 ) diff --git a/src/core/qgsofflineediting.cpp b/src/core/qgsofflineediting.cpp index 01782fd29f0..b92a9b80abd 100644 --- a/src/core/qgsofflineediting.cpp +++ b/src/core/qgsofflineediting.cpp @@ -26,10 +26,10 @@ #include "qgsmaplayerregistry.h" #include "qgsofflineediting.h" #include "qgsproject.h" +#include "qgsslconnect.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayereditbuffer.h" #include "qgsvectorlayerjoinbuffer.h" -#include "qgsslconnect.h" #include #include diff --git a/src/core/qgsogcutils.h b/src/core/qgsogcutils.h index ba7ffc16624..77af294a718 100644 --- a/src/core/qgsogcutils.h +++ b/src/core/qgsogcutils.h @@ -15,8 +15,8 @@ class QgsGeometry; class QgsPoint; class QgsRectangle; -#include "qgsgeometry.h" #include "qgsexpression.h" +#include "qgsgeometry.h" /** * @brief The QgsOgcUtils class provides various utility functions for conversion between diff --git a/src/core/qgsowsconnection.cpp b/src/core/qgsowsconnection.cpp index d6550b0a243..d9d3d485875 100644 --- a/src/core/qgsowsconnection.cpp +++ b/src/core/qgsowsconnection.cpp @@ -22,9 +22,9 @@ #include "qgis.h" // GEO_EPSG_CRS_ID #include "qgsdatasourceuri.h" #include "qgslogger.h" +#include "qgsowsconnection.h" #include "qgsproject.h" #include "qgsproviderregistry.h" -#include "qgsowsconnection.h" #include #include @@ -32,8 +32,8 @@ #include #include -#include #include +#include QgsOWSConnection::QgsOWSConnection( const QString & theService, const QString & theConnName ) : mConnName( theConnName ), diff --git a/src/core/qgsowsconnection.h b/src/core/qgsowsconnection.h index 2ade2684f0e..3f59cf8dd2a 100644 --- a/src/core/qgsowsconnection.h +++ b/src/core/qgsowsconnection.h @@ -24,8 +24,8 @@ #include "qgsdatasourceuri.h" -#include #include +#include /*! * \brief Connections management diff --git a/src/core/qgspalgeometry.h b/src/core/qgspalgeometry.h index 1dbd968bfe8..750055ff870 100644 --- a/src/core/qgspalgeometry.h +++ b/src/core/qgspalgeometry.h @@ -1,10 +1,10 @@ #ifndef QGSPALGEOMETRY_H #define QGSPALGEOMETRY_H -#include "qgsgeometry.h" -#include "qgspallabeling.h" #include #include +#include "qgsgeometry.h" +#include "qgspallabeling.h" using namespace pal; diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp index e552056d9d9..dbfce1819ec 100644 --- a/src/core/qgspallabeling.cpp +++ b/src/core/qgspallabeling.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgspallabeling.h" #include "qgspalgeometry.h" +#include "qgspallabeling.h" #include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #include @@ -34,29 +34,29 @@ #include #include -#include #include -#include #include +#include +#include #include "diagram/qgsdiagram.h" +#include "qgsdatadefined.h" #include "qgsdiagramrendererv2.h" +#include "qgsexpression.h" #include "qgsfontutils.h" #include "qgslabelsearchtree.h" -#include "qgsexpression.h" -#include "qgsdatadefined.h" -#include -#include -#include -#include #include +#include +#include #include #include #include -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" +#include +#include #include +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" Q_GUI_EXPORT extern int qt_defaultDpiX(); diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h index 1c13bdb07d2..dfaca8557d6 100644 --- a/src/core/qgspallabeling.h +++ b/src/core/qgspallabeling.h @@ -21,17 +21,17 @@ #ifndef QGSPALLABELING_H #define QGSPALLABELING_H -#include +#include #include #include -#include #include #include #include -#include "qgspoint.h" -#include "qgsmaprenderer.h" // definition of QgsLabelingEngineInterface +#include #include "qgsdiagramrendererv2.h" +#include "qgsmaprenderer.h" // definition of QgsLabelingEngineInterface #include "qgsmapunitscale.h" +#include "qgspoint.h" namespace pal { diff --git a/src/core/qgspluginlayerregistry.cpp b/src/core/qgspluginlayerregistry.cpp index ffa481fde9b..3ed7a83bb3b 100644 --- a/src/core/qgspluginlayerregistry.cpp +++ b/src/core/qgspluginlayerregistry.cpp @@ -16,10 +16,10 @@ * * ***************************************************************************/ -#include "qgspluginlayerregistry.h" #include "qgslogger.h" -#include "qgspluginlayer.h" #include "qgsmaplayerregistry.h" +#include "qgspluginlayer.h" +#include "qgspluginlayerregistry.h" QgsPluginLayerType::QgsPluginLayerType( QString name ) : mName( name ) diff --git a/src/core/qgspluginlayerregistry.h b/src/core/qgspluginlayerregistry.h index 9e3ccd3ee96..a4f52b49a38 100644 --- a/src/core/qgspluginlayerregistry.h +++ b/src/core/qgspluginlayerregistry.h @@ -19,8 +19,8 @@ #ifndef QGSPLUGINLAYERREGSITRY_H #define QGSPLUGINLAYERREGSITRY_H -#include #include +#include class QgsPluginLayer; diff --git a/src/core/qgspoint.cpp b/src/core/qgspoint.cpp index 17d8288d6cd..5fbc2cb640d 100644 --- a/src/core/qgspoint.cpp +++ b/src/core/qgspoint.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ -#include "qgspoint.h" -#include "qgis.h" #include -#include #include // for tr() +#include +#include "qgis.h" +#include "qgspoint.h" #include "qgsexception.h" diff --git a/src/core/qgspoint.h b/src/core/qgspoint.h index 392f10f879d..824c0def5a4 100644 --- a/src/core/qgspoint.h +++ b/src/core/qgspoint.h @@ -21,8 +21,8 @@ #include #include -#include #include +#include /** \ingroup core * A class to represent a vector. diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp index ca1933e8af2..d45c0110aa4 100644 --- a/src/core/qgsproject.cpp +++ b/src/core/qgsproject.cpp @@ -23,8 +23,8 @@ #include "qgsdatasourceuri.h" #include "qgsexception.h" #include "qgslayertree.h" -#include "qgslayertreeutils.h" #include "qgslayertreeregistrybridge.h" +#include "qgslayertreeutils.h" #include "qgslogger.h" #include "qgsmaplayerregistry.h" #include "qgspluginlayer.h" @@ -38,8 +38,8 @@ #include "qgsvectorlayer.h" #include -#include #include +#include #include #include diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h index 3541a839fc6..b7a3f232821 100644 --- a/src/core/qgsproject.h +++ b/src/core/qgsproject.h @@ -22,11 +22,11 @@ #define QGSPROJECT_H #include -#include "qgsprojectversion.h" #include #include #include #include +#include "qgsprojectversion.h" //for the snap settings #include "qgssnapper.h" diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp index 4512b02c1f0..ceb30ede723 100644 --- a/src/core/qgsprojectfiletransform.cpp +++ b/src/core/qgsprojectfiletransform.cpp @@ -16,18 +16,18 @@ ***************************************************************************/ -#include "qgsprojectfiletransform.h" -#include "qgsprojectversion.h" +#include +#include +#include //to find out screen resolution +#include #include "qgslogger.h" +#include "qgsprojectfiletransform.h" +#include "qgsproject.h" +#include "qgsprojectproperty.h" +#include "qgsprojectversion.h" #include "qgsrasterlayer.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include -#include -#include //to find out screen resolution -#include -#include "qgsproject.h" -#include "qgsprojectproperty.h" typedef QgsProjectVersion PFV; diff --git a/src/core/qgsprojectfiletransform.h b/src/core/qgsprojectfiletransform.h index fbcfd643223..1b775d413f3 100644 --- a/src/core/qgsprojectfiletransform.h +++ b/src/core/qgsprojectfiletransform.h @@ -26,8 +26,8 @@ #ifndef QGSPROJECTFILETRANSFORM_H #define QGSPROJECTFILETRANSFORM_H -#include #include +#include #include #include "qgsprojectversion.h" diff --git a/src/core/qgsprojectproperty.cpp b/src/core/qgsprojectproperty.cpp index 78cf97fe311..610612ece6d 100644 --- a/src/core/qgsprojectproperty.cpp +++ b/src/core/qgsprojectproperty.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsprojectproperty.h" #include "qgslogger.h" +#include "qgsprojectproperty.h" #include #include diff --git a/src/core/qgsprojectproperty.h b/src/core/qgsprojectproperty.h index 1f6367d8b7e..69eb3eb2239 100644 --- a/src/core/qgsprojectproperty.h +++ b/src/core/qgsprojectproperty.h @@ -23,8 +23,8 @@ #define QGSPROJECTPROPERTY_H #include -#include #include +#include class QDomNode; class QDomElement; diff --git a/src/core/qgsprovidercountcalcevent.cpp b/src/core/qgsprovidercountcalcevent.cpp index cae78beb039..3e2112a9df2 100644 --- a/src/core/qgsprovidercountcalcevent.cpp +++ b/src/core/qgsprovidercountcalcevent.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#include "qgsprovidercountcalcevent.h" #include "qgis.h" +#include "qgsprovidercountcalcevent.h" QgsProviderCountCalcEvent::QgsProviderCountCalcEvent( long featuresCounted ) : QEvent( static_cast( QGis::ProviderCountCalcEvent ) ) diff --git a/src/core/qgsproviderextentcalcevent.cpp b/src/core/qgsproviderextentcalcevent.cpp index 4f23e3bf513..3c0e3fd93d2 100644 --- a/src/core/qgsproviderextentcalcevent.cpp +++ b/src/core/qgsproviderextentcalcevent.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#include "qgsproviderextentcalcevent.h" #include "qgis.h" +#include "qgsproviderextentcalcevent.h" QgsProviderExtentCalcEvent::QgsProviderExtentCalcEvent( QgsRectangle* layerExtent ) : QEvent( static_cast( QGis::ProviderExtentCalcEvent ) ) diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp index 9d1b6b3bf89..39e48ba4122 100644 --- a/src/core/qgsproviderregistry.cpp +++ b/src/core/qgsproviderregistry.cpp @@ -18,18 +18,18 @@ #include "qgsproviderregistry.h" -#include #include #include +#include #include "qgis.h" #include "qgsdataprovider.h" #include "qgslogger.h" -#include "qgsmessageoutput.h" +#include "qgsmaplayerregistry.h" #include "qgsmessagelog.h" +#include "qgsmessageoutput.h" #include "qgsprovidermetadata.h" #include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" // typedefs for provider plugin functions of interest diff --git a/src/core/qgspythonrunner.cpp b/src/core/qgspythonrunner.cpp index cff8ffdff7a..d7b8f8ce252 100644 --- a/src/core/qgspythonrunner.cpp +++ b/src/core/qgspythonrunner.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgspythonrunner.h" #include "qgslogger.h" +#include "qgspythonrunner.h" QgsPythonRunner* QgsPythonRunner::mInstance = NULL; diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp index 378d6a22814..57964914f4e 100644 --- a/src/core/qgsrectangle.cpp +++ b/src/core/qgsrectangle.cpp @@ -18,16 +18,16 @@ #include #include #include +#include #include +#include #include #include #include -#include -#include +#include "qgslogger.h" #include "qgspoint.h" #include "qgsrectangle.h" -#include "qgslogger.h" QgsRectangle::QgsRectangle( double newxmin, double newymin, double newxmax, double newymax ) : xmin( newxmin ), ymin( newymin ), xmax( newxmax ), ymax( newymax ) diff --git a/src/core/qgsrelation.h b/src/core/qgsrelation.h index 247c51fd59c..6b61021f08a 100644 --- a/src/core/qgsrelation.h +++ b/src/core/qgsrelation.h @@ -16,12 +16,12 @@ #ifndef QGSRELATION_H #define QGSRELATION_H -#include #include +#include #include -#include "qgsfield.h" #include "qgsfeatureiterator.h" +#include "qgsfield.h" class QgsVectorLayer; diff --git a/src/core/qgsrelationmanager.h b/src/core/qgsrelationmanager.h index d5490efb9ad..bae906e4683 100644 --- a/src/core/qgsrelationmanager.h +++ b/src/core/qgsrelationmanager.h @@ -16,10 +16,10 @@ #ifndef QGSRELATIONMANAGER_H #define QGSRELATIONMANAGER_H +#include +#include #include #include -#include -#include #include "qgsrelation.h" diff --git a/src/core/qgsrenderchecker.cpp b/src/core/qgsrenderchecker.cpp index 5bb22fdfe95..70c447fa6a9 100644 --- a/src/core/qgsrenderchecker.cpp +++ b/src/core/qgsrenderchecker.cpp @@ -18,14 +18,14 @@ #include "qgis.h" #include "qgsmaprenderersequentialjob.h" -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include QgsRenderChecker::QgsRenderChecker() : mReport( "" ) diff --git a/src/core/qgsrenderchecker.h b/src/core/qgsrenderchecker.h index 1683c4b4843..9b75319a1ad 100644 --- a/src/core/qgsrenderchecker.h +++ b/src/core/qgsrenderchecker.h @@ -16,14 +16,14 @@ #ifndef QGSRENDERCHECKER_H #define QGSRENDERCHECKER_H -#include #include -#include -#include +#include #include +#include +#include -#include #include +#include #include #include "qgsdartmeasurement.h" diff --git a/src/core/qgsrunprocess.cpp b/src/core/qgsrunprocess.cpp index 58758c00069..b91e8bae061 100644 --- a/src/core/qgsrunprocess.cpp +++ b/src/core/qgsrunprocess.cpp @@ -20,10 +20,10 @@ #include "qgsrunprocess.h" +#include +#include #include "qgslogger.h" #include "qgsmessageoutput.h" -#include -#include QgsRunProcess::QgsRunProcess( const QString& action, bool capture ) : mProcess( NULL ), mOutput( NULL ) diff --git a/src/core/qgsscaleexpression.cpp b/src/core/qgsscaleexpression.cpp index fc4b4f1936c..06c9fd2daa7 100644 --- a/src/core/qgsscaleexpression.cpp +++ b/src/core/qgsscaleexpression.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgsscaleexpression.h" -#include "qgis.h" -#include #include +#include +#include "qgis.h" +#include "qgsscaleexpression.h" QgsScaleExpression::QgsScaleExpression( const QString& expression ) : QgsExpression( expression ) diff --git a/src/core/qgsscaleutils.cpp b/src/core/qgsscaleutils.cpp index bdbffb1934b..0452121b819 100644 --- a/src/core/qgsscaleutils.cpp +++ b/src/core/qgsscaleutils.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include #include +#include #include #include "qgsscaleutils.h" diff --git a/src/core/qgssimplifymethod.cpp b/src/core/qgssimplifymethod.cpp index 154ee4919b0..62a8cd6808f 100644 --- a/src/core/qgssimplifymethod.cpp +++ b/src/core/qgssimplifymethod.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgssimplifymethod.h" -#include "qgslogger.h" #include "qgsgeometrysimplifier.h" +#include "qgslogger.h" #include "qgsmaptopixelgeometrysimplifier.h" +#include "qgssimplifymethod.h" QgsSimplifyMethod::QgsSimplifyMethod() : mMethodType( QgsSimplifyMethod::NoSimplification ) diff --git a/src/core/qgssnapper.cpp b/src/core/qgssnapper.cpp index 2ca8d8dff84..d016abddad0 100644 --- a/src/core/qgssnapper.cpp +++ b/src/core/qgssnapper.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgssnapper.h" -#include "qgsmapsettings.h" -#include "qgsmaprenderer.h" -#include "qgsmaptopixel.h" -#include "qgsvectorlayer.h" +#include #include #include -#include +#include "qgsmaprenderer.h" +#include "qgsmapsettings.h" +#include "qgsmaptopixel.h" +#include "qgssnapper.h" +#include "qgsvectorlayer.h" QgsSnapper::QgsSnapper( QgsMapRenderer* mapRenderer ) diff --git a/src/core/qgssnapper.h b/src/core/qgssnapper.h index f4de56c8059..0bf0f637a92 100644 --- a/src/core/qgssnapper.h +++ b/src/core/qgssnapper.h @@ -18,9 +18,9 @@ #ifndef QGSSNAPPER_H #define QGSSNAPPER_H +#include "qgsfeature.h" #include "qgspoint.h" #include "qgstolerance.h" -#include "qgsfeature.h" #include #include diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h index 64b5842b58a..3eecbc15f03 100644 --- a/src/core/qgssnappingutils.h +++ b/src/core/qgssnappingutils.h @@ -18,8 +18,8 @@ #include "qgsmapsettings.h" -#include "qgstolerance.h" #include "qgspointlocator.h" +#include "qgstolerance.h" /** * This class has all the configuration of snapping and can return answers to snapping queries. diff --git a/src/core/qgsspatialindex.cpp b/src/core/qgsspatialindex.cpp index 667147db143..002086ad902 100644 --- a/src/core/qgsspatialindex.cpp +++ b/src/core/qgsspatialindex.cpp @@ -15,11 +15,11 @@ #include "qgsspatialindex.h" -#include "qgsgeometry.h" #include "qgsfeature.h" #include "qgsfeatureiterator.h" -#include "qgsrectangle.h" +#include "qgsgeometry.h" #include "qgslogger.h" +#include "qgsrectangle.h" #include "SpatialIndex.h" diff --git a/src/core/qgsstatisticalsummary.cpp b/src/core/qgsstatisticalsummary.cpp index 70a4dce9ac7..9cbfda0485b 100644 --- a/src/core/qgsstatisticalsummary.cpp +++ b/src/core/qgsstatisticalsummary.cpp @@ -13,11 +13,11 @@ * * ***************************************************************************/ -#include "qgsstatisticalsummary.h" #include #include -#include #include +#include +#include "qgsstatisticalsummary.h" QgsStatisticalSummary::QgsStatisticalSummary( Statistics stats ) : mStatistics( stats ) diff --git a/src/core/qgstolerance.cpp b/src/core/qgstolerance.cpp index 203fff41be5..4d593ede42c 100644 --- a/src/core/qgstolerance.cpp +++ b/src/core/qgstolerance.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgstolerance.h" -#include -#include #include +#include +#include +#include "qgstolerance.h" // return ratio [mu/lu] between map units and layer units diff --git a/src/core/qgstolerance.h b/src/core/qgstolerance.h index 595863c29bf..7b537ab6f45 100644 --- a/src/core/qgstolerance.h +++ b/src/core/qgstolerance.h @@ -15,9 +15,9 @@ #ifndef QGSTOLERANCE_H #define QGSTOLERANCE_H -#include "qgsmaptopixel.h" -#include "qgsmaprenderer.h" #include "qgsmaplayer.h" +#include "qgsmaprenderer.h" +#include "qgsmaptopixel.h" #include "qgspoint.h" /** \ingroup core diff --git a/src/core/qgstransaction.cpp b/src/core/qgstransaction.cpp index 87bbcbfbc93..725cdf6ead2 100644 --- a/src/core/qgstransaction.cpp +++ b/src/core/qgstransaction.cpp @@ -17,10 +17,10 @@ #include -#include "qgstransaction.h" #include "qgsdatasourceuri.h" #include "qgsmaplayerregistry.h" #include "qgsproviderregistry.h" +#include "qgstransaction.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" diff --git a/src/core/qgsvectordataprovider.cpp b/src/core/qgsvectordataprovider.cpp index 00d9908d824..b629d4cea01 100644 --- a/src/core/qgsvectordataprovider.cpp +++ b/src/core/qgsvectordataprovider.cpp @@ -19,13 +19,13 @@ #include // for DBL_MAX #include -#include "qgsvectordataprovider.h" #include "qgsfeature.h" #include "qgsfeatureiterator.h" #include "qgsfeaturerequest.h" #include "qgsfield.h" #include "qgslogger.h" #include "qgsmessagelog.h" +#include "qgsvectordataprovider.h" QgsVectorDataProvider::QgsVectorDataProvider( QString uri ) : QgsDataProvider( uri ) diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index 23f0ca8d0c8..1ee3dd66b6d 100644 --- a/src/core/qgsvectordataprovider.h +++ b/src/core/qgsvectordataprovider.h @@ -17,10 +17,10 @@ class QTextCodec; -#include -#include -#include #include +#include +#include +#include //QGIS Includes #include "qgis.h" diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp index cacaf361c35..fbd07ae24de 100644 --- a/src/core/qgsvectorfilewriter.cpp +++ b/src/core/qgsvectorfilewriter.cpp @@ -17,33 +17,33 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgsfield.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" +#include "qgsfield.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsvectorfilewriter.h" #include "qgsrendererv2.h" #include "qgssymbollayerv2.h" #include "qgsvectordataprovider.h" +#include "qgsvectorfilewriter.h" -#include -#include -#include #include +#include +#include +#include +#include +#include #include #include -#include -#include #include #include // size_t #include // std::numeric_limits -#include -#include #include +#include +#include #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 #define TO8(x) (x).toUtf8().constData() diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index e8bbe8c28bd..8e880119f61 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -19,10 +19,10 @@ #ifndef _QGSVECTORFILEWRITER_H_ #define _QGSVECTORFILEWRITER_H_ -#include "qgsvectorlayer.h" +#include #include "qgsfield.h" #include "qgssymbolv2.h" -#include +#include "qgsvectorlayer.h" #include diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp index 7c4a4096599..ade3b391bb7 100644 --- a/src/core/qgsvectorlayer.cpp +++ b/src/core/qgsvectorlayer.cpp @@ -23,6 +23,7 @@ #include +#include #include #include #include @@ -30,7 +31,6 @@ #include #include #include -#include #include #include "qgsvectorlayer.h" @@ -72,15 +72,15 @@ #include "qgsvectorlayerrenderer.h" #include "qgsvectorlayerundocommand.h" -#include "qgsrendererv2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2.h" -#include "qgssinglesymbolrendererv2.h" #include "qgsdiagramrendererv2.h" -#include "qgsstylev2.h" -#include "qgssymbologyv2conversion.h" #include "qgspallabeling.h" +#include "qgsrendererv2.h" #include "qgssimplifymethod.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgsstylev2.h" +#include "qgssymbollayerv2.h" +#include "qgssymbologyv2conversion.h" +#include "qgssymbolv2.h" #include "diagram/qgsdiagram.h" diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index ac92fbe41f9..d92193b8c42 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -19,19 +19,19 @@ #ifndef QGSVECTORLAYER_H #define QGSVECTORLAYER_H +#include #include #include -#include #include #include "qgis.h" -#include "qgsmaplayer.h" +#include "qgseditorwidgetconfig.h" #include "qgsfeature.h" #include "qgsfeatureiterator.h" -#include "qgseditorwidgetconfig.h" #include "qgsfield.h" -#include "qgssnapper.h" +#include "qgsmaplayer.h" #include "qgsrelation.h" +#include "qgssnapper.h" #include "qgsvectorsimplifymethod.h" class QPainter; diff --git a/src/core/qgsvectorlayercache.cpp b/src/core/qgsvectorlayercache.cpp index d06dffb41cf..54406027d5e 100644 --- a/src/core/qgsvectorlayercache.cpp +++ b/src/core/qgsvectorlayercache.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsvectorlayercache.h" -#include "qgscacheindex.h" #include "qgscachedfeatureiterator.h" +#include "qgscacheindex.h" +#include "qgsvectorlayercache.h" QgsVectorLayerCache::QgsVectorLayerCache( QgsVectorLayer* layer, int cacheSize, QObject* parent ) : QObject( parent ) diff --git a/src/core/qgsvectorlayereditbuffer.cpp b/src/core/qgsvectorlayereditbuffer.cpp index 8eef1f13937..cfd302cc755 100644 --- a/src/core/qgsvectorlayereditbuffer.cpp +++ b/src/core/qgsvectorlayereditbuffer.cpp @@ -16,9 +16,9 @@ #include "qgsgeometry.h" #include "qgslogger.h" -#include "qgsvectorlayerundocommand.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" +#include "qgsvectorlayerundocommand.h" //! populate two lists (ks, vs) from map - in reverse order diff --git a/src/core/qgsvectorlayereditbuffer.h b/src/core/qgsvectorlayereditbuffer.h index 7860cebff77..a577436d352 100644 --- a/src/core/qgsvectorlayereditbuffer.h +++ b/src/core/qgsvectorlayereditbuffer.h @@ -18,9 +18,9 @@ #include #include -#include "qgsgeometry.h" #include "qgsfeature.h" #include "qgsfield.h" +#include "qgsgeometry.h" #include "qgsrectangle.h" #include "qgssnapper.h" diff --git a/src/core/qgsvectorlayereditpassthrough.cpp b/src/core/qgsvectorlayereditpassthrough.cpp index ac053b9377f..48e44bc4028 100644 --- a/src/core/qgsvectorlayereditpassthrough.cpp +++ b/src/core/qgsvectorlayereditpassthrough.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ +#include "qgsvectordataprovider.h" #include "qgsvectorlayereditpassthrough.h" #include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" bool QgsVectorLayerEditPassthrough::addFeature( QgsFeature& f ) { diff --git a/src/core/qgsvectorlayereditutils.cpp b/src/core/qgsvectorlayereditutils.cpp index 19fba6065f6..a39cd80ca41 100644 --- a/src/core/qgsvectorlayereditutils.cpp +++ b/src/core/qgsvectorlayereditutils.cpp @@ -14,10 +14,10 @@ ***************************************************************************/ #include "qgsvectorlayereditutils.h" -#include "qgsvectordataprovider.h" #include "qgsgeometrycache.h" -#include "qgsvectorlayereditbuffer.h" #include "qgslogger.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayereditbuffer.h" #include diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp index cbc6c09d260..4a49ee0e937 100644 --- a/src/core/qgsvectorlayerimport.cpp +++ b/src/core/qgsvectorlayerimport.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ -#include "qgsfield.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsdatasourceuri.h" #include "qgsfeature.h" +#include "qgsfield.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsvectorlayerimport.h" #include "qgsproviderregistry.h" -#include "qgsdatasourceuri.h" +#include "qgsvectorlayerimport.h" #include diff --git a/src/core/qgsvectorlayerrenderer.cpp b/src/core/qgsvectorlayerrenderer.cpp index 7d69c75f7e8..121a159e9cc 100644 --- a/src/core/qgsvectorlayerrenderer.cpp +++ b/src/core/qgsvectorlayerrenderer.cpp @@ -20,18 +20,18 @@ #include "qgsdiagramrendererv2.h" #include "qgsgeometrycache.h" #include "qgsmessagelog.h" +#include "qgspainteffect.h" #include "qgspallabeling.h" -#include "qgsrendererv2.h" #include "qgsrendercontext.h" +#include "qgsrendererv2.h" #include "qgssinglesymbolrendererv2.h" #include "qgssymbollayerv2.h" #include "qgssymbolv2.h" -#include "qgsvectorlayer.h" #include "qgsvectorlayerfeatureiterator.h" -#include "qgspainteffect.h" +#include "qgsvectorlayer.h" -#include #include +#include // TODO: // - passing of cache to QgsVectorLayer diff --git a/src/core/qgsvectorlayerrenderer.h b/src/core/qgsvectorlayerrenderer.h index ef0cb747eb7..67825620d9b 100644 --- a/src/core/qgsvectorlayerrenderer.h +++ b/src/core/qgsvectorlayerrenderer.h @@ -34,9 +34,9 @@ class QgsSingleSymbolRendererV2; typedef QList QgsAttributeList; #include "qgis.h" -#include "qgsfield.h" // QgsFields #include "qgsfeature.h" // QgsFeatureIds #include "qgsfeatureiterator.h" +#include "qgsfield.h" // QgsFields #include "qgsvectorsimplifymethod.h" #include "qgsmaplayerrenderer.h" diff --git a/src/core/qgsvectorlayerundocommand.cpp b/src/core/qgsvectorlayerundocommand.cpp index 770fefa0b09..3cdfd62a643 100644 --- a/src/core/qgsvectorlayerundocommand.cpp +++ b/src/core/qgsvectorlayerundocommand.cpp @@ -15,11 +15,11 @@ #include "qgsvectorlayerundocommand.h" -#include "qgsgeometry.h" #include "qgsfeature.h" -#include "qgsvectorlayer.h" #include "qgsgeometrycache.h" +#include "qgsgeometry.h" #include "qgsvectorlayereditbuffer.h" +#include "qgsvectorlayer.h" #include "qgslogger.h" diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h index e0b89208d84..5e1130163ab 100644 --- a/src/core/qgsvectorlayerundocommand.h +++ b/src/core/qgsvectorlayerundocommand.h @@ -18,18 +18,18 @@ #include -#include -#include #include +#include +#include -#include "qgsfield.h" #include "qgsfeature.h" +#include "qgsfield.h" class QgsGeometry; class QgsGeometryCache; -#include "qgsvectorlayer.h" #include "qgsvectorlayereditbuffer.h" +#include "qgsvectorlayer.h" class CORE_EXPORT QgsVectorLayerUndoCommand : public QUndoCommand diff --git a/src/core/qgsvectorsimplifymethod.cpp b/src/core/qgsvectorsimplifymethod.cpp index cd0705922eb..8aff7a4d943 100644 --- a/src/core/qgsvectorsimplifymethod.cpp +++ b/src/core/qgsvectorsimplifymethod.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgis.h" -#include "qgsvectorsimplifymethod.h" #include "qgsvectorlayer.h" +#include "qgsvectorsimplifymethod.h" QgsVectorSimplifyMethod::QgsVectorSimplifyMethod() : mSimplifyHints( QGis::DEFAULT_MAPTOPIXEL_THRESHOLD > 1 ? QgsVectorSimplifyMethod::FullSimplification : QgsVectorSimplifyMethod::GeometrySimplification ) diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h index ca0fa6caec7..c418b87db17 100644 --- a/src/core/qgswebview.h +++ b/src/core/qgswebview.h @@ -16,8 +16,8 @@ #ifndef QGSWEBVIEW_H #define QGSWEBVIEW_H -#include #include +#include #ifdef WITH_QTWEBKIT #include diff --git a/src/core/raster/qgsbilinearrasterresampler.cpp b/src/core/raster/qgsbilinearrasterresampler.cpp index 658b69df2ff..23b5ec0d899 100644 --- a/src/core/raster/qgsbilinearrasterresampler.cpp +++ b/src/core/raster/qgsbilinearrasterresampler.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsbilinearrasterresampler.h" -#include #include +#include +#include "qgsbilinearrasterresampler.h" QgsBilinearRasterResampler::QgsBilinearRasterResampler() { diff --git a/src/core/raster/qgsbilinearrasterresampler.h b/src/core/raster/qgsbilinearrasterresampler.h index 17b2ae80235..8a02b988553 100644 --- a/src/core/raster/qgsbilinearrasterresampler.h +++ b/src/core/raster/qgsbilinearrasterresampler.h @@ -18,8 +18,8 @@ #ifndef QGSBILINEARRASTERRESAMPLER_H #define QGSBILINEARRASTERRESAMPLER_H -#include "qgsrasterresampler.h" #include +#include "qgsrasterresampler.h" /** \ingroup core Bilinear Raster Resampler diff --git a/src/core/raster/qgsbrightnesscontrastfilter.cpp b/src/core/raster/qgsbrightnesscontrastfilter.cpp index 81b903ec695..7c93e205b99 100644 --- a/src/core/raster/qgsbrightnesscontrastfilter.cpp +++ b/src/core/raster/qgsbrightnesscontrastfilter.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsrasterdataprovider.h" #include "qgsbrightnesscontrastfilter.h" +#include "qgsrasterdataprovider.h" -#include #include #include +#include QgsBrightnessContrastFilter::QgsBrightnessContrastFilter( QgsRasterInterface* input ) : QgsRasterInterface( input ) diff --git a/src/core/raster/qgscontrastenhancement.cpp b/src/core/raster/qgscontrastenhancement.cpp index 697bf5017df..4eedbb5e059 100644 --- a/src/core/raster/qgscontrastenhancement.cpp +++ b/src/core/raster/qgscontrastenhancement.cpp @@ -20,13 +20,13 @@ class originally created circa 2004 by T.Sutton, Gary E.Sherman, Steve Halasz #include "qgslogger.h" -#include "qgscontrastenhancement.h" -#include "qgscontrastenhancementfunction.h" -#include "qgslinearminmaxenhancement.h" -#include "qgslinearminmaxenhancementwithclip.h" -#include "qgscliptominmaxenhancement.h" #include #include +#include "qgscliptominmaxenhancement.h" +#include "qgscontrastenhancementfunction.h" +#include "qgscontrastenhancement.h" +#include "qgslinearminmaxenhancement.h" +#include "qgslinearminmaxenhancementwithclip.h" QgsContrastEnhancement::QgsContrastEnhancement( QGis::DataType theDataType ) { diff --git a/src/core/raster/qgscubicrasterresampler.cpp b/src/core/raster/qgscubicrasterresampler.cpp index b2e6b3be4ff..761c78e42e5 100644 --- a/src/core/raster/qgscubicrasterresampler.cpp +++ b/src/core/raster/qgscubicrasterresampler.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgscubicrasterresampler.h" #include #include +#include "qgscubicrasterresampler.h" QgsCubicRasterResampler::QgsCubicRasterResampler() // red diff --git a/src/core/raster/qgscubicrasterresampler.h b/src/core/raster/qgscubicrasterresampler.h index 41ea20dac12..d4a7cc1390a 100644 --- a/src/core/raster/qgscubicrasterresampler.h +++ b/src/core/raster/qgscubicrasterresampler.h @@ -18,8 +18,8 @@ #ifndef QGSCUBICRASTERRESAMPLER_H #define QGSCUBICRASTERRESAMPLER_H -#include "qgsrasterresampler.h" #include +#include "qgsrasterresampler.h" /** \ingroup core Cubic Raster Resampler diff --git a/src/core/raster/qgshuesaturationfilter.cpp b/src/core/raster/qgshuesaturationfilter.cpp index 8ceecbbc887..53f999e952b 100644 --- a/src/core/raster/qgshuesaturationfilter.cpp +++ b/src/core/raster/qgshuesaturationfilter.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsrasterdataprovider.h" #include "qgshuesaturationfilter.h" +#include "qgsrasterdataprovider.h" #include #include diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp index b2965468667..17a4cde02c8 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.cpp +++ b/src/core/raster/qgsmultibandcolorrenderer.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsmultibandcolorrenderer.h" -#include "qgscontrastenhancement.h" -#include "qgsrastertransparency.h" -#include "qgsrasterviewport.h" #include #include #include #include +#include "qgscontrastenhancement.h" +#include "qgsmultibandcolorrenderer.h" +#include "qgsrastertransparency.h" +#include "qgsrasterviewport.h" QgsMultiBandColorRenderer::QgsMultiBandColorRenderer( QgsRasterInterface* input, int redBand, int greenBand, int blueBand, QgsContrastEnhancement* redEnhancement, diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp index 600c9ed9631..1d5a5979fa1 100644 --- a/src/core/raster/qgspalettedrasterrenderer.cpp +++ b/src/core/raster/qgspalettedrasterrenderer.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgspalettedrasterrenderer.h" -#include "qgsrastertransparency.h" -#include "qgsrasterviewport.h" #include #include #include #include #include +#include "qgspalettedrasterrenderer.h" +#include "qgsrastertransparency.h" +#include "qgsrasterviewport.h" QgsPalettedRasterRenderer::QgsPalettedRasterRenderer( QgsRasterInterface* input, int bandNumber, QColor* colorArray, int nColors, const QVector labels ): diff --git a/src/core/raster/qgsrasterchecker.cpp b/src/core/raster/qgsrasterchecker.cpp index fc2a201d8a6..7318cfae279 100644 --- a/src/core/raster/qgsrasterchecker.cpp +++ b/src/core/raster/qgsrasterchecker.cpp @@ -18,15 +18,15 @@ #include "qgsrasterdataprovider.h" #include "qgsrasterlayer.h" -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include QgsRasterChecker::QgsRasterChecker() : mReport( "" ) diff --git a/src/core/raster/qgsrasterchecker.h b/src/core/raster/qgsrasterchecker.h index 0134fb54ea5..769c43a80d9 100644 --- a/src/core/raster/qgsrasterchecker.h +++ b/src/core/raster/qgsrasterchecker.h @@ -17,8 +17,8 @@ #define QGSRASTERCHECKER_H #include -#include #include +#include class QImage; /** \ingroup UnitTests diff --git a/src/core/raster/qgsrasterdataprovider.cpp b/src/core/raster/qgsrasterdataprovider.cpp index ec6bdac6fc8..83ddf3fa8bb 100644 --- a/src/core/raster/qgsrasterdataprovider.cpp +++ b/src/core/raster/qgsrasterdataprovider.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ +#include "qgslogger.h" #include "qgsproviderregistry.h" #include "qgsrasterdataprovider.h" #include "qgsrasteridentifyresult.h" #include "qgsrasterprojector.h" -#include "qgslogger.h" -#include -#include #include +#include +#include #include #include diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h index 2ce7ca9cb21..e558b6f3a03 100644 --- a/src/core/raster/qgsrasterdataprovider.h +++ b/src/core/raster/qgsrasterdataprovider.h @@ -26,8 +26,8 @@ #include #include -#include #include +#include #include "qgscolorrampshader.h" #include "qgscoordinatereferencesystem.h" diff --git a/src/core/raster/qgsrasterdrawer.cpp b/src/core/raster/qgsrasterdrawer.cpp index aca1689161d..60b5b372340 100644 --- a/src/core/raster/qgsrasterdrawer.cpp +++ b/src/core/raster/qgsrasterdrawer.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgslogger.h" -#include "qgsrasterdrawer.h" -#include "qgsrasteriterator.h" -#include "qgsrasterviewport.h" -#include "qgsmaptopixel.h" #include #include #include +#include "qgslogger.h" +#include "qgsmaptopixel.h" +#include "qgsrasterdrawer.h" +#include "qgsrasteriterator.h" +#include "qgsrasterviewport.h" QgsRasterDrawer::QgsRasterDrawer( QgsRasterIterator* iterator ): mIterator( iterator ) { diff --git a/src/core/raster/qgsrasterdrawer.h b/src/core/raster/qgsrasterdrawer.h index 230bf908df7..0faa92f0910 100644 --- a/src/core/raster/qgsrasterdrawer.h +++ b/src/core/raster/qgsrasterdrawer.h @@ -18,8 +18,8 @@ #ifndef QGSRASTERDRAWER_H #define QGSRASTERDRAWER_H -#include "qgsrasterinterface.h" #include +#include "qgsrasterinterface.h" class QPainter; class QImage; diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp index 4476375f7b7..0b20718a12f 100644 --- a/src/core/raster/qgsrasterfilewriter.cpp +++ b/src/core/raster/qgsrasterfilewriter.cpp @@ -14,17 +14,17 @@ ***************************************************************************/ #include -#include "qgsrasterfilewriter.h" #include "qgsproviderregistry.h" +#include "qgsrasterfilewriter.h" #include "qgsrasterinterface.h" #include "qgsrasteriterator.h" #include "qgsrasterlayer.h" #include "qgsrasterprojector.h" #include +#include #include #include -#include QgsRasterFileWriter::QgsRasterFileWriter( const QString& outputUrl ): mMode( Raw ), mOutputUrl( outputUrl ), mOutputProviderKey( "gdal" ), mOutputFormat( "GTiff" ), diff --git a/src/core/raster/qgsrasterfilewriter.h b/src/core/raster/qgsrasterfilewriter.h index 305553b8331..62e6eeca9d3 100644 --- a/src/core/raster/qgsrasterfilewriter.h +++ b/src/core/raster/qgsrasterfilewriter.h @@ -15,13 +15,13 @@ #ifndef QGSRASTERFILEWRITER_H #define QGSRASTERFILEWRITER_H +#include +#include +#include #include "qgscoordinatereferencesystem.h" #include "qgsrasterdataprovider.h" #include "qgsrasterpipe.h" #include "qgsrectangle.h" -#include -#include -#include class QProgressDialog; class QgsRasterIterator; diff --git a/src/core/raster/qgsrasteridentifyresult.cpp b/src/core/raster/qgsrasteridentifyresult.cpp index f488f6138a0..925e71f5188 100644 --- a/src/core/raster/qgsrasteridentifyresult.cpp +++ b/src/core/raster/qgsrasteridentifyresult.cpp @@ -19,8 +19,8 @@ #include "qgis.h" #include "qgslogger.h" -#include "qgsrasteridentifyresult.h" #include "qgsrasterdataprovider.h" +#include "qgsrasteridentifyresult.h" QgsRasterIdentifyResult::QgsRasterIdentifyResult() : mValid( false ) diff --git a/src/core/raster/qgsrasteriterator.cpp b/src/core/raster/qgsrasteriterator.cpp index d70f0392310..6c764f5e094 100644 --- a/src/core/raster/qgsrasteriterator.cpp +++ b/src/core/raster/qgsrasteriterator.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsrasteriterator.h" #include "qgsrasterinterface.h" +#include "qgsrasteriterator.h" #include "qgsrasterprojector.h" #include "qgsrasterviewport.h" diff --git a/src/core/raster/qgsrasteriterator.h b/src/core/raster/qgsrasteriterator.h index 024ceff4fea..dd96e357aca 100644 --- a/src/core/raster/qgsrasteriterator.h +++ b/src/core/raster/qgsrasteriterator.h @@ -15,8 +15,8 @@ #ifndef QGSRASTERITERATOR_H #define QGSRASTERITERATOR_H -#include "qgsrectangle.h" #include +#include "qgsrectangle.h" class QgsMapToPixel; class QgsRasterBlock; diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h index bc2aa7e6187..7543ec7c166 100644 --- a/src/core/raster/qgsrasterlayer.h +++ b/src/core/raster/qgsrasterlayer.h @@ -35,8 +35,8 @@ #include "qgshuesaturationfilter.h" #include "qgsmaplayer.h" #include "qgspoint.h" -#include "qgsraster.h" #include "qgsrasterdataprovider.h" +#include "qgsraster.h" #include "qgsrasterinterface.h" #include "qgsrasterpipe.h" #include "qgsrasterresamplefilter.h" diff --git a/src/core/raster/qgsrasternuller.h b/src/core/raster/qgsrasternuller.h index d3ded899166..5c67df780e5 100644 --- a/src/core/raster/qgsrasternuller.h +++ b/src/core/raster/qgsrasternuller.h @@ -19,8 +19,8 @@ #define QGSRASTERNULLER_H #include "qgsrasterdataprovider.h" -#include "qgsrasterrange.h" #include "qgsrasterinterface.h" +#include "qgsrasterrange.h" #include diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp index cc0e23daf10..86b88aab757 100644 --- a/src/core/raster/qgsrasterprojector.cpp +++ b/src/core/raster/qgsrasterprojector.cpp @@ -16,11 +16,11 @@ ***************************************************************************/ #include -#include "qgsrasterdataprovider.h" +#include "qgscoordinatetransform.h" #include "qgscrscache.h" #include "qgslogger.h" +#include "qgsrasterdataprovider.h" #include "qgsrasterprojector.h" -#include "qgscoordinatetransform.h" QgsRasterProjector::QgsRasterProjector( QgsCoordinateReferenceSystem theSrcCRS, diff --git a/src/core/raster/qgsrasterprojector.h b/src/core/raster/qgsrasterprojector.h index 34861301204..5ac94b186d1 100644 --- a/src/core/raster/qgsrasterprojector.h +++ b/src/core/raster/qgsrasterprojector.h @@ -23,13 +23,13 @@ #ifndef QGSRASTERPROJECTOR_H #define QGSRASTERPROJECTOR_H -#include #include +#include -#include "qgsrectangle.h" #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsrasterinterface.h" +#include "qgsrectangle.h" #include diff --git a/src/core/raster/qgsrasterrendererregistry.cpp b/src/core/raster/qgsrasterrendererregistry.cpp index dbfc7b87fd1..5e8bdb383c9 100644 --- a/src/core/raster/qgsrasterrendererregistry.cpp +++ b/src/core/raster/qgsrasterrendererregistry.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgsrasterrendererregistry.h" +#include #include "qgsmultibandcolorrenderer.h" #include "qgspalettedrasterrenderer.h" +#include "qgsrasterrendererregistry.h" #include "qgssinglebandcolordatarenderer.h" #include "qgssinglebandgrayrenderer.h" #include "qgssinglebandpseudocolorrenderer.h" -#include QgsRasterRendererRegistryEntry::QgsRasterRendererRegistryEntry( const QString& theName, const QString& theVisibleName, QgsRasterRendererCreateFunc rendererFunction, diff --git a/src/core/raster/qgsrasterrendererregistry.h b/src/core/raster/qgsrasterrendererregistry.h index e1d13297a0a..1b9ab70e74e 100644 --- a/src/core/raster/qgsrasterrendererregistry.h +++ b/src/core/raster/qgsrasterrendererregistry.h @@ -18,9 +18,9 @@ #ifndef QGSRASTERRENDERERREGISTRY_H #define QGSRASTERRENDERERREGISTRY_H -#include "qgsrasterlayer.h" //for DrawingStyle enum #include #include +#include "qgsrasterlayer.h" //for DrawingStyle enum class QDomElement; class QgsRasterInterface; diff --git a/src/core/raster/qgsrasterresamplefilter.cpp b/src/core/raster/qgsrasterresamplefilter.cpp index ca8c71f2ff5..a6541395698 100644 --- a/src/core/raster/qgsrasterresamplefilter.cpp +++ b/src/core/raster/qgsrasterresamplefilter.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ +#include "qgsmaptopixel.h" #include "qgsrasterdataprovider.h" +#include "qgsrasterprojector.h" #include "qgsrasterresamplefilter.h" #include "qgsrasterresampler.h" -#include "qgsrasterprojector.h" #include "qgsrastertransparency.h" #include "qgsrasterviewport.h" -#include "qgsmaptopixel.h" //resamplers #include "qgsbilinearrasterresampler.h" diff --git a/src/core/raster/qgsrastershader.cpp b/src/core/raster/qgsrastershader.cpp index f12f05f0832..e293cfd3612 100644 --- a/src/core/raster/qgsrastershader.cpp +++ b/src/core/raster/qgsrastershader.cpp @@ -16,11 +16,11 @@ email : ersts@amnh.org * * ***************************************************************************/ -#include "qgslogger.h" -#include "qgscolorrampshader.h" -#include "qgsrastershader.h" #include #include +#include "qgscolorrampshader.h" +#include "qgslogger.h" +#include "qgsrastershader.h" QgsRasterShader::QgsRasterShader( double theMinimumValue, double theMaximumValue ) { diff --git a/src/core/raster/qgsrastertransparency.cpp b/src/core/raster/qgsrastertransparency.cpp index c307e9b931e..f345a6ab597 100644 --- a/src/core/raster/qgsrastertransparency.cpp +++ b/src/core/raster/qgsrastertransparency.cpp @@ -16,10 +16,10 @@ email : ersts@amnh.org * * ***************************************************************************/ -#include "qgsrasterinterface.h" -#include "qgsrastertransparency.h" #include "qgis.h" #include "qgslogger.h" +#include "qgsrasterinterface.h" +#include "qgsrastertransparency.h" #include #include diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp index f5c8f1bc1fe..802c54b53b1 100644 --- a/src/core/raster/qgssinglebandcolordatarenderer.cpp +++ b/src/core/raster/qgssinglebandcolordatarenderer.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgssinglebandcolordatarenderer.h" -#include "qgsrastertransparency.h" -#include "qgsrasterviewport.h" #include #include #include +#include "qgsrastertransparency.h" +#include "qgsrasterviewport.h" +#include "qgssinglebandcolordatarenderer.h" QgsSingleBandColorDataRenderer::QgsSingleBandColorDataRenderer( QgsRasterInterface* input, int band ): QgsRasterRenderer( input, "singlebandcolordata" ), mBand( band ) diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp index 7045b7ec46e..ef401a94a9b 100644 --- a/src/core/raster/qgssinglebandgrayrenderer.cpp +++ b/src/core/raster/qgssinglebandgrayrenderer.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgssinglebandgrayrenderer.h" -#include "qgscontrastenhancement.h" -#include "qgsrastertransparency.h" #include #include #include +#include "qgscontrastenhancement.h" +#include "qgsrastertransparency.h" +#include "qgssinglebandgrayrenderer.h" QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterInterface* input, int grayBand ): QgsRasterRenderer( input, "singlebandgray" ), mGrayBand( grayBand ), mGradient( BlackToWhite ), mContrastEnhancement( 0 ) diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp index f2cab7f4f34..a84821c839e 100644 --- a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp +++ b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgssinglebandpseudocolorrenderer.h" -#include "qgsrastershader.h" -#include "qgsrastertransparency.h" -#include "qgsrasterviewport.h" #include #include #include +#include "qgsrastershader.h" +#include "qgsrastertransparency.h" +#include "qgsrasterviewport.h" +#include "qgssinglebandpseudocolorrenderer.h" QgsSingleBandPseudoColorRenderer::QgsSingleBandPseudoColorRenderer( QgsRasterInterface* input, int band, QgsRasterShader* shader ): QgsRasterRenderer( input, "singlebandpseudocolor" ) diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp index fd5e382a2da..dc5294e0273 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp @@ -16,18 +16,18 @@ #include "qgscategorizedsymbolrendererv2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgspointdisplacementrenderer.h" +#include "qgsdatadefined.h" #include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" +#include "qgspointdisplacementrenderer.h" #include "qgsscaleexpression.h" -#include "qgsdatadefined.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" #include "qgsfeature.h" -#include "qgsvectorlayer.h" #include "qgslogger.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h index bd111c83848..8395c391c4d 100644 --- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h +++ b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h @@ -15,9 +15,9 @@ #ifndef QGSCATEGORIZEDSYMBOLRENDERERV2_H #define QGSCATEGORIZEDSYMBOLRENDERERV2_H -#include "qgssymbolv2.h" -#include "qgsrendererv2.h" #include "qgsexpression.h" +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" #include #include diff --git a/src/core/symbology-ng/qgscolorbrewerpalette.h b/src/core/symbology-ng/qgscolorbrewerpalette.h index a0479b326be..fc264f8da1b 100644 --- a/src/core/symbology-ng/qgscolorbrewerpalette.h +++ b/src/core/symbology-ng/qgscolorbrewerpalette.h @@ -15,8 +15,8 @@ #ifndef QGSCOLORBREWERPALETTE_H #define QGSCOLORBREWERPALETTE_H -#include #include +#include #include "qgssymbollayerv2utils.h" diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp index c360ddd565a..e6debc331fa 100644 --- a/src/core/symbology-ng/qgscptcityarchive.cpp +++ b/src/core/symbology-ng/qgscptcityarchive.cpp @@ -21,20 +21,20 @@ #include #include #include +#include +#include #include #include #include -#include -#include -#include "qgscptcityarchive.h" #include "qgis.h" +#include "qgscptcityarchive.h" +#include "qgsapplication.h" +#include "qgsconfig.h" #include "qgsdataprovider.h" #include "qgslogger.h" -#include "qgsconfig.h" #include "qgsmimedatautils.h" -#include "qgsapplication.h" QString QgsCptCityArchive::mDefaultArchiveName; diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h index c3ce71d3fb6..e7cc9592a20 100644 --- a/src/core/symbology-ng/qgscptcityarchive.h +++ b/src/core/symbology-ng/qgscptcityarchive.h @@ -20,9 +20,9 @@ #include "qgsvectorcolorrampv2.h" #include +#include #include #include -#include class QgsCptCityColorRampV2; class QgsCptCityDataItem; diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp index a4053b01647..5c2a3bca620 100644 --- a/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsellipsesymbollayerv2.cpp @@ -12,19 +12,19 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsellipsesymbollayerv2.h" +#include "qgsdatadefined.h" #include "qgsdxfexport.h" +#include "qgsellipsesymbollayerv2.h" #include "qgsexpression.h" #include "qgsfeature.h" +#include "qgslogger.h" #include "qgsrendercontext.h" #include "qgsvectorlayer.h" -#include "qgsdatadefined.h" -#include "qgslogger.h" -#include -#include #include #include +#include +#include QgsEllipseSymbolLayerV2::QgsEllipseSymbolLayerV2() : mSymbolName( "circle" ) diff --git a/src/core/symbology-ng/qgsellipsesymbollayerv2.h b/src/core/symbology-ng/qgsellipsesymbollayerv2.h index 8eddd6da9fe..cfcb3d61f2e 100644 --- a/src/core/symbology-ng/qgsellipsesymbollayerv2.h +++ b/src/core/symbology-ng/qgsellipsesymbollayerv2.h @@ -15,8 +15,8 @@ #ifndef QGSELLIPSESYMBOLLAYERV2_H #define QGSELLIPSESYMBOLLAYERV2_H -#include "qgsmarkersymbollayerv2.h" #include +#include "qgsmarkersymbollayerv2.h" class QgsExpression; diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp index a3beb557002..2bc57647abd 100644 --- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp @@ -13,23 +13,23 @@ * * ***************************************************************************/ -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgssymbollayerv2utils.h" #include "qgsdxfexport.h" #include "qgsexpression.h" -#include "qgsrendercontext.h" -#include "qgsproject.h" -#include "qgssvgcache.h" +#include "qgsfillsymbollayerv2.h" +#include "qgslinesymbollayerv2.h" #include "qgslogger.h" +#include "qgsmarkersymbollayerv2.h" +#include "qgsproject.h" +#include "qgsrendercontext.h" +#include "qgssvgcache.h" +#include "qgssymbollayerv2utils.h" #include "qgsvectorcolorrampv2.h" -#include -#include -#include #include #include +#include +#include +#include QgsSimpleFillSymbolLayerV2::QgsSimpleFillSymbolLayerV2( QColor color, Qt::BrushStyle style, QColor borderColor, Qt::PenStyle borderStyle, double borderWidth, Qt::PenJoinStyle penJoinStyle ) diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.h b/src/core/symbology-ng/qgsfillsymbollayerv2.h index c7d630828e6..b8fd419b558 100644 --- a/src/core/symbology-ng/qgsfillsymbollayerv2.h +++ b/src/core/symbology-ng/qgsfillsymbollayerv2.h @@ -27,8 +27,8 @@ #define INF 1E20 -#include #include +#include class CORE_EXPORT QgsSimpleFillSymbolLayerV2 : public QgsFillSymbolLayerV2 { diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp index 9a37824f929..8f000588189 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp @@ -15,25 +15,25 @@ ***************************************************************************/ #include "qgsgraduatedsymbolrendererv2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgspointdisplacementrenderer.h" +#include "qgsdatadefined.h" #include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" +#include "qgspointdisplacementrenderer.h" #include "qgsscaleexpression.h" -#include "qgsdatadefined.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" -#include "qgsfeature.h" -#include "qgsvectorlayer.h" -#include "qgslogger.h" -#include "qgsvectordataprovider.h" -#include "qgsexpression.h" +#include +#include // for jenks classification #include #include #include // for legend -#include // for jenks classification -#include +#include "qgsexpression.h" +#include "qgsfeature.h" +#include "qgslogger.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsRendererRangeV2::QgsRendererRangeV2() : mLowerValue( 0 ) diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h index 10349013cbe..d9afb2a19de 100644 --- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h +++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h @@ -15,11 +15,11 @@ #ifndef QGSGRADUATEDSYMBOLRENDERERV2_H #define QGSGRADUATEDSYMBOLRENDERERV2_H -#include "qgssymbolv2.h" -#include "qgsrendererv2.h" -#include "qgsexpression.h" -#include #include +#include +#include "qgsexpression.h" +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" class CORE_EXPORT QgsRendererRangeV2 { diff --git a/src/core/symbology-ng/qgsheatmaprenderer.cpp b/src/core/symbology-ng/qgsheatmaprenderer.cpp index 65c46b0d6ac..1a14d38c1bd 100644 --- a/src/core/symbology-ng/qgsheatmaprenderer.cpp +++ b/src/core/symbology-ng/qgsheatmaprenderer.cpp @@ -15,17 +15,17 @@ #include "qgsheatmaprenderer.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" -#include "qgslogger.h" #include "qgsfeature.h" -#include "qgsvectorlayer.h" -#include "qgssymbollayerv2.h" +#include "qgslogger.h" #include "qgsogcutils.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsrendercontext.h" #include "qgspainteffect.h" +#include "qgsrendercontext.h" +#include "qgssymbollayerv2.h" +#include "qgsvectorcolorrampv2.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/symbology-ng/qgsheatmaprenderer.h b/src/core/symbology-ng/qgsheatmaprenderer.h index 68e04103a64..6f5b9d640af 100644 --- a/src/core/symbology-ng/qgsheatmaprenderer.h +++ b/src/core/symbology-ng/qgsheatmaprenderer.h @@ -15,13 +15,13 @@ #ifndef QGSHEATMAPRENDERER_H #define QGSHEATMAPRENDERER_H +#include #include "qgis.h" -#include "qgsrendererv2.h" -#include "qgssymbolv2.h" #include "qgsexpression.h" #include "qgsfeature.h" #include "qgsgeometry.h" -#include +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" class QgsVectorColorRampV2; diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp index 54e3d467919..74de653b239 100644 --- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp +++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.cpp @@ -15,15 +15,15 @@ #include "qgsinvertedpolygonrenderer.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" -#include "qgslogger.h" #include "qgsfeature.h" -#include "qgsvectorlayer.h" -#include "qgssymbollayerv2.h" +#include "qgslogger.h" #include "qgsogcutils.h" #include "qgspainteffect.h" +#include "qgssymbollayerv2.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h index 33b42cd1833..ebec35a9e13 100644 --- a/src/core/symbology-ng/qgsinvertedpolygonrenderer.h +++ b/src/core/symbology-ng/qgsinvertedpolygonrenderer.h @@ -15,13 +15,13 @@ #ifndef QGSINVERTEDPOLYGONRENDERER_H #define QGSINVERTEDPOLYGONRENDERER_H +#include #include "qgis.h" -#include "qgsrendererv2.h" -#include "qgssymbolv2.h" #include "qgsexpression.h" #include "qgsfeature.h" #include "qgsgeometry.h" -#include +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" /** * QgsInvertedPolygonRenderer is a polygon-only feature renderer used to diff --git a/src/core/symbology-ng/qgslinesymbollayerv2.cpp b/src/core/symbology-ng/qgslinesymbollayerv2.cpp index 1d1f9470143..336b2db6694 100644 --- a/src/core/symbology-ng/qgslinesymbollayerv2.cpp +++ b/src/core/symbology-ng/qgslinesymbollayerv2.cpp @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#include "qgslinesymbollayerv2.h" #include "qgsdxfexport.h" -#include "qgssymbollayerv2utils.h" #include "qgsexpression.h" -#include "qgsrendercontext.h" -#include "qgslogger.h" -#include "qgsvectorlayer.h" #include "qgsgeometrysimplifier.h" +#include "qgslinesymbollayerv2.h" +#include "qgslogger.h" +#include "qgsrendercontext.h" +#include "qgssymbollayerv2utils.h" +#include "qgsvectorlayer.h" -#include #include #include +#include #include diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp index 3dbb127153f..a9443081742 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp @@ -19,16 +19,16 @@ #include "qgsdxfexport.h" #include "qgsdxfpaintdevice.h" #include "qgsexpression.h" -#include "qgsrendercontext.h" #include "qgslogger.h" +#include "qgsrendercontext.h" #include "qgssvgcache.h" -#include -#include -#include #include #include #include +#include +#include +#include #include diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h index 8f08ddb9edb..fc10ac73c7d 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.h +++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.h @@ -25,11 +25,11 @@ #define DEFAULT_SIMPLEMARKER_SIZE DEFAULT_POINT_SIZE #define DEFAULT_SIMPLEMARKER_ANGLE 0 -#include #include +#include +#include #include #include -#include class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 { diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp index fc157b5f573..7430e67ce9d 100644 --- a/src/core/symbology-ng/qgspointdisplacementrenderer.cpp +++ b/src/core/symbology-ng/qgspointdisplacementrenderer.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgspointdisplacementrenderer.h" #include "qgsgeometry.h" #include "qgslogger.h" -#include "qgsspatialindex.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorlayer.h" -#include "qgssinglesymbolrendererv2.h" #include "qgspainteffect.h" +#include "qgspointdisplacementrenderer.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgsspatialindex.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/symbology-ng/qgspointdisplacementrenderer.h b/src/core/symbology-ng/qgspointdisplacementrenderer.h index e4299250ce6..5daeb312f97 100644 --- a/src/core/symbology-ng/qgspointdisplacementrenderer.h +++ b/src/core/symbology-ng/qgspointdisplacementrenderer.h @@ -18,12 +18,12 @@ #ifndef QGSPOINTDISPLACEMENTRENDERER_H #define QGSPOINTDISPLACEMENTRENDERER_H -#include "qgsfeature.h" -#include "qgssymbolv2.h" -#include "qgspoint.h" -#include "qgsrendererv2.h" #include #include +#include "qgsfeature.h" +#include "qgspoint.h" +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" class QgsSpatialIndex; diff --git a/src/core/symbology-ng/qgsrendererv2.cpp b/src/core/symbology-ng/qgsrendererv2.cpp index 13cbdc4cf7d..e6d368f6584 100644 --- a/src/core/symbology-ng/qgsrendererv2.cpp +++ b/src/core/symbology-ng/qgsrendererv2.cpp @@ -13,29 +13,29 @@ * * ***************************************************************************/ -#include "qgsrendererv2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsrulebasedrendererv2.h" #include "qgsdatadefined.h" +#include "qgsrendererv2.h" +#include "qgsrulebasedrendererv2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" #include "qgssinglesymbolrendererv2.h" // for default renderer #include "qgsrendererv2registry.h" -#include "qgsrendercontext.h" #include "qgsclipper.h" -#include "qgsgeometry.h" -#include "qgsfeature.h" -#include "qgslogger.h" -#include "qgsvectorlayer.h" -#include "qgspainteffect.h" #include "qgseffectstack.h" +#include "qgsfeature.h" +#include "qgsgeometry.h" +#include "qgslogger.h" +#include "qgspainteffect.h" #include "qgspainteffectregistry.h" +#include "qgsrendercontext.h" +#include "qgsvectorlayer.h" #include "qgswkbptr.h" -#include #include +#include #include diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h index deb3f2af1af..dfd3999ce72 100644 --- a/src/core/symbology-ng/qgsrendererv2.h +++ b/src/core/symbology-ng/qgsrendererv2.h @@ -21,13 +21,13 @@ #include "qgsrendercontext.h" #include "qgssymbolv2.h" -#include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include class QgsFeature; class QgsFields; diff --git a/src/core/symbology-ng/qgsrendererv2registry.cpp b/src/core/symbology-ng/qgsrendererv2registry.cpp index 17e0849fd5c..55bca4cc6ea 100644 --- a/src/core/symbology-ng/qgsrendererv2registry.cpp +++ b/src/core/symbology-ng/qgsrendererv2registry.cpp @@ -15,13 +15,13 @@ #include "qgsrendererv2registry.h" // default renderers -#include "qgssinglesymbolrendererv2.h" #include "qgscategorizedsymbolrendererv2.h" #include "qgsgraduatedsymbolrendererv2.h" -#include "qgsrulebasedrendererv2.h" -#include "qgspointdisplacementrenderer.h" -#include "qgsinvertedpolygonrenderer.h" #include "qgsheatmaprenderer.h" +#include "qgsinvertedpolygonrenderer.h" +#include "qgspointdisplacementrenderer.h" +#include "qgsrulebasedrendererv2.h" +#include "qgssinglesymbolrendererv2.h" QgsRendererV2Registry::QgsRendererV2Registry() { diff --git a/src/core/symbology-ng/qgsrendererv2registry.h b/src/core/symbology-ng/qgsrendererv2registry.h index 771b0d33e4d..d6f80b07dab 100644 --- a/src/core/symbology-ng/qgsrendererv2registry.h +++ b/src/core/symbology-ng/qgsrendererv2registry.h @@ -15,10 +15,10 @@ #ifndef QGSRENDERERV2REGISTRY_H #define QGSRENDERERV2REGISTRY_H +#include #include #include #include -#include #include "qgis.h" diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp index 80b5bf14947..a0d8fad8dbf 100644 --- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp +++ b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#include "qgsrulebasedrendererv2.h" -#include "qgssymbollayerv2.h" +#include "qgsdatadefined.h" #include "qgsexpression.h" -#include "qgssymbollayerv2utils.h" -#include "qgsrendercontext.h" -#include "qgsvectorlayer.h" +#include "qgsinvertedpolygonrenderer.h" #include "qgslogger.h" #include "qgsogcutils.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgspointdisplacementrenderer.h" -#include "qgsinvertedpolygonrenderer.h" #include "qgspainteffect.h" -#include "qgsdatadefined.h" +#include "qgspointdisplacementrenderer.h" +#include "qgsrendercontext.h" +#include "qgsrulebasedrendererv2.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgssymbollayerv2.h" +#include "qgssymbollayerv2utils.h" +#include "qgsvectorlayer.h" #include diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h index 39a7edb857d..47b99b56ab1 100644 --- a/src/core/symbology-ng/qgsrulebasedrendererv2.h +++ b/src/core/symbology-ng/qgsrulebasedrendererv2.h @@ -16,9 +16,9 @@ #ifndef QGSRULEBASEDRENDERERV2_H #define QGSRULEBASEDRENDERERV2_H -#include "qgsfield.h" -#include "qgsfeature.h" #include "qgis.h" +#include "qgsfeature.h" +#include "qgsfield.h" #include "qgsrendererv2.h" diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp index a8edfd43ff6..d7999f4626a 100644 --- a/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp +++ b/src/core/symbology-ng/qgssinglesymbolrendererv2.cpp @@ -15,19 +15,19 @@ #include "qgssinglesymbolrendererv2.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" -#include "qgslogger.h" -#include "qgsfeature.h" -#include "qgsvectorlayer.h" -#include "qgssymbollayerv2.h" -#include "qgsogcutils.h" -#include "qgspointdisplacementrenderer.h" -#include "qgsinvertedpolygonrenderer.h" -#include "qgspainteffect.h" -#include "qgsscaleexpression.h" #include "qgsdatadefined.h" +#include "qgsfeature.h" +#include "qgsinvertedpolygonrenderer.h" +#include "qgslogger.h" +#include "qgsogcutils.h" +#include "qgspainteffect.h" +#include "qgspointdisplacementrenderer.h" +#include "qgsscaleexpression.h" +#include "qgssymbollayerv2.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/core/symbology-ng/qgssinglesymbolrendererv2.h b/src/core/symbology-ng/qgssinglesymbolrendererv2.h index 1a58fb005cb..6c22d205261 100644 --- a/src/core/symbology-ng/qgssinglesymbolrendererv2.h +++ b/src/core/symbology-ng/qgssinglesymbolrendererv2.h @@ -15,11 +15,11 @@ #ifndef QGSSINGLESYMBOLRENDERERV2_H #define QGSSINGLESYMBOLRENDERERV2_H +#include #include "qgis.h" +#include "qgsexpression.h" #include "qgsrendererv2.h" #include "qgssymbolv2.h" -#include "qgsexpression.h" -#include class CORE_EXPORT QgsSingleSymbolRendererV2 : public QgsFeatureRendererV2 { diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp index a08e87e3816..c337e431ab2 100644 --- a/src/core/symbology-ng/qgsstylev2.cpp +++ b/src/core/symbology-ng/qgsstylev2.cpp @@ -23,13 +23,13 @@ #include "qgsapplication.h" #include "qgslogger.h" +#include #include #include #include #include #include #include -#include #include diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp index 2028e875372..433ef54d32c 100644 --- a/src/core/symbology-ng/qgssvgcache.cpp +++ b/src/core/symbology-ng/qgssvgcache.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgssvgcache.h" #include "qgis.h" #include "qgslogger.h" -#include "qgsnetworkaccessmanager.h" #include "qgsmessagelog.h" +#include "qgsnetworkaccessmanager.h" +#include "qgssvgcache.h" #include "qgssymbollayerv2utils.h" #include @@ -28,13 +28,13 @@ #include #include #include +#include #include +#include +#include #include #include #include -#include -#include -#include QgsSvgCacheEntry::QgsSvgCacheEntry(): file( QString() ), size( 0.0 ), outlineWidth( 0 ), widthScaleFactor( 1.0 ), rasterScaleFactor( 1.0 ), fill( Qt::black ), outline( Qt::black ), image( 0 ), picture( 0 ), nextEntry( 0 ), previousEntry( 0 ) diff --git a/src/core/symbology-ng/qgssymbollayerv2.cpp b/src/core/symbology-ng/qgssymbollayerv2.cpp index 5b83a73c9d9..72899f91f18 100644 --- a/src/core/symbology-ng/qgssymbollayerv2.cpp +++ b/src/core/symbology-ng/qgssymbollayerv2.cpp @@ -13,21 +13,21 @@ * * ***************************************************************************/ -#include "qgssymbollayerv2.h" #include "qgsclipper.h" -#include "qgsexpression.h" -#include "qgsrendercontext.h" -#include "qgsvectorlayer.h" +#include "qgsdatadefined.h" #include "qgsdxfexport.h" +#include "qgseffectstack.h" +#include "qgsexpression.h" #include "qgsgeometrysimplifier.h" #include "qgspainteffect.h" -#include "qgseffectstack.h" -#include "qgsdatadefined.h" +#include "qgsrendercontext.h" +#include "qgssymbollayerv2.h" +#include "qgsvectorlayer.h" -#include #include #include #include +#include const QString QgsSymbolLayerV2::EXPR_SIZE( "size" ); const QString QgsSymbolLayerV2::EXPR_ANGLE( "angle" ); diff --git a/src/core/symbology-ng/qgssymbollayerv2.h b/src/core/symbology-ng/qgssymbollayerv2.h index 58d4bb462f1..84828cf3e87 100644 --- a/src/core/symbology-ng/qgssymbollayerv2.h +++ b/src/core/symbology-ng/qgssymbollayerv2.h @@ -24,15 +24,15 @@ #define DEFAULT_SCALE_METHOD QgsSymbolV2::ScaleDiameter #include +#include +#include #include #include #include -#include -#include -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" // QgsStringMap #include "qgsfield.h" +#include "qgssymbollayerv2utils.h" // QgsStringMap +#include "qgssymbolv2.h" class QPainter; class QSize; diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.cpp b/src/core/symbology-ng/qgssymbollayerv2registry.cpp index 7f0e5659236..e32664a9ffd 100644 --- a/src/core/symbology-ng/qgssymbollayerv2registry.cpp +++ b/src/core/symbology-ng/qgssymbollayerv2registry.cpp @@ -16,9 +16,9 @@ #include "qgssymbollayerv2registry.h" #include "qgsellipsesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgslinesymbollayerv2.h" #include "qgsfillsymbollayerv2.h" +#include "qgslinesymbollayerv2.h" +#include "qgsmarkersymbollayerv2.h" #include "qgsvectorfieldsymbollayer.h" QgsSymbolLayerV2Registry::QgsSymbolLayerV2Registry() diff --git a/src/core/symbology-ng/qgssymbollayerv2registry.h b/src/core/symbology-ng/qgssymbollayerv2registry.h index aa213f06ef8..f3d0896f3a3 100644 --- a/src/core/symbology-ng/qgssymbollayerv2registry.h +++ b/src/core/symbology-ng/qgssymbollayerv2registry.h @@ -16,8 +16,8 @@ #ifndef QGSSYMBOLLAYERV2REGISTRY_H #define QGSSYMBOLLAYERV2REGISTRY_H -#include "qgssymbolv2.h" #include "qgssymbollayerv2.h" +#include "qgssymbolv2.h" class QgsVectorLayer; diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.cpp b/src/core/symbology-ng/qgssymbollayerv2utils.cpp index d745c7af7fe..5ee842663a3 100644 --- a/src/core/symbology-ng/qgssymbollayerv2utils.cpp +++ b/src/core/symbology-ng/qgssymbollayerv2utils.cpp @@ -15,29 +15,29 @@ #include "qgssymbollayerv2utils.h" +#include "qgsapplication.h" +#include "qgsexpression.h" +#include "qgslogger.h" +#include "qgsogcutils.h" +#include "qgspainteffect.h" +#include "qgspainteffectregistry.h" +#include "qgsproject.h" +#include "qgsrendercontext.h" #include "qgssymbollayerv2.h" #include "qgssymbollayerv2registry.h" #include "qgssymbolv2.h" #include "qgsvectorcolorrampv2.h" -#include "qgsexpression.h" -#include "qgspainteffect.h" -#include "qgspainteffectregistry.h" -#include "qgsapplication.h" -#include "qgsproject.h" -#include "qgsogcutils.h" -#include "qgslogger.h" -#include "qgsrendercontext.h" #include -#include #include -#include #include +#include +#include #include #include -#include -#include #include +#include +#include QString QgsSymbolLayerV2Utils::encodeColor( QColor color ) { @@ -634,8 +634,8 @@ void QgsSymbolLayerV2Utils::drawStippledBackground( QPainter* painter, QRect rec #include -#include #include +#include #if !defined(GEOS_VERSION_MAJOR) || !defined(GEOS_VERSION_MINOR) || \ diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h index efe9175861b..1cb618973a2 100644 --- a/src/core/symbology-ng/qgssymbollayerv2utils.h +++ b/src/core/symbology-ng/qgssymbollayerv2utils.h @@ -17,15 +17,15 @@ #ifndef QGSSYMBOLLAYERV2UTILS_H #define QGSSYMBOLLAYERV2UTILS_H +#include +#include #include +#include #include #include -#include -#include -#include -#include "qgssymbolv2.h" #include "qgis.h" #include "qgsmapunitscale.h" +#include "qgssymbolv2.h" class QgsExpression; class QgsSymbolLayerV2; diff --git a/src/core/symbology-ng/qgssymbologyv2conversion.cpp b/src/core/symbology-ng/qgssymbologyv2conversion.cpp index 7a88194e86d..3d50a9fa599 100644 --- a/src/core/symbology-ng/qgssymbologyv2conversion.cpp +++ b/src/core/symbology-ng/qgssymbologyv2conversion.cpp @@ -16,12 +16,12 @@ #include "qgslogger.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2.h" #include "qgscategorizedsymbolrendererv2.h" +#include "qgsfillsymbollayerv2.h" +#include "qgsgraduatedsymbolrendererv2.h" +#include "qgslinesymbollayerv2.h" +#include "qgsmarkersymbollayerv2.h" +#include "qgssinglesymbolrendererv2.h" diff --git a/src/core/symbology-ng/qgssymbolv2.cpp b/src/core/symbology-ng/qgssymbolv2.cpp index 36e6fc51066..61bab7f3bff 100644 --- a/src/core/symbology-ng/qgssymbolv2.cpp +++ b/src/core/symbology-ng/qgssymbolv2.cpp @@ -13,20 +13,20 @@ * * ***************************************************************************/ -#include "qgssymbolv2.h" #include "qgssymbollayerv2.h" +#include "qgssymbolv2.h" +#include "qgsfillsymbollayerv2.h" #include "qgslinesymbollayerv2.h" #include "qgsmarkersymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" #include "qgslogger.h" #include "qgsrendercontext.h" // for bigSymbolPreview +#include "qgseffectstack.h" +#include "qgspainteffect.h" #include "qgsproject.h" #include "qgsstylev2.h" -#include "qgspainteffect.h" -#include "qgseffectstack.h" #include "qgsdatadefined.h" diff --git a/src/core/symbology-ng/qgssymbolv2.h b/src/core/symbology-ng/qgssymbolv2.h index 889a769b44c..37ef9b16b75 100644 --- a/src/core/symbology-ng/qgssymbolv2.h +++ b/src/core/symbology-ng/qgssymbolv2.h @@ -16,9 +16,9 @@ #ifndef QGSSYMBOLV2_H #define QGSSYMBOLV2_H -#include "qgis.h" #include #include +#include "qgis.h" #include "qgsmapunitscale.h" class QColor; diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp index 84d04a104ab..cdde447ef15 100644 --- a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp +++ b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include "qgsvectorcolorrampv2.h" #include "qgscolorbrewerpalette.h" #include "qgscptcityarchive.h" +#include "qgsvectorcolorrampv2.h" -#include "qgssymbollayerv2utils.h" #include "qgsapplication.h" #include "qgslogger.h" +#include "qgssymbollayerv2utils.h" -#include // for random() #include +#include // for random() #include diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.h b/src/core/symbology-ng/qgsvectorcolorrampv2.h index 44c7557d162..ae7e36d7e43 100644 --- a/src/core/symbology-ng/qgsvectorcolorrampv2.h +++ b/src/core/symbology-ng/qgsvectorcolorrampv2.h @@ -19,8 +19,8 @@ #include #include -#include "qgssymbollayerv2.h" // for QgsStringMap #include "qgslogger.h" +#include "qgssymbollayerv2.h" // for QgsStringMap class CORE_EXPORT QgsVectorColorRampV2 { diff --git a/src/crssync/main.cpp b/src/crssync/main.cpp index 575826d2524..189e9dff26a 100644 --- a/src/crssync/main.cpp +++ b/src/crssync/main.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ #include "qgsapplication.h" -#include "qgscoordinatereferencesystem.h" #include "qgsconfig.h" +#include "qgscoordinatereferencesystem.h" #include diff --git a/src/customwidgets/qgscollapsiblegroupboxplugin.h b/src/customwidgets/qgscollapsiblegroupboxplugin.h index f521f102421..d6fd1c64090 100644 --- a/src/customwidgets/qgscollapsiblegroupboxplugin.h +++ b/src/customwidgets/qgscollapsiblegroupboxplugin.h @@ -16,8 +16,8 @@ #ifndef QGSCOLLAPSIBLEGROUPBOXPLUGIN_H #define QGSCOLLAPSIBLEGROUPBOXPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsCollapsibleGroupBoxPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgscolorbuttonplugin.cpp b/src/customwidgets/qgscolorbuttonplugin.cpp index 99b3ff35dda..ef16dffd06b 100644 --- a/src/customwidgets/qgscolorbuttonplugin.cpp +++ b/src/customwidgets/qgscolorbuttonplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgscolorbuttonplugin.h" #include "qgscolorbutton.h" +#include "qgscolorbuttonplugin.h" QgsColorButtonPlugin::QgsColorButtonPlugin( QObject *parent ) diff --git a/src/customwidgets/qgscolorbuttonplugin.h b/src/customwidgets/qgscolorbuttonplugin.h index a0a623b05ac..6eee912edf6 100644 --- a/src/customwidgets/qgscolorbuttonplugin.h +++ b/src/customwidgets/qgscolorbuttonplugin.h @@ -16,8 +16,8 @@ #ifndef QGSCOLORBUTTONPLUGIN_H #define QGSCOLORBUTTONPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsColorButtonPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgscolorbuttonv2plugin.cpp b/src/customwidgets/qgscolorbuttonv2plugin.cpp index 2cf7efd5b95..f534e4e1ad3 100644 --- a/src/customwidgets/qgscolorbuttonv2plugin.cpp +++ b/src/customwidgets/qgscolorbuttonv2plugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgscolorbuttonv2plugin.h" #include "qgscolorbuttonv2.h" +#include "qgscolorbuttonv2plugin.h" QgsColorButtonV2Plugin::QgsColorButtonV2Plugin( QObject *parent ) diff --git a/src/customwidgets/qgscolorbuttonv2plugin.h b/src/customwidgets/qgscolorbuttonv2plugin.h index 59613893ff8..7d8602326e0 100644 --- a/src/customwidgets/qgscolorbuttonv2plugin.h +++ b/src/customwidgets/qgscolorbuttonv2plugin.h @@ -16,8 +16,8 @@ #ifndef QGSCOLORBUTTONV2PLUGIN_H #define QGSCOLORBUTTONV2PLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsColorButtonV2Plugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsdatadefinedbuttonplugin.cpp b/src/customwidgets/qgsdatadefinedbuttonplugin.cpp index 00743afde9c..a89cdcb8946 100644 --- a/src/customwidgets/qgsdatadefinedbuttonplugin.cpp +++ b/src/customwidgets/qgsdatadefinedbuttonplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsdatadefinedbuttonplugin.h" #include "qgsdatadefinedbutton.h" +#include "qgsdatadefinedbuttonplugin.h" QgsDataDefinedButtonPlugin::QgsDataDefinedButtonPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsdatadefinedbuttonplugin.h b/src/customwidgets/qgsdatadefinedbuttonplugin.h index b0f43deb267..6b7201df441 100644 --- a/src/customwidgets/qgsdatadefinedbuttonplugin.h +++ b/src/customwidgets/qgsdatadefinedbuttonplugin.h @@ -16,8 +16,8 @@ #ifndef QGSDATADEFINEDBUTTONPLUGIN_H #define QGSDATADEFINEDBUTTONPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsDataDefinedButtonPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsdatetimeeditplugin.cpp b/src/customwidgets/qgsdatetimeeditplugin.cpp index 4a0bfddea3f..ed959c42e92 100644 --- a/src/customwidgets/qgsdatetimeeditplugin.cpp +++ b/src/customwidgets/qgsdatetimeeditplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsdatetimeeditplugin.h" #include "qgsdatetimeedit.h" +#include "qgsdatetimeeditplugin.h" QgsDateTimeEditPlugin::QgsDateTimeEditPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsdatetimeeditplugin.h b/src/customwidgets/qgsdatetimeeditplugin.h index b0ffb882cd0..389c65fdaaa 100644 --- a/src/customwidgets/qgsdatetimeeditplugin.h +++ b/src/customwidgets/qgsdatetimeeditplugin.h @@ -16,8 +16,8 @@ #ifndef QGSDATETIMEEDITPLUGIN_H #define QGSDATETIMEEDITPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsDateTimeEditPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsdoublespinboxplugin.cpp b/src/customwidgets/qgsdoublespinboxplugin.cpp index a03726e5abe..40e11cb5651 100644 --- a/src/customwidgets/qgsdoublespinboxplugin.cpp +++ b/src/customwidgets/qgsdoublespinboxplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsdoublespinboxplugin.h" #include "qgsdoublespinbox.h" +#include "qgsdoublespinboxplugin.h" QgsDoubleSpinBoxPlugin::QgsDoubleSpinBoxPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsdoublespinboxplugin.h b/src/customwidgets/qgsdoublespinboxplugin.h index 5425db02e69..ceef61e8d6a 100644 --- a/src/customwidgets/qgsdoublespinboxplugin.h +++ b/src/customwidgets/qgsdoublespinboxplugin.h @@ -16,8 +16,8 @@ #ifndef QGSDOUBLESPINBOXPLUGIN_H #define QGSDOUBLESPINBOXPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsDoubleSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsfieldcomboboxplugin.h b/src/customwidgets/qgsfieldcomboboxplugin.h index 9b081e47b99..7a04ed4f0f3 100644 --- a/src/customwidgets/qgsfieldcomboboxplugin.h +++ b/src/customwidgets/qgsfieldcomboboxplugin.h @@ -16,8 +16,8 @@ #ifndef QGSFIELDCOMBOBOXPLUGIN_H #define QGSFIELDCOMBOBOXPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsFieldComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsfieldexpressionwidgetplugin.cpp b/src/customwidgets/qgsfieldexpressionwidgetplugin.cpp index ce0cf2bdfbf..b15c170f865 100644 --- a/src/customwidgets/qgsfieldexpressionwidgetplugin.cpp +++ b/src/customwidgets/qgsfieldexpressionwidgetplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsfieldexpressionwidgetplugin.h" #include "qgsfieldexpressionwidget.h" +#include "qgsfieldexpressionwidgetplugin.h" QgsFieldExpressionWidgetPlugin::QgsFieldExpressionWidgetPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsfieldexpressionwidgetplugin.h b/src/customwidgets/qgsfieldexpressionwidgetplugin.h index 4f8788b86e8..e2c7bed1287 100644 --- a/src/customwidgets/qgsfieldexpressionwidgetplugin.h +++ b/src/customwidgets/qgsfieldexpressionwidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSFIELDEXPRESSIONWIDGETPLUGIN_H #define QGSFIELDEXPRESSIONWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsFieldExpressionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsfilterlineeditplugin.h b/src/customwidgets/qgsfilterlineeditplugin.h index 6614c4ffb90..6f72aa49ba1 100644 --- a/src/customwidgets/qgsfilterlineeditplugin.h +++ b/src/customwidgets/qgsfilterlineeditplugin.h @@ -16,8 +16,8 @@ #ifndef QGSFILTERLINEEDITPLUGIN_H #define QGSFILTERLINEEDITPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsFilterLineEditPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsmaplayercomboboxplugin.h b/src/customwidgets/qgsmaplayercomboboxplugin.h index 071f3b87f67..ea02573256d 100644 --- a/src/customwidgets/qgsmaplayercomboboxplugin.h +++ b/src/customwidgets/qgsmaplayercomboboxplugin.h @@ -16,8 +16,8 @@ #ifndef QGSMAPLAYERCOMBOBOXPLUGIN_H #define QGSMAPLAYERCOMBOBOXPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsMapLayerComboBoxPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsprojectionselectionwidgetplugin.h b/src/customwidgets/qgsprojectionselectionwidgetplugin.h index da64ba577f9..fb657ee4029 100644 --- a/src/customwidgets/qgsprojectionselectionwidgetplugin.h +++ b/src/customwidgets/qgsprojectionselectionwidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSPROJECTIONSELECTIONWIDGETPLUGIN_H #define QGSPROJECTIONSELECTIONWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsProjectionSelectionWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsrelationeditorwidgetplugin.h b/src/customwidgets/qgsrelationeditorwidgetplugin.h index b9c29883c12..d71d7a1c97b 100644 --- a/src/customwidgets/qgsrelationeditorwidgetplugin.h +++ b/src/customwidgets/qgsrelationeditorwidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSRELATIONEDITORWIDGETPLUGIN_H #define QGSRELATIONEDITORWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsRelationEditorWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsrelationreferencewidgetplugin.cpp b/src/customwidgets/qgsrelationreferencewidgetplugin.cpp index 80db9886cb2..69c02741928 100644 --- a/src/customwidgets/qgsrelationreferencewidgetplugin.cpp +++ b/src/customwidgets/qgsrelationreferencewidgetplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsrelationreferencewidgetplugin.h" #include "qgsrelationreferencewidget.h" +#include "qgsrelationreferencewidgetplugin.h" QgsRelationReferenceWidgetPlugin::QgsRelationReferenceWidgetPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsrelationreferencewidgetplugin.h b/src/customwidgets/qgsrelationreferencewidgetplugin.h index 1cd88ef15a3..a0fb4a94f40 100644 --- a/src/customwidgets/qgsrelationreferencewidgetplugin.h +++ b/src/customwidgets/qgsrelationreferencewidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSRELATIONREFERENCEWIDGETPLUGIN_H #define QGSRELATIONREFERENCEWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsRelationReferenceWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsscalerangewidgetplugin.cpp b/src/customwidgets/qgsscalerangewidgetplugin.cpp index 53e3a5db3ee..3aaf320d73b 100644 --- a/src/customwidgets/qgsscalerangewidgetplugin.cpp +++ b/src/customwidgets/qgsscalerangewidgetplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsscalerangewidgetplugin.h" #include "qgsscalerangewidget.h" +#include "qgsscalerangewidgetplugin.h" QgsScaleRangeWidgetPlugin::QgsScaleRangeWidgetPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsscalerangewidgetplugin.h b/src/customwidgets/qgsscalerangewidgetplugin.h index 47cb31030bb..d3da613e97d 100644 --- a/src/customwidgets/qgsscalerangewidgetplugin.h +++ b/src/customwidgets/qgsscalerangewidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSSCALERANGEWIDGETPLUGIN_H #define QGSSCALERANGEWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsScaleRangeWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsscalewidgetplugin.cpp b/src/customwidgets/qgsscalewidgetplugin.cpp index b82e0067758..ce5dc563783 100644 --- a/src/customwidgets/qgsscalewidgetplugin.cpp +++ b/src/customwidgets/qgsscalewidgetplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsscalewidgetplugin.h" #include "qgsscalewidget.h" +#include "qgsscalewidgetplugin.h" QgsScaleWidgetPlugin::QgsScaleWidgetPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsscalewidgetplugin.h b/src/customwidgets/qgsscalewidgetplugin.h index 2501549a161..29bb2d3f212 100644 --- a/src/customwidgets/qgsscalewidgetplugin.h +++ b/src/customwidgets/qgsscalewidgetplugin.h @@ -16,8 +16,8 @@ #ifndef QGSSCALEWIDGETPLUGIN_H #define QGSSCALEWIDGETPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsScaleWidgetPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/customwidgets/qgsspinboxplugin.cpp b/src/customwidgets/qgsspinboxplugin.cpp index ae4508b42b7..111964d81af 100644 --- a/src/customwidgets/qgsspinboxplugin.cpp +++ b/src/customwidgets/qgsspinboxplugin.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgiscustomwidgets.h" -#include "qgsspinboxplugin.h" #include "qgsspinbox.h" +#include "qgsspinboxplugin.h" QgsSpinBoxPlugin::QgsSpinBoxPlugin( QObject *parent ) diff --git a/src/customwidgets/qgsspinboxplugin.h b/src/customwidgets/qgsspinboxplugin.h index 5d051ef9262..9b08053bcc5 100644 --- a/src/customwidgets/qgsspinboxplugin.h +++ b/src/customwidgets/qgsspinboxplugin.h @@ -16,8 +16,8 @@ #ifndef QGSSPINBOXPLUGIN_H #define QGSSPINBOXPLUGIN_H -#include #include +#include class CUSTOMWIDGETS_EXPORT QgsSpinBoxPlugin : public QObject, public QDesignerCustomWidgetInterface diff --git a/src/gui/attributetable/qgsattributetabledelegate.cpp b/src/gui/attributetable/qgsattributetabledelegate.cpp index 75a2f0b7f28..45c87e51047 100644 --- a/src/gui/attributetable/qgsattributetabledelegate.cpp +++ b/src/gui/attributetable/qgsattributetabledelegate.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ +#include #include #include -#include #include #include "qgsattributeeditor.h" diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.cpp b/src/gui/attributetable/qgsattributetablefiltermodel.cpp index 6c98c5bb277..e3de1a76850 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.cpp +++ b/src/gui/attributetable/qgsattributetablefiltermodel.cpp @@ -17,12 +17,12 @@ #include "qgsattributetablefiltermodel.h" #include "qgsattributetablemodel.h" -#include "qgsvectorlayer.h" #include "qgsfeature.h" -#include "qgsmapcanvas.h" #include "qgslogger.h" +#include "qgsmapcanvas.h" #include "qgsrendererv2.h" #include "qgsvectorlayereditbuffer.h" +#include "qgsvectorlayer.h" ////////////////// // Filter Model // ////////////////// diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h index c3a45af5933..7b5e06df88b 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.h +++ b/src/gui/attributetable/qgsattributetablefiltermodel.h @@ -17,12 +17,12 @@ #ifndef QGSATTRIBUTETABLEFILTERMODEL_H #define QGSATTRIBUTETABLEFILTERMODEL_H -#include #include +#include -#include "qgsvectorlayer.h" //QgsFeatureIds #include "qgsattributetablemodel.h" #include "qgsfeaturemodel.h" +#include "qgsvectorlayer.h" //QgsFeatureIds class QgsVectorLayerCache; class QgsMapCanvas; diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp index a93ae225b1d..ee6987003d0 100644 --- a/src/gui/attributetable/qgsattributetablemodel.cpp +++ b/src/gui/attributetable/qgsattributetablemodel.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgsattributetablemodel.h" #include "qgsattributetablefiltermodel.h" +#include "qgsattributetablemodel.h" #include "qgsattributeaction.h" #include "qgseditorwidgetregistry.h" diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h index edcdc98ccb5..a68ac1ec6e2 100644 --- a/src/gui/attributetable/qgsattributetablemodel.h +++ b/src/gui/attributetable/qgsattributetablemodel.h @@ -18,15 +18,15 @@ #define QGSATTRIBUTETABLEMODEL_H #include +#include +#include #include #include -#include #include -#include -#include "qgsvectorlayer.h" // QgsAttributeList -#include "qgsvectorlayercache.h" #include "qgsattributeeditorcontext.h" +#include "qgsvectorlayercache.h" +#include "qgsvectorlayer.h" // QgsAttributeList class QgsMapCanvas; class QgsMapLayerAction; diff --git a/src/gui/attributetable/qgsattributetableview.cpp b/src/gui/attributetable/qgsattributetableview.cpp index fa9b34f96e7..08f663a8f95 100644 --- a/src/gui/attributetable/qgsattributetableview.cpp +++ b/src/gui/attributetable/qgsattributetableview.cpp @@ -13,22 +13,22 @@ * * ***************************************************************************/ -#include -#include #include +#include #include +#include -#include "qgsattributetableview.h" -#include "qgsattributetablemodel.h" #include "qgsattributetabledelegate.h" #include "qgsattributetablefiltermodel.h" -#include "qgsvectorlayer.h" -#include "qgsvectorlayercache.h" -#include "qgsvectorlayerselectionmanager.h" -#include "qgsvectordataprovider.h" +#include "qgsattributetablemodel.h" +#include "qgsattributetableview.h" +#include "qgsfeatureselectionmodel.h" #include "qgslogger.h" #include "qgsmapcanvas.h" -#include "qgsfeatureselectionmodel.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayercache.h" +#include "qgsvectorlayer.h" +#include "qgsvectorlayerselectionmanager.h" QgsAttributeTableView::QgsAttributeTableView( QWidget *parent ) : QTableView( parent ) diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h index 58af88da8bf..04d3438408a 100644 --- a/src/gui/attributetable/qgsattributetableview.h +++ b/src/gui/attributetable/qgsattributetableview.h @@ -16,8 +16,8 @@ #ifndef QGSATTRIBUTETABLEVIEW_H #define QGSATTRIBUTETABLEVIEW_H -#include #include +#include #include "qgsfeature.h" // For QgsFeatureIds diff --git a/src/gui/attributetable/qgsfeaturelistmodel.cpp b/src/gui/attributetable/qgsfeaturelistmodel.cpp index d9e357a27ac..79902cb1b46 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.cpp +++ b/src/gui/attributetable/qgsfeaturelistmodel.cpp @@ -1,9 +1,9 @@ -#include "qgsexception.h" -#include "qgsvectordataprovider.h" -#include "qgsfeaturelistmodel.h" -#include "qgsattributetablemodel.h" -#include "qgsvectorlayereditbuffer.h" #include "qgsattributetablefiltermodel.h" +#include "qgsattributetablemodel.h" +#include "qgsexception.h" +#include "qgsfeaturelistmodel.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayereditbuffer.h" #include #include diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h index 6fef07c7cd5..6fc2dad6e23 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.h +++ b/src/gui/attributetable/qgsfeaturelistmodel.h @@ -4,11 +4,11 @@ #include #include -#include #include +#include -#include "qgsfeaturemodel.h" #include "qgsfeature.h" // QgsFeatureId +#include "qgsfeaturemodel.h" class QgsAttributeTableFilterModel; class QgsAttributeTableModel; diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h index d8a89c31e9b..7d14b02fbf7 100644 --- a/src/gui/attributetable/qgsfeaturelistview.h +++ b/src/gui/attributetable/qgsfeaturelistview.h @@ -16,8 +16,8 @@ #ifndef QGSATTRIBUTELISTVIEW_H #define QGSATTRIBUTELISTVIEW_H -#include #include +#include #include "qgsfeature.h" // For QgsFeatureIds diff --git a/src/gui/attributetable/qgsfeaturelistviewdelegate.cpp b/src/gui/attributetable/qgsfeaturelistviewdelegate.cpp index f28f1d3c4a0..de4e6c079dd 100644 --- a/src/gui/attributetable/qgsfeaturelistviewdelegate.cpp +++ b/src/gui/attributetable/qgsfeaturelistviewdelegate.cpp @@ -1,17 +1,17 @@ -#include "qgsfeaturelistviewdelegate.h" -#include "qgsvectorlayer.h" +#include "qgsapplication.h" #include "qgsattributetablemodel.h" #include "qgsfeaturelistmodel.h" -#include "qgsapplication.h" -#include "qgsvectorlayereditbuffer.h" +#include "qgsfeaturelistviewdelegate.h" #include "qgsfeatureselectionmodel.h" +#include "qgsvectorlayereditbuffer.h" +#include "qgsvectorlayer.h" -#include -#include -#include #include +#include +#include #include #include +#include QgsFeatureListViewDelegate::QgsFeatureListViewDelegate( QgsFeatureListModel *listModel, QObject *parent ) : QItemDelegate( parent ) diff --git a/src/gui/attributetable/qgsfeaturemodel.h b/src/gui/attributetable/qgsfeaturemodel.h index b6502417fc5..220883afac5 100644 --- a/src/gui/attributetable/qgsfeaturemodel.h +++ b/src/gui/attributetable/qgsfeaturemodel.h @@ -1,8 +1,8 @@ #ifndef QGSFEATUREMODEL_H #define QGSFEATUREMODEL_H -#include "qgsfeature.h" // QgsFeatureId #include +#include "qgsfeature.h" // QgsFeatureId class QgsFeatureModel { diff --git a/src/gui/attributetable/qgsfeatureselectionmodel.cpp b/src/gui/attributetable/qgsfeatureselectionmodel.cpp index 4bb125e04d1..bc3fd561c32 100644 --- a/src/gui/attributetable/qgsfeatureselectionmodel.cpp +++ b/src/gui/attributetable/qgsfeatureselectionmodel.cpp @@ -1,9 +1,9 @@ +#include #include "qgsattributetablemodel.h" #include "qgsfeaturemodel.h" -#include "qgsifeatureselectionmanager.h" #include "qgsfeatureselectionmodel.h" +#include "qgsifeatureselectionmanager.h" #include "qgsvectorlayer.h" -#include QgsFeatureSelectionModel::QgsFeatureSelectionModel( QAbstractItemModel* model, QgsFeatureModel* featureModel, QgsIFeatureSelectionManager* featureSelectionManager, QObject* parent ) : QItemSelectionModel( model, parent ) diff --git a/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.h b/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.h index 75f6ab7984e..3d9f4c636bc 100644 --- a/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgsdefaultsearchwidgetwrapper.h @@ -16,8 +16,8 @@ #ifndef QGSDEFAULTSEARCHWIDGETWRAPPER_H #define QGSDEFAULTSEARCHWIDGETWRAPPER_H -#include "qgseditorwidgetwrapper.h" #include +#include "qgseditorwidgetwrapper.h" /** diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp index a3f5e5aaa32..f999ef722d0 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgseditorwidgetfactory.h" #include "qgsdefaultsearchwidgetwrapper.h" +#include "qgseditorwidgetfactory.h" #include diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h index 8f59487d031..0c52fd715ff 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h @@ -16,9 +16,9 @@ #ifndef QGSEDITORWIDGETFACTORY_H #define QGSEDITORWIDGETFACTORY_H -#include "qgseditorwidgetwrapper.h" #include "qgsapplication.h" #include "qgsdefaultsearchwidgetwrapper.h" +#include "qgseditorwidgetwrapper.h" #include #include diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp index eaf597e8d86..337d7110044 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.cpp @@ -18,28 +18,28 @@ #include "qgsattributeeditorcontext.h" //#include "qgseditorwidgetfactory.h" #include "qgslegacyhelpers.h" +#include "qgsmaplayerregistry.h" #include "qgsmessagelog.h" #include "qgsproject.h" #include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" // Editors -#include "qgsclassificationwidgetwrapperfactory.h" -#include "qgsrangewidgetfactory.h" -#include "qgsuniquevaluewidgetfactory.h" -#include "qgsfilenamewidgetfactory.h" -#include "qgsvaluemapwidgetfactory.h" -#include "qgsenumerationwidgetfactory.h" -#include "qgshiddenwidgetfactory.h" #include "qgscheckboxwidgetfactory.h" -#include "qgstexteditwidgetfactory.h" -#include "qgsvaluerelationwidgetfactory.h" -#include "qgsuuidwidgetfactory.h" -#include "qgsphotowidgetfactory.h" -#include "qgswebviewwidgetfactory.h" +#include "qgsclassificationwidgetwrapperfactory.h" #include "qgscolorwidgetfactory.h" -#include "qgsrelationreferencefactory.h" #include "qgsdatetimeeditfactory.h" +#include "qgsenumerationwidgetfactory.h" +#include "qgsfilenamewidgetfactory.h" +#include "qgshiddenwidgetfactory.h" +#include "qgsphotowidgetfactory.h" +#include "qgsrangewidgetfactory.h" +#include "qgsrelationreferencefactory.h" +#include "qgstexteditwidgetfactory.h" +#include "qgsuniquevaluewidgetfactory.h" +#include "qgsuuidwidgetfactory.h" +#include "qgsvaluemapwidgetfactory.h" +#include "qgsvaluerelationwidgetfactory.h" +#include "qgswebviewwidgetfactory.h" QgsEditorWidgetRegistry* QgsEditorWidgetRegistry::instance() { diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h index a42e7e6ac2a..6945687e822 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h @@ -16,8 +16,8 @@ #ifndef QGSEDITORWIDGETREGISTRY_H #define QGSEDITORWIDGETREGISTRY_H -#include #include +#include #include "qgseditorwidgetfactory.h" diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp index 98d63d04618..d7934d68352 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp +++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ #include "qgseditorwidgetwrapper.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" #include "qgsfield.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h index cb81482920f..3875e33e688 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h @@ -16,15 +16,15 @@ #ifndef QGSEDITORWIDGETWRAPPER_H #define QGSEDITORWIDGETWRAPPER_H -#include #include +#include #include class QgsVectorLayer; class QgsField; -#include "qgseditorwidgetconfig.h" #include "qgsattributeeditorcontext.h" +#include "qgseditorwidgetconfig.h" #include "qgswidgetwrapper.h" /** diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.cpp b/src/gui/editorwidgets/core/qgswidgetwrapper.cpp index 4fb0ced5256..b8f88173a82 100644 --- a/src/gui/editorwidgets/core/qgswidgetwrapper.cpp +++ b/src/gui/editorwidgets/core/qgswidgetwrapper.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgswidgetwrapper.h" #include "qgsvectorlayer.h" +#include "qgswidgetwrapper.h" #include diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.h b/src/gui/editorwidgets/core/qgswidgetwrapper.h index 85b71f543ab..6469f605973 100644 --- a/src/gui/editorwidgets/core/qgswidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgswidgetwrapper.h @@ -16,14 +16,14 @@ #ifndef QGSWIDGETWRAPPER_H #define QGSWIDGETWRAPPER_H -#include #include +#include #include class QgsVectorLayer; -#include "qgseditorwidgetconfig.h" #include "qgsattributeeditorcontext.h" +#include "qgseditorwidgetconfig.h" /** * Manages an editor widget diff --git a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp index 9d2618ef731..8c0eea6da92 100644 --- a/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgscheckboxwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgscheckboxwidgetfactory.h" -#include "qgscheckboxwidgetwrapper.h" #include "qgscheckboxconfigdlg.h" +#include "qgscheckboxwidgetwrapper.h" QgsCheckboxWidgetFactory::QgsCheckboxWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsdatetimeeditconfig.h b/src/gui/editorwidgets/qgsdatetimeeditconfig.h index 1e0d1ae94b0..847d8ad32cd 100644 --- a/src/gui/editorwidgets/qgsdatetimeeditconfig.h +++ b/src/gui/editorwidgets/qgsdatetimeeditconfig.h @@ -16,8 +16,8 @@ #ifndef QGSDATETIMEEDITCONFIG_H #define QGSDATETIMEEDITCONFIG_H -#include "qgseditorconfigwidget.h" #include "ui_qgsdatetimeeditconfig.h" +#include "qgseditorconfigwidget.h" class GUI_EXPORT QgsDateTimeEditConfig : public QgsEditorConfigWidget, private Ui::QgsDateTimeEditConfig { diff --git a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp index 02097312008..ff146cf9796 100644 --- a/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp +++ b/src/gui/editorwidgets/qgsdatetimeeditfactory.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsdatetimeeditfactory.h" #include "qgsdatetimeeditconfig.h" +#include "qgsdatetimeeditfactory.h" #include "qgsdatetimeeditwrapper.h" #include diff --git a/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp b/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp index bf285a91542..dff552645a2 100644 --- a/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp +++ b/src/gui/editorwidgets/qgsdatetimeeditwrapper.cpp @@ -14,15 +14,15 @@ ***************************************************************************/ -#include #include +#include #include -#include "qgsdatetimeeditwrapper.h" #include "qgsdatetimeeditfactory.h" -#include "qgsmessagelog.h" +#include "qgsdatetimeeditwrapper.h" #include "qgslogger.h" +#include "qgsmessagelog.h" QgsDateTimeEditWrapper::QgsDateTimeEditWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgsdatetimeeditwrapper.h b/src/gui/editorwidgets/qgsdatetimeeditwrapper.h index 773eec3d241..06e6054ae6d 100644 --- a/src/gui/editorwidgets/qgsdatetimeeditwrapper.h +++ b/src/gui/editorwidgets/qgsdatetimeeditwrapper.h @@ -18,9 +18,9 @@ #include -#include "qgseditorwidgetwrapper.h" -#include "qgsdatetimeedit.h" #include "qgsdatetimeeditfactory.h" +#include "qgsdatetimeedit.h" +#include "qgseditorwidgetwrapper.h" /** * Wraps a date time widget. Users will be able to choose date and time from an appropriate dialog. diff --git a/src/gui/editorwidgets/qgsdoublespinbox.cpp b/src/gui/editorwidgets/qgsdoublespinbox.cpp index 4c8c8b1e9a5..de9465fcc28 100644 --- a/src/gui/editorwidgets/qgsdoublespinbox.cpp +++ b/src/gui/editorwidgets/qgsdoublespinbox.cpp @@ -19,9 +19,9 @@ #include #include +#include "qgsapplication.h" #include "qgsdoublespinbox.h" #include "qgsexpression.h" -#include "qgsapplication.h" #include "qgslogger.h" QgsDoubleSpinBox::QgsDoubleSpinBox( QWidget *parent ) diff --git a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp index 85a7211d4b9..1d2f1293ea8 100644 --- a/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsenumerationwidgetfactory.cpp @@ -15,10 +15,10 @@ #include "qgsenumerationwidgetfactory.h" -#include "qgsenumerationwidgetwrapper.h" #include "qgsdummyconfigdlg.h" -#include "qgsvectorlayer.h" +#include "qgsenumerationwidgetwrapper.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsEnumerationWidgetFactory::QgsEnumerationWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp index 164689fd240..5b4099acf5b 100644 --- a/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsenumerationwidgetwrapper.cpp @@ -15,8 +15,8 @@ #include "qgsenumerationwidgetwrapper.h" -#include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsEnumerationWidgetWrapper::QgsEnumerationWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) diff --git a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp index fc73f07b3f3..8864fdec2e7 100644 --- a/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsfilenamewidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgsfilenamewidgetfactory.h" -#include "qgsfilenamewidgetwrapper.h" #include "qgsdummyconfigdlg.h" +#include "qgsfilenamewidgetwrapper.h" QgsFileNameWidgetFactory::QgsFileNameWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp index 6f1ef30927a..cabf1c528ab 100644 --- a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp @@ -18,8 +18,8 @@ #include "qgsfilterlineedit.h" #include -#include #include +#include QgsFileNameWidgetWrapper::QgsFileNameWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) : QgsEditorWidgetWrapper( vl, fieldIdx, editor, parent ) diff --git a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h index 52740e77c38..282432bc72b 100644 --- a/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h +++ b/src/gui/editorwidgets/qgsfilenamewidgetwrapper.h @@ -18,9 +18,9 @@ #include "qgseditorwidgetwrapper.h" +#include #include #include -#include /** diff --git a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp index 53118956866..72f91f74b56 100644 --- a/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgshiddenwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgshiddenwidgetfactory.h" -#include "qgshiddenwidgetwrapper.h" #include "qgsdummyconfigdlg.h" +#include "qgshiddenwidgetwrapper.h" QgsHiddenWidgetFactory::QgsHiddenWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp index 19c02bbb753..f9691dc4a67 100644 --- a/src/gui/editorwidgets/qgsphotowidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsphotowidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgsphotowidgetfactory.h" -#include "qgsphotowidgetwrapper.h" #include "qgsphotoconfigdlg.h" +#include "qgsphotowidgetwrapper.h" QgsPhotoWidgetFactory::QgsPhotoWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp index e5a4e43d5af..431065044b3 100644 --- a/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsphotowidgetwrapper.cpp @@ -15,8 +15,8 @@ #include "qgsphotowidgetwrapper.h" -#include #include +#include #include #include "qgsfilterlineedit.h" diff --git a/src/gui/editorwidgets/qgsphotowidgetwrapper.h b/src/gui/editorwidgets/qgsphotowidgetwrapper.h index 2761b8ab890..cf424767bd3 100644 --- a/src/gui/editorwidgets/qgsphotowidgetwrapper.h +++ b/src/gui/editorwidgets/qgsphotowidgetwrapper.h @@ -19,8 +19,8 @@ #include "qgseditorwidgetwrapper.h" #include -#include #include +#include #include "qgswebview.h" /** diff --git a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp index 203eb3f4a9f..a0f8df9a40d 100644 --- a/src/gui/editorwidgets/qgsrangewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsrangewidgetfactory.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsrangewidgetfactory.h" #include "qgsrangeconfigdlg.h" +#include "qgsrangewidgetfactory.h" #include "qgsrangewidgetwrapper.h" #include "qgsvectorlayer.h" diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp index 4d1639c5ebc..fe79b62fa60 100644 --- a/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsrangewidgetwrapper.cpp @@ -15,9 +15,9 @@ #include +#include "qgsdoublespinbox.h" #include "qgsrangewidgetwrapper.h" #include "qgsspinbox.h" -#include "qgsdoublespinbox.h" #include "qgsvectorlayer.h" QgsRangeWidgetWrapper::QgsRangeWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgsrangewidgetwrapper.h b/src/gui/editorwidgets/qgsrangewidgetwrapper.h index 206bb4cd2d0..5422314c195 100644 --- a/src/gui/editorwidgets/qgsrangewidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrangewidgetwrapper.h @@ -18,8 +18,8 @@ #include "qgseditorwidgetwrapper.h" -#include #include +#include #include "qgsdial.h" #include "qgsslider.h" diff --git a/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp b/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp index 0c7fdf3ade4..48cc20e249f 100644 --- a/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp +++ b/src/gui/editorwidgets/qgsrelationreferenceconfigdlg.cpp @@ -16,11 +16,11 @@ #include "qgsrelationreferenceconfigdlg.h" #include "qgseditorwidgetfactory.h" +#include "qgsexpressionbuilderdialog.h" #include "qgsfield.h" #include "qgsproject.h" #include "qgsrelationmanager.h" #include "qgsvectorlayer.h" -#include "qgsexpressionbuilderdialog.h" QgsRelationReferenceConfigDlg::QgsRelationReferenceConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp index 92864ab9766..7248dfcf1ba 100644 --- a/src/gui/editorwidgets/qgsrelationreferencefactory.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencefactory.cpp @@ -15,8 +15,8 @@ #include "qgsrelationreferencefactory.h" -#include "qgsrelationreferencewidgetwrapper.h" #include "qgsrelationreferenceconfigdlg.h" +#include "qgsrelationreferencewidgetwrapper.h" QgsRelationReferenceFactory::QgsRelationReferenceFactory( QString name, QgsMapCanvas* canvas, QgsMessageBar* messageBar ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp index d6cfb9ad94d..7e154504827 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidget.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencewidget.cpp @@ -15,14 +15,15 @@ #include "qgsrelationreferencewidget.h" -#include #include #include +#include #include -#include "qgsattributeform.h" -#include "qgsattributedialog.h" #include "qgsapplication.h" +#include "qgsattributedialog.h" +#include "qgsattributeform.h" +#include "qgsattributetablemodel.h" #include "qgscollapsiblegroupbox.h" #include "qgseditorwidgetfactory.h" #include "qgsexpression.h" @@ -32,7 +33,6 @@ #include "qgsmessagebar.h" #include "qgsrelationreferenceconfigdlg.h" #include "qgsvectorlayer.h" -#include "qgsattributetablemodel.h" bool orderByLessThan( const QgsRelationReferenceWidget::ValueRelationItem& p1 , const QgsRelationReferenceWidget::ValueRelationItem& p2 ) diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h index 2b78ae5b55e..edd76cf0058 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidget.h +++ b/src/gui/editorwidgets/qgsrelationreferencewidget.h @@ -17,19 +17,19 @@ #define QGSRELATIONREFERENCEWIDGET_H #include "qgsattributeeditorcontext.h" +#include "qgsattributetablefiltermodel.h" +#include "qgsattributetablemodel.h" #include "qgscollapsiblegroupbox.h" #include "qgsfeature.h" +#include "qgsfeaturelistmodel.h" #include "qgshighlight.h" #include "qgsmaptoolidentifyfeature.h" -#include "qgsattributetablemodel.h" -#include "qgsattributetablefiltermodel.h" -#include "qgsfeaturelistmodel.h" #include -#include -#include #include +#include #include +#include class QgsAttributeForm; class QgsVectorLayerTools; diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp index c4d76a8dfc8..f88eb609c69 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ -#include "qgsrelationreferencewidgetwrapper.h" #include "qgsproject.h" #include "qgsrelationmanager.h" +#include "qgsrelationreferencewidgetwrapper.h" QgsRelationReferenceWidgetWrapper::QgsRelationReferenceWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QgsMapCanvas* canvas, QgsMessageBar* messageBar, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h index 0516e340a21..8cad94cbc7c 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h @@ -16,8 +16,8 @@ #ifndef QGSRELATIONREFERENCEWIDGETWRAPPER_H #define QGSRELATIONREFERENCEWIDGETWRAPPER_H -#include "qgsrelationreferencewidget.h" #include "qgseditorwidgetwrapper.h" +#include "qgsrelationreferencewidget.h" /** diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp index 4086639a780..fb67b0bf598 100644 --- a/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp @@ -15,8 +15,8 @@ #include "qgsrelationwidgetwrapper.h" -#include "qgsrelationeditorwidget.h" #include "qgsattributeeditorcontext.h" +#include "qgsrelationeditorwidget.h" #include diff --git a/src/gui/editorwidgets/qgsspinbox.cpp b/src/gui/editorwidgets/qgsspinbox.cpp index 90a0ed2be1e..da8a50afa0f 100644 --- a/src/gui/editorwidgets/qgsspinbox.cpp +++ b/src/gui/editorwidgets/qgsspinbox.cpp @@ -19,10 +19,10 @@ #include #include -#include "qgsspinbox.h" -#include "qgsexpression.h" #include "qgsapplication.h" +#include "qgsexpression.h" #include "qgslogger.h" +#include "qgsspinbox.h" QgsSpinBox::QgsSpinBox( QWidget *parent ) : QSpinBox( parent ) diff --git a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp index 17771ee3ed6..c0d91556d88 100644 --- a/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgstexteditwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgstexteditwidgetfactory.h" -#include "qgstexteditwrapper.h" #include "qgstexteditconfigdlg.h" +#include "qgstexteditwrapper.h" QgsTextEditWidgetFactory::QgsTextEditWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp index 36572b1d244..9f71fd19b79 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgsuniquevaluewidgetfactory.h" -#include "qgsuniquevaluewidgetwrapper.h" #include "qgsuniquevaluesconfigdlg.h" +#include "qgsuniquevaluewidgetwrapper.h" QgsUniqueValueWidgetFactory::QgsUniqueValueWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp index 7eb79320777..139ff1a42d5 100644 --- a/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp @@ -15,8 +15,8 @@ #include "qgsuniquevaluewidgetwrapper.h" -#include "qgsvectorlayer.h" #include "qgsfilterlineedit.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp index 1a8b16c2fe7..db113b22dee 100644 --- a/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsuuidwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgsuuidwidgetfactory.h" -#include "qgsuuidwidgetwrapper.h" #include "qgsdummyconfigdlg.h" +#include "qgsuuidwidgetwrapper.h" QgsUuidWidgetFactory::QgsUuidWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsuuidwidgetwrapper.h b/src/gui/editorwidgets/qgsuuidwidgetwrapper.h index 4029b9d27e4..a6cdb1f5da8 100644 --- a/src/gui/editorwidgets/qgsuuidwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsuuidwidgetwrapper.h @@ -18,8 +18,8 @@ #include "qgseditorwidgetwrapper.h" -#include #include +#include /** diff --git a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp index 12ff1bbc01b..3e37da23197 100644 --- a/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp +++ b/src/gui/editorwidgets/qgsvaluemapconfigdlg.cpp @@ -17,9 +17,9 @@ #include "qgsattributetypeloaddialog.h" -#include #include #include +#include #include QgsValueMapConfigDlg::QgsValueMapConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp index 6973a362d31..84b02712cf9 100644 --- a/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgsvaluemapwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgsvaluemapwidgetfactory.h" -#include "qgsvaluemapwidgetwrapper.h" #include "qgsvaluemapconfigdlg.h" +#include "qgsvaluemapwidgetwrapper.h" QgsValueMapWidgetFactory::QgsValueMapWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp b/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp index e4f227c49b4..8e4770621bc 100644 --- a/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp +++ b/src/gui/editorwidgets/qgsvaluerelationconfigdlg.cpp @@ -13,10 +13,10 @@ * * ***************************************************************************/ -#include "qgsvaluerelationconfigdlg.h" -#include "qgsmaplayerregistry.h" -#include "qgsvectorlayer.h" #include "qgsexpressionbuilderdialog.h" +#include "qgsmaplayerregistry.h" +#include "qgsvaluerelationconfigdlg.h" +#include "qgsvectorlayer.h" QgsValueRelationConfigDlg::QgsValueRelationConfigDlg( QgsVectorLayer* vl, int fieldIdx, QWidget* parent ) : QgsEditorConfigWidget( vl, fieldIdx, parent ) diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp index c73bf89c3e9..f9dbce66fdc 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.cpp @@ -16,13 +16,13 @@ #include "qgsvaluerelationwidgetwrapper.h" #include "qgsfield.h" +#include "qgsfilterlineedit.h" #include "qgsmaplayerregistry.h" #include "qgsvaluerelationwidgetfactory.h" #include "qgsvectorlayer.h" -#include "qgsfilterlineedit.h" -#include #include +#include bool orderByKeyLessThan( const QgsValueRelationWidgetWrapper::ValueRelationItem& p1 , const QgsValueRelationWidgetWrapper::ValueRelationItem& p2 ) diff --git a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h index 7846d1d5b08..bcab0a143cc 100644 --- a/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsvaluerelationwidgetwrapper.h @@ -19,8 +19,8 @@ #include "qgseditorwidgetwrapper.h" #include -#include #include +#include class QgsValueRelationWidgetFactory; diff --git a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp index 1f3eb476f6b..3ffb916d8f2 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp +++ b/src/gui/editorwidgets/qgswebviewwidgetfactory.cpp @@ -15,8 +15,8 @@ #include "qgswebviewwidgetfactory.h" -#include "qgswebviewwidgetwrapper.h" #include "qgswebviewconfigdlg.h" +#include "qgswebviewwidgetwrapper.h" QgsWebViewWidgetFactory::QgsWebViewWidgetFactory( const QString& name ) : QgsEditorWidgetFactory( name ) diff --git a/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp index 2de9109a028..5324795b8e1 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp +++ b/src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp @@ -18,8 +18,8 @@ #include "qgsfilterlineedit.h" #include "qgsnetworkaccessmanager.h" -#include #include +#include #include QgsWebViewWidgetWrapper::QgsWebViewWidgetWrapper( QgsVectorLayer* vl, int fieldIdx, QWidget* editor, QWidget* parent ) diff --git a/src/gui/editorwidgets/qgswebviewwidgetwrapper.h b/src/gui/editorwidgets/qgswebviewwidgetwrapper.h index 227a498ef0d..570030031be 100644 --- a/src/gui/editorwidgets/qgswebviewwidgetwrapper.h +++ b/src/gui/editorwidgets/qgswebviewwidgetwrapper.h @@ -18,9 +18,9 @@ #include "qgseditorwidgetwrapper.h" -#include #include #include +#include /** * Wraps a web view widget. Will show the content available at the URL of the value in a web browser. diff --git a/src/gui/effects/qgseffectdrawmodecombobox.cpp b/src/gui/effects/qgseffectdrawmodecombobox.cpp index 85badcb4835..473cbc1656e 100644 --- a/src/gui/effects/qgseffectdrawmodecombobox.cpp +++ b/src/gui/effects/qgseffectdrawmodecombobox.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgseffectdrawmodecombobox.h" #include "qgsapplication.h" +#include "qgseffectdrawmodecombobox.h" #include #include diff --git a/src/gui/effects/qgseffectstackpropertieswidget.cpp b/src/gui/effects/qgseffectstackpropertieswidget.cpp index 877e38852c0..d264b44025f 100644 --- a/src/gui/effects/qgseffectstackpropertieswidget.cpp +++ b/src/gui/effects/qgseffectstackpropertieswidget.cpp @@ -13,20 +13,20 @@ * * ***************************************************************************/ -#include "qgseffectstackpropertieswidget.h" -#include "qgspainteffectregistry.h" -#include "qgspainteffect.h" -#include "qgseffectstack.h" -#include "qgspainteffectpropertieswidget.h" -#include "qgspainteffectwidget.h" #include "qgsapplication.h" +#include "qgseffectstack.h" +#include "qgseffectstackpropertieswidget.h" +#include "qgspainteffect.h" +#include "qgspainteffectpropertieswidget.h" +#include "qgspainteffectregistry.h" +#include "qgspainteffectwidget.h" #include "qgssymbollayerv2utils.h" -#include -#include -#include -#include #include +#include +#include +#include +#include #include static const int EffectItemType = QStandardItem::UserType + 1; diff --git a/src/gui/effects/qgseffectstackpropertieswidget.h b/src/gui/effects/qgseffectstackpropertieswidget.h index cdc5025c56d..41b572661b4 100644 --- a/src/gui/effects/qgseffectstackpropertieswidget.h +++ b/src/gui/effects/qgseffectstackpropertieswidget.h @@ -16,10 +16,10 @@ #ifndef QGSEFFECTSTACKPROPERTIESWIDGET_H #define QGSEFFECTSTACKPROPERTIESWIDGET_H -#include "qgsdialog.h" -#include "effects/qgseffectstack.h" -#include #include +#include +#include "effects/qgseffectstack.h" +#include "qgsdialog.h" #include "ui_qgseffectstackpropertieswidgetbase.h" diff --git a/src/gui/effects/qgspainteffectpropertieswidget.cpp b/src/gui/effects/qgspainteffectpropertieswidget.cpp index 15fb6e10906..1f3eb1924e5 100644 --- a/src/gui/effects/qgspainteffectpropertieswidget.cpp +++ b/src/gui/effects/qgspainteffectpropertieswidget.cpp @@ -16,16 +16,16 @@ #include "qgspainteffectpropertieswidget.h" #include -#include #include #include +#include -#include "qgspainteffectregistry.h" -#include "qgspainteffect.h" -#include "qgspainteffectwidget.h" -#include "qgseffectstack.h" #include "qgsapplication.h" +#include "qgseffectstack.h" #include "qgslogger.h" +#include "qgspainteffect.h" +#include "qgspainteffectregistry.h" +#include "qgspainteffectwidget.h" static bool _initWidgetFunction( QString name, QgsPaintEffectWidgetFunc f ) { diff --git a/src/gui/effects/qgspainteffectwidget.cpp b/src/gui/effects/qgspainteffectwidget.cpp index 9c3777a79ff..83352033175 100644 --- a/src/gui/effects/qgspainteffectwidget.cpp +++ b/src/gui/effects/qgspainteffectwidget.cpp @@ -14,15 +14,15 @@ ***************************************************************************/ -#include "qgspainteffectwidget.h" +#include "qgsblureffect.h" +#include "qgscoloreffect.h" +#include "qgsgloweffect.h" #include "qgslogger.h" #include "qgspainteffect.h" +#include "qgspainteffectwidget.h" #include "qgsshadoweffect.h" -#include "qgsblureffect.h" -#include "qgsgloweffect.h" -#include "qgstransformeffect.h" -#include "qgscoloreffect.h" #include "qgsstylev2.h" +#include "qgstransformeffect.h" #include "qgsvectorcolorrampv2.h" #include "qgsvectorgradientcolorrampv2dialog.h" diff --git a/src/gui/layertree/qgslayertreemapcanvasbridge.cpp b/src/gui/layertree/qgslayertreemapcanvasbridge.cpp index aac39319148..df09b62c894 100644 --- a/src/gui/layertree/qgslayertreemapcanvasbridge.cpp +++ b/src/gui/layertree/qgslayertreemapcanvasbridge.cpp @@ -17,9 +17,9 @@ #include "qgslayertree.h" #include "qgslayertreeutils.h" +#include "qgsmapcanvas.h" #include "qgsmaplayer.h" #include "qgsvectorlayer.h" -#include "qgsmapcanvas.h" QgsLayerTreeMapCanvasBridge::QgsLayerTreeMapCanvasBridge( QgsLayerTreeGroup *root, QgsMapCanvas *canvas, QObject* parent ) : QObject( parent ) diff --git a/src/gui/layertree/qgslayertreeview.cpp b/src/gui/layertree/qgslayertreeview.cpp index c701d0638fe..c9b5869e2df 100644 --- a/src/gui/layertree/qgslayertreeview.cpp +++ b/src/gui/layertree/qgslayertreeview.cpp @@ -21,8 +21,8 @@ #include "qgslayertreeviewdefaultactions.h" #include "qgsmaplayer.h" -#include #include +#include QgsLayerTreeView::QgsLayerTreeView( QWidget *parent ) : QTreeView( parent ) diff --git a/src/gui/qgisgui.cpp b/src/gui/qgisgui.cpp index 0c4fe6b3d54..61f6d20af19 100644 --- a/src/gui/qgisgui.cpp +++ b/src/gui/qgisgui.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include "qgisgui.h" -#include #include +#include #include "qgsencodingfiledialog.h" #include "qgslogger.h" diff --git a/src/gui/qgisgui.h b/src/gui/qgisgui.h index 14597f3ad02..1c2d4185a82 100644 --- a/src/gui/qgisgui.h +++ b/src/gui/qgisgui.h @@ -15,9 +15,9 @@ #ifndef QGISGUI_H #define QGISGUI_H -#include #include #include +#include class QFont; diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 57a7511cf78..40899b4d6ae 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -39,10 +39,10 @@ class QgsSnappingUtils; class QgsVectorLayer; class QgsVectorLayerTools; -#include -#include -#include #include +#include +#include +#include #include "qgis.h" diff --git a/src/gui/qgsannotationitem.cpp b/src/gui/qgsannotationitem.cpp index da6e149ba90..646007ad476 100644 --- a/src/gui/qgsannotationitem.cpp +++ b/src/gui/qgsannotationitem.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ +#include +#include #include "qgsannotationitem.h" #include "qgsmapcanvas.h" #include "qgsrendercontext.h" #include "qgssymbollayerv2utils.h" #include "qgssymbolv2.h" -#include -#include QgsAnnotationItem::QgsAnnotationItem( QgsMapCanvas* mapCanvas ) : QgsMapCanvasItem( mapCanvas ) diff --git a/src/gui/qgsattributedialog.cpp b/src/gui/qgsattributedialog.cpp index f1f8c669118..ee3db294f81 100644 --- a/src/gui/qgsattributedialog.cpp +++ b/src/gui/qgsattributedialog.cpp @@ -17,10 +17,10 @@ #include "qgsattributedialog.h" +#include "qgsactionmenu.h" +#include "qgsapplication.h" #include "qgsattributeform.h" #include "qgshighlight.h" -#include "qgsapplication.h" -#include "qgsactionmenu.h" #include diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h index 90838854b28..0d0828505e4 100644 --- a/src/gui/qgsattributedialog.h +++ b/src/gui/qgsattributedialog.h @@ -17,13 +17,13 @@ #ifndef QGSATTRIBUTEDIALOG_H #define QGSATTRIBUTEDIALOG_H -#include "qgsfeature.h" #include "qgsattributeeditorcontext.h" #include "qgsattributeform.h" +#include "qgsfeature.h" #include -#include #include +#include class QgsDistanceArea; class QgsFeature; diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp index 2ac225ad7f9..272ddfba6c0 100644 --- a/src/gui/qgsattributeeditor.cpp +++ b/src/gui/qgsattributeeditor.cpp @@ -21,8 +21,8 @@ #include "qgseditorwidgetwrapper.h" #include "qgsattributedialog.h" -#include "qgsattributeeditor.h" #include "qgsattributeeditorcontext.h" +#include "qgsattributeeditor.h" #include "qgscategorizedsymbolrendererv2.h" #include "qgscolorbutton.h" #include "qgsexpression.h" @@ -37,26 +37,26 @@ #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #include -#include #include -#include +#include #include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include diff --git a/src/gui/qgsattributeeditor.h b/src/gui/qgsattributeeditor.h index 436594291e0..dc4d1a39c0a 100644 --- a/src/gui/qgsattributeeditor.h +++ b/src/gui/qgsattributeeditor.h @@ -17,9 +17,9 @@ #ifndef QGSATTRIBUTEEDITOR_H #define QGSATTRIBUTEEDITOR_H -#include -#include #include +#include +#include #include "qgsfeature.h" #include "qgsrelationmanager.h" diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h index 185e04b5424..0fb805909e5 100644 --- a/src/gui/qgsattributeform.h +++ b/src/gui/qgsattributeform.h @@ -16,13 +16,13 @@ #ifndef QGSATTRIBUTEFORM_H #define QGSATTRIBUTEFORM_H +#include "qgsattributeeditorcontext.h" +#include "qgseditorwidgetwrapper.h" #include "qgsfeature.h" #include "qgsvectorlayer.h" -#include "qgseditorwidgetwrapper.h" -#include "qgsattributeeditorcontext.h" -#include #include +#include class QgsAttributeFormInterface; diff --git a/src/gui/qgsattributeformlegacyinterface.cpp b/src/gui/qgsattributeformlegacyinterface.cpp index 7c4f920037b..c2f2a8af046 100644 --- a/src/gui/qgsattributeformlegacyinterface.cpp +++ b/src/gui/qgsattributeformlegacyinterface.cpp @@ -15,12 +15,12 @@ #include "qgsattributeformlegacyinterface.h" -#include "qgspythonrunner.h" #include "qgsattributeform.h" +#include "qgspythonrunner.h" -#include #include #include +#include QgsAttributeFormLegacyInterface::QgsAttributeFormLegacyInterface( const QString& function, const QString& pyFormName, QgsAttributeForm* form ) : QgsAttributeFormInterface( form ) diff --git a/src/gui/qgsattributetypeloaddialog.cpp b/src/gui/qgsattributetypeloaddialog.cpp index 831a9976c46..c4e8c9be1b5 100644 --- a/src/gui/qgsattributetypeloaddialog.cpp +++ b/src/gui/qgsattributetypeloaddialog.cpp @@ -17,22 +17,22 @@ #include "qgsattributetypeloaddialog.h" -#include "qgsmaplayer.h" -#include "qgsvectordataprovider.h" #include "qgslogger.h" +#include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" +#include "qgsvectordataprovider.h" -#include -#include #include -#include -#include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include QgsAttributeTypeLoadDialog::QgsAttributeTypeLoadDialog( QgsVectorLayer *vl ) : QDialog() diff --git a/src/gui/qgsattributetypeloaddialog.h b/src/gui/qgsattributetypeloaddialog.h index c3b8fcdf991..5d8949f8aba 100644 --- a/src/gui/qgsattributetypeloaddialog.h +++ b/src/gui/qgsattributetypeloaddialog.h @@ -19,9 +19,9 @@ #include "ui_qgsattributeloadfrommap.h" +#include #include "qgsfeature.h" #include "qgsvectorlayer.h" -#include class QDialog; class QLayout; diff --git a/src/gui/qgsblendmodecombobox.cpp b/src/gui/qgsblendmodecombobox.cpp index 337835cf19e..1250cd452d1 100644 --- a/src/gui/qgsblendmodecombobox.cpp +++ b/src/gui/qgsblendmodecombobox.cpp @@ -16,13 +16,13 @@ ***************************************************************************/ #include "qgis.h" -#include "qgslogger.h" #include "qgsblendmodecombobox.h" +#include "qgslogger.h" #include +#include #include #include -#include QgsBlendModeComboBox::QgsBlendModeComboBox( QWidget* parent ) : QComboBox( parent ) { diff --git a/src/gui/qgsbusyindicatordialog.cpp b/src/gui/qgsbusyindicatordialog.cpp index bb231d6d41f..7e230a61fe4 100644 --- a/src/gui/qgsbusyindicatordialog.cpp +++ b/src/gui/qgsbusyindicatordialog.cpp @@ -18,8 +18,8 @@ #include "qgsbusyindicatordialog.h" #include -#include #include +#include #include QgsBusyIndicatorDialog::QgsBusyIndicatorDialog( const QString& message, QWidget* parent, Qt::WindowFlags fl ) diff --git a/src/gui/qgscharacterselectdialog.h b/src/gui/qgscharacterselectdialog.h index a6f92359a35..54032417dd7 100644 --- a/src/gui/qgscharacterselectdialog.h +++ b/src/gui/qgscharacterselectdialog.h @@ -17,10 +17,10 @@ #ifndef QGSCHARACTERSELECTDIALOG_H #define QGSCHARACTERSELECTDIALOG_H -#include -#include -#include "qgisgui.h" #include "ui_qgscharacterselectdialogbase.h" +#include +#include +#include "qgisgui.h" class CharacterWidget; diff --git a/src/gui/qgscodeeditor.cpp b/src/gui/qgscodeeditor.cpp index b1edf0dc68a..cadb0aef497 100644 --- a/src/gui/qgscodeeditor.cpp +++ b/src/gui/qgscodeeditor.cpp @@ -16,10 +16,10 @@ #include "qgscodeeditor.h" +#include +#include #include #include -#include -#include QgsCodeEditor::QgsCodeEditor( QWidget *parent, QString title, bool folding, bool margin ) : QsciScintilla( parent ) diff --git a/src/gui/qgscodeeditorcss.cpp b/src/gui/qgscodeeditorcss.cpp index bf9ba449950..30b248d25b4 100644 --- a/src/gui/qgscodeeditorcss.cpp +++ b/src/gui/qgscodeeditorcss.cpp @@ -16,10 +16,10 @@ #include "qgsapplication.h" #include "qgscodeeditorcss.h" -#include -#include #include #include +#include +#include QgsCodeEditorCSS::QgsCodeEditorCSS( QWidget *parent ) diff --git a/src/gui/qgscodeeditorhtml.cpp b/src/gui/qgscodeeditorhtml.cpp index 7fb11168252..9198b34c2a5 100644 --- a/src/gui/qgscodeeditorhtml.cpp +++ b/src/gui/qgscodeeditorhtml.cpp @@ -16,10 +16,10 @@ #include "qgsapplication.h" #include "qgscodeeditorhtml.h" -#include -#include #include #include +#include +#include QgsCodeEditorHTML::QgsCodeEditorHTML( QWidget *parent ) diff --git a/src/gui/qgscodeeditorpython.cpp b/src/gui/qgscodeeditorpython.cpp index b234e5e922c..3a226ff3d5f 100644 --- a/src/gui/qgscodeeditorpython.cpp +++ b/src/gui/qgscodeeditorpython.cpp @@ -17,13 +17,13 @@ #include "qgscodeeditorpython.h" #include "qgslogger.h" -#include -#include -#include #include +#include #include -#include #include +#include +#include +#include QgsCodeEditorPython::QgsCodeEditorPython( QWidget *parent, const QList &filenames ) : QgsCodeEditor( parent ) diff --git a/src/gui/qgscodeeditorsql.cpp b/src/gui/qgscodeeditorsql.cpp index ce7126d8355..898d7b8109c 100644 --- a/src/gui/qgscodeeditorsql.cpp +++ b/src/gui/qgscodeeditorsql.cpp @@ -16,10 +16,10 @@ #include "qgsapplication.h" #include "qgscodeeditorsql.h" -#include -#include #include #include +#include +#include QgsCodeEditorSQL::QgsCodeEditorSQL( QWidget *parent ) diff --git a/src/gui/qgscollapsiblegroupbox.cpp b/src/gui/qgscollapsiblegroupbox.cpp index cf4425fd590..db6c0c1cbe2 100644 --- a/src/gui/qgscollapsiblegroupbox.cpp +++ b/src/gui/qgscollapsiblegroupbox.cpp @@ -20,12 +20,12 @@ #include "qgsapplication.h" #include "qgslogger.h" -#include #include #include -#include -#include #include +#include +#include +#include QIcon QgsCollapsibleGroupBoxBasic::mCollapseIcon; QIcon QgsCollapsibleGroupBoxBasic::mExpandIcon; diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h index 63591c5fd61..d2deb6163cc 100644 --- a/src/gui/qgscollapsiblegroupbox.h +++ b/src/gui/qgscollapsiblegroupbox.h @@ -21,10 +21,10 @@ #include "qgisgui.h" #include -#include -#include -#include #include +#include +#include +#include class QToolButton; class QScrollArea; diff --git a/src/gui/qgscolorbutton.cpp b/src/gui/qgscolorbutton.cpp index 6fdd1010cf8..67ddc583a68 100644 --- a/src/gui/qgscolorbutton.cpp +++ b/src/gui/qgscolorbutton.cpp @@ -13,21 +13,21 @@ * * ***************************************************************************/ +#include "qgsapplication.h" #include "qgscolorbutton.h" #include "qgscolordialog.h" -#include "qgsapplication.h" +#include "qgscursors.h" #include "qgslogger.h" #include "qgssymbollayerv2utils.h" -#include "qgscursors.h" +#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include #ifdef Q_OS_WIN #include diff --git a/src/gui/qgscolorbuttonv2.cpp b/src/gui/qgscolorbuttonv2.cpp index 9c1bdb3d11f..7c6284de609 100644 --- a/src/gui/qgscolorbuttonv2.cpp +++ b/src/gui/qgscolorbuttonv2.cpp @@ -13,30 +13,30 @@ * * ***************************************************************************/ +#include "qgsapplication.h" #include "qgscolorbuttonv2.h" #include "qgscolordialog.h" -#include "qgsapplication.h" +#include "qgscolorschemeregistry.h" +#include "qgscolorswatchgrid.h" +#include "qgscolorwidgets.h" +#include "qgscursors.h" #include "qgslogger.h" #include "qgssymbollayerv2utils.h" -#include "qgscursors.h" -#include "qgscolorswatchgrid.h" -#include "qgscolorschemeregistry.h" -#include "qgscolorwidgets.h" -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include +#include #include -#include -#include -#include QgsColorButtonV2::QgsColorButtonV2( QWidget *parent, QString cdt, QgsColorSchemeRegistry* registry ) : QToolButton( parent ) diff --git a/src/gui/qgscolorbuttonv2.h b/src/gui/qgscolorbuttonv2.h index 5922644697a..a80c60fc529 100644 --- a/src/gui/qgscolorbuttonv2.h +++ b/src/gui/qgscolorbuttonv2.h @@ -16,8 +16,8 @@ #define QGSCOLORBUTTONV2_H #include -#include #include +#include #include "qgscolorscheme.h" class QMimeData; diff --git a/src/gui/qgscolordialog.cpp b/src/gui/qgscolordialog.cpp index a88a1e40efa..b20c99403e2 100644 --- a/src/gui/qgscolordialog.cpp +++ b/src/gui/qgscolordialog.cpp @@ -14,21 +14,21 @@ * * ***************************************************************************/ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "qgsapplication.h" #include "qgscolordialog.h" #include "qgscolorscheme.h" #include "qgscolorschemeregistry.h" -#include "qgssymbollayerv2utils.h" #include "qgscursors.h" -#include "qgsapplication.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "qgssymbollayerv2utils.h" QgsColorDialog::QgsColorDialog() { diff --git a/src/gui/qgscolordialog.h b/src/gui/qgscolordialog.h index d0f7aa6deb6..0ceeaf85adc 100644 --- a/src/gui/qgscolordialog.h +++ b/src/gui/qgscolordialog.h @@ -17,9 +17,9 @@ #ifndef QGSCOLORDIALOG_H #define QGSCOLORDIALOG_H +#include "ui_qgscolordialog.h" #include #include "qgisgui.h" -#include "ui_qgscolordialog.h" class QColor; diff --git a/src/gui/qgscolorschemelist.cpp b/src/gui/qgscolorschemelist.cpp index 64804b71f95..6b918ad9eb6 100644 --- a/src/gui/qgscolorschemelist.cpp +++ b/src/gui/qgscolorschemelist.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include "qgscolorschemelist.h" +#include +#include +#include +#include +#include #include "qgsapplication.h" +#include "qgscolordialog.h" +#include "qgscolorschemelist.h" #include "qgslogger.h" #include "qgssymbollayerv2utils.h" -#include "qgscolordialog.h" -#include -#include -#include -#include -#include #ifdef ENABLE_MODELTEST #include "modeltest.h" diff --git a/src/gui/qgscolorschemelist.h b/src/gui/qgscolorschemelist.h index 0c737813b57..62a47023114 100644 --- a/src/gui/qgscolorschemelist.h +++ b/src/gui/qgscolorschemelist.h @@ -15,11 +15,11 @@ #ifndef QGSCOLORSCHEMELIST_H #define QGSCOLORSCHEMELIST_H -#include "qgscolorscheme.h" -#include #include -#include #include +#include +#include +#include "qgscolorscheme.h" class QMimeData; diff --git a/src/gui/qgscolorswatchgrid.cpp b/src/gui/qgscolorswatchgrid.cpp index 24086fa51e8..5b717532014 100644 --- a/src/gui/qgscolorswatchgrid.cpp +++ b/src/gui/qgscolorswatchgrid.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include "qgscolorswatchgrid.h" -#include "qgsapplication.h" -#include "qgslogger.h" -#include -#include #include +#include +#include +#include "qgsapplication.h" +#include "qgscolorswatchgrid.h" +#include "qgslogger.h" #define NUMBER_COLORS_PER_ROW 10 //number of color swatches per row #define SWATCH_SIZE 14 //width/height of color swatches diff --git a/src/gui/qgscolorswatchgrid.h b/src/gui/qgscolorswatchgrid.h index e015bf5a3c8..96a8399d45b 100644 --- a/src/gui/qgscolorswatchgrid.h +++ b/src/gui/qgscolorswatchgrid.h @@ -15,9 +15,9 @@ #ifndef QGSCOLORSWATCHGRID_H #define QGSCOLORSWATCHGRID_H -#include "qgscolorscheme.h" #include #include +#include "qgscolorscheme.h" /** \ingroup gui * \class QgsColorSwatchGrid diff --git a/src/gui/qgscolorwidgets.cpp b/src/gui/qgscolorwidgets.cpp index 4f18dde0bfa..1ce6fa5859b 100644 --- a/src/gui/qgscolorwidgets.cpp +++ b/src/gui/qgscolorwidgets.cpp @@ -13,21 +13,21 @@ * * ***************************************************************************/ -#include "qgscolorwidgets.h" -#include "qgsapplication.h" -#include "qgssymbollayerv2utils.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "qgsapplication.h" +#include "qgscolorwidgets.h" +#include "qgssymbollayerv2utils.h" // diff --git a/src/gui/qgscomposerruler.cpp b/src/gui/qgscomposerruler.cpp index 48a9123b233..31ff04a6168 100644 --- a/src/gui/qgscomposerruler.cpp +++ b/src/gui/qgscomposerruler.cpp @@ -1,10 +1,10 @@ -#include "qgscomposerruler.h" -#include "qgscomposition.h" -#include "qgis.h" +#include #include #include #include -#include +#include "qgis.h" +#include "qgscomposerruler.h" +#include "qgscomposition.h" const int RULER_FONT_SIZE = 8; const unsigned int COUNT_VALID_MULTIPLES = 3; diff --git a/src/gui/qgscomposerruler.h b/src/gui/qgscomposerruler.h index eccbf11e34f..7574309dfb2 100644 --- a/src/gui/qgscomposerruler.h +++ b/src/gui/qgscomposerruler.h @@ -1,8 +1,8 @@ #ifndef QGSCOMPOSERRULER_H #define QGSCOMPOSERRULER_H -#include "qgscomposeritem.h" #include +#include "qgscomposeritem.h" class QgsComposition; class QGraphicsLineItem; diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp index 12654c5bf04..11b697f8dc7 100644 --- a/src/gui/qgscomposerview.cpp +++ b/src/gui/qgscomposerview.cpp @@ -16,36 +16,36 @@ ***************************************************************************/ #include -#include -#include -#include #include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include "qgsaddremovemultiframecommand.h" #include "qgsapplication.h" -#include "qgscomposerview.h" #include "qgscomposerarrow.h" +#include "qgscomposerattributetablev2.h" #include "qgscomposerframe.h" #include "qgscomposerhtml.h" +#include "qgscomposeritemgroup.h" #include "qgscomposerlabel.h" #include "qgscomposerlegend.h" #include "qgscomposermap.h" #include "qgscomposermousehandles.h" -#include "qgscomposeritemgroup.h" #include "qgscomposerpicture.h" #include "qgscomposerruler.h" #include "qgscomposerscalebar.h" #include "qgscomposershape.h" -#include "qgscomposerattributetablev2.h" -#include "qgslogger.h" -#include "qgsaddremovemultiframecommand.h" -#include "qgspaperitem.h" -#include "qgsmapcanvas.h" //for QgsMapCanvas::WheelAction -#include "qgscursors.h" #include "qgscomposerutils.h" +#include "qgscomposerview.h" +#include "qgscursors.h" +#include "qgslogger.h" +#include "qgsmapcanvas.h" //for QgsMapCanvas::WheelAction +#include "qgspaperitem.h" QgsComposerView::QgsComposerView( QWidget* parent, const char* name, Qt::WindowFlags f ) : QGraphicsView( parent ) diff --git a/src/gui/qgscredentialdialog.h b/src/gui/qgscredentialdialog.h index 8014ce33406..77baf1eec0a 100644 --- a/src/gui/qgscredentialdialog.h +++ b/src/gui/qgscredentialdialog.h @@ -17,8 +17,8 @@ #ifndef QGSCREDENTIALDIALOG_H #define QGSCREDENTIALDIALOG_H -#include #include +#include #include "qgscredentials.h" #include diff --git a/src/gui/qgsdatadefinedbutton.h b/src/gui/qgsdatadefinedbutton.h index 5bb632d5c7e..6f7b1e2aca7 100644 --- a/src/gui/qgsdatadefinedbutton.h +++ b/src/gui/qgsdatadefinedbutton.h @@ -19,8 +19,8 @@ #include #include #include -#include #include +#include class QgsVectorLayer; class QgsDataDefined; diff --git a/src/gui/qgsdatumtransformdialog.cpp b/src/gui/qgsdatumtransformdialog.cpp index 75c43e5efd0..3892a64f258 100644 --- a/src/gui/qgsdatumtransformdialog.cpp +++ b/src/gui/qgsdatumtransformdialog.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsdatumtransformdialog.h" #include "qgscoordinatetransform.h" +#include "qgsdatumtransformdialog.h" #include "qgslogger.h" #include diff --git a/src/gui/qgsdetaileditemdata.h b/src/gui/qgsdetaileditemdata.h index e08bd5c612f..e1012dc77b5 100644 --- a/src/gui/qgsdetaileditemdata.h +++ b/src/gui/qgsdetaileditemdata.h @@ -19,8 +19,8 @@ #include -#include #include +#include /** \ingroup gui * This class is the data only representation of a diff --git a/src/gui/qgsdetaileditemdelegate.cpp b/src/gui/qgsdetaileditemdelegate.cpp index 4f93c830169..2a85c7e372c 100644 --- a/src/gui/qgsdetaileditemdelegate.cpp +++ b/src/gui/qgsdetaileditemdelegate.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgsdetaileditemdelegate.h" -#include "qgsdetaileditemwidget.h" -#include "qgsdetaileditemdata.h" -#include +#include #include #include -#include -#include -#include #include +#include +#include +#include +#include "qgsdetaileditemdata.h" +#include "qgsdetaileditemdelegate.h" +#include "qgsdetaileditemwidget.h" QgsDetailedItemDelegate::QgsDetailedItemDelegate( QObject * parent ) : QAbstractItemDelegate( parent ), mpWidget( new QgsDetailedItemWidget() ), diff --git a/src/gui/qgsdetaileditemwidget.h b/src/gui/qgsdetaileditemwidget.h index 4313915871a..febb84e8a90 100644 --- a/src/gui/qgsdetaileditemwidget.h +++ b/src/gui/qgsdetaileditemwidget.h @@ -17,8 +17,8 @@ #ifndef QGSDETAILEDITEMWIDGET_H #define QGSDETAILEDITEMWIDGET_H -#include #include +#include /** \ingroup gui * A widget renderer for detailed item views. diff --git a/src/gui/qgsencodingfiledialog.cpp b/src/gui/qgsencodingfiledialog.cpp index 0b6074d33be..3cb9541f70f 100644 --- a/src/gui/qgsencodingfiledialog.cpp +++ b/src/gui/qgsencodingfiledialog.cpp @@ -14,15 +14,15 @@ ***************************************************************************/ #include "qgsencodingfiledialog.h" -#include "qgsproject.h" #include "qgslogger.h" +#include "qgsproject.h" #include "qgsvectordataprovider.h" -#include #include -#include #include #include +#include +#include #include QgsEncodingFileDialog::QgsEncodingFileDialog( QWidget * parent, diff --git a/src/gui/qgsexpressionbuilderdialog.cpp b/src/gui/qgsexpressionbuilderdialog.cpp index 6c504d8cca3..2084a0566ff 100644 --- a/src/gui/qgsexpressionbuilderdialog.cpp +++ b/src/gui/qgsexpressionbuilderdialog.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsexpressionbuilderdialog.h" #include +#include "qgsexpressionbuilderdialog.h" QgsExpressionBuilderDialog::QgsExpressionBuilderDialog( QgsVectorLayer* layer, QString startText, QWidget* parent, QString key ) : QDialog( parent ), mRecentKey( key ) diff --git a/src/gui/qgsexpressionbuilderdialog.h b/src/gui/qgsexpressionbuilderdialog.h index 8fac2ceec29..7555580acbc 100644 --- a/src/gui/qgsexpressionbuilderdialog.h +++ b/src/gui/qgsexpressionbuilderdialog.h @@ -16,9 +16,9 @@ #ifndef QGSEXPRESSIONBUILDERDIALOG_H #define QGSEXPRESSIONBUILDERDIALOG_H +#include "ui_qgsexpressionbuilderdialogbase.h" #include #include "qgsdistancearea.h" -#include "ui_qgsexpressionbuilderdialogbase.h" /** A generic dialog for building expression strings * @remarks This class also shows an example on how to use QgsExpressionBuilderWidget diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp index 7e39efe786e..5b9440d3fc8 100644 --- a/src/gui/qgsexpressionbuilderwidget.cpp +++ b/src/gui/qgsexpressionbuilderwidget.cpp @@ -13,19 +13,19 @@ * * ***************************************************************************/ -#include "qgsexpressionbuilderwidget.h" -#include "qgslogger.h" -#include "qgsexpression.h" -#include "qgsmessageviewer.h" #include "qgsapplication.h" +#include "qgsexpressionbuilderwidget.h" +#include "qgsexpression.h" +#include "qgslogger.h" +#include "qgsmessageviewer.h" #include "qgspythonrunner.h" -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent ) : QWidget( parent ) diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h index 1752d959eaf..c1368fab3e9 100644 --- a/src/gui/qgsexpressionbuilderwidget.h +++ b/src/gui/qgsexpressionbuilderwidget.h @@ -16,15 +16,15 @@ #ifndef QGSEXPRESSIONBUILDER_H #define QGSEXPRESSIONBUILDER_H -#include #include "ui_qgsexpressionbuilder.h" -#include "qgsvectorlayer.h" -#include "qgsexpressionhighlighter.h" +#include #include "qgsdistancearea.h" +#include "qgsexpressionhighlighter.h" +#include "qgsvectorlayer.h" -#include "QStandardItemModel" -#include "QStandardItem" #include "QSortFilterProxyModel" +#include "QStandardItem" +#include "QStandardItemModel" /** Search proxy used to filter the QgsExpressionBuilderWidget tree. * The default search for a tree model only searches top level this will handle one diff --git a/src/gui/qgsexpressionhighlighter.h b/src/gui/qgsexpressionhighlighter.h index eeed6214456..d5b3eab18e3 100644 --- a/src/gui/qgsexpressionhighlighter.h +++ b/src/gui/qgsexpressionhighlighter.h @@ -16,12 +16,12 @@ #ifndef QGSEXPRESSIONHIGHLIGHTER_H #define QGSEXPRESSIONHIGHLIGHTER_H -#include "qgsfield.h" #include +#include "qgsfield.h" #include -#include #include +#include class QTextDocument; diff --git a/src/gui/qgsexpressionselectiondialog.cpp b/src/gui/qgsexpressionselectiondialog.cpp index 9df6f6ca7f7..eb7abdb9bc9 100644 --- a/src/gui/qgsexpressionselectiondialog.cpp +++ b/src/gui/qgsexpressionselectiondialog.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsexpressionselectiondialog.h" #include "qgsapplication.h" #include "qgsexpression.h" +#include "qgsexpressionselectiondialog.h" #include diff --git a/src/gui/qgsexpressionselectiondialog.h b/src/gui/qgsexpressionselectiondialog.h index fb34913f89b..db7f162c69d 100644 --- a/src/gui/qgsexpressionselectiondialog.h +++ b/src/gui/qgsexpressionselectiondialog.h @@ -16,9 +16,9 @@ #ifndef QGSEXPRESSIONSELECTIONDIALOG_H #define QGSEXPRESSIONSELECTIONDIALOG_H +#include "ui_qgsexpressionselectiondialogbase.h" #include #include "qgsdistancearea.h" -#include "ui_qgsexpressionselectiondialogbase.h" /** * This class offers a dialog to change feature selections. diff --git a/src/gui/qgsfeatureselectiondlg.cpp b/src/gui/qgsfeatureselectiondlg.cpp index 7b019f19a3b..78608118fa7 100644 --- a/src/gui/qgsfeatureselectiondlg.cpp +++ b/src/gui/qgsfeatureselectiondlg.cpp @@ -15,8 +15,8 @@ #include "qgsfeatureselectiondlg.h" -#include "qgsgenericfeatureselectionmanager.h" #include "qgsdistancearea.h" +#include "qgsgenericfeatureselectionmanager.h" QgsFeatureSelectionDlg::QgsFeatureSelectionDlg( QgsVectorLayer* vl, QWidget *parent ) : QDialog( parent ) diff --git a/src/gui/qgsfieldexpressionwidget.cpp b/src/gui/qgsfieldexpressionwidget.cpp index cba0add6bdb..09fbbcd9a6a 100644 --- a/src/gui/qgsfieldexpressionwidget.cpp +++ b/src/gui/qgsfieldexpressionwidget.cpp @@ -17,10 +17,10 @@ #include #include "qgsapplication.h" -#include "qgsfieldexpressionwidget.h" -#include "qgsexpressionbuilderdialog.h" -#include "qgsfieldproxymodel.h" #include "qgsdistancearea.h" +#include "qgsexpressionbuilderdialog.h" +#include "qgsfieldexpressionwidget.h" +#include "qgsfieldproxymodel.h" QgsFieldExpressionWidget::QgsFieldExpressionWidget( QWidget *parent ) : QWidget( parent ) diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h index 37913601a4f..0cb4cb00756 100644 --- a/src/gui/qgsfieldexpressionwidget.h +++ b/src/gui/qgsfieldexpressionwidget.h @@ -16,11 +16,11 @@ #ifndef QGSFIELDEXPRESSIONWIDGET_H #define QGSFIELDEXPRESSIONWIDGET_H -#include -#include -#include -#include #include +#include +#include +#include +#include #include "qgsdistancearea.h" #include "qgsfieldproxymodel.h" diff --git a/src/gui/qgsfieldmodel.cpp b/src/gui/qgsfieldmodel.cpp index 1b8621222c2..7bc69a9fe2a 100644 --- a/src/gui/qgsfieldmodel.cpp +++ b/src/gui/qgsfieldmodel.cpp @@ -16,9 +16,9 @@ #include #include "qgsfieldmodel.h" +#include "qgslogger.h" #include "qgsmaplayermodel.h" #include "qgsmaplayerproxymodel.h" -#include "qgslogger.h" QgsFieldModel::QgsFieldModel( QObject *parent ) diff --git a/src/gui/qgsfieldmodel.h b/src/gui/qgsfieldmodel.h index 5b35fba4362..4d240d71f3f 100644 --- a/src/gui/qgsfieldmodel.h +++ b/src/gui/qgsfieldmodel.h @@ -17,8 +17,8 @@ #define QGSFIELDMODEL_H #include -#include #include +#include #include "qgsvectorlayer.h" diff --git a/src/gui/qgsfieldproxymodel.cpp b/src/gui/qgsfieldproxymodel.cpp index ad1bcdb21e9..655e9691a96 100644 --- a/src/gui/qgsfieldproxymodel.cpp +++ b/src/gui/qgsfieldproxymodel.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsfieldproxymodel.h" #include "qgsfieldmodel.h" +#include "qgsfieldproxymodel.h" #include "qgsvectorlayer.h" QgsFieldProxyModel::QgsFieldProxyModel( QObject *parent ) diff --git a/src/gui/qgsfieldvalidator.cpp b/src/gui/qgsfieldvalidator.cpp index a716661f63c..637f58f2fd3 100644 --- a/src/gui/qgsfieldvalidator.cpp +++ b/src/gui/qgsfieldvalidator.cpp @@ -19,15 +19,15 @@ #include "qgsfieldvalidator.h" -#include -#include #include -#include +#include #include +#include +#include +#include "qgsfield.h" #include "qgslogger.h" #include "qgslonglongvalidator.h" -#include "qgsfield.h" QgsFieldValidator::QgsFieldValidator( QObject *parent, const QgsField &field, QString defaultValue, QString dateFormat ) : QValidator( parent ) diff --git a/src/gui/qgsfieldvalidator.h b/src/gui/qgsfieldvalidator.h index cf31cc2c0d1..a7a90ed4887 100644 --- a/src/gui/qgsfieldvalidator.h +++ b/src/gui/qgsfieldvalidator.h @@ -20,9 +20,9 @@ #ifndef QGSFIELDVALIDATOR_H #define QGSFIELDVALIDATOR_H +#include #include #include -#include #include "qgsfield.h" diff --git a/src/gui/qgsfiledropedit.cpp b/src/gui/qgsfiledropedit.cpp index d3ee7ceac4d..b5886d44c3f 100644 --- a/src/gui/qgsfiledropedit.cpp +++ b/src/gui/qgsfiledropedit.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include "qgsfiledropedit.h" #include #include +#include #include #include -#include +#include "qgsfiledropedit.h" /*! \class QgsFileDropEdit diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp index cd7e0136a7a..6a3bb1a62d6 100644 --- a/src/gui/qgsfilterlineedit.cpp +++ b/src/gui/qgsfilterlineedit.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsfilterlineedit.h" #include "qgsapplication.h" +#include "qgsfilterlineedit.h" -#include -#include #include +#include +#include QgsFilterLineEdit::QgsFilterLineEdit( QWidget* parent, QString nullValue ) : QLineEdit( parent ) diff --git a/src/gui/qgsformannotationitem.cpp b/src/gui/qgsformannotationitem.cpp index 3507caeda60..9982b920d8b 100644 --- a/src/gui/qgsformannotationitem.cpp +++ b/src/gui/qgsformannotationitem.cpp @@ -15,16 +15,8 @@ * * ***************************************************************************/ -#include "qgsformannotationitem.h" -#include "qgsattributeeditor.h" -#include "qgsfeature.h" -#include "qgslogger.h" -#include "qgsmapcanvas.h" -#include "qgsmaplayerregistry.h" -#include "qgsmaptool.h" -#include "qgsvectorlayer.h" -#include #include +#include #include #include #include @@ -32,6 +24,14 @@ #include #include #include +#include "qgsattributeeditor.h" +#include "qgsfeature.h" +#include "qgsformannotationitem.h" +#include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaptool.h" +#include "qgsvectorlayer.h" QgsFormAnnotationItem::QgsFormAnnotationItem( QgsMapCanvas* canvas, QgsVectorLayer* vlayer, bool hasFeature, int feature ) : QgsAnnotationItem( canvas ) diff --git a/src/gui/qgsformannotationitem.h b/src/gui/qgsformannotationitem.h index 83248a3dfe7..e0405583180 100644 --- a/src/gui/qgsformannotationitem.h +++ b/src/gui/qgsformannotationitem.h @@ -18,9 +18,9 @@ #ifndef QGSFORMANNOTATIONITEM_H #define QGSFORMANNOTATIONITEM_H +#include #include "qgsannotationitem.h" #include "qgsfeature.h" -#include class QGraphicsProxyWidget; diff --git a/src/gui/qgsgenericprojectionselector.cpp b/src/gui/qgsgenericprojectionselector.cpp index 3c7c4f1dcb3..ca7e806e915 100644 --- a/src/gui/qgsgenericprojectionselector.cpp +++ b/src/gui/qgsgenericprojectionselector.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ #include "qgsapplication.h" -#include #include +#include #include /** diff --git a/src/gui/qgsgenericprojectionselector.h b/src/gui/qgsgenericprojectionselector.h index 8922c90d872..584f9ccacca 100644 --- a/src/gui/qgsgenericprojectionselector.h +++ b/src/gui/qgsgenericprojectionselector.h @@ -17,8 +17,8 @@ ***************************************************************************/ #ifndef QGSGENERICPROJECTIONSELECTOR_H #define QGSGENERICPROJECTIONSELECTOR_H -#include #include +#include #include diff --git a/src/gui/qgshighlight.cpp b/src/gui/qgshighlight.cpp index 570bca34ca0..a8bd15a9c06 100644 --- a/src/gui/qgshighlight.cpp +++ b/src/gui/qgshighlight.cpp @@ -15,8 +15,8 @@ #include -#include "qgsmarkersymbollayerv2.h" #include "qgslinesymbollayerv2.h" +#include "qgsmarkersymbollayerv2.h" #include "qgscoordinatetransform.h" #include "qgsfillsymbollayerv2.h" diff --git a/src/gui/qgshighlight.h b/src/gui/qgshighlight.h index a18b59cd9fc..eb1dd5709bb 100644 --- a/src/gui/qgshighlight.h +++ b/src/gui/qgshighlight.h @@ -15,17 +15,17 @@ #ifndef QGSHIGHLIGHT_H #define QGSHIGHLIGHT_H -#include "qgsmapcanvasitem.h" -#include "qgsfeaturestore.h" -#include "qgsgeometry.h" -#include "qgsrendererv2.h" -#include "qgssymbolv2.h" #include #include #include -#include #include #include +#include +#include "qgsfeaturestore.h" +#include "qgsgeometry.h" +#include "qgsmapcanvasitem.h" +#include "qgsrendererv2.h" +#include "qgssymbolv2.h" class QgsMapLayer; class QgsVectorLayer; diff --git a/src/gui/qgshistogramwidget.cpp b/src/gui/qgshistogramwidget.cpp index 57fde6c0318..a861eb62085 100644 --- a/src/gui/qgshistogramwidget.cpp +++ b/src/gui/qgshistogramwidget.cpp @@ -15,28 +15,28 @@ * * ***************************************************************************/ -#include "qgshistogramwidget.h" #include "qgsapplication.h" -#include "qgsvectorlayer.h" +#include "qgshistogramwidget.h" #include "qgsstatisticalsummary.h" +#include "qgsvectorlayer.h" -#include -#include #include +#include +#include // QWT Charting widget #include +#include #include -#include #include #include +#include +#include #include #include -#include -#include #if defined(QWT_VERSION) && QWT_VERSION>=0x060000 -#include #include +#include #else #include "../raster/qwt5_histogram_item.h" #endif diff --git a/src/gui/qgshistogramwidget.h b/src/gui/qgshistogramwidget.h index fb48796d415..b859d7707ba 100644 --- a/src/gui/qgshistogramwidget.h +++ b/src/gui/qgshistogramwidget.h @@ -19,11 +19,11 @@ #include "ui_qgshistogramwidgetbase.h" +#include +#include +#include "qgsgraduatedsymbolrendererv2.h" #include "qgshistogram.h" #include "qgsstatisticalsummary.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include -#include class QgsVectorLayer; class QgsGraduatedSymbolRendererV2; diff --git a/src/gui/qgshtmlannotationitem.cpp b/src/gui/qgshtmlannotationitem.cpp index 0e70e8a1afc..f77de3fb3e6 100644 --- a/src/gui/qgshtmlannotationitem.cpp +++ b/src/gui/qgshtmlannotationitem.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgshtmlannotationitem.h" #include "qgsattributeeditor.h" +#include "qgsexpression.h" #include "qgsfeature.h" +#include "qgshtmlannotationitem.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" #include "qgsmaptool.h" -#include "qgsvectorlayer.h" -#include "qgsexpression.h" #include "qgsnetworkaccessmanager.h" +#include "qgsvectorlayer.h" -#include #include +#include #include #include #include diff --git a/src/gui/qgshtmlannotationitem.h b/src/gui/qgshtmlannotationitem.h index b6abe532ada..a9468bd42f2 100644 --- a/src/gui/qgshtmlannotationitem.h +++ b/src/gui/qgshtmlannotationitem.h @@ -20,8 +20,8 @@ #include "qgsannotationitem.h" #include "qgsfeature.h" -#include "qgswebview.h" #include "qgswebframe.h" +#include "qgswebview.h" #include diff --git a/src/gui/qgslegendinterface.h b/src/gui/qgslegendinterface.h index ee5610c0a60..0b7dc3f8dfe 100644 --- a/src/gui/qgslegendinterface.h +++ b/src/gui/qgslegendinterface.h @@ -17,10 +17,10 @@ #ifndef QGSLEGENDINTERFACE_H #define QGSLEGENDINTERFACE_H +#include #include #include #include -#include class QgsMapLayer; class QTreeWidgetItem; diff --git a/src/gui/qgslonglongvalidator.h b/src/gui/qgslonglongvalidator.h index 39ed3f5516d..eaf270876d6 100644 --- a/src/gui/qgslonglongvalidator.h +++ b/src/gui/qgslonglongvalidator.h @@ -21,8 +21,8 @@ #define QGSLONGLONGVALIDATOR_H #include -#include #include +#include class GUI_EXPORT QgsLongLongValidator : public QValidator { diff --git a/src/gui/qgsmanageconnectionsdialog.h b/src/gui/qgsmanageconnectionsdialog.h index e76f0a17903..c8f1c7718a1 100644 --- a/src/gui/qgsmanageconnectionsdialog.h +++ b/src/gui/qgsmanageconnectionsdialog.h @@ -18,9 +18,9 @@ #ifndef QGSMANAGECONNECTIONSDIALOG_H #define QGSMANAGECONNECTIONSDIALOG_H +#include "ui_qgsmanageconnectionsdialogbase.h" #include #include -#include "ui_qgsmanageconnectionsdialogbase.h" class GUI_EXPORT QgsManageConnectionsDialog : public QDialog, private Ui::QgsManageConnectionsDialogBase { diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp index 104ebf9cd0f..cf9612d863d 100644 --- a/src/gui/qgsmapcanvas.cpp +++ b/src/gui/qgsmapcanvas.cpp @@ -16,7 +16,6 @@ email : sherman at mrcc.com ***************************************************************************/ -#include #include #include #include @@ -30,13 +29,15 @@ email : sherman at mrcc.com #include #include #include -#include -#include #include +#include #include #include +#include +#include #include +#include #include "qgis.h" #include "qgsapplication.h" #include "qgscrscache.h" @@ -47,22 +48,21 @@ email : sherman at mrcc.com #include "qgsmapcanvassnappingutils.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" +#include "qgsmapoverviewcanvas.h" +#include "qgsmaprenderercache.h" +#include "qgsmaprenderercustompainterjob.h" +#include "qgsmaprenderer.h" +#include "qgsmaprendererparalleljob.h" +#include "qgsmaprenderersequentialjob.h" #include "qgsmaptoolpan.h" #include "qgsmaptoolzoom.h" #include "qgsmaptopixel.h" -#include "qgsmapoverviewcanvas.h" -#include "qgsmaprenderer.h" -#include "qgsmaprenderercache.h" -#include "qgsmaprenderercustompainterjob.h" -#include "qgsmaprendererparalleljob.h" -#include "qgsmaprenderersequentialjob.h" #include "qgsmessagelog.h" #include "qgsmessageviewer.h" #include "qgspallabeling.h" #include "qgsproject.h" #include "qgsrubberband.h" #include "qgsvectorlayer.h" -#include /** @deprecated to be deleted, stuff from here should be moved elsewhere */ diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index 5561ea5352c..148a98dd5ba 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -20,13 +20,13 @@ #include "qgsconfig.h" +#include #include #include -#include -#include "qgsrectangle.h" -#include "qgspoint.h" #include "qgis.h" +#include "qgspoint.h" +#include "qgsrectangle.h" #include #include diff --git a/src/gui/qgsmapcanvasitem.cpp b/src/gui/qgsmapcanvasitem.cpp index 763f3401129..86abd8f6d95 100644 --- a/src/gui/qgsmapcanvasitem.cpp +++ b/src/gui/qgsmapcanvasitem.cpp @@ -14,17 +14,17 @@ ***************************************************************************/ -#include "qgsmapcanvasitem.h" +#include +#include +#include +#include +#include +#include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmapcanvasitem.h" #include "qgsmaprenderer.h" #include "qgsmaptopixel.h" #include "qgsrendercontext.h" -#include -#include -#include -#include -#include -#include "qgslogger.h" QgsMapCanvasItem::QgsMapCanvasItem( QgsMapCanvas* mapCanvas ) : QGraphicsItem() diff --git a/src/gui/qgsmapcanvasmap.cpp b/src/gui/qgsmapcanvasmap.cpp index cbdcd3b8485..11594224714 100644 --- a/src/gui/qgsmapcanvasmap.cpp +++ b/src/gui/qgsmapcanvasmap.cpp @@ -16,9 +16,9 @@ #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmapcanvasmap.h" +#include "qgsmaplayer.h" #include "qgsmaprenderer.h" #include "qgsmapsettings.h" -#include "qgsmaplayer.h" #include diff --git a/src/gui/qgsmapcanvassnapper.cpp b/src/gui/qgsmapcanvassnapper.cpp index 9318c43792a..7d8f5825b83 100644 --- a/src/gui/qgsmapcanvassnapper.cpp +++ b/src/gui/qgsmapcanvassnapper.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgsmapcanvassnapper.h" +#include +#include "qgsgeometry.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmapcanvassnapper.h" #include "qgsmaplayerregistry.h" #include "qgsmaptopixel.h" #include "qgsproject.h" -#include "qgsvectorlayer.h" #include "qgstolerance.h" -#include -#include "qgslogger.h" -#include "qgsgeometry.h" +#include "qgsvectorlayer.h" QgsMapCanvasSnapper::QgsMapCanvasSnapper( QgsMapCanvas* canvas ) : mMapCanvas( canvas ) diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h index 74e8718b842..cf28f2825cd 100644 --- a/src/gui/qgsmaplayeractionregistry.h +++ b/src/gui/qgsmaplayeractionregistry.h @@ -16,10 +16,10 @@ #ifndef QGSMAPLAYERACTIONREGISTRY_H #define QGSMAPLAYERACTIONREGISTRY_H -#include +#include #include #include -#include +#include #include "qgsmaplayer.h" diff --git a/src/gui/qgsmaplayermodel.cpp b/src/gui/qgsmaplayermodel.cpp index 9e052eaf6fc..4949a375336 100644 --- a/src/gui/qgsmaplayermodel.cpp +++ b/src/gui/qgsmaplayermodel.cpp @@ -15,10 +15,10 @@ #include +#include "qgsapplication.h" #include "qgsdataitem.h" #include "qgsmaplayermodel.h" #include "qgsmaplayerregistry.h" -#include "qgsapplication.h" #include "qgsvectorlayer.h" diff --git a/src/gui/qgsmaplayerproxymodel.cpp b/src/gui/qgsmaplayerproxymodel.cpp index b5edc7dfcce..84b73dddeeb 100644 --- a/src/gui/qgsmaplayerproxymodel.cpp +++ b/src/gui/qgsmaplayerproxymodel.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsmaplayerproxymodel.h" -#include "qgsmaplayermodel.h" #include "qgsmaplayer.h" +#include "qgsmaplayermodel.h" +#include "qgsmaplayerproxymodel.h" #include "qgsvectorlayer.h" QgsMapLayerProxyModel::QgsMapLayerProxyModel( QObject *parent ) diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp index 6711d003aae..4232a2b8f94 100644 --- a/src/gui/qgsmapoverviewcanvas.cpp +++ b/src/gui/qgsmapoverviewcanvas.cpp @@ -23,12 +23,12 @@ #include "qgsmaprenderersequentialjob.h" #include "qgsmaptopixel.h" +#include +#include #include #include #include -#include #include "qgslogger.h" -#include //! widget that serves as rectangle showing current extent in overview class QgsPanningWidget : public QWidget diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h index 4b160880d57..75b101d67ec 100644 --- a/src/gui/qgsmapoverviewcanvas.h +++ b/src/gui/qgsmapoverviewcanvas.h @@ -21,10 +21,10 @@ #include +#include +#include #include #include -#include -#include class QgsMapCanvas; class QgsPanningWidget; // defined in .cpp diff --git a/src/gui/qgsmaptip.cpp b/src/gui/qgsmaptip.cpp index 1a9e8011293..68012980911 100644 --- a/src/gui/qgsmaptip.cpp +++ b/src/gui/qgsmaptip.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ // QGIS includes +#include "qgsexpression.h" +#include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaptool.h" #include "qgsvectorlayer.h" -#include "qgsexpression.h" -#include "qgslogger.h" // Qt includes #include -#include #include +#include #include "qgsmaptip.h" diff --git a/src/gui/qgsmaptool.cpp b/src/gui/qgsmaptool.cpp index 21ad73f3b51..11210b9ee8c 100644 --- a/src/gui/qgsmaptool.cpp +++ b/src/gui/qgsmaptool.cpp @@ -13,14 +13,14 @@ * * ***************************************************************************/ -#include "qgslogger.h" -#include "qgsmaptool.h" -#include "qgsmapcanvas.h" -#include "qgsmaptopixel.h" -#include "qgsmaprenderer.h" -#include "qgsrendercontext.h" -#include #include +#include +#include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmaprenderer.h" +#include "qgsmaptool.h" +#include "qgsmaptopixel.h" +#include "qgsrendercontext.h" QgsMapTool::QgsMapTool( QgsMapCanvas* canvas ) : QObject( canvas ) diff --git a/src/gui/qgsmaptool.h b/src/gui/qgsmaptool.h index 073293a0585..f2982191842 100644 --- a/src/gui/qgsmaptool.h +++ b/src/gui/qgsmaptool.h @@ -20,8 +20,8 @@ #include "qgsmessagebar.h" #include -#include #include +#include #ifdef HAVE_TOUCH #include diff --git a/src/gui/qgsmaptoolemitpoint.cpp b/src/gui/qgsmaptoolemitpoint.cpp index 34383405c0e..36de0245929 100644 --- a/src/gui/qgsmaptoolemitpoint.cpp +++ b/src/gui/qgsmaptoolemitpoint.cpp @@ -14,9 +14,9 @@ ***************************************************************************/ -#include "qgsmaptoolemitpoint.h" -#include "qgsmapcanvas.h" #include +#include "qgsmapcanvas.h" +#include "qgsmaptoolemitpoint.h" QgsMapToolEmitPoint::QgsMapToolEmitPoint( QgsMapCanvas* canvas ) diff --git a/src/gui/qgsmaptoolemitpoint.h b/src/gui/qgsmaptoolemitpoint.h index eb2cdb29472..97aa90a34f9 100644 --- a/src/gui/qgsmaptoolemitpoint.h +++ b/src/gui/qgsmaptoolemitpoint.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLEMITPOINT_H #define QGSMAPTOOLEMITPOINT_H -#include "qgspoint.h" #include "qgsmaptool.h" +#include "qgspoint.h" class QgsMapCanvas; diff --git a/src/gui/qgsmaptoolidentify.cpp b/src/gui/qgsmaptoolidentify.cpp index 2f4430055ca..0f7d29404f7 100644 --- a/src/gui/qgsmaptoolidentify.cpp +++ b/src/gui/qgsmaptoolidentify.cpp @@ -14,6 +14,7 @@ ***************************************************************************/ #include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" #include "qgscursors.h" #include "qgsdistancearea.h" #include "qgsfeature.h" @@ -23,26 +24,25 @@ #include "qgsidentifymenu.h" #include "qgslogger.h" #include "qgsmapcanvas.h" +#include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" #include "qgsmaptoolidentify.h" #include "qgsmaptopixel.h" #include "qgsmessageviewer.h" -#include "qgsmaplayer.h" -#include "qgsrasterlayer.h" +#include "qgsproject.h" #include "qgsrasteridentifyresult.h" -#include "qgscoordinatereferencesystem.h" +#include "qgsrasterlayer.h" +#include "qgsrendererv2.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgsproject.h" -#include "qgsmaplayerregistry.h" -#include "qgsrendererv2.h" -#include -#include #include +#include +#include #include +#include #include #include -#include QgsMapToolIdentify::QgsMapToolIdentify( QgsMapCanvas* canvas ) : QgsMapTool( canvas ) diff --git a/src/gui/qgsmaptoolidentify.h b/src/gui/qgsmaptoolidentify.h index 2a653090a20..62c2fc7e208 100644 --- a/src/gui/qgsmaptoolidentify.h +++ b/src/gui/qgsmaptoolidentify.h @@ -19,8 +19,8 @@ #include "qgsdistancearea.h" #include "qgsfeature.h" #include "qgsfield.h" -#include "qgsmaptool.h" #include "qgsmaplayer.h" +#include "qgsmaptool.h" #include "qgspoint.h" #include diff --git a/src/gui/qgsmaptoolidentifyfeature.cpp b/src/gui/qgsmaptoolidentifyfeature.cpp index 9fed9b35270..902d25ba2b2 100644 --- a/src/gui/qgsmaptoolidentifyfeature.cpp +++ b/src/gui/qgsmaptoolidentifyfeature.cpp @@ -16,8 +16,8 @@ #include #include "qgscursors.h" -#include "qgsmaptoolidentifyfeature.h" #include "qgsmapcanvas.h" +#include "qgsmaptoolidentifyfeature.h" QgsMapToolIdentifyFeature::QgsMapToolIdentifyFeature( QgsMapCanvas* canvas, QgsVectorLayer* vl ) : QgsMapToolIdentify( canvas ) diff --git a/src/gui/qgsmaptoolpan.cpp b/src/gui/qgsmaptoolpan.cpp index ec3f67e86ef..f00594747ff 100644 --- a/src/gui/qgsmaptoolpan.cpp +++ b/src/gui/qgsmaptoolpan.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ -#include "qgsmaptoolpan.h" -#include "qgsmapcanvas.h" -#include "qgscursors.h" -#include "qgsmaptopixel.h" #include #include #include +#include "qgscursors.h" +#include "qgsmapcanvas.h" +#include "qgsmaptoolpan.h" +#include "qgsmaptopixel.h" QgsMapToolPan::QgsMapToolPan( QgsMapCanvas* canvas ) diff --git a/src/gui/qgsmaptooltouch.cpp b/src/gui/qgsmaptooltouch.cpp index e110ed0af8b..ef09f20620e 100644 --- a/src/gui/qgsmaptooltouch.cpp +++ b/src/gui/qgsmaptooltouch.cpp @@ -13,14 +13,14 @@ * * ***************************************************************************/ -#include "qgsmaptooltouch.h" -#include "qgsmapcanvas.h" -#include "qgscursors.h" -#include "qgsmaptopixel.h" #include #include -#include #include +#include +#include "qgscursors.h" +#include "qgsmapcanvas.h" +#include "qgsmaptooltouch.h" +#include "qgsmaptopixel.h" QgsMapToolTouch::QgsMapToolTouch( QgsMapCanvas* canvas ) diff --git a/src/gui/qgsmaptooltouch.h b/src/gui/qgsmaptooltouch.h index e7805501c67..43ec70489a1 100644 --- a/src/gui/qgsmaptooltouch.h +++ b/src/gui/qgsmaptooltouch.h @@ -16,9 +16,9 @@ #ifndef QGSMAPTOOLTOUCH_H #define QGSMAPTOOLTOUCH_H -#include "qgsmaptool.h" #include #include +#include "qgsmaptool.h" class QgsMapCanvas; diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp index e86a54efa96..680db262d11 100644 --- a/src/gui/qgsmaptoolzoom.cpp +++ b/src/gui/qgsmaptoolzoom.cpp @@ -13,17 +13,17 @@ * * ***************************************************************************/ -#include "qgsmaptoolzoom.h" -#include "qgsmapcanvas.h" -#include "qgsmaptopixel.h" #include "qgscursors.h" +#include "qgsmapcanvas.h" +#include "qgsmaptoolzoom.h" +#include "qgsmaptopixel.h" #include "qgsrubberband.h" -#include -#include #include #include +#include #include +#include #include "qgslogger.h" diff --git a/src/gui/qgsmaptoolzoom.h b/src/gui/qgsmaptoolzoom.h index 87ddbda3b6e..bcb6aece857 100644 --- a/src/gui/qgsmaptoolzoom.h +++ b/src/gui/qgsmaptoolzoom.h @@ -16,8 +16,8 @@ #ifndef QGSMAPTOOLZOOM_H #define QGSMAPTOOLZOOM_H -#include "qgsmaptool.h" #include +#include "qgsmaptool.h" class QgsRubberBand; diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp index 1b21953837f..b47a80167bf 100644 --- a/src/gui/qgsmessagebar.cpp +++ b/src/gui/qgsmessagebar.cpp @@ -15,20 +15,20 @@ * * ***************************************************************************/ +#include "qgsapplication.h" #include "qgsmessagebar.h" #include "qgsmessagebaritem.h" -#include "qgsapplication.h" -#include -#include -#include -#include -#include -#include #include +#include #include #include -#include +#include +#include +#include +#include +#include +#include QgsMessageBar::QgsMessageBar( QWidget *parent ) : QFrame( parent ), mCurrentItem( NULL ) diff --git a/src/gui/qgsmessagebar.h b/src/gui/qgsmessagebar.h index 3472a3f39dc..985a043d198 100644 --- a/src/gui/qgsmessagebar.h +++ b/src/gui/qgsmessagebar.h @@ -19,11 +19,11 @@ #include -#include +#include #include #include -#include #include +#include class QWidget; class QGridLayout; diff --git a/src/gui/qgsmessagebaritem.cpp b/src/gui/qgsmessagebaritem.cpp index a8eeeba61be..1ecb224c5d9 100644 --- a/src/gui/qgsmessagebaritem.cpp +++ b/src/gui/qgsmessagebaritem.cpp @@ -16,8 +16,8 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgsmessagebaritem.h" #include "qgsmessagebar.h" +#include "qgsmessagebaritem.h" #include #include diff --git a/src/gui/qgsmessagebaritem.h b/src/gui/qgsmessagebaritem.h index 9cf0ed835e0..f8a811a9027 100644 --- a/src/gui/qgsmessagebaritem.h +++ b/src/gui/qgsmessagebaritem.h @@ -17,13 +17,13 @@ #ifndef qgsmessagebaritem_H #define qgsmessagebaritem_H -#include #include +#include -#include +#include #include #include -#include +#include class GUI_EXPORT QgsMessageBarItem : public QWidget diff --git a/src/gui/qgsmessagelogviewer.cpp b/src/gui/qgsmessagelogviewer.cpp index b70cb2eef94..e149e9ec9e1 100644 --- a/src/gui/qgsmessagelogviewer.cpp +++ b/src/gui/qgsmessagelogviewer.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgsmessagelogviewer.h" -#include "qgsmessagelog.h" #include "qgsapplication.h" +#include "qgsmessagelog.h" +#include "qgsmessagelogviewer.h" -#include #include -#include -#include -#include -#include #include +#include #include #include +#include +#include +#include +#include QgsMessageLogViewer::QgsMessageLogViewer( QStatusBar *statusBar, QWidget *parent, Qt::WindowFlags fl ) diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h index 7db259c145a..53bb29caebe 100644 --- a/src/gui/qgsmessagelogviewer.h +++ b/src/gui/qgsmessagelogviewer.h @@ -17,8 +17,8 @@ #ifndef QGSMESSAGELOGVIEWER_H #define QGSMESSAGELOGVIEWER_H -#include #include +#include #include "qgsmessagelog.h" #include diff --git a/src/gui/qgsmessageviewer.cpp b/src/gui/qgsmessageviewer.cpp index 73c9f8dcab6..c117da37c68 100644 --- a/src/gui/qgsmessageviewer.cpp +++ b/src/gui/qgsmessageviewer.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsmessageviewer.h" #include +#include "qgsmessageviewer.h" QgsMessageViewer::QgsMessageViewer( QWidget *parent, Qt::WindowFlags fl, bool deleteOnClose ) : QDialog( parent, fl ) diff --git a/src/gui/qgsmessageviewer.h b/src/gui/qgsmessageviewer.h index a5c759cddab..a862207e46a 100644 --- a/src/gui/qgsmessageviewer.h +++ b/src/gui/qgsmessageviewer.h @@ -17,8 +17,8 @@ #ifndef QGSMESSAGEVIEWER_H #define QGSMESSAGEVIEWER_H -#include #include +#include #include "qgsmessageoutput.h" #include diff --git a/src/gui/qgsnewhttpconnection.cpp b/src/gui/qgsnewhttpconnection.cpp index f3a42a18b07..ef123df4f2f 100644 --- a/src/gui/qgsnewhttpconnection.cpp +++ b/src/gui/qgsnewhttpconnection.cpp @@ -14,13 +14,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsnewhttpconnection.h" -#include "qgscontexthelp.h" -#include #include -#include #include #include +#include +#include +#include "qgscontexthelp.h" +#include "qgsnewhttpconnection.h" QgsNewHttpConnection::QgsNewHttpConnection( QWidget *parent, const QString& baseKey, const QString& connName, Qt::WindowFlags fl ): diff --git a/src/gui/qgsnewmemorylayerdialog.cpp b/src/gui/qgsnewmemorylayerdialog.cpp index ad42485686e..296187a1655 100644 --- a/src/gui/qgsnewmemorylayerdialog.cpp +++ b/src/gui/qgsnewmemorylayerdialog.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgsnewmemorylayerdialog.h" -#include "qgsapplication.h" #include "qgis.h" +#include "qgsapplication.h" #include "qgscoordinatereferencesystem.h" +#include "qgsnewmemorylayerdialog.h" #include "qgsproviderregistry.h" #include "qgsvectordataprovider.h" -#include #include +#include #include +#include #include #include -#include QgsVectorLayer *QgsNewMemoryLayerDialog::runAndCreateLayer( QWidget *parent ) { diff --git a/src/gui/qgsnewmemorylayerdialog.h b/src/gui/qgsnewmemorylayerdialog.h index 2e6bd898894..bc9a37c92b4 100644 --- a/src/gui/qgsnewmemorylayerdialog.h +++ b/src/gui/qgsnewmemorylayerdialog.h @@ -20,8 +20,8 @@ #include "ui_qgsnewmemorylayerdialogbase.h" #include "qgisgui.h" #include "qgis.h" -#include "qgsvectorlayer.h" #include "qgscoordinatereferencesystem.h" +#include "qgsvectorlayer.h" class GUI_EXPORT QgsNewMemoryLayerDialog: public QDialog, private Ui::QgsNewMemoryLayerDialogBase { diff --git a/src/gui/qgsnewvectorlayerdialog.cpp b/src/gui/qgsnewvectorlayerdialog.cpp index d99dc3b09ea..878eb9d7f6c 100644 --- a/src/gui/qgsnewvectorlayerdialog.cpp +++ b/src/gui/qgsnewvectorlayerdialog.cpp @@ -15,20 +15,20 @@ * * ***************************************************************************/ -#include "qgsnewvectorlayerdialog.h" -#include "qgsapplication.h" #include "qgis.h" -#include "qgslogger.h" +#include "qgsapplication.h" #include "qgscoordinatereferencesystem.h" +#include "qgslogger.h" +#include "qgsnewvectorlayerdialog.h" #include "qgsproviderregistry.h" #include "qgsvectordataprovider.h" #include "qgsvectorfilewriter.h" -#include #include -#include -#include #include +#include +#include +#include QgsNewVectorLayerDialog::QgsNewVectorLayerDialog( QWidget *parent, Qt::WindowFlags fl ) diff --git a/src/gui/qgsoptionsdialogbase.cpp b/src/gui/qgsoptionsdialogbase.cpp index 66bbb74c7d5..ed6f720719a 100644 --- a/src/gui/qgsoptionsdialogbase.cpp +++ b/src/gui/qgsoptionsdialogbase.cpp @@ -22,8 +22,8 @@ #include #include #include -#include #include +#include #include diff --git a/src/gui/qgsowssourceselect.cpp b/src/gui/qgsowssourceselect.cpp index 080de6e791b..aca7f0d1376 100644 --- a/src/gui/qgsowssourceselect.cpp +++ b/src/gui/qgsowssourceselect.cpp @@ -23,36 +23,36 @@ #include "qgis.h" // GEO_EPSG_CRS_ID #include "qgscontexthelp.h" #include "qgscoordinatereferencesystem.h" +#include "qgsdataprovider.h" #include "qgsdatasourceuri.h" #include "qgsgenericprojectionselector.h" #include "qgslogger.h" #include "qgsmanageconnectionsdialog.h" #include "qgsmessageviewer.h" +#include "qgsnetworkaccessmanager.h" #include "qgsnewhttpconnection.h" #include "qgsnumericsortlistviewitem.h" +#include "qgsowsconnection.h" +#include "qgsowssourceselect.h" #include "qgsproject.h" #include "qgsproviderregistry.h" -#include "qgsowsconnection.h" -#include "qgsdataprovider.h" -#include "qgsowssourceselect.h" -#include "qgsnetworkaccessmanager.h" #include -#include -#include #include +#include #include #include #include #include #include #include +#include #include #include #include -#include #include +#include QgsOWSSourceSelect::QgsOWSSourceSelect( QString service, QWidget * parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode ) : QDialog( parent, fl ) diff --git a/src/gui/qgsowssourceselect.h b/src/gui/qgsowssourceselect.h index 3f421efe297..5da1bbb92b3 100644 --- a/src/gui/qgsowssourceselect.h +++ b/src/gui/qgsowssourceselect.h @@ -20,15 +20,15 @@ #ifndef QGSOWSSOURCESELECT_H #define QGSOWSSOURCESELECT_H #include "ui_qgsowssourceselectbase.h" -#include "qgsdatasourceuri.h" #include "qgisgui.h" #include "qgscontexthelp.h" +#include "qgsdatasourceuri.h" #include "qgsdataprovider.h" -#include -#include #include +#include +#include class QgisApp; class QgsDataProvider; diff --git a/src/gui/qgspluginmanagerinterface.h b/src/gui/qgspluginmanagerinterface.h index 2f9a839ec1c..28447efbd3a 100644 --- a/src/gui/qgspluginmanagerinterface.h +++ b/src/gui/qgspluginmanagerinterface.h @@ -17,9 +17,9 @@ #ifndef QGSPLUGINMANAGERINTERFACE_H #define QGSPLUGINMANAGERINTERFACE_H +#include #include #include -#include #include "qgsmessagebar.h" class GUI_EXPORT QgsPluginManagerInterface : public QObject diff --git a/src/gui/qgsprojectbadlayerguihandler.cpp b/src/gui/qgsprojectbadlayerguihandler.cpp index 724debee0d2..db4a2601011 100644 --- a/src/gui/qgsprojectbadlayerguihandler.cpp +++ b/src/gui/qgsprojectbadlayerguihandler.cpp @@ -21,8 +21,8 @@ #include #include -#include "qgslogger.h" #include "qgisgui.h" +#include "qgslogger.h" #include "qgsproviderregistry.h" QgsProjectBadLayerGuiHandler::QgsProjectBadLayerGuiHandler() diff --git a/src/gui/qgsprojectionselectionwidget.cpp b/src/gui/qgsprojectionselectionwidget.cpp index 45c43c1646e..82fc1c702f0 100644 --- a/src/gui/qgsprojectionselectionwidget.cpp +++ b/src/gui/qgsprojectionselectionwidget.cpp @@ -16,11 +16,11 @@ #include -#include "qgsprojectionselectionwidget.h" +#include #include "qgsapplication.h" #include "qgsgenericprojectionselector.h" #include "qgsproject.h" -#include +#include "qgsprojectionselectionwidget.h" QgsProjectionSelectionWidget::QgsProjectionSelectionWidget( QWidget *parent ) : QWidget( parent ) diff --git a/src/gui/qgsprojectionselectionwidget.h b/src/gui/qgsprojectionselectionwidget.h index 995ce797a09..4f50f13577c 100644 --- a/src/gui/qgsprojectionselectionwidget.h +++ b/src/gui/qgsprojectionselectionwidget.h @@ -17,10 +17,10 @@ #ifndef QGSPROJECTIONSELECTIONWIDGET_H #define QGSPROJECTIONSELECTIONWIDGET_H -#include +#include #include #include -#include +#include #include "qgscoordinatereferencesystem.h" diff --git a/src/gui/qgsprojectionselector.cpp b/src/gui/qgsprojectionselector.cpp index 28470cf6243..acf06bd530d 100644 --- a/src/gui/qgsprojectionselector.cpp +++ b/src/gui/qgsprojectionselector.cpp @@ -16,14 +16,14 @@ //qgis includes #include "qgis.h" //magic numbers here #include "qgsapplication.h" -#include "qgslogger.h" #include "qgscoordinatereferencesystem.h" +#include "qgslogger.h" //qt includes #include #include -#include #include +#include #include QgsProjectionSelector::QgsProjectionSelector( QWidget* parent, const char *name, Qt::WindowFlags fl ) diff --git a/src/gui/qgsquerybuilder.cpp b/src/gui/qgsquerybuilder.cpp index 0482887ea1f..a1291b9223f 100644 --- a/src/gui/qgsquerybuilder.cpp +++ b/src/gui/qgsquerybuilder.cpp @@ -12,15 +12,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsquerybuilder.h" -#include "qgslogger.h" #include #include -#include #include +#include #include -#include "qgsvectorlayer.h" +#include "qgslogger.h" +#include "qgsquerybuilder.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" // constructor used when the query builder must make its own // connection to the database diff --git a/src/gui/qgsquerybuilder.h b/src/gui/qgsquerybuilder.h index 0bae17e0c0e..c41112da403 100644 --- a/src/gui/qgsquerybuilder.h +++ b/src/gui/qgsquerybuilder.h @@ -14,15 +14,15 @@ ***************************************************************************/ #ifndef QGSQUERYBUILDER_H #define QGSQUERYBUILDER_H -#include -#include -#include -#include -#include #include "ui_qgsquerybuilderbase.h" +#include +#include +#include +#include +#include #include "qgisgui.h" -#include "qgsfield.h" #include "qgscontexthelp.h" +#include "qgsfield.h" class QgsVectorLayer; diff --git a/src/gui/qgsrasterformatsaveoptionswidget.cpp b/src/gui/qgsrasterformatsaveoptionswidget.cpp index e0faf6831ce..b6463f0b9c8 100644 --- a/src/gui/qgsrasterformatsaveoptionswidget.cpp +++ b/src/gui/qgsrasterformatsaveoptionswidget.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgsrasterformatsaveoptionswidget.h" -#include "qgslogger.h" #include "qgsdialog.h" -#include "qgsrasterlayer.h" +#include "qgslogger.h" #include "qgsproviderregistry.h" +#include "qgsrasterformatsaveoptionswidget.h" +#include "qgsrasterlayer.h" -#include #include -#include -#include -#include #include +#include +#include +#include +#include QMap< QString, QStringList > QgsRasterFormatSaveOptionsWidget::mBuiltinProfiles; diff --git a/src/gui/qgsrasterlayersaveasdialog.cpp b/src/gui/qgsrasterlayersaveasdialog.cpp index a134b14b323..fdcae6b1216 100644 --- a/src/gui/qgsrasterlayersaveasdialog.cpp +++ b/src/gui/qgsrasterlayersaveasdialog.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ #include "qgsapplication.h" -#include "qgslogger.h" #include "qgscoordinatetransform.h" -#include "qgsrasterlayer.h" -#include "qgsrasterlayersaveasdialog.h" +#include "qgsgenericprojectionselector.h" +#include "qgslogger.h" #include "qgsrasterdataprovider.h" #include "qgsrasterformatsaveoptionswidget.h" -#include "qgsgenericprojectionselector.h" +#include "qgsrasterlayer.h" +#include "qgsrasterlayersaveasdialog.h" #include #include diff --git a/src/gui/qgsrasterlayersaveasdialog.h b/src/gui/qgsrasterlayersaveasdialog.h index b74b90bbbdc..cb59ec1a469 100644 --- a/src/gui/qgsrasterlayersaveasdialog.h +++ b/src/gui/qgsrasterlayersaveasdialog.h @@ -16,9 +16,9 @@ #define QGSRASTERLAYERSAVEASDIALOG_H #include "ui_qgsrasterlayersaveasdialogbase.h" -#include "qgsrectangle.h" #include "qgscoordinatereferencesystem.h" #include "qgsrasterrange.h" +#include "qgsrectangle.h" class QgsRasterLayer; class QgsRasterDataProvider; diff --git a/src/gui/qgsrasterpyramidsoptionswidget.cpp b/src/gui/qgsrasterpyramidsoptionswidget.cpp index 8e6fba586c3..0ecee0c04a0 100644 --- a/src/gui/qgsrasterpyramidsoptionswidget.cpp +++ b/src/gui/qgsrasterpyramidsoptionswidget.cpp @@ -15,17 +15,17 @@ * * ***************************************************************************/ -#include "qgsrasterpyramidsoptionswidget.h" -#include "qgslogger.h" #include "qgsdialog.h" +#include "qgslogger.h" +#include "qgsrasterpyramidsoptionswidget.h" -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include QgsRasterPyramidsOptionsWidget::QgsRasterPyramidsOptionsWidget( QWidget* parent, QString provider ) diff --git a/src/gui/qgsrelationadddlg.h b/src/gui/qgsrelationadddlg.h index cb15a687082..4b42ec70c57 100644 --- a/src/gui/qgsrelationadddlg.h +++ b/src/gui/qgsrelationadddlg.h @@ -1,8 +1,8 @@ #ifndef QGSRELATIONADDDLG_H #define QGSRELATIONADDDLG_H -#include #include "ui_qgsrelationadddlgbase.h" +#include class QgsVectorLayer; diff --git a/src/gui/qgsrelationeditorwidget.cpp b/src/gui/qgsrelationeditorwidget.cpp index 8dbbc8a138e..cb7fca92629 100644 --- a/src/gui/qgsrelationeditorwidget.cpp +++ b/src/gui/qgsrelationeditorwidget.cpp @@ -17,12 +17,12 @@ #include "qgsapplication.h" #include "qgsdistancearea.h" -#include "qgsvectordataprovider.h" #include "qgsexpression.h" #include "qgsfeature.h" #include "qgsfeatureselectiondlg.h" #include "qgsgenericfeatureselectionmanager.h" #include "qgsrelation.h" +#include "qgsvectordataprovider.h" #include "qgsvectorlayertools.h" #include diff --git a/src/gui/qgsrelationeditorwidget.h b/src/gui/qgsrelationeditorwidget.h index 6f3612663cb..d20a86ba63b 100644 --- a/src/gui/qgsrelationeditorwidget.h +++ b/src/gui/qgsrelationeditorwidget.h @@ -16,10 +16,10 @@ #ifndef QGSRELATIONEDITOR_H #define QGSRELATIONEDITOR_H -#include -#include #include #include +#include +#include #include "qgsattributeeditorcontext.h" #include "qgscollapsiblegroupbox.h" diff --git a/src/gui/qgsrelationmanagerdialog.h b/src/gui/qgsrelationmanagerdialog.h index eab420f67b7..07619e85587 100644 --- a/src/gui/qgsrelationmanagerdialog.h +++ b/src/gui/qgsrelationmanagerdialog.h @@ -16,8 +16,8 @@ #ifndef QGSRELATIONMANAGERDIALOG_H #define QGSRELATIONMANAGERDIALOG_H -#include #include "ui_qgsrelationmanagerdialogbase.h" +#include class QgsRelation; class QgsRelationManager; diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp index 980d66df89c..c01b14d2c38 100644 --- a/src/gui/qgsrubberband.cpp +++ b/src/gui/qgsrubberband.cpp @@ -13,14 +13,14 @@ * * ***************************************************************************/ -#include "qgsrubberband.h" +#include #include "qgsfeature.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaprenderer.h" +#include "qgsrubberband.h" #include "qgsvectorlayer.h" -#include /*! \class QgsRubberBand diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h index a0bec00c259..279f19efc5c 100644 --- a/src/gui/qgsrubberband.h +++ b/src/gui/qgsrubberband.h @@ -15,12 +15,12 @@ #ifndef QGSRUBBERBAND_H #define QGSRUBBERBAND_H -#include "qgsmapcanvasitem.h" -#include "qgsgeometry.h" #include #include #include #include +#include "qgsgeometry.h" +#include "qgsmapcanvasitem.h" class QgsVectorLayer; class QPaintEvent; diff --git a/src/gui/qgsscalecombobox.cpp b/src/gui/qgsscalecombobox.cpp index 7257d38b3fc..3e49c849631 100644 --- a/src/gui/qgsscalecombobox.cpp +++ b/src/gui/qgsscalecombobox.cpp @@ -20,9 +20,9 @@ #include "qgsscalecombobox.h" #include +#include #include #include -#include QgsScaleComboBox::QgsScaleComboBox( QWidget* parent ) : QComboBox( parent ), mScale( 1.0 ) { diff --git a/src/gui/qgsscalerangewidget.cpp b/src/gui/qgsscalerangewidget.cpp index 8350907aa12..fdc719e9fca 100644 --- a/src/gui/qgsscalerangewidget.cpp +++ b/src/gui/qgsscalerangewidget.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsscalerangewidget.h" #include "qgsapplication.h" #include "qgsproject.h" +#include "qgsscalerangewidget.h" QgsScaleRangeWidget::QgsScaleRangeWidget( QWidget *parent ) diff --git a/src/gui/qgsscalerangewidget.h b/src/gui/qgsscalerangewidget.h index 40f47bde515..e41c411bf7e 100644 --- a/src/gui/qgsscalerangewidget.h +++ b/src/gui/qgsscalerangewidget.h @@ -20,8 +20,8 @@ #include #include "qgscollapsiblegroupbox.h" -#include "qgsmaplayer.h" #include "qgsmapcanvas.h" +#include "qgsmaplayer.h" #include "qgsscalewidget.h" diff --git a/src/gui/qgsscalevisibilitydialog.cpp b/src/gui/qgsscalevisibilitydialog.cpp index 63a2770e548..47d38a30813 100644 --- a/src/gui/qgsscalevisibilitydialog.cpp +++ b/src/gui/qgsscalevisibilitydialog.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include #include +#include #include "qgsscalevisibilitydialog.h" diff --git a/src/gui/qgsscalewidget.cpp b/src/gui/qgsscalewidget.cpp index d2b3ea75471..a075cadab96 100644 --- a/src/gui/qgsscalewidget.cpp +++ b/src/gui/qgsscalewidget.cpp @@ -16,8 +16,8 @@ #include #include "qgsapplication.h" -#include "qgsscalewidget.h" #include "qgsmapcanvas.h" +#include "qgsscalewidget.h" QgsScaleWidget::QgsScaleWidget( QWidget *parent ) : QWidget( parent ) diff --git a/src/gui/qgsscalewidget.h b/src/gui/qgsscalewidget.h index aa7b15b5a07..def4022bd77 100644 --- a/src/gui/qgsscalewidget.h +++ b/src/gui/qgsscalewidget.h @@ -16,8 +16,8 @@ #ifndef QGSSCALEWIDGET_H #define QGSSCALEWIDGET_H -#include #include +#include #include "qgsscalecombobox.h" diff --git a/src/gui/qgssearchquerybuilder.cpp b/src/gui/qgssearchquerybuilder.cpp index 4332cef353b..a706b98dd52 100644 --- a/src/gui/qgssearchquerybuilder.cpp +++ b/src/gui/qgssearchquerybuilder.cpp @@ -23,12 +23,12 @@ #include #include #include +#include "qgsexpression.h" #include "qgsfeature.h" #include "qgsfield.h" -#include "qgssearchquerybuilder.h" -#include "qgsexpression.h" -#include "qgsvectorlayer.h" #include "qgslogger.h" +#include "qgssearchquerybuilder.h" +#include "qgsvectorlayer.h" QgsSearchQueryBuilder::QgsSearchQueryBuilder( QgsVectorLayer* layer, QWidget *parent, Qt::WindowFlags fl ) diff --git a/src/gui/qgssearchquerybuilder.h b/src/gui/qgssearchquerybuilder.h index 2592b5ad4bb..d33dec7c2f1 100644 --- a/src/gui/qgssearchquerybuilder.h +++ b/src/gui/qgssearchquerybuilder.h @@ -17,9 +17,9 @@ #define QGSSEARCHQUERYBUILDER_H #include -#include -#include #include +#include +#include #include "ui_qgsquerybuilderbase.h" #include "qgisgui.h" diff --git a/src/gui/qgssublayersdialog.cpp b/src/gui/qgssublayersdialog.cpp index 80fefabab39..395e327ffd0 100644 --- a/src/gui/qgssublayersdialog.cpp +++ b/src/gui/qgssublayersdialog.cpp @@ -17,9 +17,9 @@ #include "qgslogger.h" +#include #include #include -#include QgsSublayersDialog::QgsSublayersDialog( ProviderType providerType, QString name, diff --git a/src/gui/qgssvgannotationitem.cpp b/src/gui/qgssvgannotationitem.cpp index bfd67717ec1..933d53f105d 100644 --- a/src/gui/qgssvgannotationitem.cpp +++ b/src/gui/qgssvgannotationitem.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgssvgannotationitem.h" -#include "qgsproject.h" #include #include +#include "qgsproject.h" +#include "qgssvgannotationitem.h" QgsSvgAnnotationItem::QgsSvgAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ) diff --git a/src/gui/qgssvgannotationitem.h b/src/gui/qgssvgannotationitem.h index f696e3dd1ef..5a712926acd 100644 --- a/src/gui/qgssvgannotationitem.h +++ b/src/gui/qgssvgannotationitem.h @@ -18,8 +18,8 @@ #ifndef QGSSVGANNOTATIONITEM_H #define QGSSVGANNOTATIONITEM_H -#include "qgsannotationitem.h" #include +#include "qgsannotationitem.h" class GUI_EXPORT QgsSvgAnnotationItem: public QgsAnnotationItem { diff --git a/src/gui/qgstextannotationitem.cpp b/src/gui/qgstextannotationitem.cpp index 5fa0f781914..6a3018cad4e 100644 --- a/src/gui/qgstextannotationitem.cpp +++ b/src/gui/qgstextannotationitem.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgstextannotationitem.h" #include #include +#include "qgstextannotationitem.h" QgsTextAnnotationItem::QgsTextAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas ), mDocument( new QTextDocument( QObject::tr( "QGIS rocks!" ) ) ) { diff --git a/src/gui/qgstextannotationitem.h b/src/gui/qgstextannotationitem.h index fb433561f2a..02745d722a4 100644 --- a/src/gui/qgstextannotationitem.h +++ b/src/gui/qgstextannotationitem.h @@ -18,8 +18,8 @@ #ifndef QGSTEXTANNOTATIONITEM_H #define QGSTEXTANNOTATIONITEM_H -#include "qgsannotationitem.h" #include +#include "qgsannotationitem.h" /**An annotation item that displays formated text*/ class GUI_EXPORT QgsTextAnnotationItem: public QgsAnnotationItem diff --git a/src/gui/qgsunitselectionwidget.h b/src/gui/qgsunitselectionwidget.h index d0d27aad34b..e06243fe608 100644 --- a/src/gui/qgsunitselectionwidget.h +++ b/src/gui/qgsunitselectionwidget.h @@ -18,10 +18,10 @@ #ifndef QGSUNITSELECTIONWIDGET_H #define QGSUNITSELECTIONWIDGET_H -#include -#include "qgssymbolv2.h" #include "ui_qgsunitselectionwidget.h" #include "ui_qgsmapunitscaledialog.h" +#include +#include "qgssymbolv2.h" /** Dialog allowing the user to choose the minimum and maximum scale of an object in map units */ class GUI_EXPORT QgsMapUnitScaleDialog : public QDialog, private Ui::QgsMapUnitScaleDialog diff --git a/src/gui/qgsuserinputdockwidget.cpp b/src/gui/qgsuserinputdockwidget.cpp index e0ac5e58ca8..44a8064d0c8 100644 --- a/src/gui/qgsuserinputdockwidget.cpp +++ b/src/gui/qgsuserinputdockwidget.cpp @@ -15,8 +15,8 @@ #include "qgsuserinputdockwidget.h" -#include #include +#include QgsUserInputDockWidget::QgsUserInputDockWidget( QWidget *parent ) : QDockWidget( tr( "User input" ), parent ) diff --git a/src/gui/raster/qgsmultibandcolorrendererwidget.cpp b/src/gui/raster/qgsmultibandcolorrendererwidget.cpp index 38ba6c15d29..cc061b1edd0 100644 --- a/src/gui/raster/qgsmultibandcolorrendererwidget.cpp +++ b/src/gui/raster/qgsmultibandcolorrendererwidget.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsmultibandcolorrendererwidget.h" #include "qgsmultibandcolorrenderer.h" +#include "qgsmultibandcolorrendererwidget.h" #include "qgsrasterlayer.h" QgsMultiBandColorRendererWidget::QgsMultiBandColorRendererWidget( QgsRasterLayer* layer, const QgsRectangle &extent ) diff --git a/src/gui/raster/qgsmultibandcolorrendererwidget.h b/src/gui/raster/qgsmultibandcolorrendererwidget.h index 6f95016e45d..446b585b25a 100644 --- a/src/gui/raster/qgsmultibandcolorrendererwidget.h +++ b/src/gui/raster/qgsmultibandcolorrendererwidget.h @@ -18,9 +18,9 @@ #ifndef QGSMULTIBANDCOLORRENDERERWIDGET_H #define QGSMULTIBANDCOLORRENDERERWIDGET_H +#include "ui_qgsmultibandcolorrendererwidgetbase.h" #include "qgsrasterminmaxwidget.h" #include "qgsrasterrendererwidget.h" -#include "ui_qgsmultibandcolorrendererwidgetbase.h" class QgsContrastEnhancement; class QgsMultiBandColorRenderer; diff --git a/src/gui/raster/qgspalettedrendererwidget.cpp b/src/gui/raster/qgspalettedrendererwidget.cpp index 8244f11f6d3..6fb563b38c8 100644 --- a/src/gui/raster/qgspalettedrendererwidget.cpp +++ b/src/gui/raster/qgspalettedrendererwidget.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgspalettedrendererwidget.h" -#include "qgspalettedrasterrenderer.h" -#include "qgsrasterlayer.h" -#include "qgscolordialog.h" #include +#include "qgscolordialog.h" +#include "qgspalettedrasterrenderer.h" +#include "qgspalettedrendererwidget.h" +#include "qgsrasterlayer.h" QgsPalettedRendererWidget::QgsPalettedRendererWidget( QgsRasterLayer* layer, const QgsRectangle &extent ): QgsRasterRendererWidget( layer, extent ) { diff --git a/src/gui/raster/qgspalettedrendererwidget.h b/src/gui/raster/qgspalettedrendererwidget.h index 98feb11a2b0..5d60841dc1c 100644 --- a/src/gui/raster/qgspalettedrendererwidget.h +++ b/src/gui/raster/qgspalettedrendererwidget.h @@ -18,8 +18,8 @@ #ifndef QGSPALETTEDRENDERERWIDGET_H #define QGSPALETTEDRENDERERWIDGET_H -#include "qgsrasterrendererwidget.h" #include "ui_qgspalettedrendererwidgetbase.h" +#include "qgsrasterrendererwidget.h" class QgsRasterLayer; diff --git a/src/gui/raster/qgsrasterhistogramwidget.cpp b/src/gui/raster/qgsrasterhistogramwidget.cpp index 33de6f26841..133753313ce 100644 --- a/src/gui/raster/qgsrasterhistogramwidget.cpp +++ b/src/gui/raster/qgsrasterhistogramwidget.cpp @@ -15,33 +15,33 @@ * * ***************************************************************************/ -#include "qgsapplication.h" #include "qgisgui.h" +#include "qgsapplication.h" +#include "qgsrasterhistogramwidget.h" #include "qgsrasterrendererregistry.h" #include "qgsrasterrendererwidget.h" -#include "qgsrasterhistogramwidget.h" -#include -#include #include +#include +#include #include #include // QWT Charting widget #include -#include #include -#include +#include +#include #include #include +#include +#include #include #include -#include #include -#include #if defined(QWT_VERSION) && QWT_VERSION>=0x060000 -#include #include +#include #else #include "qwt5_histogram_item.h" #endif diff --git a/src/gui/raster/qgsrasterminmaxwidget.cpp b/src/gui/raster/qgsrasterminmaxwidget.cpp index b15b82ace56..c9deeac636c 100644 --- a/src/gui/raster/qgsrasterminmaxwidget.cpp +++ b/src/gui/raster/qgsrasterminmaxwidget.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include #include +#include #include "qgsrasterlayer.h" #include "qgsrasterminmaxwidget.h" diff --git a/src/gui/raster/qgsrasterrendererwidget.cpp b/src/gui/raster/qgsrasterrendererwidget.cpp index 64fabe3fd3d..fc9060a831c 100644 --- a/src/gui/raster/qgsrasterrendererwidget.cpp +++ b/src/gui/raster/qgsrasterrendererwidget.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsrasterrendererwidget.h" #include "qgsrasterdataprovider.h" #include "qgsrasterlayer.h" +#include "qgsrasterrendererwidget.h" QString QgsRasterRendererWidget::displayBandName( int band ) const diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp index 72ba9a6f24f..db5b717a06b 100644 --- a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp +++ b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgssinglebandgrayrendererwidget.h" -#include "qgssinglebandgrayrenderer.h" #include "qgsrasterlayer.h" +#include "qgssinglebandgrayrenderer.h" +#include "qgssinglebandgrayrendererwidget.h" QgsSingleBandGrayRendererWidget::QgsSingleBandGrayRendererWidget( QgsRasterLayer* layer, const QgsRectangle &extent ) : QgsRasterRendererWidget( layer, extent ) diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.h b/src/gui/raster/qgssinglebandgrayrendererwidget.h index ff053604a05..ed9276877d0 100644 --- a/src/gui/raster/qgssinglebandgrayrendererwidget.h +++ b/src/gui/raster/qgssinglebandgrayrendererwidget.h @@ -18,9 +18,9 @@ #ifndef QGSSINGLEBANDGRAYRENDERERWIDGET_H #define QGSSINGLEBANDGRAYRENDERERWIDGET_H +#include "ui_qgssinglebandgrayrendererwidgetbase.h" #include "qgsrasterminmaxwidget.h" #include "qgsrasterrendererwidget.h" -#include "ui_qgssinglebandgrayrendererwidgetbase.h" class GUI_EXPORT QgsSingleBandGrayRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandGrayRendererWidgetBase { diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp index 3d57488b913..ce8b28424fb 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgssinglebandpseudocolorrendererwidget.h" -#include "qgssinglebandpseudocolorrenderer.h" #include "qgsrasterlayer.h" +#include "qgssinglebandpseudocolorrenderer.h" +#include "qgssinglebandpseudocolorrendererwidget.h" // for color ramps - todo add rasterStyle and refactor raster vs. vector ramps +#include "qgscolordialog.h" #include "qgsstylev2.h" #include "qgsvectorcolorrampv2.h" -#include "qgscolordialog.h" #include #include diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h index bb11a98d65b..7b72577c37c 100644 --- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h +++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.h @@ -18,10 +18,10 @@ #ifndef QGSSINGLEBANDCOLORRENDERERWIDGET_H #define QGSSINGLEBANDCOLORRENDERERWIDGET_H +#include "ui_qgssinglebandpseudocolorrendererwidgetbase.h" +#include "qgscolorrampshader.h" #include "qgsrasterminmaxwidget.h" #include "qgsrasterrendererwidget.h" -#include "qgscolorrampshader.h" -#include "ui_qgssinglebandpseudocolorrendererwidgetbase.h" class GUI_EXPORT QgsSingleBandPseudoColorRendererWidget: public QgsRasterRendererWidget, private Ui::QgsSingleBandPseudoColorRendererWidgetBase diff --git a/src/gui/raster/qwt5_histogram_item.cpp b/src/gui/raster/qwt5_histogram_item.cpp index cd142d6a9dd..9bf4c1ecc46 100644 --- a/src/gui/raster/qwt5_histogram_item.cpp +++ b/src/gui/raster/qwt5_histogram_item.cpp @@ -10,8 +10,8 @@ #if defined( QWT_VERSION ) && QWT_VERSION<0x060000 -#include #include +#include #include "qwt5_histogram_item.h" diff --git a/src/gui/raster/qwt5_histogram_item.h b/src/gui/raster/qwt5_histogram_item.h index 554be439b76..fa90302f566 100644 --- a/src/gui/raster/qwt5_histogram_item.h +++ b/src/gui/raster/qwt5_histogram_item.h @@ -13,8 +13,8 @@ #ifndef HISTOGRAM_ITEM_H #define HISTOGRAM_ITEM_H -#include #include +#include #include "qwt_plot_item.h" @@ -75,13 +75,13 @@ class HistogramItem: public QwtPlotItem PrivateData *d_data; }; -#include #include -#include +#include #include -#include -#include #include +#include +#include +#include class HistogramItem::PrivateData { diff --git a/src/gui/symbology-ng/characterwidget.cpp b/src/gui/symbology-ng/characterwidget.cpp index 83efbbe330f..aeb57afa315 100644 --- a/src/gui/symbology-ng/characterwidget.cpp +++ b/src/gui/symbology-ng/characterwidget.cpp @@ -45,8 +45,8 @@ #include #include -#include #include +#include #include #include #include diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp index 020e29cad0d..1d3f932ac06 100644 --- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp @@ -17,27 +17,27 @@ #include "qgscategorizedsymbolrendererv2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" #include "qgsstylev2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" -#include "qgssymbolv2selectordialog.h" #include "qgsexpressionbuilderdialog.h" +#include "qgssymbolv2selectordialog.h" #include "qgsvectorlayer.h" -#include "qgsproject.h" #include "qgsexpression.h" +#include "qgsproject.h" +#include #include #include #include -#include -#include -#include #include -#include +#include +#include +#include QgsCategorizedSymbolRendererV2Model::QgsCategorizedSymbolRendererV2Model( QObject * parent ) : QAbstractItemModel( parent ) , mRenderer( 0 ) diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h index 394b09a5d77..b32726ad312 100644 --- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h +++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h @@ -15,10 +15,10 @@ #ifndef QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H #define QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H +#include +#include #include "qgscategorizedsymbolrendererv2.h" #include "qgsrendererv2widget.h" -#include -#include class QgsCategorizedSymbolRendererV2; class QgsRendererCategoryV2; diff --git a/src/gui/symbology-ng/qgscolorrampcombobox.cpp b/src/gui/symbology-ng/qgscolorrampcombobox.cpp index 4e2e0de79c7..20edd02e176 100644 --- a/src/gui/symbology-ng/qgscolorrampcombobox.cpp +++ b/src/gui/symbology-ng/qgscolorrampcombobox.cpp @@ -14,10 +14,10 @@ ***************************************************************************/ #include "qgscolorrampcombobox.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" #include "qgsstylev2.h" #include "qgsstylev2managerdialog.h" +#include "qgssymbollayerv2utils.h" +#include "qgsvectorcolorrampv2.h" QSize QgsColorRampComboBox::rampIconSize( 50, 16 ); diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp index a9ef034f8bf..269911119e2 100644 --- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp @@ -15,17 +15,17 @@ #include "qgscptcitycolorrampv2dialog.h" -#include "qgscptcityarchive.h" -#include "qgsvectorcolorrampv2.h" -#include "qgslogger.h" #include "qgsapplication.h" +#include "qgscptcityarchive.h" #include "qgsdialog.h" +#include "qgslogger.h" +#include "qgsvectorcolorrampv2.h" +#include #include +#include #include #include -#include -#include ///////// diff --git a/src/gui/symbology-ng/qgsdashspacedialog.cpp b/src/gui/symbology-ng/qgsdashspacedialog.cpp index 8446a3d78b0..3ec3f4db0c6 100644 --- a/src/gui/symbology-ng/qgsdashspacedialog.cpp +++ b/src/gui/symbology-ng/qgsdashspacedialog.cpp @@ -13,9 +13,9 @@ * * ***************************************************************************/ -#include "qgsdashspacedialog.h" -#include "qgsapplication.h" #include +#include "qgsapplication.h" +#include "qgsdashspacedialog.h" QString iconPath( QString iconFile ) { diff --git a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp index 86369275027..3b33edd9a6b 100644 --- a/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp +++ b/src/gui/symbology-ng/qgsdatadefinedsymboldialog.cpp @@ -1,8 +1,8 @@ #include "qgsdatadefinedsymboldialog.h" #include "qgsexpressionbuilderdialog.h" #include "qgsfieldexpressionwidget.h" -#include "qgsvectorlayer.h" #include "qgslogger.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp index 4a5b16db0ae..1cb672fa76e 100644 --- a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp +++ b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsellipsesymbollayerv2widget.h" +#include #include "qgsdatadefinedsymboldialog.h" #include "qgsellipsesymbollayerv2.h" +#include "qgsellipsesymbollayerv2widget.h" #include "qgsmaplayerregistry.h" #include "qgsvectorlayer.h" -#include QgsEllipseSymbolLayerV2Widget::QgsEllipseSymbolLayerV2Widget( const QgsVectorLayer* vl, QWidget* parent ) : QgsSymbolLayerV2Widget( parent, vl ) diff --git a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp index 1ae3d807ff4..6faabf491aa 100644 --- a/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedhistogramwidget.cpp @@ -15,30 +15,30 @@ * * ***************************************************************************/ +#include "qgsapplication.h" #include "qgsgraduatedhistogramwidget.h" #include "qgsgraduatedsymbolrendererv2.h" #include "qgsgraduatedsymbolrendererv2widget.h" -#include "qgsapplication.h" -#include "qgsvectorlayer.h" #include "qgsstatisticalsummary.h" +#include "qgsvectorlayer.h" -#include -#include #include +#include +#include // QWT Charting widget #include +#include #include -#include #include #include +#include +#include #include #include -#include -#include #if defined(QWT_VERSION) && QWT_VERSION>=0x060000 -#include #include +#include #else #include "../raster/qwt5_histogram_item.h" #endif diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp index a22c20db309..bf811ef025b 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp @@ -14,15 +14,15 @@ ***************************************************************************/ #include "qgsgraduatedsymbolrendererv2widget.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" #include "qgsstylev2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" #include "qgsvectorlayer.h" -#include "qgssymbolv2selectordialog.h" #include "qgsexpressionbuilderdialog.h" +#include "qgssymbolv2selectordialog.h" #include "qgsludialog.h" @@ -31,10 +31,10 @@ #include #include #include -#include -#include -#include #include +#include +#include +#include // ------------------------------ Model ------------------------------------ diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h index f4b515fd7b6..49b714b9e3e 100644 --- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h +++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h @@ -16,10 +16,10 @@ #ifndef QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H #define QGSGRADUATEDSYMBOLRENDERERV2WIDGET_H +#include +#include #include "qgsgraduatedsymbolrendererv2.h" #include "qgsrendererv2widget.h" -#include -#include #include "ui_qgsgraduatedsymbolrendererv2widget.h" diff --git a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp index 4b2ab1181c7..4b4c6a578e0 100644 --- a/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp +++ b/src/gui/symbology-ng/qgsheatmaprendererwidget.cpp @@ -12,20 +12,20 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsheatmaprendererwidget.h" #include "qgsheatmaprenderer.h" +#include "qgsheatmaprendererwidget.h" #include "qgsrendererv2registry.h" #include "qgssymbolv2.h" -#include "qgslogger.h" -#include "qgsvectorlayer.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsvectorgradientcolorrampv2dialog.h" -#include "qgsstylev2.h" -#include "qgsproject.h" #include #include +#include "qgslogger.h" +#include "qgsproject.h" +#include "qgsstylev2.h" +#include "qgsvectorcolorrampv2.h" +#include "qgsvectorgradientcolorrampv2dialog.h" +#include "qgsvectorlayer.h" QgsRendererV2Widget* QgsHeatmapRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) { diff --git a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp index 24c0872c2cd..3d25e05e03a 100644 --- a/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp +++ b/src/gui/symbology-ng/qgsinvertedpolygonrendererwidget.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsinvertedpolygonrendererwidget.h" #include "qgsinvertedpolygonrenderer.h" +#include "qgsinvertedpolygonrendererwidget.h" #include "qgsrendererv2registry.h" #include "qgssymbolv2.h" diff --git a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp index 85dfbe4860a..f91ec68d922 100644 --- a/src/gui/symbology-ng/qgslayerpropertieswidget.cpp +++ b/src/gui/symbology-ng/qgslayerpropertieswidget.cpp @@ -16,10 +16,10 @@ #include "qgslayerpropertieswidget.h" #include -#include #include #include #include +#include #include "qgssymbollayerv2.h" #include "qgssymbollayerv2registry.h" @@ -27,10 +27,10 @@ #include "qgsapplication.h" #include "qgslogger.h" -#include "qgssymbollayerv2widget.h" #include "qgsellipsesymbollayerv2widget.h" -#include "qgsvectorfieldsymbollayerwidget.h" +#include "qgssymbollayerv2widget.h" #include "qgssymbolv2.h" //for the unit +#include "qgsvectorfieldsymbollayerwidget.h" static bool _initWidgetFunction( QString name, QgsSymbolLayerV2WidgetFunc f ) { diff --git a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp index 448e8b759de..db44cb22090 100644 --- a/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp +++ b/src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgspointdisplacementrendererwidget.h" -#include "qgspointdisplacementrenderer.h" -#include "qgsrendererv2registry.h" -#include "qgsfield.h" -#include "qgsstylev2.h" -#include "qgssymbolv2selectordialog.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorlayer.h" #include "qgisgui.h" +#include "qgsfield.h" +#include "qgspointdisplacementrenderer.h" +#include "qgspointdisplacementrendererwidget.h" +#include "qgsrendererv2registry.h" +#include "qgsstylev2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2selectordialog.h" +#include "qgsvectorlayer.h" QgsRendererV2Widget* QgsPointDisplacementRendererWidget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer ) { diff --git a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp index 1a1a6717093..b9843bcf599 100644 --- a/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp +++ b/src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp @@ -17,14 +17,14 @@ #include "qgsrendererv2.h" #include "qgsrendererv2registry.h" -#include "qgsrendererv2widget.h" -#include "qgssinglesymbolrendererv2widget.h" #include "qgscategorizedsymbolrendererv2widget.h" #include "qgsgraduatedsymbolrendererv2widget.h" -#include "qgsrulebasedrendererv2widget.h" -#include "qgspointdisplacementrendererwidget.h" -#include "qgsinvertedpolygonrendererwidget.h" #include "qgsheatmaprendererwidget.h" +#include "qgsinvertedpolygonrendererwidget.h" +#include "qgspointdisplacementrendererwidget.h" +#include "qgsrendererv2widget.h" +#include "qgsrulebasedrendererv2widget.h" +#include "qgssinglesymbolrendererv2widget.h" #include "qgsapplication.h" #include "qgslogger.h" diff --git a/src/gui/symbology-ng/qgsrendererv2widget.cpp b/src/gui/symbology-ng/qgsrendererv2widget.cpp index 33b60b857c2..f5c776a6fe0 100644 --- a/src/gui/symbology-ng/qgsrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrendererv2widget.cpp @@ -12,16 +12,16 @@ * (at your option) any later version. * * * ***************************************************************************/ +#include "qgscolordialog.h" +#include "qgsexpressionbuilderdialog.h" #include "qgsrendererv2widget.h" +#include "qgssymbollevelsv2dialog.h" #include "qgssymbolv2.h" #include "qgsvectorlayer.h" -#include "qgscolordialog.h" -#include "qgssymbollevelsv2dialog.h" -#include "qgsexpressionbuilderdialog.h" -#include #include #include +#include QgsRendererV2Widget::QgsRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style ) : QWidget(), mLayer( layer ), mStyle( style ) diff --git a/src/gui/symbology-ng/qgsrendererv2widget.h b/src/gui/symbology-ng/qgsrendererv2widget.h index e5f09b6745c..f5d217e9929 100644 --- a/src/gui/symbology-ng/qgsrendererv2widget.h +++ b/src/gui/symbology-ng/qgsrendererv2widget.h @@ -15,10 +15,10 @@ #ifndef QGSRENDERERV2WIDGET_H #define QGSRENDERERV2WIDGET_H -#include #include -#include "qgssymbolv2.h" +#include #include "qgsdatadefined.h" +#include "qgssymbolv2.h" class QgsVectorLayer; class QgsStyleV2; diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp index a64df435cfb..c1567e9f7ec 100644 --- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp +++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp @@ -15,24 +15,24 @@ #include "qgsrulebasedrendererv2widget.h" -#include "qgsrulebasedrendererv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgssymbolv2.h" -#include "qgsvectorlayer.h" #include "qgsapplication.h" #include "qgsexpression.h" -#include "qgssymbolv2selectordialog.h" #include "qgslogger.h" -#include "qstring.h" +#include "qgsrulebasedrendererv2.h" #include "qgssinglesymbolrendererv2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgssymbolv2selectordialog.h" +#include "qgsvectorlayer.h" +#include "qstring.h" #include #include +#include #include #include #include #include -#include #ifdef ENABLE_MODELTEST #include "modeltest.h" @@ -204,14 +204,14 @@ void QgsRuleBasedRendererV2Widget::currentRuleChanged( const QModelIndex& curren } -#include "qgscategorizedsymbolrendererv2.h" -#include "qgscategorizedsymbolrendererv2widget.h" -#include "qgsgraduatedsymbolrendererv2.h" -#include "qgsgraduatedsymbolrendererv2widget.h" -#include "qgsexpressionbuilderdialog.h" +#include #include #include -#include +#include "qgscategorizedsymbolrendererv2.h" +#include "qgscategorizedsymbolrendererv2widget.h" +#include "qgsexpressionbuilderdialog.h" +#include "qgsgraduatedsymbolrendererv2.h" +#include "qgsgraduatedsymbolrendererv2widget.h" void QgsRuleBasedRendererV2Widget::refineRule( int type ) { diff --git a/src/gui/symbology-ng/qgssizescalewidget.cpp b/src/gui/symbology-ng/qgssizescalewidget.cpp index 6a19786d181..f0a824171fa 100644 --- a/src/gui/symbology-ng/qgssizescalewidget.cpp +++ b/src/gui/symbology-ng/qgssizescalewidget.cpp @@ -16,18 +16,18 @@ #include "qgssizescalewidget.h" -#include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" -#include "qgssymbolv2.h" +#include "qgsdatadefined.h" #include "qgslayertreelayer.h" #include "qgslayertreemodellegendnode.h" -#include "qgssymbollayerv2utils.h" +#include "qgsmaplayerregistry.h" #include "qgsscaleexpression.h" -#include "qgsdatadefined.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorlayer.h" -#include #include #include +#include #include diff --git a/src/gui/symbology-ng/qgssizescalewidget.h b/src/gui/symbology-ng/qgssizescalewidget.h index 6eb51fba0a8..e875bc1bf5f 100644 --- a/src/gui/symbology-ng/qgssizescalewidget.h +++ b/src/gui/symbology-ng/qgssizescalewidget.h @@ -17,11 +17,11 @@ #ifndef QGSSIZESCALEWIDGET_H #define QGSSIZESCALEWIDGET_H -#include "qgslayertreegroup.h" -#include "qgslayertreemodel.h" -#include "qgsdatadefinedbutton.h" #include "ui_widget_size_scale.h" #include +#include "qgsdatadefinedbutton.h" +#include "qgslayertreegroup.h" +#include "qgslayertreemodel.h" class QgsVectorLayer; class QgsMarkerSymbolV2; diff --git a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp index f29005d3b40..0cb0f610577 100644 --- a/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp +++ b/src/gui/symbology-ng/qgssmartgroupeditordialog.cpp @@ -15,11 +15,11 @@ #include "qgssmartgroupeditordialog.h" -#include "qgsstylev2.h" #include "qgsapplication.h" +#include "qgsstylev2.h" -#include #include +#include // -------------------------- // // Condition Widget functions // diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp b/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp index cf94f77b90a..14b723175fb 100644 --- a/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp +++ b/src/gui/symbology-ng/qgsstylev2exportimportdialog.cpp @@ -15,15 +15,15 @@ ***************************************************************************/ #include "qgsstylev2exportimportdialog.h" -#include "qgsstylev2.h" -#include "qgssymbolv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsvectorcolorrampv2.h" #include "qgslogger.h" +#include "qgsstylev2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" -#include #include #include +#include #include #include #include diff --git a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h b/src/gui/symbology-ng/qgsstylev2exportimportdialog.h index ea69fc6d25b..a8a4101afe6 100644 --- a/src/gui/symbology-ng/qgsstylev2exportimportdialog.h +++ b/src/gui/symbology-ng/qgsstylev2exportimportdialog.h @@ -18,11 +18,11 @@ #define QGSSTYLEV2EXPORTIMPORTDIALOG_H #include -#include -#include -#include #include #include +#include +#include +#include #include "ui_qgsstylev2exportimportdialogbase.h" diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp index 3c054d0d1a1..e8ef5415e0f 100644 --- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp +++ b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp @@ -16,26 +16,26 @@ #include "qgsstylev2managerdialog.h" #include "qgsstylev2.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" #include "qgsvectorcolorrampv2.h" +#include "qgscptcitycolorrampv2dialog.h" +#include "qgssmartgroupeditordialog.h" +#include "qgsstylev2exportimportdialog.h" #include "qgssymbolv2selectordialog.h" +#include "qgsvectorcolorbrewercolorrampv2dialog.h" #include "qgsvectorgradientcolorrampv2dialog.h" #include "qgsvectorrandomcolorrampv2dialog.h" -#include "qgsvectorcolorbrewercolorrampv2dialog.h" -#include "qgscptcitycolorrampv2dialog.h" -#include "qgsstylev2exportimportdialog.h" -#include "qgssmartgroupeditordialog.h" +#include #include #include #include +#include #include #include #include -#include -#include #include "qgsapplication.h" #include "qgslogger.h" diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.h b/src/gui/symbology-ng/qgsstylev2managerdialog.h index 0b7b6c9581f..915cf6fee15 100644 --- a/src/gui/symbology-ng/qgsstylev2managerdialog.h +++ b/src/gui/symbology-ng/qgsstylev2managerdialog.h @@ -16,10 +16,10 @@ #ifndef QGSSTYLEV2MANAGERDIALOG_H #define QGSSTYLEV2MANAGERDIALOG_H -#include -#include #include +#include #include +#include #include "ui_qgsstylev2managerdialogbase.h" #include "qgscontexthelp.h" diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp index 9f8f2ecdd37..42120607b56 100644 --- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp +++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp @@ -16,20 +16,20 @@ #include "qgssymbollayerv2widget.h" +#include "qgsfillsymbollayerv2.h" #include "qgslinesymbollayerv2.h" #include "qgsmarkersymbollayerv2.h" -#include "qgsfillsymbollayerv2.h" #include "characterwidget.h" #include "qgsdashspacedialog.h" +#include "qgsdatadefined.h" #include "qgsdatadefinedsymboldialog.h" -#include "qgssymbolv2selectordialog.h" +#include "qgsstylev2.h" //for symbol selector dialog #include "qgssvgcache.h" #include "qgssymbollayerv2utils.h" +#include "qgssymbolv2selectordialog.h" #include "qgsvectorcolorrampv2.h" #include "qgsvectorgradientcolorrampv2dialog.h" -#include "qgsdatadefined.h" -#include "qgsstylev2.h" //for symbol selector dialog #include "qgsapplication.h" @@ -41,11 +41,11 @@ #include #include #include +#include #include #include #include #include -#include void QgsSymbolLayerV2Widget::registerDataDefinedButton( QgsDataDefinedButton * button, const QString & propertyName, QgsDataDefinedButton::DataType type, const QString & description ) { @@ -1546,10 +1546,10 @@ QgsSvgMarkerSymbolLayerV2Widget::~QgsSvgMarkerSymbolLayerV2Widget() delete mAssistantPreviewSymbol; } -#include #include #include #include +#include class QgsSvgListModel : public QAbstractListModel { diff --git a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp index 43c3e98b0ad..6d0c41cc008 100644 --- a/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp +++ b/src/gui/symbology-ng/qgssymbollevelsv2dialog.cpp @@ -15,13 +15,13 @@ #include "qgssymbollevelsv2dialog.h" -#include "qgssymbollayerv2utils.h" #include "qgssymbollayerv2.h" +#include "qgssymbollayerv2utils.h" #include "qgssymbolv2.h" -#include #include #include +#include // delegate used from Qt Spin Box example class SpinBoxDelegate : public QItemDelegate diff --git a/src/gui/symbology-ng/qgssymbolslistwidget.cpp b/src/gui/symbology-ng/qgssymbolslistwidget.cpp index 4bf8fa911a7..d3cf5d1ca9c 100644 --- a/src/gui/symbology-ng/qgssymbolslistwidget.cpp +++ b/src/gui/symbology-ng/qgssymbolslistwidget.cpp @@ -18,26 +18,26 @@ #include "qgssizescalewidget.h" -#include "qgsstylev2managerdialog.h" #include "qgsdatadefined.h" +#include "qgsstylev2managerdialog.h" -#include "qgssymbolv2.h" +#include "qgsmarkersymbollayerv2.h" #include "qgsstylev2.h" #include "qgssymbollayerv2utils.h" -#include "qgsmarkersymbollayerv2.h" +#include "qgssymbolv2.h" #include "qgsapplication.h" +#include +#include +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include QgsSymbolsListWidget::QgsSymbolsListWidget( QgsSymbolV2* symbol, QgsStyleV2* style, QMenu* menu, QWidget* parent, const QgsVectorLayer * layer ) diff --git a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp index 9e0b28c377c..ba09e514e9d 100644 --- a/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp +++ b/src/gui/symbology-ng/qgssymbolv2selectordialog.cpp @@ -16,32 +16,32 @@ #include "qgssymbolv2selectordialog.h" #include "qgsstylev2.h" -#include "qgssymbolv2.h" #include "qgssymbollayerv2.h" -#include "qgssymbollayerv2utils.h" #include "qgssymbollayerv2registry.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" // the widgets -#include "qgssymbolslistwidget.h" +#include "qgsellipsesymbollayerv2widget.h" #include "qgslayerpropertieswidget.h" #include "qgssymbollayerv2widget.h" -#include "qgsellipsesymbollayerv2widget.h" +#include "qgssymbolslistwidget.h" #include "qgsvectorfieldsymbollayerwidget.h" -#include "qgslogger.h" #include "qgsapplication.h" +#include "qgslogger.h" #include -#include -#include #include -#include #include #include +#include +#include +#include -#include #include #include +#include static const int SymbolLayerItemType = QStandardItem::UserType + 1; diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp index a0b2d1c1c38..213dc000c9c 100644 --- a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp +++ b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsvectorfieldsymbollayerwidget.h" #include "qgsvectorfieldsymbollayer.h" +#include "qgsvectorfieldsymbollayerwidget.h" #include "qgsvectorlayer.h" QgsVectorFieldSymbolLayerWidget::QgsVectorFieldSymbolLayerWidget( const QgsVectorLayer* vl, QWidget* parent ): QgsSymbolLayerV2Widget( parent, vl ), mLayer( 0 ) diff --git a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h index f92c5a2c4a9..1f67bec781e 100644 --- a/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h +++ b/src/gui/symbology-ng/qgsvectorfieldsymbollayerwidget.h @@ -15,8 +15,8 @@ #ifndef QGSVECTORFIELDSYMBOLLAYERWIDGET_H #define QGSVECTORFIELDSYMBOLLAYERWIDGET_H -#include "qgssymbollayerv2widget.h" #include "ui_widget_vectorfield.h" +#include "qgssymbollayerv2widget.h" class QgsVectorFieldSymbolLayer; diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp index 08732103d12..82529eb33ce 100644 --- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp +++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp @@ -15,10 +15,10 @@ #include "qgsvectorgradientcolorrampv2dialog.h" -#include "qgsvectorcolorrampv2.h" -#include "qgsdialog.h" #include "qgscolordialog.h" #include "qgscptcityarchive.h" +#include "qgsdialog.h" +#include "qgsvectorcolorrampv2.h" #include #include diff --git a/src/helpviewer/main.cpp b/src/helpviewer/main.cpp index 941ba5bd15b..5d6d3c19ea7 100644 --- a/src/helpviewer/main.cpp +++ b/src/helpviewer/main.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ #include +#include #include #include #include -#include -#include "qgshelpviewer.h" #include "qgsapplication.h" -#include "qgslogger.h" #include "qgsconfig.h" +#include "qgshelpviewer.h" +#include "qgslogger.h" int main( int argc, char ** argv ) { diff --git a/src/helpviewer/qgshelpviewer.cpp b/src/helpviewer/qgshelpviewer.cpp index 0882f663582..21d41934335 100644 --- a/src/helpviewer/qgshelpviewer.cpp +++ b/src/helpviewer/qgshelpviewer.cpp @@ -18,12 +18,12 @@ #include -#include #include #include +#include -#include "qgshelpviewer.h" #include "qgsapplication.h" +#include "qgshelpviewer.h" #include "qgslogger.h" QgsReaderThread::QgsReaderThread() diff --git a/src/plugins/compass/compass.h b/src/plugins/compass/compass.h index a640381ae04..3d781d7feca 100644 --- a/src/plugins/compass/compass.h +++ b/src/plugins/compass/compass.h @@ -20,8 +20,8 @@ #ifndef _COMPASS_H__ #define _COMPASS_H__ -#include #include +#include QTM_USE_NAMESPACE diff --git a/src/plugins/compass/qgscompassplugin.cpp b/src/plugins/compass/qgscompassplugin.cpp index ed3c37b4b30..a0b1bac3467 100644 --- a/src/plugins/compass/qgscompassplugin.cpp +++ b/src/plugins/compass/qgscompassplugin.cpp @@ -19,16 +19,16 @@ // includes -#include #include +#include #include #include "qgscompassplugin.h" -#include #include #include -#include +#include #include +#include #include "qgscompassplugingui.h" diff --git a/src/plugins/compass/qgscompassplugin.h b/src/plugins/compass/qgscompassplugin.h index 4b3ba80dde2..47bdf4a8e03 100644 --- a/src/plugins/compass/qgscompassplugin.h +++ b/src/plugins/compass/qgscompassplugin.h @@ -18,8 +18,8 @@ ***************************************************************************/ #ifndef PLUGIN #define PLUGIN -#include "../qgisplugin.h" #include "ui_qgscompasspluginguibase.h" +#include "../qgisplugin.h" #include "qgscompassplugingui.h" class QgisInterface; diff --git a/src/plugins/compass/qgscompassplugingui.cpp b/src/plugins/compass/qgscompassplugingui.cpp index b9838bdc19a..bc30cbcd0f4 100644 --- a/src/plugins/compass/qgscompassplugingui.cpp +++ b/src/plugins/compass/qgscompassplugingui.cpp @@ -19,11 +19,11 @@ #include "qgisinterface.h" //#include "qgscontexthelp.h" -#include "qgslogger.h" #include +#include "qgslogger.h" -#include "qgscompassplugingui.h" #include "compass.h" +#include "qgscompassplugingui.h" QgsCompassPluginGui::QgsCompassPluginGui( QWidget * parent, Qt::WindowFlags fl ) : QWidget( parent, fl ) diff --git a/src/plugins/coordinate_capture/coordinatecapture.cpp b/src/plugins/coordinate_capture/coordinatecapture.cpp index 7fde65c870b..6a0f99cf568 100644 --- a/src/plugins/coordinate_capture/coordinatecapture.cpp +++ b/src/plugins/coordinate_capture/coordinatecapture.cpp @@ -19,34 +19,34 @@ // QGIS Specific includes // -#include #include -#include "qgsapplication.h" -#include -#include -#include #include +#include #include #include #include +#include +#include +#include +#include "qgsapplication.h" -#include "coordinatecapture.h" #include "coordinatecapturegui.h" +#include "coordinatecapture.h" // // Qt4 Related Includes // #include -#include -#include -#include -#include #include -#include -#include +#include #include #include +#include +#include +#include +#include +#include static const QString sName = QObject::tr( "Coordinate Capture" ); static const QString sDescription = QObject::tr( "Capture mouse coordinates in different CRS" ); diff --git a/src/plugins/coordinate_capture/coordinatecapture.h b/src/plugins/coordinate_capture/coordinatecapture.h index 673552487ab..2f0ff4350df 100644 --- a/src/plugins/coordinate_capture/coordinatecapture.h +++ b/src/plugins/coordinate_capture/coordinatecapture.h @@ -40,10 +40,10 @@ #include //QGIS includes -#include "../qgisplugin.h" -#include "coordinatecapturemaptool.h" #include #include +#include "coordinatecapturemaptool.h" +#include "../qgisplugin.h" //forward declarations class QAction; diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp index 7776037984c..2ab31a8d7f5 100644 --- a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp +++ b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp @@ -14,16 +14,16 @@ ***************************************************************************/ #include "coordinatecapturemaptool.h" +#include "qgscoordinatereferencesystem.h" #include "qgscursors.h" #include "qgsmapcanvas.h" #include "qgsmaptopixel.h" #include "qgsrubberband.h" -#include "qgscoordinatereferencesystem.h" #include -#include #include +#include #include CoordinateCaptureMapTool::CoordinateCaptureMapTool( QgsMapCanvas* thepCanvas ) diff --git a/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp b/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp index 64409c2d1f5..554520268e3 100644 --- a/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp +++ b/src/plugins/dxf2shp_converter/dxf2shpconverter.cpp @@ -17,13 +17,13 @@ // QGIS Specific includes // -#include #include +#include #include #include -#include "dxf2shpconverter.h" #include "dxf2shpconvertergui.h" +#include "dxf2shpconverter.h" // // Qt4 Related Includes diff --git a/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp b/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp index d95fb6ad4e8..650de5b9bd7 100644 --- a/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp +++ b/src/plugins/dxf2shp_converter/dxf2shpconvertergui.cpp @@ -19,11 +19,11 @@ #include "dxflib/src/dl_dxf.h" //qt includes +#include +#include +#include #include #include -#include -#include -#include #include "qgslogger.h" diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnection.h b/src/plugins/evis/databaseconnection/evisdatabaseconnection.h index a8740cc4006..4b4cd3dccf6 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnection.h +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnection.h @@ -29,8 +29,8 @@ #include #include -#include #include +#include /** * \class eVisDatabaseConnection diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp index 1ce38ee3dbc..a0af48a2547 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.cpp @@ -26,15 +26,15 @@ **/ #include "evisdatabaseconnectiongui.h" -#include "qgscontexthelp.h" #include "qgsapplication.h" +#include "qgscontexthelp.h" -#include -#include #include +#include #include -#include +#include #include +#include #include #include #include diff --git a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h index 5109f148fd5..e7e364769b7 100644 --- a/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h +++ b/src/plugins/evis/databaseconnection/evisdatabaseconnectiongui.h @@ -33,8 +33,8 @@ #include "evisquerydefinition.h" #include "qgscontexthelp.h" -#include #include +#include /** * \class eVisDatabaseConnectionGui diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp index 50b295264d3..db2b6b3b0d2 100644 --- a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp +++ b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp @@ -27,22 +27,22 @@ #include "evisgenericeventbrowsergui.h" #include "qgsapplication.h" -#include "qgsmaprenderer.h" -#include "qgsmaptopixel.h" -#include "qgsmapcanvas.h" +#include "qgsfield.h" #include "qgsgeometry.h" #include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmaprenderer.h" +#include "qgsmaptopixel.h" #include "qgspoint.h" -#include "qgsfield.h" #include "qgsrectangle.h" -#include -#include +#include #include -#include +#include #include #include -#include +#include +#include /** * Constructor called when browser is launched from the application plugin tool bar diff --git a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h index 7aa8833d8db..6281d883682 100644 --- a/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h +++ b/src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.h @@ -30,13 +30,13 @@ #include #include -#include "qgsmaptool.h" +#include "qgisinterface.h" #include "qgsfeature.h" #include "qgsmapcanvas.h" -#include "qgisinterface.h" #include "qgsmaprenderer.h" -#include "qgsvectorlayer.h" +#include "qgsmaptool.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include "evisconfiguration.h" diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp index add11ecd076..6efc789157e 100644 --- a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp +++ b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.cpp @@ -28,10 +28,10 @@ #include "qgsapplication.h" -#include #include #include #include +#include /** * Constructor * @param parent - Pointer the to parent QWidget for modality diff --git a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h index 30dc48ae491..6fb7b2ee630 100644 --- a/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h +++ b/src/plugins/evis/eventbrowser/evisimagedisplaywidget.h @@ -27,11 +27,11 @@ #ifndef EVISIMAGEDISPLAYWIDGET_H #define EVISIMAGEDISPLAYWIDGET_H -#include -#include -#include -#include #include +#include +#include +#include +#include // TODO: Update to QNetworkAccessManager #if QT_VERSION < 0x050000 #include diff --git a/src/plugins/evis/evis.cpp b/src/plugins/evis/evis.cpp index 662d04f1e6d..5448f6dc2b0 100644 --- a/src/plugins/evis/evis.cpp +++ b/src/plugins/evis/evis.cpp @@ -50,28 +50,28 @@ // // QGIS Specific includes // -#include -#include -#include -#include #include +#include +#include +#include +#include //the gui subclass #include "evisdatabaseconnectiongui.h" -#include "evisgenericeventbrowsergui.h" #include "eviseventidtool.h" +#include "evisgenericeventbrowsergui.h" // // Qt4 Related Includes // -#include -#include -#include -#include -#include #include #include #include +#include +#include +#include +#include +#include static const QString sName = QObject::tr( "eVis" ); static const QString sDescription = QObject::tr( "An event visualization tool - view images associated with vector features" ); diff --git a/src/plugins/evis/evis.h b/src/plugins/evis/evis.h index a2db6bfd58c..9845f22142a 100644 --- a/src/plugins/evis/evis.h +++ b/src/plugins/evis/evis.h @@ -70,8 +70,8 @@ #include -#include #include +#include //forward declarations class QAction; diff --git a/src/plugins/evis/idtool/eviseventidtool.cpp b/src/plugins/evis/idtool/eviseventidtool.cpp index 3c204060838..a7b5ae84376 100644 --- a/src/plugins/evis/idtool/eviseventidtool.cpp +++ b/src/plugins/evis/idtool/eviseventidtool.cpp @@ -27,13 +27,13 @@ #include "eviseventidtool.h" #include "qgscursors.h" -#include "qgsmaptopixel.h" #include "qgsmaptool.h" -#include "qgsvectorlayer.h" +#include "qgsmaptopixel.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" -#include #include +#include /** * Constructor for the id style tool, this tool inherits the QgsMapTool and requires a pointer to diff --git a/src/plugins/evis/idtool/eviseventidtool.h b/src/plugins/evis/idtool/eviseventidtool.h index f3c4a6420c4..33f805ceb8e 100644 --- a/src/plugins/evis/idtool/eviseventidtool.h +++ b/src/plugins/evis/idtool/eviseventidtool.h @@ -30,9 +30,9 @@ #include #include +#include "qgsmapcanvas.h" #include "qgsmaplayer.h" #include "qgsmaptool.h" -#include "qgsmapcanvas.h" #include "qgspoint.h" #include "evisgenericeventbrowsergui.h" diff --git a/src/plugins/georeferencer/qgsgcplist.cpp b/src/plugins/georeferencer/qgsgcplist.cpp index d596b405ace..0f6a53b353e 100644 --- a/src/plugins/georeferencer/qgsgcplist.cpp +++ b/src/plugins/georeferencer/qgsgcplist.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgspoint.h" #include "qgsgeorefdatapoint.h" +#include "qgspoint.h" #include "qgsgcplist.h" diff --git a/src/plugins/georeferencer/qgsgcplistmodel.cpp b/src/plugins/georeferencer/qgsgcplistmodel.cpp index 3b7a773de86..fb93b09a191 100644 --- a/src/plugins/georeferencer/qgsgcplistmodel.cpp +++ b/src/plugins/georeferencer/qgsgcplistmodel.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ +#include +#include "qgis.h" #include "qgsgcplist.h" #include "qgsgcplistmodel.h" -#include "qgis.h" #include "qgsgeorefdatapoint.h" #include "qgsgeoreftransform.h" -#include #include using namespace std; diff --git a/src/plugins/georeferencer/qgsgcplistmodel.h b/src/plugins/georeferencer/qgsgcplistmodel.h index 2d93227b543..4ee19802e4f 100644 --- a/src/plugins/georeferencer/qgsgcplistmodel.h +++ b/src/plugins/georeferencer/qgsgcplistmodel.h @@ -16,8 +16,8 @@ #ifndef QGSGCP_LIST_TABLE_VIEW_H #define QGSGCP_LIST_TABLE_VIEW_H -#include #include +#include class QgsGeorefDataPoint; class QgsGeorefTransform; diff --git a/src/plugins/georeferencer/qgsgcplistwidget.cpp b/src/plugins/georeferencer/qgsgcplistwidget.cpp index 5a253f0387a..c9ce03c2fef 100644 --- a/src/plugins/georeferencer/qgsgcplistwidget.cpp +++ b/src/plugins/georeferencer/qgsgcplistwidget.cpp @@ -13,17 +13,17 @@ * * ***************************************************************************/ -#include #include +#include #include #include #include -#include "qgsgeorefdelegates.h" -#include "qgsgeorefdatapoint.h" #include "qgsgcplist.h" -#include "qgsgcplistwidget.h" #include "qgsgcplistmodel.h" +#include "qgsgcplistwidget.h" +#include "qgsgeorefdatapoint.h" +#include "qgsgeorefdelegates.h" QgsGCPListWidget::QgsGCPListWidget( QWidget *parent ) : QTableView( parent ) diff --git a/src/plugins/georeferencer/qgsgeorefdatapoint.cpp b/src/plugins/georeferencer/qgsgeorefdatapoint.cpp index 75b4df58eb3..09a7d604cf7 100644 --- a/src/plugins/georeferencer/qgsgeorefdatapoint.cpp +++ b/src/plugins/georeferencer/qgsgeorefdatapoint.cpp @@ -14,8 +14,8 @@ ***************************************************************************/ #include -#include "qgsmapcanvas.h" #include "qgsgcpcanvasitem.h" +#include "qgsmapcanvas.h" #include "qgsgeorefdatapoint.h" diff --git a/src/plugins/georeferencer/qgsgeorefdelegates.cpp b/src/plugins/georeferencer/qgsgeorefdelegates.cpp index 59fb40acc4d..c11b851c05f 100644 --- a/src/plugins/georeferencer/qgsgeorefdelegates.cpp +++ b/src/plugins/georeferencer/qgsgeorefdelegates.cpp @@ -17,8 +17,8 @@ #include #include -#include "qgsgeorefvalidators.h" #include "qgsgeorefdelegates.h" +#include "qgsgeorefvalidators.h" // ------------------------ QgsNonEditableDelegate ------------------------- // QgsNonEditableDelegate::QgsNonEditableDelegate( QWidget *parent ) diff --git a/src/plugins/georeferencer/qgsgeorefplugin.h b/src/plugins/georeferencer/qgsgeorefplugin.h index 374d0293ba9..2a926c24de1 100644 --- a/src/plugins/georeferencer/qgsgeorefplugin.h +++ b/src/plugins/georeferencer/qgsgeorefplugin.h @@ -50,8 +50,8 @@ class QgsGeorefPluginGui; // //QT Includes // -#include #include +#include /** * \class Plugin diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.cpp b/src/plugins/georeferencer/qgsgeorefplugingui.cpp index e0f6558d313..cc9e35d68d2 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.cpp +++ b/src/plugins/georeferencer/qgsgeorefplugingui.cpp @@ -13,27 +13,27 @@ * * ***************************************************************************/ +#include #include #include -#include #include #include +#include #include #include #include +#include #include #include #include #include #include -#include -#include #include -#include +#include #include "qgisinterface.h" -#include "qgslegendinterface.h" #include "qgsapplication.h" +#include "qgslegendinterface.h" #include "qgscomposerlabel.h" #include "qgscomposermap.h" @@ -42,21 +42,21 @@ #include "qgsmapcoordsdialog.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" -#include "qgsmaptoolzoom.h" #include "qgsmaptoolpan.h" +#include "qgsmaptoolzoom.h" -#include "qgsproject.h" -#include "qgsrasterlayer.h" #include "../../app/qgsrasterlayerproperties.h" +#include "qgsproject.h" #include "qgsproviderregistry.h" +#include "qgsrasterlayer.h" #include "qgsgeorefdatapoint.h" #include "qgsgeoreftooladdpoint.h" #include "qgsgeoreftooldeletepoint.h" #include "qgsgeoreftoolmovepoint.h" -#include "qgsleastsquares.h" #include "qgsgcplistwidget.h" +#include "qgsleastsquares.h" #include "qgsgeorefconfigdialog.h" #include "qgsgeorefdescriptiondialog.h" diff --git a/src/plugins/georeferencer/qgsgeorefplugingui.h b/src/plugins/georeferencer/qgsgeorefplugingui.h index eeaaf9b9dfe..cd9a23968bb 100644 --- a/src/plugins/georeferencer/qgsgeorefplugingui.h +++ b/src/plugins/georeferencer/qgsgeorefplugingui.h @@ -17,8 +17,8 @@ #include "qgsgeoreftransform.h" #include "qgsgcplist.h" -#include "qgsmapcoordsdialog.h" #include "qgsimagewarper.h" +#include "qgsmapcoordsdialog.h" #include diff --git a/src/plugins/georeferencer/qgsgeoreftransform.cpp b/src/plugins/georeferencer/qgsgeoreftransform.cpp index 251218074eb..7c69118fd43 100644 --- a/src/plugins/georeferencer/qgsgeoreftransform.cpp +++ b/src/plugins/georeferencer/qgsgeoreftransform.cpp @@ -16,8 +16,8 @@ #include "qgsgeoreftransform.h" -#include #include +#include #include "qgsleastsquares.h" diff --git a/src/plugins/georeferencer/qgsgeoreftransform.h b/src/plugins/georeferencer/qgsgeoreftransform.h index 222cf187302..85e68acf6cd 100644 --- a/src/plugins/georeferencer/qgsgeoreftransform.h +++ b/src/plugins/georeferencer/qgsgeoreftransform.h @@ -20,8 +20,8 @@ #include // just needed for GDALTransformerFunc, forward? #include -#include #include +#include #include "qgsrasterchangecoords.h" diff --git a/src/plugins/georeferencer/qgsimagewarper.cpp b/src/plugins/georeferencer/qgsimagewarper.cpp index d5eaa60e9ff..3abc88c0553 100644 --- a/src/plugins/georeferencer/qgsimagewarper.cpp +++ b/src/plugins/georeferencer/qgsimagewarper.cpp @@ -25,8 +25,8 @@ #include #include -#include "qgsimagewarper.h" #include "qgsgeoreftransform.h" +#include "qgsimagewarper.h" #include "qgslogger.h" #if defined(GDAL_VERSION_NUM) && GDAL_VERSION_NUM >= 1800 diff --git a/src/plugins/georeferencer/qgsleastsquares.cpp b/src/plugins/georeferencer/qgsleastsquares.cpp index 8e574e40647..6af070180ca 100644 --- a/src/plugins/georeferencer/qgsleastsquares.cpp +++ b/src/plugins/georeferencer/qgsleastsquares.cpp @@ -15,8 +15,8 @@ #include #include -#include #include +#include #include diff --git a/src/plugins/georeferencer/qgsleastsquares.h b/src/plugins/georeferencer/qgsleastsquares.h index eabcf168150..40143d4217d 100644 --- a/src/plugins/georeferencer/qgsleastsquares.h +++ b/src/plugins/georeferencer/qgsleastsquares.h @@ -15,9 +15,9 @@ #ifndef QGSLEASTSQUARES_H #define QGSLEASTSQUARES_H -#include #include #include +#include #include "qgspoint.h" diff --git a/src/plugins/georeferencer/qgsmapcoordsdialog.cpp b/src/plugins/georeferencer/qgsmapcoordsdialog.cpp index a7212655287..3d2626ae186 100644 --- a/src/plugins/georeferencer/qgsmapcoordsdialog.cpp +++ b/src/plugins/georeferencer/qgsmapcoordsdialog.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include "qgsmapcanvas.h" #include "qgssnappingutils.h" diff --git a/src/plugins/georeferencer/qgsopenrasterdialog.cpp b/src/plugins/georeferencer/qgsopenrasterdialog.cpp index 19941aa33dd..82de659c8eb 100644 --- a/src/plugins/georeferencer/qgsopenrasterdialog.cpp +++ b/src/plugins/georeferencer/qgsopenrasterdialog.cpp @@ -18,8 +18,8 @@ #include #include -#include "qgsrasterlayer.h" #include "qgsproject.h" +#include "qgsrasterlayer.h" #include "qgsopenrasterdialog.h" diff --git a/src/plugins/georeferencer/qgsrasterchangecoords.cpp b/src/plugins/georeferencer/qgsrasterchangecoords.cpp index 6391beea68f..e412192abe3 100644 --- a/src/plugins/georeferencer/qgsrasterchangecoords.cpp +++ b/src/plugins/georeferencer/qgsrasterchangecoords.cpp @@ -15,8 +15,8 @@ #include "qgsrasterchangecoords.h" -#include #include +#include #include diff --git a/src/plugins/georeferencer/qgsresidualplotitem.cpp b/src/plugins/georeferencer/qgsresidualplotitem.cpp index 5bee9736d09..91c81d14f99 100644 --- a/src/plugins/georeferencer/qgsresidualplotitem.cpp +++ b/src/plugins/georeferencer/qgsresidualplotitem.cpp @@ -13,12 +13,12 @@ * * ***************************************************************************/ -#include "qgsresidualplotitem.h" -#include "qgsgeorefdatapoint.h" -#include "qgscomposerutils.h" -#include #include #include +#include +#include "qgscomposerutils.h" +#include "qgsgeorefdatapoint.h" +#include "qgsresidualplotitem.h" QgsResidualPlotItem::QgsResidualPlotItem( QgsComposition* c ): QgsComposerItem( c ), mConvertScaleToMapUnits( false ) { diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp index 6a1ebd31c81..449daec489b 100644 --- a/src/plugins/globe/globe_plugin.cpp +++ b/src/plugins/globe/globe_plugin.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#include "globe_plugin.h" #include "globe_plugin_dialog.h" +#include "globe_plugin.h" #include "qgsosgearthtilesource.h" #ifdef HAVE_OSGEARTHQT #include @@ -27,40 +27,40 @@ #include -#include #include -#include +#include #include -#include +#include #include #include +#include +#include #include -#include #include #include -#include #include +#include -#include #include #include +#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include #if OSGEARTH_VERSION_GREATER_OR_EQUAL( 2, 2, 0 ) #include diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h index 9f52d1a09f6..e4eb143c2f7 100644 --- a/src/plugins/globe/globe_plugin.h +++ b/src/plugins/globe/globe_plugin.h @@ -19,15 +19,15 @@ #ifndef QGS_GLOBE_PLUGIN_H #define QGS_GLOBE_PLUGIN_H -#include "qgsconfig.h" -#include "qgisplugin.h" -#include "qgsosgearthtilesource.h" -#include "globe_plugin_dialog.h" -#include -#include -#include #include +#include #include +#include +#include +#include "globe_plugin_dialog.h" +#include "qgisplugin.h" +#include "qgsconfig.h" +#include "qgsosgearthtilesource.h" #ifndef HAVE_OSGEARTHQT //use backported controls if osgEarth <= 2.1 #define USE_BACKPORTED_CONTROLS #endif diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp index 2deb9320c79..e1341e576bb 100644 --- a/src/plugins/globe/globe_plugin_dialog.cpp +++ b/src/plugins/globe/globe_plugin_dialog.cpp @@ -16,24 +16,24 @@ #include "globe_plugin_dialog.h" #include "globe_plugin.h" -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include #include #include #include +#include +#include -#include #include -#include #include +#include +#include #include diff --git a/src/plugins/globe/globe_plugin_dialog.h b/src/plugins/globe/globe_plugin_dialog.h index a5129ebe12a..a72ce61bdf8 100644 --- a/src/plugins/globe/globe_plugin_dialog.h +++ b/src/plugins/globe/globe_plugin_dialog.h @@ -15,14 +15,14 @@ #ifndef QGIS_GLOBE_PLUGIN_DIALOG_H #define QGIS_GLOBE_PLUGIN_DIALOG_H -#include -#include -#include -#include #include -#include "qgscontexthelp.h" +#include +#include #include #include +#include +#include +#include "qgscontexthelp.h" class GlobePlugin; diff --git a/src/plugins/globe/qgsosgearthtilesource.cpp b/src/plugins/globe/qgsosgearthtilesource.cpp index 318c0bae160..8e860bd1806 100644 --- a/src/plugins/globe/qgsosgearthtilesource.cpp +++ b/src/plugins/globe/qgsosgearthtilesource.cpp @@ -13,22 +13,22 @@ * * ***************************************************************************/ -#include -#include #include +#include +#include -#include #include #include -#include #include +#include #include +#include #include "qgsosgearthtilesource.h" +#include #include #include -#include #include #ifdef USE_RENDERER @@ -37,9 +37,9 @@ #include #endif +#include #include #include -#include using namespace osgEarth; using namespace osgEarth::Drivers; diff --git a/src/plugins/gps_importer/qgsgpsdevicedialog.cpp b/src/plugins/gps_importer/qgsgpsdevicedialog.cpp index 778ee5a6434..d80d9ec7779 100644 --- a/src/plugins/gps_importer/qgsgpsdevicedialog.cpp +++ b/src/plugins/gps_importer/qgsgpsdevicedialog.cpp @@ -10,8 +10,8 @@ * (at your option) any later version. * ***************************************************************************/ -#include "qgsgpsdevicedialog.h" #include "qgisgui.h" +#include "qgsgpsdevicedialog.h" #include #include diff --git a/src/plugins/gps_importer/qgsgpsplugin.cpp b/src/plugins/gps_importer/qgsgpsplugin.cpp index f9355352e70..26498bf73dc 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.cpp +++ b/src/plugins/gps_importer/qgsgpsplugin.cpp @@ -18,27 +18,27 @@ // includes -#include "qgisinterface.h" #include "qgisgui.h" +#include "qgisinterface.h" #include "qgsapplication.h" -#include "qgsmaplayerregistry.h" -#include "qgsmaplayer.h" -#include "qgsvectorlayer.h" #include "qgsdataprovider.h" -#include "qgsvectordataprovider.h" #include "qgsgpsplugin.h" #include "qgslogger.h" +#include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" -#include -#include #include #include +#include #include -#include +#include #include #include #include #include +#include //non qt includes #include diff --git a/src/plugins/gps_importer/qgsgpsplugin.h b/src/plugins/gps_importer/qgsgpsplugin.h index f7a057f19c2..1d35dea695d 100644 --- a/src/plugins/gps_importer/qgsgpsplugin.h +++ b/src/plugins/gps_importer/qgsgpsplugin.h @@ -18,9 +18,9 @@ ***************************************************************************/ #ifndef QGSGPSPLUGIN_H #define QGSGPSPLUGIN_H +#include "qgisplugin.h" #include "qgsbabelformat.h" #include "qgsgpsdevice.h" -#include "qgisplugin.h" class QgisInterface; class QgsVectorLayer; diff --git a/src/plugins/gps_importer/qgsgpsplugingui.cpp b/src/plugins/gps_importer/qgsgpsplugingui.cpp index 315e0d4e31d..200336e3870 100644 --- a/src/plugins/gps_importer/qgsgpsplugingui.cpp +++ b/src/plugins/gps_importer/qgsgpsplugingui.cpp @@ -9,13 +9,13 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include "qgsgpsplugingui.h" -#include "qgsgpsdevicedialog.h" -#include "qgsmaplayer.h" -#include "qgsdataprovider.h" #include "qgscontexthelp.h" -#include "qgslogger.h" +#include "qgsdataprovider.h" #include "qgsgpsdetector.h" +#include "qgsgpsdevicedialog.h" +#include "qgsgpsplugingui.h" +#include "qgslogger.h" +#include "qgsmaplayer.h" //qt includes #include diff --git a/src/plugins/gps_importer/qgsgpsplugingui.h b/src/plugins/gps_importer/qgsgpsplugingui.h index bc7a1c8d191..b2eb32d9b80 100644 --- a/src/plugins/gps_importer/qgsgpsplugingui.h +++ b/src/plugins/gps_importer/qgsgpsplugingui.h @@ -17,11 +17,11 @@ #ifndef QGSGPSPLUGINGUI_H #define QGSGPSPLUGINGUI_H -#include "qgsvectorlayer.h" #include "ui_qgsgpspluginguibase.h" #include "qgsbabelformat.h" -#include "qgsgpsdevice.h" #include "qgscontexthelp.h" +#include "qgsgpsdevice.h" +#include "qgsvectorlayer.h" #include diff --git a/src/plugins/grass/qgis.g.browser.cpp b/src/plugins/grass/qgis.g.browser.cpp index ac26e6cf102..98f37fc241f 100644 --- a/src/plugins/grass/qgis.g.browser.cpp +++ b/src/plugins/grass/qgis.g.browser.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include #include -#include #include #include +#include +#include +#include #ifdef Q_OS_WIN #include diff --git a/src/plugins/grass/qgsgrassedit.cpp b/src/plugins/grass/qgsgrassedit.cpp index a915f96ef86..edefe575d63 100644 --- a/src/plugins/grass/qgsgrassedit.cpp +++ b/src/plugins/grass/qgsgrassedit.cpp @@ -14,13 +14,13 @@ * * ***************************************************************************/ -#include "qgsgrassedit.h" #include "qgsgrassattributes.h" +#include "qgsgrassedit.h" #include "qgsgrassedittools.h" -#include "qgsgrassplugin.h" -#include "qgsgrassutils.h" -#include "qgsgrassprovider.h" #include "qgsgrass.h" +#include "qgsgrassplugin.h" +#include "qgsgrassprovider.h" +#include "qgsgrassutils.h" #include "qgisinterface.h" #include "qgsapplication.h" @@ -37,13 +37,13 @@ #include #include +#include #include #include #include #include #include #include -#include extern "C" { diff --git a/src/plugins/grass/qgsgrassedittools.cpp b/src/plugins/grass/qgsgrassedittools.cpp index 5b82a4976a3..702bad33fbd 100644 --- a/src/plugins/grass/qgsgrassedittools.cpp +++ b/src/plugins/grass/qgsgrassedittools.cpp @@ -14,9 +14,9 @@ * * ***************************************************************************/ -#include "qgsgrassedittools.h" #include "qgsgrassattributes.h" #include "qgsgrassedit.h" +#include "qgsgrassedittools.h" #include "qgsgrassprovider.h" #include "qgisinterface.h" diff --git a/src/plugins/grass/qgsgrassmapcalc.cpp b/src/plugins/grass/qgsgrassmapcalc.cpp index 02788dc7213..a0cc0da4c54 100644 --- a/src/plugins/grass/qgsgrassmapcalc.cpp +++ b/src/plugins/grass/qgsgrassmapcalc.cpp @@ -13,16 +13,16 @@ * * *************************************************************************/ +#include "qgsgrass.h" #include "qgsgrassmapcalc.h" #include "qgsgrassselect.h" -#include "qgsgrass.h" #include "qgisinterface.h" #include "qgsapplication.h" +#include "qgsgrassplugin.h" #include "qgslogger.h" #include "qgsmapcanvas.h" #include "qgsmaplayer.h" -#include "qgsgrassplugin.h" #include diff --git a/src/plugins/grass/qgsgrassmodule.cpp b/src/plugins/grass/qgsgrassmodule.cpp index c8ac6116e47..3898268173a 100644 --- a/src/plugins/grass/qgsgrassmodule.cpp +++ b/src/plugins/grass/qgsgrassmodule.cpp @@ -13,15 +13,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgrassmodule.h" +#include "qgsconfig.h" +#include "qgsgrass.h" #include "qgsgrassmapcalc.h" +#include "qgsgrassmodule.h" #include "qgsgrassplugin.h" +#include "qgsgrassprovider.h" #include "qgsgrassselect.h" #include "qgsgrasstools.h" -#include "qgsgrassprovider.h" #include "qgsgrassutils.h" -#include "qgsgrass.h" -#include "qgsconfig.h" #include "qgisinterface.h" #include "qgsapplication.h" @@ -37,13 +37,13 @@ #include "qgsrasterlayer.h" #include "qgsvectorlayer.h" -#include #include #include #include #include #include #include +#include extern "C" { diff --git a/src/plugins/grass/qgsgrassmodule.h b/src/plugins/grass/qgsgrassmodule.h index dd27217002b..e781748c258 100644 --- a/src/plugins/grass/qgsgrassmodule.h +++ b/src/plugins/grass/qgsgrassmodule.h @@ -19,8 +19,8 @@ #include "ui_qgsgrassmodulebase.h" #include "qgis.h" -#include "qgsfield.h" #include "qgscoordinatereferencesystem.h" +#include "qgsfield.h" #include #include diff --git a/src/plugins/grass/qgsgrassnewmapset.cpp b/src/plugins/grass/qgsgrassnewmapset.cpp index 5fc3108d02f..23e908b7f46 100644 --- a/src/plugins/grass/qgsgrassnewmapset.cpp +++ b/src/plugins/grass/qgsgrassnewmapset.cpp @@ -14,9 +14,9 @@ * * ***************************************************************************/ +#include "qgsgrass.h" #include "qgsgrassnewmapset.h" #include "qgsgrassplugin.h" -#include "qgsgrass.h" #include "qgisinterface.h" #include "qgsapplication.h" diff --git a/src/plugins/grass/qgsgrassplugin.cpp b/src/plugins/grass/qgsgrassplugin.cpp index 37b1500c2ae..e61b2f52159 100644 --- a/src/plugins/grass/qgsgrassplugin.cpp +++ b/src/plugins/grass/qgsgrassplugin.cpp @@ -14,9 +14,9 @@ * * ***************************************************************************/ -#include "qgsgrassplugin.h" #include "qgis.h" #include "qgsgrass.h" +#include "qgsgrassplugin.h" //the gui subclass #include "qgsgrassedit.h" @@ -31,10 +31,10 @@ #include "qgsapplication.h" #include "qgslogger.h" #include "qgsmapcanvas.h" -#include "qgsrubberband.h" -#include "qgsproject.h" -#include "qgsvectorlayer.h" #include "qgsmaplayerregistry.h" +#include "qgsproject.h" +#include "qgsrubberband.h" +#include "qgsvectorlayer.h" #include #include diff --git a/src/plugins/grass/qgsgrassplugin.h b/src/plugins/grass/qgsgrassplugin.h index 1180479f1f9..c46092ce29e 100644 --- a/src/plugins/grass/qgsgrassplugin.h +++ b/src/plugins/grass/qgsgrassplugin.h @@ -15,11 +15,11 @@ ***************************************************************************/ #ifndef QGSGRASSPLUGIN_H #define QGSGRASSPLUGIN_H +#include +#include #include "../qgisplugin.h" #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" -#include -#include class QgsGrassTools; diff --git a/src/plugins/grass/qgsgrassregion.cpp b/src/plugins/grass/qgsgrassregion.cpp index 8d0f9de550e..9feb8b25309 100644 --- a/src/plugins/grass/qgsgrassregion.cpp +++ b/src/plugins/grass/qgsgrassregion.cpp @@ -15,9 +15,9 @@ ***************************************************************************/ #include "qgis.h" -#include "qgsgrassregion.h" -#include "qgsgrassplugin.h" #include "qgsgrass.h" +#include "qgsgrassplugin.h" +#include "qgsgrassregion.h" #include "qgisinterface.h" #include "qgslogger.h" diff --git a/src/plugins/grass/qgsgrassregion.h b/src/plugins/grass/qgsgrassregion.h index 03c874a119d..7d3cad2f406 100644 --- a/src/plugins/grass/qgsgrassregion.h +++ b/src/plugins/grass/qgsgrassregion.h @@ -20,8 +20,8 @@ #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsmaptool.h" -#include "qgsrubberband.h" #include "qgspoint.h" +#include "qgsrubberband.h" class QgsGrassPlugin; class QgsGrassRegionEdit; diff --git a/src/plugins/grass/qgsgrassselect.cpp b/src/plugins/grass/qgsgrassselect.cpp index c8d772ee642..8dcc7b6665d 100644 --- a/src/plugins/grass/qgsgrassselect.cpp +++ b/src/plugins/grass/qgsgrassselect.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include "qgsgrassselect.h" #include "qgsgrass.h" +#include "qgsgrassselect.h" #include "qgslogger.h" diff --git a/src/plugins/grass/qgsgrassshell.cpp b/src/plugins/grass/qgsgrassshell.cpp index f6d3cc50e45..214430d2702 100644 --- a/src/plugins/grass/qgsgrassshell.cpp +++ b/src/plugins/grass/qgsgrassshell.cpp @@ -12,19 +12,19 @@ * (at your option) any later version. * * * ***************************************************************************/ +#include +#include #include #include -#include -#include -#include "qgslogger.h" #include "qgsapplication.h" -#include "qtermwidget/qtermwidget.h" -#include "qgsgrass.h" #include "qgsconfig.h" +#include "qgsgrass.h" +#include "qgslogger.h" +#include "qtermwidget/qtermwidget.h" -#include "qgsgrassutils.h" #include "qgsgrassshell.h" +#include "qgsgrassutils.h" extern "C" { diff --git a/src/plugins/grass/qgsgrasstools.cpp b/src/plugins/grass/qgsgrasstools.cpp index 028dd0f2c38..84ff9f8aec0 100644 --- a/src/plugins/grass/qgsgrasstools.cpp +++ b/src/plugins/grass/qgsgrasstools.cpp @@ -14,11 +14,11 @@ * * ***************************************************************************/ -#include "qgsgrasstools.h" +#include "qgsconfig.h" +#include "qgsgrass.h" #include "qgsgrassmodule.h" #include "qgsgrassshell.h" -#include "qgsgrass.h" -#include "qgsconfig.h" +#include "qgsgrasstools.h" #include "qgisinterface.h" #include "qgsapplication.h" @@ -37,10 +37,10 @@ // For experimental model view alternative ui by Tim // // -#include "qgsdetaileditemdata.h" -#include "qgsdetaileditemdelegate.h" #include #include +#include "qgsdetaileditemdata.h" +#include "qgsdetaileditemdelegate.h" #ifdef Q_OS_WIN #include "qgsgrassutils.h" diff --git a/src/plugins/grass/qgsgrassutils.cpp b/src/plugins/grass/qgsgrassutils.cpp index f45bea521c1..2f2db15cb17 100644 --- a/src/plugins/grass/qgsgrassutils.cpp +++ b/src/plugins/grass/qgsgrassutils.cpp @@ -12,9 +12,9 @@ (at your option) any later version. *******************************************************************/ -#include "qgsgrassutils.h" -#include "qgsgrassselect.h" #include "qgsgrass.h" +#include "qgsgrassselect.h" +#include "qgsgrassutils.h" #include "qgisinterface.h" #include "qgsapplication.h" diff --git a/src/plugins/heatmap/heatmap.cpp b/src/plugins/heatmap/heatmap.cpp index 9b8c26f7e5a..8165079c6e4 100644 --- a/src/plugins/heatmap/heatmap.cpp +++ b/src/plugins/heatmap/heatmap.cpp @@ -16,31 +16,31 @@ ***************************************************************************/ // GDAL includes -#include "gdal_priv.h" -#include "cpl_string.h" #include "cpl_conv.h" +#include "cpl_string.h" +#include "gdal_priv.h" // QGIS Specific includes -#include #include +#include -#include "heatmap.h" #include "heatmapgui.h" +#include "heatmap.h" -#include "qgsgeometry.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsdistancearea.h" #include "qgscoordinatereferencesystem.h" +#include "qgsdistancearea.h" +#include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagebar.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" // Qt4 Related Includes #include -#include -#include #include +#include #include +#include #define NO_DATA -9999 diff --git a/src/plugins/heatmap/heatmap.h b/src/plugins/heatmap/heatmap.h index 43eb2d96d3b..93e2e67775a 100644 --- a/src/plugins/heatmap/heatmap.h +++ b/src/plugins/heatmap/heatmap.h @@ -40,8 +40,8 @@ //QGIS includes #include "../qgisplugin.h" -#include "qgsvectorlayer.h" #include "qgscoordinatereferencesystem.h" +#include "qgsvectorlayer.h" //forward declarations class QAction; diff --git a/src/plugins/heatmap/heatmapgui.cpp b/src/plugins/heatmap/heatmapgui.cpp index cd1671b14f8..68398c87a9b 100644 --- a/src/plugins/heatmap/heatmapgui.cpp +++ b/src/plugins/heatmap/heatmapgui.cpp @@ -10,29 +10,29 @@ * (at your option) any later version. * ***************************************************************************/ // qgis includes -#include "qgis.h" #include "heatmapgui.h" #include "heatmap.h" +#include "qgis.h" #include "qgscontexthelp.h" -#include "qgsmaplayer.h" -#include "qgsmaplayerregistry.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgslogger.h" -#include "qgsgeometry.h" #include "qgscoordinatereferencesystem.h" #include "qgsdistancearea.h" +#include "qgsgeometry.h" +#include "qgslogger.h" +#include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" // GDAL includes -#include "gdal_priv.h" -#include "cpl_string.h" #include "cpl_conv.h" +#include "cpl_string.h" +#include "gdal_priv.h" //qt includes #include #include -#include #include +#include //standard includes diff --git a/src/plugins/heatmap/heatmapgui.h b/src/plugins/heatmap/heatmapgui.h index 18828272f44..004f40ba837 100644 --- a/src/plugins/heatmap/heatmapgui.h +++ b/src/plugins/heatmap/heatmapgui.h @@ -16,9 +16,9 @@ #include #include "heatmap.h" -#include "qgsvectorlayer.h" #include "qgscoordinatereferencesystem.h" #include "qgsgeometry.h" +#include "qgsvectorlayer.h" /** @author Arunmozhi */ diff --git a/src/plugins/interpolation/qgsinterpolationdialog.cpp b/src/plugins/interpolation/qgsinterpolationdialog.cpp index 97277e2ffc1..cf396fc1015 100644 --- a/src/plugins/interpolation/qgsinterpolationdialog.cpp +++ b/src/plugins/interpolation/qgsinterpolationdialog.cpp @@ -16,20 +16,20 @@ * * ***************************************************************************/ -#include "qgsinterpolationdialog.h" -#include "qgsinterpolatordialog.h" -#include "qgsfield.h" -#include "qgsgridfilewriter.h" -#include "qgsidwinterpolatordialog.h" -#include "qgstininterpolatordialog.h" -#include "qgsmapcanvas.h" -#include "qgsmaplayerregistry.h" -#include "qgsvectordataprovider.h" -#include "qgsvectorlayer.h" #include #include #include #include +#include "qgsfield.h" +#include "qgsgridfilewriter.h" +#include "qgsidwinterpolatordialog.h" +#include "qgsinterpolationdialog.h" +#include "qgsinterpolatordialog.h" +#include "qgsmapcanvas.h" +#include "qgsmaplayerregistry.h" +#include "qgstininterpolatordialog.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" QgsInterpolationDialog::QgsInterpolationDialog( QWidget* parent, QgisInterface* iface ): QDialog( parent ), mIface( iface ), mInterpolatorDialog( 0 ) diff --git a/src/plugins/interpolation/qgsinterpolationdialog.h b/src/plugins/interpolation/qgsinterpolationdialog.h index 5ac1cddf9d6..4ed15637a0a 100644 --- a/src/plugins/interpolation/qgsinterpolationdialog.h +++ b/src/plugins/interpolation/qgsinterpolationdialog.h @@ -19,9 +19,9 @@ #define QGSINTERPOLATIONDIALOG_H #include "ui_qgsinterpolationdialogbase.h" -#include "qgsrectangle.h" -#include "qgisinterface.h" #include +#include "qgisinterface.h" +#include "qgsrectangle.h" class QgsInterpolatorDialog; class QgsVectorLayer; diff --git a/src/plugins/interpolation/qgsinterpolationplugin.cpp b/src/plugins/interpolation/qgsinterpolationplugin.cpp index c70169075ed..e4c1cccda1e 100644 --- a/src/plugins/interpolation/qgsinterpolationplugin.cpp +++ b/src/plugins/interpolation/qgsinterpolationplugin.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgsinterpolationplugin.h" #include "qgisinterface.h" +#include "qgsapplication.h" #include "qgsinterpolationdialog.h" +#include "qgsinterpolationplugin.h" #include diff --git a/src/plugins/interpolation/qgsinterpolationplugin.h b/src/plugins/interpolation/qgsinterpolationplugin.h index 140cb404b49..e0ecfc0dbda 100644 --- a/src/plugins/interpolation/qgsinterpolationplugin.h +++ b/src/plugins/interpolation/qgsinterpolationplugin.h @@ -18,8 +18,8 @@ #ifndef QGSINTERPOLATIONPLUGIN_H #define QGSINTERPOLATIONPLUGIN_H -#include "qgisplugin.h" #include +#include "qgisplugin.h" class QgisInterface; class QAction; diff --git a/src/plugins/interpolation/qgsinterpolatordialog.h b/src/plugins/interpolation/qgsinterpolatordialog.h index 2697412c2aa..a67c62071f6 100644 --- a/src/plugins/interpolation/qgsinterpolatordialog.h +++ b/src/plugins/interpolation/qgsinterpolatordialog.h @@ -18,9 +18,9 @@ #ifndef QGSINTERPOLATORDIALOG_H #define QGSINTERPOLATORDIALOG_H -#include "qgsinterpolator.h" #include #include +#include "qgsinterpolator.h" class QgsVectorLayer; class QgisInterface; diff --git a/src/plugins/interpolation/qgstininterpolatordialog.cpp b/src/plugins/interpolation/qgstininterpolatordialog.cpp index f1b19553e30..610d7d03eb3 100644 --- a/src/plugins/interpolation/qgstininterpolatordialog.cpp +++ b/src/plugins/interpolation/qgstininterpolatordialog.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgstininterpolatordialog.h" -#include "qgstininterpolator.h" #include #include +#include "qgstininterpolatordialog.h" +#include "qgstininterpolator.h" QgsTINInterpolatorDialog::QgsTINInterpolatorDialog( QWidget* parent, QgisInterface* iface ): QgsInterpolatorDialog( parent, iface ) { diff --git a/src/plugins/interpolation/qgstininterpolatordialog.h b/src/plugins/interpolation/qgstininterpolatordialog.h index 6528c99c5bf..4d0fa301360 100644 --- a/src/plugins/interpolation/qgstininterpolatordialog.h +++ b/src/plugins/interpolation/qgstininterpolatordialog.h @@ -18,8 +18,8 @@ #ifndef QGSTININTERPOLATORDIALOG_H #define QGSTININTERPOLATORDIALOG_H -#include "qgsinterpolatordialog.h" #include "ui_qgstininterpolatordialogbase.h" +#include "qgsinterpolatordialog.h" class QgsTINInterpolatorDialog: public QgsInterpolatorDialog, private Ui::QgsTINInterpolatorDialogBase { diff --git a/src/plugins/offline_editing/offline_editing_plugin.cpp b/src/plugins/offline_editing/offline_editing_plugin.cpp index f13eaec614c..9dbe65a24cc 100644 --- a/src/plugins/offline_editing/offline_editing_plugin.cpp +++ b/src/plugins/offline_editing/offline_editing_plugin.cpp @@ -16,15 +16,15 @@ * * ***************************************************************************/ -#include "offline_editing_plugin.h" #include "offline_editing_plugin_gui.h" +#include "offline_editing_plugin.h" #include "offline_editing_progress_dialog.h" -#include #include +#include #include -#include #include +#include #include diff --git a/src/plugins/offline_editing/offline_editing_plugin.h b/src/plugins/offline_editing/offline_editing_plugin.h index ebab857d5a8..26e00abd319 100644 --- a/src/plugins/offline_editing/offline_editing_plugin.h +++ b/src/plugins/offline_editing/offline_editing_plugin.h @@ -19,9 +19,9 @@ #ifndef QGS_OFFLINE_EDITING_PLUGIN_H #define QGS_OFFLINE_EDITING_PLUGIN_H -#include "../qgisplugin.h" #include #include +#include "../qgisplugin.h" class QAction; class QgisInterface; diff --git a/src/plugins/offline_editing/offline_editing_progress_dialog.h b/src/plugins/offline_editing/offline_editing_progress_dialog.h index d43fe68473d..267e0bb3ae5 100644 --- a/src/plugins/offline_editing/offline_editing_progress_dialog.h +++ b/src/plugins/offline_editing/offline_editing_progress_dialog.h @@ -19,8 +19,8 @@ #ifndef QGS_OFFLINE_EDITING_PROGRESS_DIALOG_H #define QGS_OFFLINE_EDITING_PROGRESS_DIALOG_H -#include #include "ui_offline_editing_progress_dialog_base.h" +#include class QgsOfflineEditingProgressDialog : public QDialog, private Ui::QgsOfflineEditingProgressDialogBase { diff --git a/src/plugins/oracle_raster/qgsoracle_plugin.h b/src/plugins/oracle_raster/qgsoracle_plugin.h index bd6966e909b..b50a4f160a5 100644 --- a/src/plugins/oracle_raster/qgsoracle_plugin.h +++ b/src/plugins/oracle_raster/qgsoracle_plugin.h @@ -17,14 +17,14 @@ #define OraclePlugin_H // Qt Includes -#include #include +#include #include // QGIS Includes -#include -#include #include +#include +#include class QgsOraclePlugin : public QObject, public QgisPlugin { diff --git a/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp b/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp index 235b43a353c..15ff665ae0c 100644 --- a/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp +++ b/src/plugins/oracle_raster/qgsoracleconnect_ui.cpp @@ -16,8 +16,8 @@ #include "qgsoracleconnect_ui.h" // Qt Includes -#include #include +#include QgsOracleConnect::QgsOracleConnect( QWidget* parent, const QString& connName, diff --git a/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp b/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp index 75c48bed819..a3eec65aa05 100644 --- a/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp +++ b/src/plugins/oracle_raster/qgsselectgeoraster_ui.cpp @@ -13,15 +13,15 @@ * * ***************************************************************************/ -#include "qgsselectgeoraster_ui.h" #include "qgsoracleconnect_ui.h" +#include "qgsselectgeoraster_ui.h" //GDAL includes +#include #include "gdal.h" #include "ogr_api.h" #include "ogrsf_frmts.h" -#include #include "qgsvectorlayer.h" diff --git a/src/plugins/oracle_raster/qgsselectgeoraster_ui.h b/src/plugins/oracle_raster/qgsselectgeoraster_ui.h index 312385b7390..03f7e81bd0e 100644 --- a/src/plugins/oracle_raster/qgsselectgeoraster_ui.h +++ b/src/plugins/oracle_raster/qgsselectgeoraster_ui.h @@ -20,9 +20,9 @@ #include "ui_qgsselectgeorasterbase.h" //Qt includes -#include -#include #include +#include +#include // QGIS Includes #include diff --git a/src/plugins/plugin_template/plugin.cpp b/src/plugins/plugin_template/plugin.cpp index e27b37c0ed2..01d8ad36f71 100644 --- a/src/plugins/plugin_template/plugin.cpp +++ b/src/plugins/plugin_template/plugin.cpp @@ -19,11 +19,11 @@ // QGIS Specific includes // -#include #include +#include -#include "[pluginlcasename].h" #include "[pluginlcasename]gui.h" +#include "[pluginlcasename].h" // // Qt4 Related Includes diff --git a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp index 5916505c6db..4ee6e64ef51 100644 --- a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp +++ b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisdialog.cpp @@ -12,9 +12,6 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsrasterterrainanalysisdialog.h" -#include "qgsmaplayerregistry.h" -#include "qgsrasterlayer.h" #include #include #include @@ -25,6 +22,9 @@ #include #include "cpl_string.h" #include "gdal.h" +#include "qgsmaplayerregistry.h" +#include "qgsrasterlayer.h" +#include "qgsrasterterrainanalysisdialog.h" QgsRasterTerrainAnalysisDialog::QgsRasterTerrainAnalysisDialog( DisplayMode mode, QWidget * parent, Qt::WindowFlags f ): QDialog( parent, f ) { diff --git a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp index b8a217fd315..0e237855766 100644 --- a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp +++ b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.cpp @@ -15,24 +15,24 @@ * * ***************************************************************************/ -#include "qgsrasterterrainanalysisplugin.h" -#include "qgis.h" -#include "qgisinterface.h" -#include "qgsmaplayer.h" -#include "qgsmaplayerregistry.h" -#include "qgsaspectfilter.h" -#include "qgshillshadefilter.h" -#include "qgsslopefilter.h" -#include "qgsruggednessfilter.h" -#include "qgstotalcurvaturefilter.h" -#include "qgsrelief.h" -#include "qgsrasterterrainanalysisdialog.h" #include #include #include #include #include #include +#include "qgis.h" +#include "qgisinterface.h" +#include "qgsaspectfilter.h" +#include "qgshillshadefilter.h" +#include "qgsmaplayer.h" +#include "qgsmaplayerregistry.h" +#include "qgsrasterterrainanalysisdialog.h" +#include "qgsrasterterrainanalysisplugin.h" +#include "qgsrelief.h" +#include "qgsruggednessfilter.h" +#include "qgsslopefilter.h" +#include "qgstotalcurvaturefilter.h" static const QString name_ = QObject::tr( "Raster Terrain Analysis plugin" ); static const QString description_ = QObject::tr( "A plugin for raster based terrain analysis" ); diff --git a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h index 2f0f8bcc4d7..4b3fb667a84 100644 --- a/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h +++ b/src/plugins/raster_terrain_analysis/qgsrasterterrainanalysisplugin.h @@ -18,8 +18,8 @@ #ifndef QGSRASTERTERRAINANALYSISPLUGIN_H #define QGSRASTERTERRAINANALYSISPLUGIN_H -#include "qgisplugin.h" #include +#include "qgisplugin.h" class QgsInterface; class QAction; diff --git a/src/plugins/roadgraph/exportdlg.cpp b/src/plugins/roadgraph/exportdlg.cpp index 5402973d089..1dea1929425 100644 --- a/src/plugins/roadgraph/exportdlg.cpp +++ b/src/plugins/roadgraph/exportdlg.cpp @@ -7,24 +7,24 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include "exportdlg.h" #include +#include "exportdlg.h" //qt includes -#include #include -#include -#include -#include #include +#include +#include #include +#include +#include // Qgis includes -#include #include #include #include +#include //standard includes diff --git a/src/plugins/roadgraph/linevectorlayersettings.cpp b/src/plugins/roadgraph/linevectorlayersettings.cpp index 49736098031..52e129f7680 100644 --- a/src/plugins/roadgraph/linevectorlayersettings.cpp +++ b/src/plugins/roadgraph/linevectorlayersettings.cpp @@ -21,8 +21,8 @@ #include // QT includes -#include #include +#include #include //standard includes diff --git a/src/plugins/roadgraph/linevectorlayerwidget.cpp b/src/plugins/roadgraph/linevectorlayerwidget.cpp index 30692fe1127..bd3f23610af 100644 --- a/src/plugins/roadgraph/linevectorlayerwidget.cpp +++ b/src/plugins/roadgraph/linevectorlayerwidget.cpp @@ -9,20 +9,20 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include "linevectorlayerwidget.h" #include "linevectorlayersettings.h" +#include "linevectorlayerwidget.h" //qt includes -#include -#include #include -#include -#include #include -#include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include // Qgis includes #include "qgsfield.h" diff --git a/src/plugins/roadgraph/roadgraphplugin.cpp b/src/plugins/roadgraph/roadgraphplugin.cpp index 9b05df9dca2..db7b3f2652d 100644 --- a/src/plugins/roadgraph/roadgraphplugin.cpp +++ b/src/plugins/roadgraph/roadgraphplugin.cpp @@ -15,27 +15,27 @@ // QGIS Specific includes -#include -#include #include +#include +#include #include -#include -#include #include +#include +#include #include -#include #include +#include -#include +#include #include #include -#include +#include // Road grap plugin includes #include "roadgraphplugin.h" -#include "shortestpathwidget.h" #include "settingsdlg.h" +#include "shortestpathwidget.h" #include "speedproperter.h" #include "units.h" @@ -46,13 +46,13 @@ // #include +#include +#include #include #include -#include #include -#include +#include #include -#include // standard includes diff --git a/src/plugins/roadgraph/settingsdlg.cpp b/src/plugins/roadgraph/settingsdlg.cpp index 784d4345d64..9aa22430f30 100644 --- a/src/plugins/roadgraph/settingsdlg.cpp +++ b/src/plugins/roadgraph/settingsdlg.cpp @@ -8,17 +8,17 @@ * (at your option) any later version. * ***************************************************************************/ //road-graph plugin includes -#include "settingsdlg.h" #include +#include "settingsdlg.h" //qt includes -#include #include -#include -#include #include -#include #include +#include +#include +#include +#include // Qgis includes #include "settings.h" diff --git a/src/plugins/roadgraph/shortestpathwidget.cpp b/src/plugins/roadgraph/shortestpathwidget.cpp index 62cf0b98636..ad529db084b 100644 --- a/src/plugins/roadgraph/shortestpathwidget.cpp +++ b/src/plugins/roadgraph/shortestpathwidget.cpp @@ -17,40 +17,40 @@ //qt includes #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include // Qgis includes -#include -#include #include -#include -#include -#include -#include #include -#include -#include +#include +#include +#include +#include +#include #include +#include +#include +#include -#include -#include -#include #include +#include +#include +#include // roadgraph plugin includes -#include "roadgraphplugin.h" -#include "shortestpathwidget.h" #include "exportdlg.h" -#include "units.h" +#include "roadgraphplugin.h" #include "settings.h" +#include "shortestpathwidget.h" +#include "units.h" //standard includes diff --git a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h index 50090aa200c..6fb7bfe5852 100644 --- a/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h +++ b/src/plugins/spatialquery/qgsgeometrycoordinatetransform.h @@ -18,9 +18,9 @@ #ifndef GEOMETRYCOORDINATETRANSFORM_H #define GEOMETRYCOORDINATETRANSFORM_H +#include "qgscoordinatetransform.h" #include "qgsgeometry.h" #include "qgsvectorlayer.h" -#include "qgscoordinatetransform.h" /** * \class QgsGeometryCoordinateTransform diff --git a/src/plugins/spatialquery/qgsreaderfeatures.h b/src/plugins/spatialquery/qgsreaderfeatures.h index a5094709691..b7c9bd1b346 100644 --- a/src/plugins/spatialquery/qgsreaderfeatures.h +++ b/src/plugins/spatialquery/qgsreaderfeatures.h @@ -18,8 +18,8 @@ #ifndef READERFEATURES_H #define READERFEATURES_H -#include #include +#include /** * \class QgsReaderFeatures diff --git a/src/plugins/spatialquery/qgsrubberselectid.h b/src/plugins/spatialquery/qgsrubberselectid.h index 18c66ee3c01..e96f3b758cd 100644 --- a/src/plugins/spatialquery/qgsrubberselectid.h +++ b/src/plugins/spatialquery/qgsrubberselectid.h @@ -19,8 +19,8 @@ #ifndef QGSRUBBERSELECTID_H #define QGSRUBBERSELECTID_H -#include "qgsrubberband.h" #include "qgsmapcanvas.h" +#include "qgsrubberband.h" #include "qgsvectorlayer.h" /** diff --git a/src/plugins/spatialquery/qgsspatialquery.cpp b/src/plugins/spatialquery/qgsspatialquery.cpp index aa8b40beae7..83f3244417b 100644 --- a/src/plugins/spatialquery/qgsspatialquery.cpp +++ b/src/plugins/spatialquery/qgsspatialquery.cpp @@ -18,10 +18,10 @@ #include -#include "qgsvectordataprovider.h" #include "qgsfeature.h" #include "qgsgeometrycoordinatetransform.h" #include "qgsspatialquery.h" +#include "qgsvectordataprovider.h" QgsSpatialQuery::QgsSpatialQuery( MngProgressBar *pb ) : mPb( pb ) diff --git a/src/plugins/spatialquery/qgsspatialquery.h b/src/plugins/spatialquery/qgsspatialquery.h index 75efd71019e..6f93a7e8b6b 100644 --- a/src/plugins/spatialquery/qgsspatialquery.h +++ b/src/plugins/spatialquery/qgsspatialquery.h @@ -18,8 +18,8 @@ #ifndef SPATIALQUERY_H #define SPATIALQUERY_H -#include #include +#include #include "qgsmngprogressbar.h" #include "qgsreaderfeatures.h" diff --git a/src/plugins/spatialquery/qgsspatialquerydialog.cpp b/src/plugins/spatialquery/qgsspatialquerydialog.cpp index c10e1c1d6a6..192f7e79c5c 100644 --- a/src/plugins/spatialquery/qgsspatialquerydialog.cpp +++ b/src/plugins/spatialquery/qgsspatialquerydialog.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#include #include +#include #include #include "qgis.h" @@ -27,10 +27,10 @@ #include "qgsproject.h" #include "qgsvectordataprovider.h" +#include "qgsmngprogressbar.h" +#include "qgsrubberselectid.h" #include "qgsspatialquerydialog.h" #include "qgsspatialquery.h" -#include "qgsrubberselectid.h" -#include "qgsmngprogressbar.h" QgsSpatialQueryDialog::QgsSpatialQueryDialog( QWidget* parent, QgisInterface* iface ): QDialog( parent ) { diff --git a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp index 6aac6c789be..6c594f22c04 100644 --- a/src/plugins/spatialquery/qgsspatialqueryplugin.cpp +++ b/src/plugins/spatialquery/qgsspatialqueryplugin.cpp @@ -29,8 +29,8 @@ // // Required plugin includes // -#include "qgsspatialqueryplugin.h" #include "qgsspatialquerydialog.h" +#include "qgsspatialqueryplugin.h" // // Required Qt includes diff --git a/src/plugins/spit/qgsshapefile.cpp b/src/plugins/spit/qgsshapefile.cpp index 55cac17d3cb..cdc0b3f0129 100644 --- a/src/plugins/spit/qgsshapefile.cpp +++ b/src/plugins/spit/qgsshapefile.cpp @@ -15,23 +15,23 @@ * * ***************************************************************************/ -#include -#include #include +#include +#include #include -#include -#include -#include -#include #include +#include +#include #include +#include +#include -#include "qgsapplication.h" #include "cpl_error.h" -#include "qgsshapefile.h" #include "qgis.h" +#include "qgsapplication.h" #include "qgslogger.h" +#include "qgsshapefile.h" #include "qgspgutil.h" diff --git a/src/plugins/spit/qgsshapefile.h b/src/plugins/spit/qgsshapefile.h index da2e18b20b7..339ce4e2ccd 100644 --- a/src/plugins/spit/qgsshapefile.h +++ b/src/plugins/spit/qgsshapefile.h @@ -18,11 +18,11 @@ #ifndef QGSSHAPEFILE_H #define QGSSHAPEFILE_H -#include +#include +#include #include #include -#include -#include +#include class QProgressDialog; class QTextCodec; diff --git a/src/plugins/spit/qgsspit.cpp b/src/plugins/spit/qgsspit.cpp index 1a9da8415b1..bdc5253cf28 100644 --- a/src/plugins/spit/qgsspit.cpp +++ b/src/plugins/spit/qgsspit.cpp @@ -15,28 +15,28 @@ * * ***************************************************************************/ -#include #include +#include #include +#include +#include +#include +#include +#include #include #include -#include #include -#include -#include -#include -#include #include -#include +#include #include "qgsencodingfiledialog.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmessageviewer.h" +#include "qgspgnewconnection.h" #include "qgspgutil.h" #include "qgsspit.h" -#include "qgspgnewconnection.h" -#include "qgsdatasourceuri.h" -#include "qgsmessageviewer.h" -#include "qgslogger.h" QgsSpit::QgsSpit( QWidget *parent, Qt::WindowFlags fl ) : QDialog( parent, fl ) diff --git a/src/plugins/spit/qgsspit.h b/src/plugins/spit/qgsspit.h index e9542c55f2f..a413caffcdf 100644 --- a/src/plugins/spit/qgsspit.h +++ b/src/plugins/spit/qgsspit.h @@ -17,15 +17,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include -#include -#include #include +#include +#include -#include "qgsshapefile.h" #include "ui_qgsspitbase.h" +#include "qgsshapefile.h" class QTableWidgetItem; diff --git a/src/plugins/spit/qgsspitplugin.cpp b/src/plugins/spit/qgsspitplugin.cpp index 9329a87c358..e474b743fea 100644 --- a/src/plugins/spit/qgsspitplugin.cpp +++ b/src/plugins/spit/qgsspitplugin.cpp @@ -26,8 +26,8 @@ #include "qgisinterface.h" #include "qgsapplication.h" -#include "qgsspitplugin.h" #include "qgsspit.h" +#include "qgsspitplugin.h" static const QString name_ = QObject::tr( "SPIT" ); diff --git a/src/plugins/topology/checkDock.cpp b/src/plugins/topology/checkDock.cpp index 05b9ac0e57e..56701f72102 100644 --- a/src/plugins/topology/checkDock.cpp +++ b/src/plugins/topology/checkDock.cpp @@ -20,24 +20,24 @@ #include "checkDock.h" -#include -#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include -#include "topolTest.h" -#include "rulesDialog.h" #include "dockModel.h" +#include "rulesDialog.h" +#include "topolTest.h" //class QgisInterface; diff --git a/src/plugins/topology/checkDock.h b/src/plugins/topology/checkDock.h index 7e13020e4f1..0bf5d9e2036 100644 --- a/src/plugins/topology/checkDock.h +++ b/src/plugins/topology/checkDock.h @@ -20,17 +20,17 @@ #include -#include #include +#include //#include #include "qgsspatialindex.h" //#include #include "ui_checkDock.h" +#include "dockModel.h" #include "rulesDialog.h" #include "topolError.h" #include "topolTest.h" -#include "dockModel.h" class QgsMapLayerRegistry; class QgsRubberBand; diff --git a/src/plugins/topology/rulesDialog.cpp b/src/plugins/topology/rulesDialog.cpp index 46dde0467aa..46fc37785f5 100644 --- a/src/plugins/topology/rulesDialog.cpp +++ b/src/plugins/topology/rulesDialog.cpp @@ -18,14 +18,14 @@ #include #include -#include -#include +#include +#include #include #include -#include -#include -#include #include +#include +#include +#include #include "qgsapplication.h" #include "rulesDialog.h" #include "topolTest.h" diff --git a/src/plugins/topology/topol.cpp b/src/plugins/topology/topol.cpp index d833ca5208f..90a243d1f4c 100644 --- a/src/plugins/topology/topol.cpp +++ b/src/plugins/topology/topol.cpp @@ -16,19 +16,19 @@ ***************************************************************************/ // QGIS Specific includes -#include -#include -#include #include +#include +#include +#include // Qt4 Related Includes #include -#include #include #include +#include -#include "topol.h" #include "checkDock.h" +#include "topol.h" static const QString sName = QObject::tr( "Topology Checker" ); static const QString sDescription = QObject::tr( "A Plugin for finding topological errors in vector layers" ); diff --git a/src/plugins/topology/topolError.cpp b/src/plugins/topology/topolError.cpp index e2ee500b826..440286b5875 100644 --- a/src/plugins/topology/topolError.cpp +++ b/src/plugins/topology/topolError.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "topolError.h" #include +#include "topolError.h" //TODO: tell dock to parse errorlist when feature is deleted bool TopolError::fix( QString fixName ) diff --git a/src/plugins/topology/topolError.h b/src/plugins/topology/topolError.h index 6482a121b59..552fdbc16a9 100644 --- a/src/plugins/topology/topolError.h +++ b/src/plugins/topology/topolError.h @@ -18,9 +18,9 @@ #ifndef TOPOLERROR_H #define TOPOLERROR_H -#include #include #include +#include class TopolError; typedef QList ErrorList; diff --git a/src/plugins/topology/topolTest.cpp b/src/plugins/topology/topolTest.cpp index e69f111495f..92e93060aa3 100644 --- a/src/plugins/topology/topolTest.cpp +++ b/src/plugins/topology/topolTest.cpp @@ -17,18 +17,18 @@ #include "topolTest.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include topolTest::topolTest( QgisInterface* qgsIface ) { diff --git a/src/plugins/topology/topolTest.h b/src/plugins/topology/topolTest.h index 9d621dcc33d..4263ee8f911 100644 --- a/src/plugins/topology/topolTest.h +++ b/src/plugins/topology/topolTest.h @@ -20,8 +20,8 @@ #include -#include #include +#include #include "qgsspatialindex.h" #include "topolError.h" diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp index af58f2bafe9..7ff1643dd3e 100644 --- a/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp +++ b/src/plugins/zonal_statistics/qgszonalstatisticsdialog.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgszonalstatisticsdialog.h" +#include "qgisinterface.h" #include "qgsmaplayerregistry.h" #include "qgsrasterlayer.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgisinterface.h" +#include "qgszonalstatisticsdialog.h" -#include #include +#include QgsZonalStatisticsDialog::QgsZonalStatisticsDialog( QgisInterface* iface ): QDialog( iface->mainWindow() ), mIface( iface ) { diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp b/src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp index 0dd6819c5e5..4e3686a9201 100644 --- a/src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp +++ b/src/plugins/zonal_statistics/qgszonalstatisticsplugin.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgszonalstatisticsplugin.h" -#include "qgisinterface.h" -#include "qgszonalstatistics.h" -#include "qgszonalstatisticsdialog.h" -#include "qgsvectorlayer.h" #include #include +#include "qgisinterface.h" +#include "qgsvectorlayer.h" +#include "qgszonalstatisticsdialog.h" +#include "qgszonalstatistics.h" +#include "qgszonalstatisticsplugin.h" static const QString name_ = QObject::tr( "Zonal statistics plugin" ); static const QString description_ = QObject::tr( "A plugin to calculate count, sum, mean of rasters for each polygon of a vector layer" ); diff --git a/src/plugins/zonal_statistics/qgszonalstatisticsplugin.h b/src/plugins/zonal_statistics/qgszonalstatisticsplugin.h index b9187eb7eb5..fd004975605 100644 --- a/src/plugins/zonal_statistics/qgszonalstatisticsplugin.h +++ b/src/plugins/zonal_statistics/qgszonalstatisticsplugin.h @@ -18,8 +18,8 @@ #ifndef QGSZONALSTATISTICSPLUGIN_H #define QGSZONALSTATISTICSPLUGIN_H -#include "qgisplugin.h" #include +#include "qgisplugin.h" class QgsInterface; class QAction; diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp index 0f43a2a64b1..0f5324c039a 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ #include "qgsdelimitedtextfeatureiterator.h" -#include "qgsdelimitedtextprovider.h" #include "qgsdelimitedtextfile.h" +#include "qgsdelimitedtextprovider.h" #include "qgsexpression.h" #include "qgsgeometry.h" diff --git a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h index 632c4077cd5..a98239c4bd5 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h +++ b/src/providers/delimitedtext/qgsdelimitedtextfeatureiterator.h @@ -16,8 +16,8 @@ #define QGSDELIMITEDTEXTFEATUREITERATOR_H #include -#include "qgsfeatureiterator.h" #include "qgsfeature.h" +#include "qgsfeatureiterator.h" #include "qgsdelimitedtextprovider.h" diff --git a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp index 72729f90c2e..d8c86399799 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextfile.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextfile.cpp @@ -18,14 +18,14 @@ #include "qgsdelimitedtextfile.h" #include "qgslogger.h" -#include -#include #include -#include +#include #include -#include -#include #include +#include +#include +#include +#include #include diff --git a/src/providers/delimitedtext/qgsdelimitedtextfile.h b/src/providers/delimitedtext/qgsdelimitedtextfile.h index c71f37e0378..96e02c15ba1 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextfile.h +++ b/src/providers/delimitedtext/qgsdelimitedtextfile.h @@ -18,8 +18,8 @@ #ifndef QGSDELIMITEDTEXTFILE_H #define QGSDELIMITEDTEXTFILE_H -#include #include +#include #include class QgsFeature; diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp index c7122a6288a..17f5c136792 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.cpp @@ -17,17 +17,18 @@ #include "qgsdelimitedtextprovider.h" -#include +#include #include #include -#include -#include -#include #include -#include #include +#include +#include +#include +#include #include +#include "qgis.h" #include "qgsapplication.h" #include "qgsdataprovider.h" #include "qgsexpression.h" @@ -39,11 +40,10 @@ #include "qgsmessageoutput.h" #include "qgsrectangle.h" #include "qgsspatialindex.h" -#include "qgis.h" -#include "qgsdelimitedtextsourceselect.h" #include "qgsdelimitedtextfeatureiterator.h" #include "qgsdelimitedtextfile.h" +#include "qgsdelimitedtextsourceselect.h" static const QString TEXT_PROVIDER_KEY = "delimitedtext"; static const QString TEXT_PROVIDER_DESCRIPTION = "Delimited text data provider"; diff --git a/src/providers/delimitedtext/qgsdelimitedtextprovider.h b/src/providers/delimitedtext/qgsdelimitedtextprovider.h index 9281c0f417f..e14068584ab 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextprovider.h +++ b/src/providers/delimitedtext/qgsdelimitedtextprovider.h @@ -18,9 +18,9 @@ #ifndef QGSDELIMITEDTEXTPROVIDER_H #define QGSDELIMITEDTEXTPROVIDER_H -#include "qgsvectordataprovider.h" #include "qgscoordinatereferencesystem.h" #include "qgsdelimitedtextfile.h" +#include "qgsvectordataprovider.h" #include diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp index 81321559685..fe4a2afcf50 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp +++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.cpp @@ -15,10 +15,10 @@ #include "qgisinterface.h" #include "qgscontexthelp.h" +#include "qgsdelimitedtextfile.h" +#include "qgsdelimitedtextprovider.h" #include "qgslogger.h" #include "qgsvectordataprovider.h" -#include "qgsdelimitedtextprovider.h" -#include "qgsdelimitedtextfile.h" #include #include @@ -27,8 +27,8 @@ #include #include #include -#include #include +#include #include const int MAX_SAMPLE_LENGTH = 200; diff --git a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h index 3b66ec2fdc8..7c664a9abae 100644 --- a/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h +++ b/src/providers/delimitedtext/qgsdelimitedtextsourceselect.h @@ -16,8 +16,8 @@ #include "ui_qgsdelimitedtextsourceselectbase.h" #include -#include "qgscontexthelp.h" #include "qgisgui.h" +#include "qgscontexthelp.h" class QButtonGroup; class QgisInterface; diff --git a/src/providers/gdal/qgsgdalprovider.cpp b/src/providers/gdal/qgsgdalprovider.cpp index 969e35b48da..924664ac593 100644 --- a/src/providers/gdal/qgsgdalprovider.cpp +++ b/src/providers/gdal/qgsgdalprovider.cpp @@ -16,42 +16,42 @@ * * ***************************************************************************/ -#include "qgslogger.h" +#include "qgsconfig.h" #include "qgsgdalproviderbase.h" #include "qgsgdalprovider.h" -#include "qgsconfig.h" +#include "qgslogger.h" #include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsdataitem.h" #include "qgsdatasourceuri.h" #include "qgsmessagelog.h" -#include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" #include "qgsrasterbandstats.h" #include "qgsrasteridentifyresult.h" #include "qgsrasterlayer.h" #include "qgsrasterpyramid.h" +#include "qgsrectangle.h" #include "qgspoint.h" -#include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include "gdalwarper.h" -#include "ogr_spatialref.h" #include "cpl_conv.h" #include "cpl_string.h" +#include "gdalwarper.h" +#include "ogr_spatialref.h" #define ERRMSG(message) QGS_ERROR_MESSAGE(message,"GDAL provider") #define ERR(message) QgsError(message,"GDAL provider") diff --git a/src/providers/gdal/qgsgdalprovider.h b/src/providers/gdal/qgsgdalprovider.h index 128cd386451..e747e009c62 100644 --- a/src/providers/gdal/qgsgdalprovider.h +++ b/src/providers/gdal/qgsgdalprovider.h @@ -19,18 +19,18 @@ #ifndef QGSGDALPROVIDER_H #define QGSGDALPROVIDER_H +#include "qgscolorrampshader.h" #include "qgscoordinatereferencesystem.h" #include "qgsdataitem.h" -#include "qgsrasterdataprovider.h" #include "qgsgdalproviderbase.h" -#include "qgsrectangle.h" -#include "qgscolorrampshader.h" #include "qgsrasterbandstats.h" +#include "qgsrasterdataprovider.h" +#include "qgsrectangle.h" -#include -#include #include #include +#include +#include #include class QgsRasterPyramid; diff --git a/src/providers/gdal/qgsgdalproviderbase.cpp b/src/providers/gdal/qgsgdalproviderbase.cpp index 1640f6c88bc..b1ccd8d9e26 100644 --- a/src/providers/gdal/qgsgdalproviderbase.cpp +++ b/src/providers/gdal/qgsgdalproviderbase.cpp @@ -19,8 +19,8 @@ #include "cpl_conv.h" #include "qgsapplication.h" -#include "qgslogger.h" #include "qgsgdalproviderbase.h" +#include "qgslogger.h" #include diff --git a/src/providers/gdal/qgsgdalproviderbase.h b/src/providers/gdal/qgsgdalproviderbase.h index 3ddd5e38762..4faff6d5b09 100644 --- a/src/providers/gdal/qgsgdalproviderbase.h +++ b/src/providers/gdal/qgsgdalproviderbase.h @@ -18,8 +18,8 @@ #ifndef QGSGDALPROVIDERBASE_H #define QGSGDALPROVIDERBASE_H -#include "qgsrasterdataprovider.h" #include "qgscolorrampshader.h" +#include "qgsrasterdataprovider.h" #include diff --git a/src/providers/gpx/gpsdata.cpp b/src/providers/gpx/gpsdata.cpp index bc1af301116..82d0c33f5fa 100644 --- a/src/providers/gpx/gpsdata.cpp +++ b/src/providers/gpx/gpsdata.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ +#include #include #include -#include #include -#include -#include #include #include +#include +#include -#include "gpsdata.h" #include +#include "gpsdata.h" #define OUTPUT_PRECISION 12 diff --git a/src/providers/gpx/gpsdata.h b/src/providers/gpx/gpsdata.h index 33a7690adef..6d0345c9fb5 100644 --- a/src/providers/gpx/gpsdata.h +++ b/src/providers/gpx/gpsdata.h @@ -21,9 +21,9 @@ #include #include +#include #include #include -#include #include "qgsfeature.h" #include "qgsrectangle.h" diff --git a/src/providers/gpx/qgsgpxfeatureiterator.cpp b/src/providers/gpx/qgsgpxfeatureiterator.cpp index 0ca944e6335..10cb9ec7a73 100644 --- a/src/providers/gpx/qgsgpxfeatureiterator.cpp +++ b/src/providers/gpx/qgsgpxfeatureiterator.cpp @@ -21,8 +21,8 @@ #include "qgslogger.h" #include "qgsmessagelog.h" -#include #include +#include QgsGPXFeatureIterator::QgsGPXFeatureIterator( QgsGPXFeatureSource* source, bool ownSource, const QgsFeatureRequest& request ) diff --git a/src/providers/gpx/qgsgpxprovider.cpp b/src/providers/gpx/qgsgpxprovider.cpp index 8c68ab69f18..9571bd7fd70 100644 --- a/src/providers/gpx/qgsgpxprovider.cpp +++ b/src/providers/gpx/qgsgpxprovider.cpp @@ -18,18 +18,18 @@ ***************************************************************************/ #include -#include -#include #include +#include +#include // Changed #include to . Apparently some // debian distros do not include the qapp.h wrapper and the compilation // fails. [gsherman] #include #include +#include #include #include -#include #include "qgis.h" #include "qgsapplication.h" @@ -41,9 +41,9 @@ #include "qgslogger.h" #include "qgsrectangle.h" +#include "gpsdata.h" #include "qgsgpxfeatureiterator.h" #include "qgsgpxprovider.h" -#include "gpsdata.h" const char* QgsGPXProvider::attr[] = { "name", "elevation", "symbol", "number", "comment", "description", "source", diff --git a/src/providers/gpx/qgsgpxprovider.h b/src/providers/gpx/qgsgpxprovider.h index fa916c14d96..589234e7d3a 100644 --- a/src/providers/gpx/qgsgpxprovider.h +++ b/src/providers/gpx/qgsgpxprovider.h @@ -20,8 +20,8 @@ #ifndef QGSGPXPROVIDER_H #define QGSGPXPROVIDER_H -#include "qgsvectordataprovider.h" #include "gpsdata.h" +#include "qgsvectordataprovider.h" class QgsFeature; diff --git a/src/providers/grass/qgis.r.in.cpp b/src/providers/grass/qgis.r.in.cpp index 16b8ea2955c..e78c92bcb8c 100644 --- a/src/providers/grass/qgis.r.in.cpp +++ b/src/providers/grass/qgis.r.in.cpp @@ -15,19 +15,19 @@ extern "C" { -#include -#include -#include -#include #include +#include +#include +#include +#include #ifdef WIN32 #include #include #endif -#include +#include #include #include -#include +#include #ifdef _MSC_VER #include @@ -40,9 +40,9 @@ extern "C" #include #include -#include "qgsrectangle.h" -#include "qgsrasterblock.h" #include "qgsgrass.h" +#include "qgsrasterblock.h" +#include "qgsrectangle.h" #if GRASS_VERSION_MAJOR >= 7 #define G_allocate_raster_buf Rast_allocate_buf diff --git a/src/providers/grass/qgis.v.in.cpp b/src/providers/grass/qgis.v.in.cpp index 83386a80428..b05406cbd7d 100644 --- a/src/providers/grass/qgis.v.in.cpp +++ b/src/providers/grass/qgis.v.in.cpp @@ -15,18 +15,18 @@ extern "C" { -#include -#include -#include -#include #include +#include +#include +#include +#include #ifdef WIN32 #include #include #endif -#include -#include #include +#include +#include #if GRASS_VERSION_MAJOR < 7 #include @@ -42,10 +42,10 @@ extern "C" #include "qgsfeature.h" #include "qgsgeometry.h" -#include "qgsrectangle.h" -#include "qgsrasterblock.h" -#include "qgsspatialindex.h" #include "qgsgrass.h" +#include "qgsrasterblock.h" +#include "qgsrectangle.h" +#include "qgsspatialindex.h" static struct line_pnts *line = Vect_new_line_struct(); diff --git a/src/providers/grass/qgsgrass.cpp b/src/providers/grass/qgsgrass.cpp index c6650bd4dc3..7fe6f2332f1 100644 --- a/src/providers/grass/qgsgrass.cpp +++ b/src/providers/grass/qgsgrass.cpp @@ -23,20 +23,20 @@ #include "qgsgrass.h" -#include "qgslogger.h" #include "qgsapplication.h" +#include "qgsconfig.h" #include "qgscoordinatereferencesystem.h" #include "qgsfield.h" +#include "qgslogger.h" #include "qgsrectangle.h" -#include "qgsconfig.h" #include +#include #include #include #include -#include #include -#include +#include #include @@ -45,14 +45,14 @@ extern "C" #ifndef _MSC_VER #include #endif -#include #include +#include #if GRASS_VERSION_MAJOR < 7 #include #else -#include #include +#include #endif } diff --git a/src/providers/grass/qgsgrass.h b/src/providers/grass/qgsgrass.h index 4bb7c1891e3..419f2ce5a08 100644 --- a/src/providers/grass/qgsgrass.h +++ b/src/providers/grass/qgsgrass.h @@ -23,24 +23,24 @@ // GRASS header files extern "C" { -#include -#include -#include #include +#include +#include +#include } +#include +#include +#include +#include +#include +#include +#include #include #include "qgsapplication.h" #include "qgsexception.h" #include "qgsfeature.h" #include "qgsfield.h" -#include -#include -#include -#include -#include -#include -#include class QgsCoordinateReferenceSystem; class QgsRectangle; diff --git a/src/providers/grass/qgsgrassgislib.cpp b/src/providers/grass/qgsgrassgislib.cpp index 3587643acc1..3b2a32cde67 100644 --- a/src/providers/grass/qgsgrassgislib.cpp +++ b/src/providers/grass/qgsgrassgislib.cpp @@ -14,10 +14,10 @@ * * ***************************************************************************/ //#include -#include -#include #include #include +#include +#include // If qgsgrassgislibfunctions.h is included on Linux, symbols defined here // cannot be found (undefined symbol error) even if they are present in @@ -33,22 +33,22 @@ extern "C" #include "qgsgrassgislib.h" #include "qgis.h" -#include "qgslogger.h" #include "qgsapplication.h" +#include "qgsconfig.h" #include "qgscoordinatereferencesystem.h" #include "qgsdatasourceuri.h" #include "qgsgeometry.h" +#include "qgslogger.h" #include "qgsrectangle.h" -#include "qgsconfig.h" #include #include +#include #include #include #include -#include #include -#include +#include #include diff --git a/src/providers/grass/qgsgrassgislib.h b/src/providers/grass/qgsgrassgislib.h index 679c64467f6..2706f0076f0 100644 --- a/src/providers/grass/qgsgrassgislib.h +++ b/src/providers/grass/qgsgrassgislib.h @@ -22,20 +22,20 @@ extern "C" #include } -#include #include #include #include #include -#include #include #include +#include +#include +#include #include +#include #include #include -#include -#include #include class QgsCoordinateReferenceSystem; class QgsRectangle; diff --git a/src/providers/grass/qgsgrassimport.cpp b/src/providers/grass/qgsgrassimport.cpp index cb3433c76b1..51c348c2730 100644 --- a/src/providers/grass/qgsgrassimport.cpp +++ b/src/providers/grass/qgsgrassimport.cpp @@ -29,10 +29,10 @@ extern "C" { -#include #include -#include #include +#include +#include } QgsGrassImport::QgsGrassImport( QgsGrassObject grassObject ) diff --git a/src/providers/grass/qgsgrassoptions.cpp b/src/providers/grass/qgsgrassoptions.cpp index 3d15c8e3c6b..ae03e473e68 100644 --- a/src/providers/grass/qgsgrassoptions.cpp +++ b/src/providers/grass/qgsgrassoptions.cpp @@ -15,8 +15,8 @@ ***************************************************************************/ #include "qgsrasterprojector.h" -#include "qgsgrassoptions.h" #include "ui_qgsgrassoptionsbase.h" +#include "qgsgrassoptions.h" QgsGrassOptions::QgsGrassOptions( QWidget *parent ) : QDialog( parent ) diff --git a/src/providers/grass/qgsgrassprovider.cpp b/src/providers/grass/qgsgrassprovider.cpp index bb1f2881da1..826cd6fd51e 100644 --- a/src/providers/grass/qgsgrassprovider.cpp +++ b/src/providers/grass/qgsgrassprovider.cpp @@ -14,12 +14,12 @@ * * ***************************************************************************/ +#include #include #include -#include -#include #include +#include #include "qgis.h" #include "qgsdataprovider.h" @@ -27,9 +27,9 @@ #include "qgsfield.h" #include "qgsrectangle.h" +#include "qgsgrassfeatureiterator.h" #include "qgsgrass.h" #include "qgsgrassprovider.h" -#include "qgsgrassfeatureiterator.h" #include "qgsapplication.h" #include "qgscoordinatereferencesystem.h" @@ -49,10 +49,10 @@ extern "C" { -#include -#include -#include #include +#include +#include +#include #if GRASS_VERSION_MAJOR < 7 #include #else diff --git a/src/providers/grass/qgsgrassprovider.h b/src/providers/grass/qgsgrassprovider.h index e3b1ac2b5fc..f60ab5d8039 100644 --- a/src/providers/grass/qgsgrassprovider.h +++ b/src/providers/grass/qgsgrassprovider.h @@ -23,8 +23,8 @@ class QgsGrassFeatureIterator; #include -#include "qgsvectordataprovider.h" #include +#include "qgsvectordataprovider.h" /* Update. * Vectors are updated (reloaded) if: diff --git a/src/providers/grass/qgsgrassprovidermodule.cpp b/src/providers/grass/qgsgrassprovidermodule.cpp index c1465136231..bf51f410121 100644 --- a/src/providers/grass/qgsgrassprovidermodule.cpp +++ b/src/providers/grass/qgsgrassprovidermodule.cpp @@ -14,21 +14,21 @@ * * ***************************************************************************/ +#include "qgslogger.h" #include "qgsmessageoutput.h" #include "qgsmimedatautils.h" #include "qgsnewnamedialog.h" #include "qgsproviderregistry.h" #include "qgsrasterlayer.h" -#include "qgslogger.h" -#include "qgsgrassprovidermodule.h" -#include "qgsgrassprovider.h" -#include "qgsgrassoptions.h" #include "qgsgrass.h" +#include "qgsgrassoptions.h" +#include "qgsgrassprovider.h" +#include "qgsgrassprovidermodule.h" #include -#include #include +#include #include #include diff --git a/src/providers/grass/qgsgrassrasterprovider.cpp b/src/providers/grass/qgsgrassrasterprovider.cpp index 54a7b8fef8c..93192628543 100644 --- a/src/providers/grass/qgsgrassrasterprovider.cpp +++ b/src/providers/grass/qgsgrassrasterprovider.cpp @@ -17,26 +17,26 @@ ***************************************************************************/ #include -#include "qgslogger.h" -#include "qgsgrass.h" -#include "qgsrasteridentifyresult.h" -#include "qgsgrassrasterprovider.h" #include "qgsconfig.h" +#include "qgsgrass.h" +#include "qgsgrassrasterprovider.h" +#include "qgslogger.h" +#include "qgsrasteridentifyresult.h" #include "qgsapplication.h" -#include "qgscoordinatetransform.h" -#include "qgsrectangle.h" #include "qgscoordinatereferencesystem.h" +#include "qgscoordinatetransform.h" #include "qgsrasterbandstats.h" +#include "qgsrectangle.h" -#include -#include #include -#include #include -#include #include +#include #include +#include +#include +#include #define ERR(message) QGS_ERROR_MESSAGE(message,"GRASS provider") #define ERROR(message) QgsError(message,"GRASS provider") diff --git a/src/providers/grass/qgsgrassrasterprovider.h b/src/providers/grass/qgsgrassrasterprovider.h index f1ff14cffd4..000bdba4378 100644 --- a/src/providers/grass/qgsgrassrasterprovider.h +++ b/src/providers/grass/qgsgrassrasterprovider.h @@ -22,26 +22,26 @@ extern "C" { -#include #include +#include #if GRASS_VERSION_MAJOR > 6 #include #endif } +#include "qgscolorrampshader.h" #include "qgscoordinatereferencesystem.h" #include "qgsrasterdataprovider.h" #include "qgsrectangle.h" -#include "qgscolorrampshader.h" +#include +#include +#include +#include #include #include -#include -#include -#include #include -#include -#include +#include class QgsCoordinateTransform; diff --git a/src/providers/memory/qgsmemoryfeatureiterator.cpp b/src/providers/memory/qgsmemoryfeatureiterator.cpp index 861040f56f7..020d75009c2 100644 --- a/src/providers/memory/qgsmemoryfeatureiterator.cpp +++ b/src/providers/memory/qgsmemoryfeatureiterator.cpp @@ -17,8 +17,8 @@ #include "qgsgeometry.h" #include "qgslogger.h" -#include "qgsspatialindex.h" #include "qgsmessagelog.h" +#include "qgsspatialindex.h" diff --git a/src/providers/memory/qgsmemoryprovider.cpp b/src/providers/memory/qgsmemoryprovider.cpp index 4f4a47854d9..7c4f1de3b11 100644 --- a/src/providers/memory/qgsmemoryprovider.cpp +++ b/src/providers/memory/qgsmemoryprovider.cpp @@ -13,18 +13,18 @@ * * ***************************************************************************/ -#include "qgsmemoryprovider.h" #include "qgsmemoryfeatureiterator.h" +#include "qgsmemoryprovider.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsspatialindex.h" -#include "qgscoordinatereferencesystem.h" -#include #include +#include static const QString TEXT_PROVIDER_KEY = "memory"; diff --git a/src/providers/memory/qgsmemoryprovider.h b/src/providers/memory/qgsmemoryprovider.h index 799f598d795..16dde1efe62 100644 --- a/src/providers/memory/qgsmemoryprovider.h +++ b/src/providers/memory/qgsmemoryprovider.h @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgsvectordataprovider.h" #include "qgscoordinatereferencesystem.h" +#include "qgsvectordataprovider.h" typedef QMap QgsFeatureMap; diff --git a/src/providers/mssql/qgsmssqldataitems.cpp b/src/providers/mssql/qgsmssqldataitems.cpp index 6f7f26a7f75..05fc4b42e07 100644 --- a/src/providers/mssql/qgsmssqldataitems.cpp +++ b/src/providers/mssql/qgsmssqldataitems.cpp @@ -19,16 +19,16 @@ #include "qgsmssqldataitems.h" -#include "qgsmssqlsourceselect.h" -#include "qgsmssqlnewconnection.h" +#include "qgsdatasourceuri.h" #include "qgslogger.h" #include "qgsmimedatautils.h" -#include "qgsvectorlayerimport.h" -#include "qgsdatasourceuri.h" +#include "qgsmssqlnewconnection.h" #include "qgsmssqlprovider.h" +#include "qgsmssqlsourceselect.h" +#include "qgsvectorlayerimport.h" -#include #include +#include #include #include diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.cpp b/src/providers/mssql/qgsmssqlfeatureiterator.cpp index 64e6138c948..621d99229b8 100644 --- a/src/providers/mssql/qgsmssqlfeatureiterator.cpp +++ b/src/providers/mssql/qgsmssqlfeatureiterator.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ +#include "qgslogger.h" #include "qgsmssqlfeatureiterator.h" #include "qgsmssqlprovider.h" -#include "qgslogger.h" #include -#include #include +#include QgsMssqlFeatureIterator::QgsMssqlFeatureIterator( QgsMssqlFeatureSource* source, bool ownSource, const QgsFeatureRequest& request ) diff --git a/src/providers/mssql/qgsmssqlfeatureiterator.h b/src/providers/mssql/qgsmssqlfeatureiterator.h index ed34cf3bcba..2c38c4b4868 100644 --- a/src/providers/mssql/qgsmssqlfeatureiterator.h +++ b/src/providers/mssql/qgsmssqlfeatureiterator.h @@ -18,11 +18,11 @@ #ifndef QGSMSSQLFEATUREITERATOR_H #define QGSMSSQLFEATUREITERATOR_H -#include "qgsmssqlgeometryparser.h" -#include "qgsfeatureiterator.h" #include -#include #include +#include +#include "qgsfeatureiterator.h" +#include "qgsmssqlgeometryparser.h" class QgsMssqlProvider; diff --git a/src/providers/mssql/qgsmssqlgeometryparser.cpp b/src/providers/mssql/qgsmssqlgeometryparser.cpp index 48c3aed566b..2f86f80e913 100644 --- a/src/providers/mssql/qgsmssqlgeometryparser.cpp +++ b/src/providers/mssql/qgsmssqlgeometryparser.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgsmssqlgeometryparser.h" +#include "qgsapplication.h" #include "qgsgeometry.h" #include "qgslogger.h" -#include "qgsapplication.h" +#include "qgsmssqlgeometryparser.h" /* SqlGeometry serialization format diff --git a/src/providers/mssql/qgsmssqlnewconnection.cpp b/src/providers/mssql/qgsmssqlnewconnection.cpp index 76a18d75eae..dc6f73824e0 100644 --- a/src/providers/mssql/qgsmssqlnewconnection.cpp +++ b/src/providers/mssql/qgsmssqlnewconnection.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include -#include #include +#include +#include #include #include +#include "qgscontexthelp.h" #include "qgsmssqlnewconnection.h" #include "qgsmssqlprovider.h" -#include "qgscontexthelp.h" QgsMssqlNewConnection::QgsMssqlNewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl ) : QDialog( parent, fl ), mOriginalConnName( connName ) diff --git a/src/providers/mssql/qgsmssqlprovider.cpp b/src/providers/mssql/qgsmssqlprovider.cpp index 337fe187abf..17697959dbb 100644 --- a/src/providers/mssql/qgsmssqlprovider.cpp +++ b/src/providers/mssql/qgsmssqlprovider.cpp @@ -17,23 +17,24 @@ #include "qgsmssqlprovider.h" -#include -#include #include -#include +#include #include -#include #include -#include -#include -#include -#include -#include -#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include +#include "qgis.h" #include "qgsapplication.h" #include "qgsdataprovider.h" #include "qgsfeature.h" @@ -42,10 +43,9 @@ #include "qgslogger.h" #include "qgsmessageoutput.h" #include "qgsrectangle.h" -#include "qgis.h" -#include "qgsmssqlsourceselect.h" #include "qgsmssqldataitems.h" +#include "qgsmssqlsourceselect.h" #include "qgsmssqlfeatureiterator.h" diff --git a/src/providers/mssql/qgsmssqlprovider.h b/src/providers/mssql/qgsmssqlprovider.h index aafe8c11b91..9875916b7a8 100644 --- a/src/providers/mssql/qgsmssqlprovider.h +++ b/src/providers/mssql/qgsmssqlprovider.h @@ -18,15 +18,15 @@ #ifndef QGSMSSQLPROVIDER_H #define QGSMSSQLPROVIDER_H -#include "qgsvectordataprovider.h" #include "qgscoordinatereferencesystem.h" +#include "qgsvectordataprovider.h" #include "qgsvectorlayerimport.h" -#include #include +#include #include -#include #include +#include class QgsFeature; class QgsField; diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp index e2d2475b0da..05aa062db95 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.cpp +++ b/src/providers/mssql/qgsmssqlsourceselect.cpp @@ -18,23 +18,23 @@ #include "qgsmssqlsourceselect.h" -#include "qgslogger.h" #include "qgsapplication.h" #include "qgscontexthelp.h" -#include "qgsmssqlprovider.h" -#include "qgsmssqlnewconnection.h" -#include "qgsmanageconnectionsdialog.h" -#include "qgsquerybuilder.h" #include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmanageconnectionsdialog.h" +#include "qgsmssqlnewconnection.h" +#include "qgsmssqlprovider.h" +#include "qgsquerybuilder.h" #include "qgsvectorlayer.h" #include +#include #include #include #include -#include -#include #include +#include #include #include diff --git a/src/providers/mssql/qgsmssqlsourceselect.h b/src/providers/mssql/qgsmssqlsourceselect.h index 6dd7aebe20c..d6aeede626b 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.h +++ b/src/providers/mssql/qgsmssqlsourceselect.h @@ -19,14 +19,14 @@ #include "ui_qgsdbsourceselectbase.h" #include "qgisgui.h" +#include "qgscontexthelp.h" #include "qgsdbfilterproxymodel.h" #include "qgsmssqltablemodel.h" -#include "qgscontexthelp.h" -#include -#include #include #include +#include +#include #include class QPushButton; diff --git a/src/providers/mssql/qgsmssqltablemodel.cpp b/src/providers/mssql/qgsmssqltablemodel.cpp index 4ff14052e39..43d4c3dce49 100644 --- a/src/providers/mssql/qgsmssqltablemodel.cpp +++ b/src/providers/mssql/qgsmssqltablemodel.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgsmssqltablemodel.h" #include "qgsdataitem.h" -#include "qgslogger.h" #include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmssqltablemodel.h" QgsMssqlTableModel::QgsMssqlTableModel() : QStandardItemModel() diff --git a/src/providers/ogr/qgsogrconnpool.h b/src/providers/ogr/qgsogrconnpool.h index df03cacbcfc..af052089d9b 100644 --- a/src/providers/ogr/qgsogrconnpool.h +++ b/src/providers/ogr/qgsogrconnpool.h @@ -16,8 +16,8 @@ #ifndef QGSOGRCONNPOOL_H #define QGSOGRCONNPOOL_H -#include "qgsconnectionpool.h" #include +#include "qgsconnectionpool.h" struct QgsOgrConn diff --git a/src/providers/ogr/qgsogrdataitems.cpp b/src/providers/ogr/qgsogrdataitems.cpp index 2920ec4bc39..192d7add7de 100644 --- a/src/providers/ogr/qgsogrdataitems.cpp +++ b/src/providers/ogr/qgsogrdataitems.cpp @@ -19,12 +19,12 @@ #include "qgsmessagelog.h" #include -#include #include +#include -#include -#include #include +#include +#include // these are defined in qgsogrprovider.cpp QGISEXTERN QStringList fileExtensions(); diff --git a/src/providers/ogr/qgsogrfeatureiterator.cpp b/src/providers/ogr/qgsogrfeatureiterator.cpp index b7b4bee01d0..f2048e5d562 100644 --- a/src/providers/ogr/qgsogrfeatureiterator.cpp +++ b/src/providers/ogr/qgsogrfeatureiterator.cpp @@ -14,16 +14,16 @@ ***************************************************************************/ #include "qgsogrfeatureiterator.h" -#include "qgsogrprovider.h" #include "qgsogrgeometrysimplifier.h" +#include "qgsogrprovider.h" #include "qgsapplication.h" #include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include #include +#include // using from provider: // - setRelevantFields(), mRelevantFieldsForNextFeature diff --git a/src/providers/ogr/qgsogrgeometrysimplifier.cpp b/src/providers/ogr/qgsogrgeometrysimplifier.cpp index 38c740d1e04..4492ceb365c 100644 --- a/src/providers/ogr/qgsogrgeometrysimplifier.cpp +++ b/src/providers/ogr/qgsogrgeometrysimplifier.cpp @@ -14,9 +14,9 @@ * * ***************************************************************************/ +#include "qgsapplication.h" #include "qgsogrgeometrysimplifier.h" #include "qgsogrprovider.h" -#include "qgsapplication.h" QgsOgrAbstractGeometrySimplifier::~QgsOgrAbstractGeometrySimplifier() { diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp index d77e834d8e1..a4587ee525e 100644 --- a/src/providers/ogr/qgsogrprovider.cpp +++ b/src/providers/ogr/qgsogrprovider.cpp @@ -15,35 +15,35 @@ email : sherman at mrcc.com * * ***************************************************************************/ -#include "qgsogrprovider.h" -#include "qgsogrfeatureiterator.h" #include "qgslogger.h" #include "qgsmessagelog.h" +#include "qgsogrfeatureiterator.h" +#include "qgsogrprovider.h" #define CPL_SUPRESS_CPLUSPLUS +#include #include // to collect version information #include #include -#include #include -#include -#include #include +#include #include #include -#include -#include #include +#include +#include +#include #include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" #include "qgsdataitem.h" #include "qgsdataprovider.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgscoordinatereferencesystem.h" #include "qgsvectorlayerimport.h" static const QString TEXT_PROVIDER_KEY = "ogr"; diff --git a/src/providers/oracle/ocispatial/qsql_ocispatial.cpp b/src/providers/oracle/ocispatial/qsql_ocispatial.cpp index 329d1a156b1..cd6ef86496f 100644 --- a/src/providers/oracle/ocispatial/qsql_ocispatial.cpp +++ b/src/providers/oracle/ocispatial/qsql_ocispatial.cpp @@ -49,8 +49,8 @@ #include "wkbptr.h" #include -#include #include +#include #include #include #include @@ -59,9 +59,9 @@ #include #include #include +#include #include #include -#include #ifdef Q_OS_WIN #include diff --git a/src/providers/oracle/ocispatial/qsql_ocispatial.h b/src/providers/oracle/ocispatial/qsql_ocispatial.h index 743882804de..30496d39c96 100644 --- a/src/providers/oracle/ocispatial/qsql_ocispatial.h +++ b/src/providers/oracle/ocispatial/qsql_ocispatial.h @@ -42,8 +42,8 @@ #ifndef QSQL_OCISPATIAL_H #define QSQL_OCISPATIAL_H -#include #include +#include #include "qsqlcachedresult_p.h" #ifdef QT_PLUGIN diff --git a/src/providers/oracle/qgsoraclecolumntypethread.cpp b/src/providers/oracle/qgsoraclecolumntypethread.cpp index 74cc477e215..6f1ece9a047 100644 --- a/src/providers/oracle/qgsoraclecolumntypethread.cpp +++ b/src/providers/oracle/qgsoraclecolumntypethread.cpp @@ -15,8 +15,8 @@ email : jef at norbit dot de * * ***************************************************************************/ -#include "qgsoraclecolumntypethread.h" #include "qgslogger.h" +#include "qgsoraclecolumntypethread.h" #include diff --git a/src/providers/oracle/qgsoracleconn.cpp b/src/providers/oracle/qgsoracleconn.cpp index d081bd4499c..afd851bde7a 100644 --- a/src/providers/oracle/qgsoracleconn.cpp +++ b/src/providers/oracle/qgsoracleconn.cpp @@ -15,17 +15,17 @@ * * ***************************************************************************/ -#include "qgsoracleconn.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" -#include "qgsmessagelog.h" #include "qgscredentials.h" +#include "qgsdatasourceuri.h" #include "qgsfield.h" +#include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsoracleconn.h" #include "qgsoracletablemodel.h" +#include #include #include -#include QMap QgsOracleConn::sConnections; int QgsOracleConn::snConnections = 0; diff --git a/src/providers/oracle/qgsoracleconn.h b/src/providers/oracle/qgsoracleconn.h index e3efb3e0583..99e07eb26c9 100644 --- a/src/providers/oracle/qgsoracleconn.h +++ b/src/providers/oracle/qgsoracleconn.h @@ -18,12 +18,12 @@ #ifndef QGSORACLECONN_H #define QGSORACLECONN_H -#include -#include -#include #include #include +#include +#include #include +#include #include "qgis.h" #include "qgsdatasourceuri.h" diff --git a/src/providers/oracle/qgsoracledataitems.cpp b/src/providers/oracle/qgsoracledataitems.cpp index 8ce1307d013..ea264e5c8fe 100644 --- a/src/providers/oracle/qgsoracledataitems.cpp +++ b/src/providers/oracle/qgsoracledataitems.cpp @@ -14,13 +14,13 @@ ***************************************************************************/ #include "qgsoracledataitems.h" -#include "qgsoracletablemodel.h" -#include "qgsoraclenewconnection.h" -#include "qgsoraclecolumntypethread.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" #include "qgsapplication.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" #include "qgsmessageoutput.h" +#include "qgsoraclecolumntypethread.h" +#include "qgsoraclenewconnection.h" +#include "qgsoracletablemodel.h" #include #include diff --git a/src/providers/oracle/qgsoracledataitems.h b/src/providers/oracle/qgsoracledataitems.h index 00e5d7fed6f..af0681248eb 100644 --- a/src/providers/oracle/qgsoracledataitems.h +++ b/src/providers/oracle/qgsoracledataitems.h @@ -15,14 +15,14 @@ #ifndef QGSORACLEDATAITEMS_H #define QGSORACLEDATAITEMS_H -#include #include +#include #include "qgsdataitem.h" -#include "qgsoracletablemodel.h" -#include "qgsoraclesourceselect.h" #include "qgsmimedatautils.h" +#include "qgsoraclesourceselect.h" +#include "qgsoracletablemodel.h" #include "qgsvectorlayerimport.h" class QSqlDatabase; diff --git a/src/providers/oracle/qgsoraclefeatureiterator.cpp b/src/providers/oracle/qgsoraclefeatureiterator.cpp index 6eeff508423..3179baf46d5 100644 --- a/src/providers/oracle/qgsoraclefeatureiterator.cpp +++ b/src/providers/oracle/qgsoraclefeatureiterator.cpp @@ -16,9 +16,9 @@ #include "qgsoraclefeatureiterator.h" #include "qgsoracleprovider.h" +#include "qgsgeometry.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgsgeometry.h" #include diff --git a/src/providers/oracle/qgsoraclenewconnection.cpp b/src/providers/oracle/qgsoraclenewconnection.cpp index 7bca5df89cf..083aaee450b 100644 --- a/src/providers/oracle/qgsoraclenewconnection.cpp +++ b/src/providers/oracle/qgsoraclenewconnection.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include -#include #include +#include +#include -#include "qgsoraclenewconnection.h" #include "qgscontexthelp.h" #include "qgsdatasourceuri.h" +#include "qgsoraclenewconnection.h" #include "qgsoracletablemodel.h" QgsOracleNewConnection::QgsOracleNewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl ) diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp index f086338e0c8..f38c2dda0d0 100644 --- a/src/providers/oracle/qgsoracleprovider.cpp +++ b/src/providers/oracle/qgsoracleprovider.cpp @@ -15,27 +15,27 @@ * * ***************************************************************************/ +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgsmessageoutput.h" -#include "qgsmessagelog.h" -#include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsvectorlayerimport.h" #include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsmessageoutput.h" +#include "qgsrectangle.h" +#include "qgsvectorlayerimport.h" #include "qgsprovidercountcalcevent.h" #include "qgsproviderextentcalcevent.h" -#include "qgsoracleprovider.h" -#include "qgsoracletablemodel.h" -#include "qgsoraclesourceselect.h" #include "qgsoracledataitems.h" #include "qgsoraclefeatureiterator.h" +#include "qgsoracleprovider.h" +#include "qgsoraclesourceselect.h" +#include "qgsoracletablemodel.h" -#include #include +#include #include "ocispatial/wkbptr.h" diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h index 66f57a3b778..1e5e82b797f 100644 --- a/src/providers/oracle/qgsoracleprovider.h +++ b/src/providers/oracle/qgsoracleprovider.h @@ -18,16 +18,16 @@ #ifndef QGSORACLEPROVIDER_H #define QGSORACLEPROVIDER_H -#include "qgsvectordataprovider.h" -#include "qgsrectangle.h" -#include "qgsvectorlayerimport.h" -#include "qgsoracletablemodel.h" #include "qgsdatasourceuri.h" +#include "qgsoracletablemodel.h" +#include "qgsrectangle.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayerimport.h" -#include #include -#include #include +#include +#include class QgsFeature; class QgsField; diff --git a/src/providers/oracle/qgsoraclesourceselect.cpp b/src/providers/oracle/qgsoraclesourceselect.cpp index 464638daad8..0a79245b724 100644 --- a/src/providers/oracle/qgsoraclesourceselect.cpp +++ b/src/providers/oracle/qgsoraclesourceselect.cpp @@ -18,25 +18,25 @@ email : jef at norbit dot de #include "qgsoraclesourceselect.h" -#include "qgslogger.h" #include "qgsapplication.h" #include "qgscontexthelp.h" -#include "qgsoracleprovider.h" -#include "qgsoraclenewconnection.h" -#include "qgsoracletablecache.h" -#include "qgsmanageconnectionsdialog.h" -#include "qgsquerybuilder.h" #include "qgsdatasourceuri.h" -#include "qgsvectorlayer.h" +#include "qgslogger.h" +#include "qgsmanageconnectionsdialog.h" #include "qgsoraclecolumntypethread.h" +#include "qgsoraclenewconnection.h" +#include "qgsoracleprovider.h" +#include "qgsoracletablecache.h" +#include "qgsquerybuilder.h" +#include "qgsvectorlayer.h" #include +#include #include #include #include -#include -#include #include +#include /** Used to create an editor for when the user tries to change the contents of a cell */ QWidget *QgsOracleSourceSelectDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const diff --git a/src/providers/oracle/qgsoraclesourceselect.h b/src/providers/oracle/qgsoraclesourceselect.h index 8969f382dbb..c3abda88274 100644 --- a/src/providers/oracle/qgsoraclesourceselect.h +++ b/src/providers/oracle/qgsoraclesourceselect.h @@ -19,14 +19,14 @@ #include "ui_qgsdbsourceselectbase.h" #include "qgisgui.h" +#include "qgscontexthelp.h" #include "qgsdbfilterproxymodel.h" #include "qgsoracletablemodel.h" -#include "qgscontexthelp.h" -#include -#include #include #include +#include +#include class QPushButton; class QStringList; diff --git a/src/providers/oracle/qgsoracletablemodel.cpp b/src/providers/oracle/qgsoracletablemodel.cpp index 0894d73681c..65188941a69 100644 --- a/src/providers/oracle/qgsoracletablemodel.cpp +++ b/src/providers/oracle/qgsoracletablemodel.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsoracletablemodel.h" #include "qgsdataitem.h" #include "qgslogger.h" +#include "qgsoracletablemodel.h" QgsOracleTableModel::QgsOracleTableModel() : QStandardItemModel() diff --git a/src/providers/ows/qgsowsdataitems.cpp b/src/providers/ows/qgsowsdataitems.cpp index 5b82839cdf2..92d863b6d07 100644 --- a/src/providers/ows/qgsowsdataitems.cpp +++ b/src/providers/ows/qgsowsdataitems.cpp @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsproviderregistry.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsnewhttpconnection.h" +#include "qgsowsconnection.h" #include "qgsowsdataitems.h" #include "qgsowsprovider.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" -#include "qgsowsconnection.h" -#include "qgsnewhttpconnection.h" +#include "qgsproviderregistry.h" #include "qgsapplication.h" diff --git a/src/providers/ows/qgsowsprovider.cpp b/src/providers/ows/qgsowsprovider.cpp index 043708c2a0e..a91299dddde 100644 --- a/src/providers/ows/qgsowsprovider.cpp +++ b/src/providers/ows/qgsowsprovider.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ +#include "qgsconfig.h" #include "qgslogger.h" #include "qgsowsprovider.h" -#include "qgsconfig.h" #include diff --git a/src/providers/ows/qgsowsprovider.h b/src/providers/ows/qgsowsprovider.h index 3f3464ecddb..70cfddb1378 100644 --- a/src/providers/ows/qgsowsprovider.h +++ b/src/providers/ows/qgsowsprovider.h @@ -18,9 +18,9 @@ #ifndef QGSOWSPROVIDER_H #define QGSOWSPROVIDER_H -#include "qgsdataprovider.h" #include "qgscoordinatereferencesystem.h" #include "qgsdataitem.h" +#include "qgsdataprovider.h" #include "qgsrectangle.h" #include diff --git a/src/providers/postgres/qgscolumntypethread.cpp b/src/providers/postgres/qgscolumntypethread.cpp index 6495d37f340..27551a312d0 100644 --- a/src/providers/postgres/qgscolumntypethread.cpp +++ b/src/providers/postgres/qgscolumntypethread.cpp @@ -18,8 +18,8 @@ email : jef at norbit dot de #include "qgscolumntypethread.h" #include "qgslogger.h" -#include #include +#include QgsGeomColumnTypeThread::QgsGeomColumnTypeThread( QString name, bool useEstimatedMetaData, bool allowGeometrylessTables ) : QThread() diff --git a/src/providers/postgres/qgspgnewconnection.cpp b/src/providers/postgres/qgspgnewconnection.cpp index 083dd952cab..cd0c2c2018d 100644 --- a/src/providers/postgres/qgspgnewconnection.cpp +++ b/src/providers/postgres/qgspgnewconnection.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include -#include #include +#include +#include -#include "qgspgnewconnection.h" #include "qgscontexthelp.h" #include "qgsdatasourceuri.h" +#include "qgspgnewconnection.h" #include "qgspostgresconn.h" QgsPgNewConnection::QgsPgNewConnection( QWidget *parent, const QString& connName, Qt::WindowFlags fl ) diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp index 538cf3daf39..6df254fa86a 100644 --- a/src/providers/postgres/qgspgsourceselect.cpp +++ b/src/providers/postgres/qgspgsourceselect.cpp @@ -18,24 +18,24 @@ email : sherman at mrcc.com #include "qgspgsourceselect.h" -#include "qgslogger.h" #include "qgsapplication.h" -#include "qgscontexthelp.h" -#include "qgspostgresprovider.h" -#include "qgspgnewconnection.h" -#include "qgsmanageconnectionsdialog.h" -#include "qgsquerybuilder.h" -#include "qgsdatasourceuri.h" -#include "qgsvectorlayer.h" #include "qgscolumntypethread.h" +#include "qgscontexthelp.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmanageconnectionsdialog.h" +#include "qgspgnewconnection.h" +#include "qgspostgresprovider.h" +#include "qgsquerybuilder.h" +#include "qgsvectorlayer.h" #include +#include #include #include #include -#include -#include #include +#include /** Used to create an editor for when the user tries to change the contents of a cell */ QWidget *QgsPgSourceSelectDelegate::createEditor( QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &index ) const diff --git a/src/providers/postgres/qgspgsourceselect.h b/src/providers/postgres/qgspgsourceselect.h index 1faf68a5589..5d54e44f026 100644 --- a/src/providers/postgres/qgspgsourceselect.h +++ b/src/providers/postgres/qgspgsourceselect.h @@ -19,14 +19,14 @@ #include "ui_qgsdbsourceselectbase.h" #include "qgisgui.h" +#include "qgscontexthelp.h" #include "qgsdbfilterproxymodel.h" #include "qgspgtablemodel.h" -#include "qgscontexthelp.h" -#include -#include #include #include +#include +#include class QPushButton; class QStringList; diff --git a/src/providers/postgres/qgspgtablemodel.cpp b/src/providers/postgres/qgspgtablemodel.cpp index 9c12f67a14a..bbbe32d7335 100644 --- a/src/providers/postgres/qgspgtablemodel.cpp +++ b/src/providers/postgres/qgspgtablemodel.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgspgtablemodel.h" #include "qgsdataitem.h" #include "qgslogger.h" +#include "qgspgtablemodel.h" #include diff --git a/src/providers/postgres/qgspostgresconn.cpp b/src/providers/postgres/qgspostgresconn.cpp index ed8b6c18f8f..0e3e78708ef 100644 --- a/src/providers/postgres/qgspostgresconn.cpp +++ b/src/providers/postgres/qgspostgresconn.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgspostgresconn.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" -#include "qgsmessagelog.h" #include "qgscredentials.h" +#include "qgsdatasourceuri.h" #include "qgsfield.h" +#include "qgslogger.h" +#include "qgsmessagelog.h" #include "qgspgtablemodel.h" +#include "qgspostgresconn.h" #include "qgsproviderregistry.h" #include "qgsvectordataprovider.h" #include "qgswkbtypes.h" diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h index 9b6cabc92c0..b774720f243 100644 --- a/src/providers/postgres/qgspostgresconn.h +++ b/src/providers/postgres/qgspostgresconn.h @@ -18,11 +18,11 @@ #ifndef QGSPOSTGRESCONN_H #define QGSPOSTGRESCONN_H +#include +#include #include #include #include -#include -#include #include "qgis.h" #include "qgsdatasourceuri.h" diff --git a/src/providers/postgres/qgspostgresconnpool.cpp b/src/providers/postgres/qgspostgresconnpool.cpp index 6dc9b68b916..e8ee7113c5a 100644 --- a/src/providers/postgres/qgspostgresconnpool.cpp +++ b/src/providers/postgres/qgspostgresconnpool.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include "qgspostgresconnpool.h" #include "qgspostgresconn.h" +#include "qgspostgresconnpool.h" QgsPostgresConnPool QgsPostgresConnPool::sInstance; diff --git a/src/providers/postgres/qgspostgresdataitems.cpp b/src/providers/postgres/qgspostgresdataitems.cpp index d3a91be7197..ec374b32820 100644 --- a/src/providers/postgres/qgspostgresdataitems.cpp +++ b/src/providers/postgres/qgspostgresdataitems.cpp @@ -14,18 +14,18 @@ ***************************************************************************/ #include "qgspostgresdataitems.h" +#include "qgsapplication.h" +#include "qgscolumntypethread.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmessageoutput.h" +#include "qgspgnewconnection.h" #include "qgspostgresconn.h" #include "qgspostgresconnpool.h" -#include "qgspgnewconnection.h" -#include "qgscolumntypethread.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" -#include "qgsapplication.h" -#include "qgsmessageoutput.h" +#include #include #include -#include QGISEXTERN bool deleteLayer( const QString& uri, QString& errCause ); diff --git a/src/providers/postgres/qgspostgresdataitems.h b/src/providers/postgres/qgspostgresdataitems.h index f1c5bcf1d6d..c692a314fb3 100644 --- a/src/providers/postgres/qgspostgresdataitems.h +++ b/src/providers/postgres/qgspostgresdataitems.h @@ -19,9 +19,9 @@ #include "qgsdataitem.h" -#include "qgspostgresconn.h" -#include "qgspgsourceselect.h" #include "qgsmimedatautils.h" +#include "qgspgsourceselect.h" +#include "qgspostgresconn.h" #include "qgsvectorlayerimport.h" class QgsPGRootItem; diff --git a/src/providers/postgres/qgspostgresprovider.cpp b/src/providers/postgres/qgspostgresprovider.cpp index 40dd2a0cc94..0afae39d4eb 100644 --- a/src/providers/postgres/qgspostgresprovider.cpp +++ b/src/providers/postgres/qgspostgresprovider.cpp @@ -16,27 +16,27 @@ ***************************************************************************/ #include +#include #include #include #include -#include #include +#include #include -#include #include -#include "qgsvectorlayerimport.h" -#include "qgsprovidercountcalcevent.h" -#include "qgsproviderextentcalcevent.h" -#include "qgspostgresprovider.h" +#include "qgslogger.h" +#include "qgspgsourceselect.h" #include "qgspostgresconn.h" #include "qgspostgresconnpool.h" -#include "qgspgsourceselect.h" #include "qgspostgresdataitems.h" #include "qgspostgresfeatureiterator.h" +#include "qgspostgresprovider.h" #include "qgspostgrestransaction.h" -#include "qgslogger.h" +#include "qgsprovidercountcalcevent.h" +#include "qgsproviderextentcalcevent.h" +#include "qgsvectorlayerimport.h" const QString POSTGRES_KEY = "postgres"; const QString POSTGRES_DESCRIPTION = "PostgreSQL/PostGIS data provider"; diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h index 76c3220019d..1a86947c2a8 100644 --- a/src/providers/postgres/qgspostgresprovider.h +++ b/src/providers/postgres/qgspostgresprovider.h @@ -18,10 +18,10 @@ #ifndef QGSPOSTGRESPROVIDER_H #define QGSPOSTGRESPROVIDER_H -#include "qgsvectordataprovider.h" -#include "qgsrectangle.h" -#include "qgsvectorlayerimport.h" #include "qgspostgresconn.h" +#include "qgsrectangle.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayerimport.h" class QgsFeature; diff --git a/src/providers/postgres/qgspostgrestransaction.cpp b/src/providers/postgres/qgspostgrestransaction.cpp index 78f81ba4e93..f3f42d7894b 100644 --- a/src/providers/postgres/qgspostgrestransaction.cpp +++ b/src/providers/postgres/qgspostgrestransaction.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgspostgrestransaction.h" -#include "qgspostgresconn.h" -#include "qgslogger.h" #include "qgis.h" +#include "qgslogger.h" +#include "qgspostgresconn.h" +#include "qgspostgrestransaction.h" QgsPostgresTransaction::QgsPostgresTransaction( const QString &connString ) : QgsTransaction( connString ), mConn( 0 ) diff --git a/src/providers/spatialite/qgsspatialiteconnection.cpp b/src/providers/spatialite/qgsspatialiteconnection.cpp index b6d6c5ec1b6..bc3fd20f032 100644 --- a/src/providers/spatialite/qgsspatialiteconnection.cpp +++ b/src/providers/spatialite/qgsspatialiteconnection.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsspatialiteconnection.h" #include "qgsslconnect.h" +#include "qgsspatialiteconnection.h" #include #include diff --git a/src/providers/spatialite/qgsspatialiteconnection.h b/src/providers/spatialite/qgsspatialiteconnection.h index f4b1a23f6e8..71729dde454 100644 --- a/src/providers/spatialite/qgsspatialiteconnection.h +++ b/src/providers/spatialite/qgsspatialiteconnection.h @@ -15,8 +15,8 @@ #ifndef QGSSPATIALITECONNECTION_H #define QGSSPATIALITECONNECTION_H -#include #include +#include extern "C" { diff --git a/src/providers/spatialite/qgsspatialitedataitems.cpp b/src/providers/spatialite/qgsspatialitedataitems.cpp index 8cc9a9925a8..b27f44e2a82 100644 --- a/src/providers/spatialite/qgsspatialitedataitems.cpp +++ b/src/providers/spatialite/qgsspatialitedataitems.cpp @@ -14,14 +14,14 @@ ***************************************************************************/ #include "qgsspatialitedataitems.h" -#include "qgsspatialiteprovider.h" #include "qgsspatialiteconnection.h" +#include "qgsspatialiteprovider.h" #include "qgsspatialitesourceselect.h" #include "qgslogger.h" +#include "qgsmessageoutput.h" #include "qgsmimedatautils.h" #include "qgsvectorlayerimport.h" -#include "qgsmessageoutput.h" #include #include diff --git a/src/providers/spatialite/qgsspatialiteprovider.cpp b/src/providers/spatialite/qgsspatialiteprovider.cpp index fa30181a704..625f118e0a9 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.cpp +++ b/src/providers/spatialite/qgsspatialiteprovider.cpp @@ -16,23 +16,23 @@ email : a.furieri@lqt.it #include "qgis.h" #include "qgsapplication.h" +#include "qgscoordinatereferencesystem.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" -#include "qgsmessageoutput.h" -#include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" #include "qgslogger.h" #include "qgsmessagelog.h" -#include "qgsvectorlayerimport.h" +#include "qgsmessageoutput.h" +#include "qgsrectangle.h" #include "qgsslconnect.h" -#include "qgsspatialiteprovider.h" #include "qgsspatialiteconnpool.h" #include "qgsspatialitefeatureiterator.h" +#include "qgsspatialiteprovider.h" +#include "qgsvectorlayerimport.h" -#include -#include #include +#include +#include #ifdef _MSC_VER #define strcasecmp(a,b) stricmp(a,b) diff --git a/src/providers/spatialite/qgsspatialiteprovider.h b/src/providers/spatialite/qgsspatialiteprovider.h index bca80cf7e8f..bd7a726c85b 100644 --- a/src/providers/spatialite/qgsspatialiteprovider.h +++ b/src/providers/spatialite/qgsspatialiteprovider.h @@ -25,13 +25,13 @@ extern "C" #include } -#include "qgsvectordataprovider.h" -#include "qgsrectangle.h" -#include "qgsvectorlayerimport.h" +#include #include #include -#include #include +#include "qgsrectangle.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayerimport.h" class QgsFeature; class QgsField; diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp index 5d7af381378..be612a8f672 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.cpp +++ b/src/providers/spatialite/qgsspatialitesourceselect.cpp @@ -16,24 +16,24 @@ email : a.furieri@lqt.it * * ***************************************************************************/ -#include "qgsspatialitesourceselect.h" #include "qgsspatialiteconnection.h" +#include "qgsspatialitesourceselect.h" -#include "qgslogger.h" #include "qgsapplication.h" #include "qgscontexthelp.h" -#include "qgsquerybuilder.h" #include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsquerybuilder.h" #include "qgsvectorlayer.h" +#include #include #include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include #ifdef _MSC_VER #define strcasecmp(a,b) stricmp(a,b) diff --git a/src/providers/spatialite/qgsspatialitesourceselect.h b/src/providers/spatialite/qgsspatialitesourceselect.h index 70ff8df74f1..75587d4bc33 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.h +++ b/src/providers/spatialite/qgsspatialitesourceselect.h @@ -18,20 +18,20 @@ #define QGSSPATIALITESOURCESELECT_H #include "ui_qgsdbsourceselectbase.h" #include "qgisgui.h" +#include "qgscontexthelp.h" #include "qgsdbfilterproxymodel.h" #include "qgsspatialitetablemodel.h" -#include "qgscontexthelp.h" #include -#include #include #include +#include +#include +#include #include #include -#include -#include class QStringList; class QTableWidgetItem; diff --git a/src/providers/spatialite/qgsspatialitetablemodel.cpp b/src/providers/spatialite/qgsspatialitetablemodel.cpp index 25eb909d372..f500495669e 100644 --- a/src/providers/spatialite/qgsspatialitetablemodel.cpp +++ b/src/providers/spatialite/qgsspatialitetablemodel.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsspatialitetablemodel.h" #include "qgsapplication.h" #include "qgsdataitem.h" // for icons +#include "qgsspatialitetablemodel.h" QgsSpatiaLiteTableModel::QgsSpatiaLiteTableModel(): QStandardItemModel(), mTableCount( 0 ) { diff --git a/src/providers/wcs/qgswcscapabilities.cpp b/src/providers/wcs/qgswcscapabilities.cpp index dd8e4f88de4..5d68b375c81 100644 --- a/src/providers/wcs/qgswcscapabilities.cpp +++ b/src/providers/wcs/qgswcscapabilities.cpp @@ -21,26 +21,27 @@ #define WCS_THRESHOLD 200 // time to wait for an answer without emitting dataChanged() #include "qgslogger.h" -#include "qgswcscapabilities.h" #include "qgsowsconnection.h" +#include "qgswcscapabilities.h" #include +#include +#include +#include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsdatasourceuri.h" +#include "qgsnetworkaccessmanager.h" #include "qgsrasterlayer.h" #include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsnetworkaccessmanager.h" -#include -#include -#include -#include -#include #include +#include +#include +#include -#include +#include +#include #include #include #include @@ -48,9 +49,8 @@ #include #include #include -#include -#include #include +#include #ifdef _MSC_VER #include @@ -58,8 +58,8 @@ #endif #ifdef QGISDEBUG -#include #include +#include #endif QgsWcsCapabilities::QgsWcsCapabilities( QgsDataSourceURI const &theUri ) diff --git a/src/providers/wcs/qgswcscapabilities.h b/src/providers/wcs/qgswcscapabilities.h index 2421aa7589e..d1cf7199012 100644 --- a/src/providers/wcs/qgswcscapabilities.h +++ b/src/providers/wcs/qgswcscapabilities.h @@ -23,13 +23,13 @@ #include "qgsdatasourceuri.h" #include "qgsrectangle.h" -#include -#include #include #include #include -#include +#include +#include #include +#include class QNetworkAccessManager; class QNetworkReply; diff --git a/src/providers/wcs/qgswcsdataitems.cpp b/src/providers/wcs/qgswcsdataitems.cpp index d8a7f681fbc..821d400e8b6 100644 --- a/src/providers/wcs/qgswcsdataitems.cpp +++ b/src/providers/wcs/qgswcsdataitems.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ #include "qgsapplication.h" +#include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsnewhttpconnection.h" +#include "qgsowsconnection.h" #include "qgswcsdataitems.h" #include "qgswcsprovider.h" -#include "qgslogger.h" -#include "qgsdatasourceuri.h" #include "qgswcssourceselect.h" -#include "qgsowsconnection.h" -#include "qgsnewhttpconnection.h" #include #include diff --git a/src/providers/wcs/qgswcsprovider.cpp b/src/providers/wcs/qgswcsprovider.cpp index e7ace4b0d56..dac0600f097 100644 --- a/src/providers/wcs/qgswcsprovider.cpp +++ b/src/providers/wcs/qgswcsprovider.cpp @@ -21,40 +21,40 @@ #include -#include "qgslogger.h" -#include "qgswcsprovider.h" +#include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsdatasourceuri.h" +#include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsmessageoutput.h" +#include "qgsnetworkaccessmanager.h" +#include "qgsnetworkreplyparser.h" #include "qgsrasteridentifyresult.h" #include "qgsrasterlayer.h" #include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsnetworkaccessmanager.h" -#include "qgsnetworkreplyparser.h" -#include "qgsmessageoutput.h" -#include "qgsmessagelog.h" +#include "qgswcsprovider.h" -#include -#include -#include #include +#include +#include +#include -#include +#include +#include +#include #include #include -#include -#include #include -#include +#include #ifdef QGISDEBUG #include #endif -#include "gdalwarper.h" -#include "ogr_spatialref.h" #include "cpl_conv.h" #include "cpl_string.h" +#include "gdalwarper.h" +#include "ogr_spatialref.h" #define TINY_VALUE std::numeric_limits::epsilon() * 20 diff --git a/src/providers/wcs/qgswcsprovider.h b/src/providers/wcs/qgswcsprovider.h index 79f28754819..443fbc3409c 100644 --- a/src/providers/wcs/qgswcsprovider.h +++ b/src/providers/wcs/qgswcsprovider.h @@ -23,19 +23,19 @@ #define QGSWCSPROVIDER_H #include "qgserror.h" -#include "qgswcscapabilities.h" -#include "qgsrasterdataprovider.h" #include "qgsgdalproviderbase.h" +#include "qgsrasterdataprovider.h" #include "qgsrectangle.h" +#include "qgswcscapabilities.h" -#include -#include #include #include #include #include -#include +#include +#include #include +#include class QgsCoordinateTransform; class QgsNetworkAccessManager; diff --git a/src/providers/wcs/qgswcssourceselect.cpp b/src/providers/wcs/qgswcssourceselect.cpp index d21a997d91a..25802803490 100644 --- a/src/providers/wcs/qgswcssourceselect.cpp +++ b/src/providers/wcs/qgswcssourceselect.cpp @@ -20,10 +20,10 @@ #include "qgslogger.h" #include "qgsnetworkaccessmanager.h" +#include "qgsnumericsortlistviewitem.h" +#include "qgswcscapabilities.h" #include "qgswcsprovider.h" #include "qgswcssourceselect.h" -#include "qgswcscapabilities.h" -#include "qgsnumericsortlistviewitem.h" #include diff --git a/src/providers/wcs/qgswcssourceselect.h b/src/providers/wcs/qgswcssourceselect.h index 93888a9e4b0..6669cb7cfe2 100644 --- a/src/providers/wcs/qgswcssourceselect.h +++ b/src/providers/wcs/qgswcssourceselect.h @@ -20,16 +20,16 @@ #ifndef QGSWCSSOURCESELECT_H #define QGSWCSSOURCESELECT_H -#include "qgsowssourceselect.h" -#include "qgsdatasourceuri.h" #include "qgisgui.h" #include "qgscontexthelp.h" +#include "qgsdatasourceuri.h" +#include "qgsowssourceselect.h" #include "qgswcscapabilities.h" #include "qgsdataprovider.h" -#include #include +#include class QgisApp; class QgsDataProvider; diff --git a/src/providers/wfs/qgswfscapabilities.cpp b/src/providers/wfs/qgswfscapabilities.cpp index 17b550b82d9..a06620cacfb 100644 --- a/src/providers/wfs/qgswfscapabilities.cpp +++ b/src/providers/wfs/qgswfscapabilities.cpp @@ -12,17 +12,17 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgswfscapabilities.h" +#include +#include +#include +#include +#include #include "qgsexpression.h" #include "qgslogger.h" #include "qgsmessagelog.h" #include "qgsnetworkaccessmanager.h" #include "qgsogcutils.h" -#include -#include -#include -#include -#include +#include "qgswfscapabilities.h" static const QString WFS_NAMESPACE = "http://www.opengis.net/wfs"; diff --git a/src/providers/wfs/qgswfscapabilities.h b/src/providers/wfs/qgswfscapabilities.h index 1a434a0c7f9..9ecb0697534 100644 --- a/src/providers/wfs/qgswfscapabilities.h +++ b/src/providers/wfs/qgswfscapabilities.h @@ -15,11 +15,11 @@ #ifndef QGSWFSCAPABILITIES_H #define QGSWFSCAPABILITIES_H -#include #include +#include -#include "qgsrectangle.h" #include "qgsdatasourceuri.h" +#include "qgsrectangle.h" class QNetworkReply; diff --git a/src/providers/wfs/qgswfsdataitems.cpp b/src/providers/wfs/qgswfsdataitems.cpp index ead9a920f08..64d9871e98a 100644 --- a/src/providers/wfs/qgswfsdataitems.cpp +++ b/src/providers/wfs/qgswfsdataitems.cpp @@ -20,8 +20,8 @@ #include "qgswfsprovider.h" #include "qgswfssourceselect.h" -#include #include +#include QgsWFSLayerItem::QgsWFSLayerItem( QgsDataItem* parent, QString name, QgsDataSourceURI uri, QString featureType, QString title, QString crsString ) diff --git a/src/providers/wfs/qgswfsfeatureiterator.cpp b/src/providers/wfs/qgswfsfeatureiterator.cpp index 46f0bca800c..ea332d47158 100644 --- a/src/providers/wfs/qgswfsfeatureiterator.cpp +++ b/src/providers/wfs/qgswfsfeatureiterator.cpp @@ -12,11 +12,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgswfsfeatureiterator.h" -#include "qgsspatialindex.h" -#include "qgswfsprovider.h" -#include "qgsmessagelog.h" #include "qgsgeometry.h" +#include "qgsmessagelog.h" +#include "qgsspatialindex.h" +#include "qgswfsfeatureiterator.h" +#include "qgswfsprovider.h" QgsWFSFeatureIterator::QgsWFSFeatureIterator( QgsWFSFeatureSource* source, bool ownSource, const QgsFeatureRequest& request ) : QgsAbstractFeatureIteratorFromSource( source, ownSource, request ) diff --git a/src/providers/wfs/qgswfsprovider.cpp b/src/providers/wfs/qgswfsprovider.cpp index 0d2b62a78f6..abb3af3f194 100644 --- a/src/providers/wfs/qgswfsprovider.cpp +++ b/src/providers/wfs/qgswfsprovider.cpp @@ -19,31 +19,31 @@ #include "qgis.h" #include "qgsapplication.h" -#include "qgsmaplayerregistry.h" +#include "qgscoordinatereferencesystem.h" +#include "qgsdatasourceuri.h" #include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" #include "qgsgml.h" -#include "qgscoordinatereferencesystem.h" -#include "qgswfsfeatureiterator.h" -#include "qgswfsprovider.h" -#include "qgsdatasourceuri.h" -#include "qgsspatialindex.h" #include "qgslogger.h" +#include "qgsmaplayerregistry.h" #include "qgsmessagelog.h" #include "qgsnetworkaccessmanager.h" #include "qgsogcutils.h" +#include "qgsspatialindex.h" +#include "qgswfsfeatureiterator.h" +#include "qgswfsprovider.h" #include -#include #include -#include -#include #include -#include -#include +#include +#include +#include #include #include +#include +#include #include diff --git a/src/providers/wfs/qgswfsprovider.h b/src/providers/wfs/qgswfsprovider.h index 988bf5a694b..07c7449d4c3 100644 --- a/src/providers/wfs/qgswfsprovider.h +++ b/src/providers/wfs/qgswfsprovider.h @@ -20,10 +20,10 @@ #include #include "qgis.h" -#include "qgsrectangle.h" #include "qgscoordinatereferencesystem.h" -#include "qgsvectordataprovider.h" #include "qgsmaplayer.h" +#include "qgsrectangle.h" +#include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" #include "qgswfsfeatureiterator.h" diff --git a/src/providers/wfs/qgswfssourceselect.cpp b/src/providers/wfs/qgswfssourceselect.cpp index 6aae8c18959..8c6f0d7667e 100644 --- a/src/providers/wfs/qgswfssourceselect.cpp +++ b/src/providers/wfs/qgswfssourceselect.cpp @@ -15,27 +15,27 @@ * * ***************************************************************************/ -#include "qgswfssourceselect.h" -#include "qgsowsconnection.h" -#include "qgswfscapabilities.h" -#include "qgswfsprovider.h" -#include "qgsnewhttpconnection.h" -#include "qgsgenericprojectionselector.h" -#include "qgsexpressionbuilderdialog.h" #include "qgscontexthelp.h" -#include "qgsproject.h" #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" +#include "qgsexpressionbuilderdialog.h" +#include "qgsgenericprojectionselector.h" #include "qgslogger.h" -#include "qgsmapcanvas.h" //for current view extent #include "qgsmanageconnectionsdialog.h" +#include "qgsmapcanvas.h" //for current view extent +#include "qgsnewhttpconnection.h" +#include "qgsowsconnection.h" +#include "qgsproject.h" +#include "qgswfscapabilities.h" +#include "qgswfsprovider.h" +#include "qgswfssourceselect.h" #include +#include #include #include -#include -#include #include +#include QgsWFSSourceSelect::QgsWFSSourceSelect( QWidget* parent, Qt::WindowFlags fl, bool embeddedMode ) diff --git a/src/providers/wfs/qgswfssourceselect.h b/src/providers/wfs/qgswfssourceselect.h index 4e9219b34e6..2bc97ea89ea 100644 --- a/src/providers/wfs/qgswfssourceselect.h +++ b/src/providers/wfs/qgswfssourceselect.h @@ -22,8 +22,8 @@ #include "qgscontexthelp.h" #include -#include #include +#include class QgsGenericProjectionSelector; class QgsWFSCapabilities; diff --git a/src/providers/wms/qgstilescalewidget.cpp b/src/providers/wms/qgstilescalewidget.cpp index 0126e8afca8..d1085311792 100644 --- a/src/providers/wms/qgstilescalewidget.cpp +++ b/src/providers/wms/qgstilescalewidget.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgstilescalewidget.h" -#include "qgsmapcanvas.h" -#include "qgsrasterlayer.h" -#include "qgsmessagelog.h" #include "qgslogger.h" +#include "qgsmapcanvas.h" +#include "qgsmessagelog.h" +#include "qgsrasterlayer.h" +#include "qgstilescalewidget.h" #include +#include #include #include -#include QgsTileScaleWidget::QgsTileScaleWidget( QgsMapCanvas * mapCanvas, QWidget * parent, Qt::WindowFlags f ) : QWidget( parent, f ) diff --git a/src/providers/wms/qgswmscapabilities.cpp b/src/providers/wms/qgswmscapabilities.cpp index f8e7c9a6d19..15cc01e682f 100644 --- a/src/providers/wms/qgswmscapabilities.cpp +++ b/src/providers/wms/qgswmscapabilities.cpp @@ -2,8 +2,8 @@ #include "qgswmscapabilities.h" #include "qgswmsprovider.h" -#include #include +#include #include "qgscoordinatetransform.h" #include "qgsdatasourceuri.h" diff --git a/src/providers/wms/qgswmsconnection.cpp b/src/providers/wms/qgswmsconnection.cpp index 723ca7abb5e..c58fea2dd0d 100644 --- a/src/providers/wms/qgswmsconnection.cpp +++ b/src/providers/wms/qgswmsconnection.cpp @@ -21,11 +21,11 @@ #include "../providers/wms/qgswmsprovider.h" #include "qgis.h" // GEO_EPSG_CRS_ID #include "qgsdatasourceuri.h" +#include "qgsnetworkaccessmanager.h" #include "qgsnewhttpconnection.h" #include "qgsproject.h" #include "qgsproviderregistry.h" #include "qgswmsconnection.h" -#include "qgsnetworkaccessmanager.h" #include #include @@ -33,8 +33,8 @@ #include #include -#include #include +#include QgsWMSConnection::QgsWMSConnection( QString theConnName ) : mConnName( theConnName ) diff --git a/src/providers/wms/qgswmsdataitems.cpp b/src/providers/wms/qgswmsdataitems.cpp index eb2c15126c1..9ac35c77c5c 100644 --- a/src/providers/wms/qgswmsdataitems.cpp +++ b/src/providers/wms/qgswmsdataitems.cpp @@ -17,11 +17,11 @@ #include "qgslogger.h" #include "qgsdatasourceuri.h" +#include "qgsnewhttpconnection.h" +#include "qgstilescalewidget.h" #include "qgswmscapabilities.h" #include "qgswmsconnection.h" #include "qgswmssourceselect.h" -#include "qgsnewhttpconnection.h" -#include "qgstilescalewidget.h" // --------------------------------------------------------------------------- QgsWMSConnectionItem::QgsWMSConnectionItem( QgsDataItem* parent, QString name, QString path, QString uri ) diff --git a/src/providers/wms/qgswmsprovider.cpp b/src/providers/wms/qgswmsprovider.cpp index cee67abc232..7c5c628b244 100644 --- a/src/providers/wms/qgswmsprovider.cpp +++ b/src/providers/wms/qgswmsprovider.cpp @@ -28,45 +28,45 @@ #include -#include "qgslogger.h" -#include "qgswmsprovider.h" -#include "qgswmsconnection.h" +#include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgsdatasourceuri.h" #include "qgsfeaturestore.h" #include "qgsgeometry.h" +#include "qgsgml.h" +#include "qgsgmlschema.h" +#include "qgslogger.h" +#include "qgsmessagelog.h" +#include "qgsmessageoutput.h" +#include "qgsnetworkaccessmanager.h" +#include "qgsnetworkreplyparser.h" #include "qgsrasteridentifyresult.h" #include "qgsrasterlayer.h" #include "qgsrectangle.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsmessageoutput.h" -#include "qgsmessagelog.h" -#include "qgsnetworkaccessmanager.h" -#include "qgsnetworkreplyparser.h" -#include "qgsgml.h" -#include "qgsgmlschema.h" #include "qgswmscapabilities.h" +#include "qgswmsconnection.h" +#include "qgswmsprovider.h" -#include -#include -#include #include +#include +#include +#include #include #include -#include +#include +#include #include #include #include #include #include #include -#include -#include #include -#include #include +#include +#include #include #include @@ -75,8 +75,8 @@ #include #ifdef QGISDEBUG -#include #include +#include #endif #define ERR(message) QGS_ERROR_MESSAGE(message,"WMS provider") diff --git a/src/providers/wms/qgswmsprovider.h b/src/providers/wms/qgswmsprovider.h index 51bce927e4e..8302412dbcb 100644 --- a/src/providers/wms/qgswmsprovider.h +++ b/src/providers/wms/qgswmsprovider.h @@ -20,17 +20,17 @@ #ifndef QGSWMSPROVIDER_H #define QGSWMSPROVIDER_H -#include "qgsrasterdataprovider.h" #include "qgsnetworkreplyparser.h" +#include "qgsrasterdataprovider.h" #include "qgswmscapabilities.h" -#include -#include #include #include #include -#include +#include +#include #include +#include class QgsCoordinateTransform; class QgsNetworkAccessManager; diff --git a/src/providers/wms/qgswmssourceselect.cpp b/src/providers/wms/qgswmssourceselect.cpp index dd11eb1d13f..bacad0eea3c 100644 --- a/src/providers/wms/qgswmssourceselect.cpp +++ b/src/providers/wms/qgswmssourceselect.cpp @@ -18,7 +18,6 @@ * * ***************************************************************************/ -#include "qgswmsprovider.h" #include "qgis.h" // GEO_EPSG_CRS_ID #include "qgscontexthelp.h" #include "qgscoordinatereferencesystem.h" @@ -27,32 +26,33 @@ #include "qgslogger.h" #include "qgsmanageconnectionsdialog.h" #include "qgsmessageviewer.h" +#include "qgsnetworkaccessmanager.h" #include "qgsnewhttpconnection.h" #include "qgsnumericsortlistviewitem.h" #include "qgsproject.h" #include "qgsproviderregistry.h" +#include "qgswmscapabilities.h" #include "qgswmsconnection.h" +#include "qgswmsprovider.h" #include "qgswmssourceselect.h" #include "qgswmtsdimensions.h" -#include "qgsnetworkaccessmanager.h" -#include "qgswmscapabilities.h" #include -#include -#include #include +#include #include #include #include #include #include #include +#include #include #include #include -#include #include +#include QgsWMSSourceSelect::QgsWMSSourceSelect( QWidget * parent, Qt::WindowFlags fl, bool managerMode, bool embeddedMode ) : QDialog( parent, fl ) diff --git a/src/providers/wms/qgswmssourceselect.h b/src/providers/wms/qgswmssourceselect.h index 5188ebb6728..d347ef9e038 100644 --- a/src/providers/wms/qgswmssourceselect.h +++ b/src/providers/wms/qgswmssourceselect.h @@ -18,14 +18,14 @@ #ifndef QGSWMSSOURCESELECT_H #define QGSWMSSOURCESELECT_H #include "ui_qgswmssourceselectbase.h" -#include "qgsdatasourceuri.h" #include "qgisgui.h" #include "qgscontexthelp.h" +#include "qgsdatasourceuri.h" #include "qgswmsprovider.h" -#include #include +#include class QgisApp; class QgsWmsProvider; diff --git a/src/providers/wms/qgswmtsdimensions.cpp b/src/providers/wms/qgswmtsdimensions.cpp index bc6e61f24ff..13cdb4e8a2b 100644 --- a/src/providers/wms/qgswmtsdimensions.cpp +++ b/src/providers/wms/qgswmtsdimensions.cpp @@ -18,8 +18,8 @@ #include "qgswmsprovider.h" #include "qgswmtsdimensions.h" -#include #include +#include QgsWmtsDimensions::QgsWmtsDimensions( const QgsWmtsTileLayer &layer, QWidget *parent, Qt::WindowFlags fl ) : QDialog( parent, fl ) diff --git a/src/python/qgspythonutilsimpl.cpp b/src/python/qgspythonutilsimpl.cpp index 16a218b8158..65614aac7a1 100644 --- a/src/python/qgspythonutilsimpl.cpp +++ b/src/python/qgspythonutilsimpl.cpp @@ -29,9 +29,9 @@ #include "qgslogger.h" #include "qgsmessageoutput.h" +#include #include #include -#include PyThreadState* _mainState; diff --git a/src/server/qgis_map_serv.cpp b/src/server/qgis_map_serv.cpp index 89e725101b4..661b4cf8898 100644 --- a/src/server/qgis_map_serv.cpp +++ b/src/server/qgis_map_serv.cpp @@ -22,35 +22,35 @@ #include "qgsapplication.h" #include "qgscapabilitiescache.h" #include "qgsconfigcache.h" +#include "qgseditorwidgetregistry.h" #include "qgsfontutils.h" #include "qgsgetrequesthandler.h" -#include "qgspostrequesthandler.h" -#include "qgssoaprequesthandler.h" -#include "qgsproviderregistry.h" #include "qgslogger.h" -#include "qgswmsserver.h" -#include "qgswfsserver.h" -#include "qgswcsserver.h" +#include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsmapserviceexception.h" -#include "qgspallabeling.h" #include "qgsnetworkaccessmanager.h" -#include "qgsmaplayerregistry.h" +#include "qgspallabeling.h" +#include "qgspostrequesthandler.h" +#include "qgsproviderregistry.h" #include "qgsserverlogger.h" -#include "qgseditorwidgetregistry.h" +#include "qgssoaprequesthandler.h" +#include "qgswcsserver.h" +#include "qgswfsserver.h" +#include "qgswmsserver.h" #ifdef HAVE_SERVER_PYTHON_PLUGINS -#include "qgsserverplugins.h" #include "qgsserverfilter.h" #include "qgsserverinterfaceimpl.h" +#include "qgsserverplugins.h" #endif -#include -#include -#include -#include #include +#include +#include +#include #include +#include #include diff --git a/src/server/qgscapabilitiescache.cpp b/src/server/qgscapabilitiescache.cpp index 9b4f7a50ca6..dfcd31e6284 100644 --- a/src/server/qgscapabilitiescache.cpp +++ b/src/server/qgscapabilitiescache.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ +#include #include "qgscapabilitiescache.h" #include "qgslogger.h" -#include QgsCapabilitiesCache::QgsCapabilitiesCache() { diff --git a/src/server/qgsconfigcache.cpp b/src/server/qgsconfigcache.cpp index 6e07073bc8e..f7548378fc2 100644 --- a/src/server/qgsconfigcache.cpp +++ b/src/server/qgsconfigcache.cpp @@ -18,10 +18,10 @@ #include "qgsconfigcache.h" #include "qgsmessagelog.h" #include "qgsmslayercache.h" +#include "qgssldconfigparser.h" #include "qgswcsprojectparser.h" #include "qgswfsprojectparser.h" #include "qgswmsprojectparser.h" -#include "qgssldconfigparser.h" #include diff --git a/src/server/qgsconfigparserutils.cpp b/src/server/qgsconfigparserutils.cpp index d1f53c9d510..42430c3d6e2 100644 --- a/src/server/qgsconfigparserutils.cpp +++ b/src/server/qgsconfigparserutils.cpp @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#include "qgsconfigparserutils.h" #include "qgsapplication.h" +#include "qgsconfigparserutils.h" #include "qgscoordinatereferencesystem.h" #include "qgscoordinatetransform.h" #include "qgscrscache.h" diff --git a/src/server/qgsftptransaction.cpp b/src/server/qgsftptransaction.cpp index 5c507c03fea..3a02413dc84 100644 --- a/src/server/qgsftptransaction.cpp +++ b/src/server/qgsftptransaction.cpp @@ -15,9 +15,9 @@ * * ***************************************************************************/ -#include "qgsftptransaction.h" #include #include +#include "qgsftptransaction.h" QgsFtpTransaction::QgsFtpTransaction(): mFtp( new QFtp( 0 ) ), mRequestFinished( false ), mErrorFlag( false ) { diff --git a/src/server/qgsgetrequesthandler.cpp b/src/server/qgsgetrequesthandler.cpp index 366baf82dfa..d786951937d 100644 --- a/src/server/qgsgetrequesthandler.cpp +++ b/src/server/qgsgetrequesthandler.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsgetrequesthandler.h" -#include "qgslogger.h" -#include "qgsremotedatasourcebuilder.h" #include #include #include +#include "qgsgetrequesthandler.h" +#include "qgslogger.h" +#include "qgsremotedatasourcebuilder.h" QgsGetRequestHandler::QgsGetRequestHandler() : QgsHttpRequestHandler() diff --git a/src/server/qgshostedrdsbuilder.cpp b/src/server/qgshostedrdsbuilder.cpp index ff3072b3f14..4361a6cafe8 100644 --- a/src/server/qgshostedrdsbuilder.cpp +++ b/src/server/qgshostedrdsbuilder.cpp @@ -16,12 +16,12 @@ * * ***************************************************************************/ +#include +#include "qgscoordinatereferencesystem.h" #include "qgshostedrdsbuilder.h" #include "qgslogger.h" #include "qgsmslayercache.h" #include "qgsrasterlayer.h" -#include "qgscoordinatereferencesystem.h" -#include QgsHostedRDSBuilder::QgsHostedRDSBuilder(): QgsMSLayerBuilder() { diff --git a/src/server/qgshostedvdsbuilder.cpp b/src/server/qgshostedvdsbuilder.cpp index 07ca7b6fc6d..bd5f7218761 100644 --- a/src/server/qgshostedvdsbuilder.cpp +++ b/src/server/qgshostedvdsbuilder.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgshostedvdsbuilder.h" -#include "qgsmslayercache.h" -#include "qgslogger.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsvectorlayer.h" #include +#include "qgscoordinatereferencesystem.h" +#include "qgshostedvdsbuilder.h" +#include "qgslogger.h" +#include "qgsmslayercache.h" +#include "qgsvectorlayer.h" QgsHostedVDSBuilder::QgsHostedVDSBuilder(): QgsMSLayerBuilder() { diff --git a/src/server/qgshttprequesthandler.cpp b/src/server/qgshttprequesthandler.cpp index 11d996183a8..12f56847070 100644 --- a/src/server/qgshttprequesthandler.cpp +++ b/src/server/qgshttprequesthandler.cpp @@ -17,20 +17,20 @@ * * ***************************************************************************/ -#include "qgshttprequesthandler.h" -#include "qgsftptransaction.h" -#include "qgshttptransaction.h" -#include "qgslogger.h" -#include "qgsmapserviceexception.h" +#include #include #include #include #include #include -#include #include +#include #include -#include +#include "qgsftptransaction.h" +#include "qgshttprequesthandler.h" +#include "qgshttptransaction.h" +#include "qgslogger.h" +#include "qgsmapserviceexception.h" QgsHttpRequestHandler::QgsHttpRequestHandler() : QgsRequestHandler() diff --git a/src/server/qgshttprequesthandler.h b/src/server/qgshttprequesthandler.h index 64e8b103025..b5a191a06e1 100644 --- a/src/server/qgshttprequesthandler.h +++ b/src/server/qgshttprequesthandler.h @@ -20,9 +20,9 @@ #ifndef QGSHTTPREQUESTHANDLER_H #define QGSHTTPREQUESTHANDLER_H -#include "qgsrequesthandler.h" #include #include +#include "qgsrequesthandler.h" typedef QList< QPair > QgsColorBox; //Color / number of pixels typedef QMultiMap< int, QgsColorBox > QgsColorBoxMap; // sum of pixels / color box diff --git a/src/server/qgsinterpolationlayerbuilder.cpp b/src/server/qgsinterpolationlayerbuilder.cpp index 129d30cb15f..2f511f5993e 100644 --- a/src/server/qgsinterpolationlayerbuilder.cpp +++ b/src/server/qgsinterpolationlayerbuilder.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ +#include +#include #include "qgsinterpolationlayerbuilder.h" #include "qgslogger.h" #include "qgsrasterlayer.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include -#include //for interpolation #include "qgsgridfilewriter.h" diff --git a/src/server/qgsmslayercache.cpp b/src/server/qgsmslayercache.cpp index c1a86dcdadb..0e3e582526d 100644 --- a/src/server/qgsmslayercache.cpp +++ b/src/server/qgsmslayercache.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ +#include +#include "qgslogger.h" #include "qgsmslayercache.h" #include "qgsvectorlayer.h" -#include "qgslogger.h" -#include QgsMSLayerCache* QgsMSLayerCache::instance() { diff --git a/src/server/qgsmslayercache.h b/src/server/qgsmslayercache.h index 3cb87b501f6..ade96e92d0b 100644 --- a/src/server/qgsmslayercache.h +++ b/src/server/qgsmslayercache.h @@ -18,12 +18,12 @@ #ifndef QGSMSLAYERCACHE_H #define QGSMSLAYERCACHE_H -#include #include #include #include #include #include +#include class QgsMapLayer; diff --git a/src/server/qgsmsutils.cpp b/src/server/qgsmsutils.cpp index 7b40e6e0d56..b32a4b533a2 100644 --- a/src/server/qgsmsutils.cpp +++ b/src/server/qgsmsutils.cpp @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgsmsutils.h" -#include "qgslogger.h" -#include -#include #include #include #include +#include +#include +#include "qgslogger.h" +#include "qgsmsutils.h" QString QgsMSUtils::createTempFilePath() { diff --git a/src/server/qgspostrequesthandler.cpp b/src/server/qgspostrequesthandler.cpp index 3f44b4aa72b..337d2107c5a 100644 --- a/src/server/qgspostrequesthandler.cpp +++ b/src/server/qgspostrequesthandler.cpp @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include "qgspostrequesthandler.h" -#include "qgslogger.h" #include +#include +#include "qgslogger.h" +#include "qgspostrequesthandler.h" QgsPostRequestHandler::QgsPostRequestHandler() { diff --git a/src/server/qgsremotedatasourcebuilder.cpp b/src/server/qgsremotedatasourcebuilder.cpp index 11884b518f3..41a0e7ec7e6 100644 --- a/src/server/qgsremotedatasourcebuilder.cpp +++ b/src/server/qgsremotedatasourcebuilder.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgsremotedatasourcebuilder.h" +#include +#include +#include #include "qgsftptransaction.h" #include "qgshttptransaction.h" #include "qgslogger.h" #include "qgsrasterlayer.h" +#include "qgsremotedatasourcebuilder.h" #include "qgsvectorlayer.h" -#include -#include -#include QgsRemoteDataSourceBuilder::QgsRemoteDataSourceBuilder(): QgsMSLayerBuilder() { diff --git a/src/server/qgsremoteowsbuilder.cpp b/src/server/qgsremoteowsbuilder.cpp index 838a2996cce..46539128089 100644 --- a/src/server/qgsremoteowsbuilder.cpp +++ b/src/server/qgsremoteowsbuilder.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ +#include +#include #include "qgsdatasourceuri.h" -#include "qgsremoteowsbuilder.h" #include "qgshttptransaction.h" #include "qgslogger.h" #include "qgsmslayercache.h" #include "qgsrasterlayer.h" +#include "qgsremoteowsbuilder.h" #include "qgsvectorlayer.h" -#include -#include QgsRemoteOWSBuilder::QgsRemoteOWSBuilder( const QMap& parameterMap ) : QgsMSLayerBuilder() diff --git a/src/server/qgsremoteowsbuilder.h b/src/server/qgsremoteowsbuilder.h index 0e650c4ba2b..c84ec5b312e 100644 --- a/src/server/qgsremoteowsbuilder.h +++ b/src/server/qgsremoteowsbuilder.h @@ -18,8 +18,8 @@ #ifndef QGSREMOTEOWSBUILDER_H #define QGSREMOTEOWSBUILDER_H -#include "qgsmslayerbuilder.h" #include +#include "qgsmslayerbuilder.h" class QgsRasterLayer; class QgsVectorLayer; diff --git a/src/server/qgssentdatasourcebuilder.cpp b/src/server/qgssentdatasourcebuilder.cpp index d2d81b56a8f..eb33aa03258 100644 --- a/src/server/qgssentdatasourcebuilder.cpp +++ b/src/server/qgssentdatasourcebuilder.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgssentdatasourcebuilder.h" -#include "qgslogger.h" -#include "qgsrasterlayer.h" -#include "qgsvectorlayer.h" #include #include #include #include +#include "qgslogger.h" +#include "qgsrasterlayer.h" +#include "qgssentdatasourcebuilder.h" +#include "qgsvectorlayer.h" QgsSentDataSourceBuilder::QgsSentDataSourceBuilder() { diff --git a/src/server/qgsserverfilter.cpp b/src/server/qgsserverfilter.cpp index 449b29a6f25..3672f880135 100644 --- a/src/server/qgsserverfilter.cpp +++ b/src/server/qgsserverfilter.cpp @@ -17,8 +17,8 @@ ***************************************************************************/ -#include "qgsserverfilter.h" #include "qgslogger.h" +#include "qgsserverfilter.h" /** * QgsServerFilter diff --git a/src/server/qgsserverinterfaceimpl.h b/src/server/qgsserverinterfaceimpl.h index b74a85d4205..083a73b1038 100644 --- a/src/server/qgsserverinterfaceimpl.h +++ b/src/server/qgsserverinterfaceimpl.h @@ -19,12 +19,12 @@ #ifndef QGSSERVERINTERFACEIMPL_H #define QGSSERVERINTERFACEIMPL_H -#include "qgsserverinterface.h" #include "qgscapabilitiescache.h" #include "qgsgetrequesthandler.h" -#include "qgspostrequesthandler.h" -#include "qgssoaprequesthandler.h" #include "qgsmaprenderer.h" +#include "qgspostrequesthandler.h" +#include "qgsserverinterface.h" +#include "qgssoaprequesthandler.h" /** * QgsServerInterface diff --git a/src/server/qgsserverlogger.cpp b/src/server/qgsserverlogger.cpp index eeb52685c61..5be5b7e8627 100644 --- a/src/server/qgsserverlogger.cpp +++ b/src/server/qgsserverlogger.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgsserverlogger.h" #include #include #include #include +#include "qgsserverlogger.h" #include diff --git a/src/server/qgsserverplugins.cpp b/src/server/qgsserverplugins.cpp index 448f187e635..5299280a330 100644 --- a/src/server/qgsserverplugins.cpp +++ b/src/server/qgsserverplugins.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsserverplugins.h" -#include "qgsmapserviceexception.h" #include "qgsapplication.h" #include "qgslogger.h" -#include "qgsserverlogger.h" +#include "qgsmapserviceexception.h" #include "qgsmsutils.h" +#include "qgsserverlogger.h" +#include "qgsserverplugins.h" #include diff --git a/src/server/qgsserverplugins.h b/src/server/qgsserverplugins.h index 2b7b28ee413..21b16dedade 100644 --- a/src/server/qgsserverplugins.h +++ b/src/server/qgsserverplugins.h @@ -18,8 +18,8 @@ #ifndef QGSSERVERPLUGINS_H #define QGSSERVERPLUGINS_H -#include "qgsrequesthandler.h" #include "qgspythonutils.h" +#include "qgsrequesthandler.h" #include "qgsserverinterface.h" class SERVER_EXPORT QgsServerPlugins diff --git a/src/server/qgsserverprojectparser.cpp b/src/server/qgsserverprojectparser.cpp index 30c9987352e..1c56afc024b 100644 --- a/src/server/qgsserverprojectparser.cpp +++ b/src/server/qgsserverprojectparser.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgsserverprojectparser.h" #include "qgsapplication.h" #include "qgsconfigcache.h" #include "qgsconfigparserutils.h" #include "qgscrscache.h" #include "qgsdatasourceuri.h" +#include "qgseditorwidgetregistry.h" #include "qgsmaplayerregistry.h" #include "qgsmslayercache.h" #include "qgsrasterlayer.h" -#include "qgseditorwidgetregistry.h" +#include "qgsserverprojectparser.h" #include #include diff --git a/src/server/qgsserverprojectparser.h b/src/server/qgsserverprojectparser.h index 3cad16ac337..2eae60a8b7b 100644 --- a/src/server/qgsserverprojectparser.h +++ b/src/server/qgsserverprojectparser.h @@ -18,11 +18,11 @@ #ifndef QGSSERVERPROJECTPARSER_H #define QGSSERVERPROJECTPARSER_H -#include "qgsvectorlayer.h" #include #include #include #include +#include "qgsvectorlayer.h" class QgsCoordinateReferenceSystem; class QgsMapLayer; diff --git a/src/server/qgssldconfigparser.cpp b/src/server/qgssldconfigparser.cpp index 3137a1e372e..6567a504cfe 100644 --- a/src/server/qgssldconfigparser.cpp +++ b/src/server/qgssldconfigparser.cpp @@ -15,19 +15,19 @@ * * ***************************************************************************/ -#include "qgssldconfigparser.h" #include "qgsapplication.h" #include "qgsconfigparserutils.h" -#include "qgslabel.h" #include "qgslabelattributes.h" +#include "qgslabel.h" #include "qgslogger.h" #include "qgsmapserviceexception.h" #include "qgsrasterlayer.h" #include "qgsrendererv2.h" #include "qgssinglesymbolrendererv2.h" +#include "qgssldconfigparser.h" #include "qgssymbolv2.h" -#include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include //layer builders @@ -39,13 +39,13 @@ //for contours #include "gdal_alg.h" -#include "ogr_srs_api.h" #include "ogr_api.h" +#include "ogr_srs_api.h" //for raster interpolation -#include "qgsinterpolationlayerbuilder.h" #include "qgsgridfilewriter.h" #include "qgsidwinterpolator.h" +#include "qgsinterpolationlayerbuilder.h" #include "qgstininterpolator.h" #include diff --git a/src/server/qgssoaprequesthandler.cpp b/src/server/qgssoaprequesthandler.cpp index de0b9bc16c0..c0e3af6b7dd 100644 --- a/src/server/qgssoaprequesthandler.cpp +++ b/src/server/qgssoaprequesthandler.cpp @@ -15,9 +15,7 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgssoaprequesthandler.h" -#include "qgslogger.h" -#include "qgsmapserviceexception.h" +#include #include #include #include @@ -25,7 +23,9 @@ #include #include #include -#include +#include "qgslogger.h" +#include "qgsmapserviceexception.h" +#include "qgssoaprequesthandler.h" QgsSOAPRequestHandler::QgsSOAPRequestHandler() { diff --git a/src/server/qgswcsprojectparser.cpp b/src/server/qgswcsprojectparser.cpp index 3c361893eef..47dc960c9e0 100644 --- a/src/server/qgswcsprojectparser.cpp +++ b/src/server/qgswcsprojectparser.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgswcsprojectparser.h" #include "qgsconfigcache.h" #include "qgsconfigparserutils.h" #include "qgsrasterlayer.h" +#include "qgswcsprojectparser.h" QgsWCSProjectParser::QgsWCSProjectParser( const QString& filePath ) { diff --git a/src/server/qgswcsserver.cpp b/src/server/qgswcsserver.cpp index 1a0530fe6cd..bd86a691f34 100644 --- a/src/server/qgswcsserver.cpp +++ b/src/server/qgswcsserver.cpp @@ -14,15 +14,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgswcsserver.h" -#include "qgswcsprojectparser.h" #include "qgscrscache.h" +#include "qgslogger.h" +#include "qgsmapserviceexception.h" +#include "qgsrasterfilewriter.h" #include "qgsrasterlayer.h" #include "qgsrasterpipe.h" #include "qgsrasterprojector.h" -#include "qgsrasterfilewriter.h" -#include "qgslogger.h" -#include "qgsmapserviceexception.h" +#include "qgswcsprojectparser.h" +#include "qgswcsserver.h" #include #include diff --git a/src/server/qgswcsserver.h b/src/server/qgswcsserver.h index d2e2bf936e8..c025c908871 100644 --- a/src/server/qgswcsserver.h +++ b/src/server/qgswcsserver.h @@ -18,10 +18,10 @@ #ifndef QGSWCSSERVER_H #define QGSWCSSERVER_H +#include #include #include #include -#include #include "qgis.h" #include "qgsowsserver.h" diff --git a/src/server/qgswfsprojectparser.cpp b/src/server/qgswfsprojectparser.cpp index 12023ff0440..bb53bd2212e 100644 --- a/src/server/qgswfsprojectparser.cpp +++ b/src/server/qgswfsprojectparser.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgswfsprojectparser.h" #include "qgsconfigcache.h" #include "qgsconfigparserutils.h" #include "qgsmaplayerregistry.h" #include "qgsvectordataprovider.h" +#include "qgswfsprojectparser.h" QgsWFSProjectParser::QgsWFSProjectParser( const QString& filePath ) { diff --git a/src/server/qgswfsserver.cpp b/src/server/qgswfsserver.cpp index dea983eabe5..87e1b280939 100644 --- a/src/server/qgswfsserver.cpp +++ b/src/server/qgswfsserver.cpp @@ -14,45 +14,45 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgswfsserver.h" +#include "qgscomposerlegenditem.h" +#include "qgscoordinatereferencesystem.h" #include "qgscrscache.h" -#include "qgsfield.h" #include "qgsexpression.h" +#include "qgsfield.h" #include "qgsgeometry.h" +#include "qgslegendmodel.h" +#include "qgslogger.h" #include "qgsmaplayer.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" +#include "qgsmapserviceexception.h" #include "qgsmaptopixel.h" #include "qgsmessagelog.h" +#include "qgsogcutils.h" #include "qgspallabeling.h" #include "qgsproject.h" #include "qgsrasterlayer.h" +#include "qgsrequesthandler.h" #include "qgsscalecalculator.h" -#include "qgscoordinatereferencesystem.h" +#include "qgssymbolv2.h" #include "qgsvectordataprovider.h" #include "qgsvectorlayer.h" -#include "qgslogger.h" -#include "qgsmapserviceexception.h" -#include "qgssymbolv2.h" -#include "qgslegendmodel.h" -#include "qgscomposerlegenditem.h" -#include "qgsrequesthandler.h" -#include "qgsogcutils.h" +#include "qgswfsserver.h" +#include #include #include +#include #include #include -#include -#include //for printing -#include "qgscomposition.h" #include +#include #include #include #include -#include +#include "qgscomposition.h" #ifndef Q_OS_WIN #include diff --git a/src/server/qgswfsserver.h b/src/server/qgswfsserver.h index 19c964bb35a..50842578346 100644 --- a/src/server/qgswfsserver.h +++ b/src/server/qgswfsserver.h @@ -18,10 +18,10 @@ #ifndef QGSWFSSERVER_H #define QGSWFSSERVER_H +#include #include #include #include -#include #include "qgis.h" #include "qgsowsserver.h" #include "qgsvectorlayer.h" diff --git a/src/server/qgswmsconfigparser.cpp b/src/server/qgswmsconfigparser.cpp index 9d1a9083011..8517955042b 100644 --- a/src/server/qgswmsconfigparser.cpp +++ b/src/server/qgswmsconfigparser.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgswmsconfigparser.h" #include "qgsmaplayer.h" #include "qgsmapserviceexception.h" +#include "qgswmsconfigparser.h" +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" #include "qgscomposerlabel.h" #include "qgscomposerlegend.h" -#include "qgscomposermap.h" #include "qgscomposermapgrid.h" -#include "qgscomposerhtml.h" -#include "qgscomposerframe.h" +#include "qgscomposermap.h" #include "qgscomposition.h" #include "qgslayertreegroup.h" diff --git a/src/server/qgswmsprojectparser.cpp b/src/server/qgswmsprojectparser.cpp index ed89bf0aa2f..ed10a898997 100644 --- a/src/server/qgswmsprojectparser.cpp +++ b/src/server/qgswmsprojectparser.cpp @@ -15,7 +15,6 @@ * * ***************************************************************************/ -#include "qgswmsprojectparser.h" #include "qgsconfigcache.h" #include "qgsconfigparserutils.h" #include "qgslogger.h" @@ -25,18 +24,19 @@ #include "qgspallabeling.h" #include "qgsrendererv2.h" #include "qgsvectorlayer.h" +#include "qgswmsprojectparser.h" -#include "qgscomposition.h" #include "qgscomposerarrow.h" #include "qgscomposerattributetable.h" +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" #include "qgscomposerlabel.h" #include "qgscomposerlegend.h" #include "qgscomposermap.h" -#include "qgscomposerframe.h" -#include "qgscomposerhtml.h" #include "qgscomposerpicture.h" #include "qgscomposerscalebar.h" #include "qgscomposershape.h" +#include "qgscomposition.h" #include "qgslayertreegroup.h" #include diff --git a/src/server/qgswmsprojectparser.h b/src/server/qgswmsprojectparser.h index 209f9d42c39..52c089801b4 100644 --- a/src/server/qgswmsprojectparser.h +++ b/src/server/qgswmsprojectparser.h @@ -18,9 +18,9 @@ #ifndef QGSWMSPROJECTPARSER_H #define QGSWMSPROJECTPARSER_H -#include "qgswmsconfigparser.h" -#include "qgsserverprojectparser.h" #include "qgslayertreegroup.h" +#include "qgsserverprojectparser.h" +#include "qgswmsconfigparser.h" class QTextDocument; class QSvgRenderer; diff --git a/src/server/qgswmsserver.cpp b/src/server/qgswmsserver.cpp index 8c86e0f2ca0..168cb15ad74 100644 --- a/src/server/qgswmsserver.cpp +++ b/src/server/qgswmsserver.cpp @@ -15,52 +15,52 @@ * * ***************************************************************************/ -#include "qgswmsserver.h" #include "qgscapabilitiescache.h" +#include "qgscoordinatereferencesystem.h" #include "qgscrscache.h" +#include "qgseditorwidgetregistry.h" +#include "qgsfeature.h" #include "qgsfield.h" #include "qgsgeometry.h" #include "qgslayertree.h" #include "qgslayertreemodel.h" #include "qgslayertreemodellegendnode.h" #include "qgslegendrenderer.h" +#include "qgslogger.h" #include "qgsmaplayer.h" #include "qgsmaplayerlegend.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" +#include "qgsmapserviceexception.h" #include "qgsmaptopixel.h" +#include "qgsmessagelog.h" +#include "qgsogcutils.h" +#include "qgspaintenginehack.h" #include "qgsproject.h" #include "qgsrasteridentifyresult.h" #include "qgsrasterlayer.h" +#include "qgsrendererv2.h" #include "qgsscalecalculator.h" -#include "qgscoordinatereferencesystem.h" -#include "qgsvectordataprovider.h" -#include "qgsvectorlayer.h" -#include "qgslogger.h" -#include "qgsmessagelog.h" -#include "qgsmapserviceexception.h" #include "qgssldconfigparser.h" #include "qgssymbolv2.h" -#include "qgsrendererv2.h" -#include "qgspaintenginehack.h" -#include "qgsogcutils.h" -#include "qgsfeature.h" -#include "qgseditorwidgetregistry.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" +#include "qgswmsserver.h" +#include #include #include #include #include #include -#include //for printing -#include "qgscomposition.h" #include +#include #include #include #include -#include +#include "qgscomposition.h" QgsWMSServer::QgsWMSServer( const QString& configFilePath, QMap ¶meters, QgsWMSConfigParser* cp, QgsRequestHandler* rh, QgsMapRenderer* renderer, QgsCapabilitiesCache* capCache ) diff --git a/src/server/qgswmsserver.h b/src/server/qgswmsserver.h index a933ddd2c0a..b552722c6a0 100644 --- a/src/server/qgswmsserver.h +++ b/src/server/qgswmsserver.h @@ -18,13 +18,13 @@ #ifndef QGSWMSSERVER_H #define QGSWMSSERVER_H -#include "qgsowsserver.h" -#include "qgswmsconfigparser.h" +#include #include #include #include #include -#include +#include "qgsowsserver.h" +#include "qgswmsconfigparser.h" class QgsCapabilitiesCache; class QgsCoordinateReferenceSystem; diff --git a/tests/bench/main.cpp b/tests/bench/main.cpp index 8ab3da715d1..dc0e2a099be 100644 --- a/tests/bench/main.cpp +++ b/tests/bench/main.cpp @@ -50,15 +50,15 @@ typedef SInt32 SRefCon; #endif #endif -#include "qgsbench.h" -#include "qgsapplication.h" #include #include +#include "qgsapplication.h" +#include "qgsbench.h" #include "qgsexception.h" +#include "qgslogger.h" #include "qgsproject.h" #include "qgsproviderregistry.h" #include "qgsrectangle.h" -#include "qgslogger.h" /** print usage text diff --git a/tests/bench/qgsbench.cpp b/tests/bench/qgsbench.cpp index fdfd595b6e4..8f262c5d4b1 100644 --- a/tests/bench/qgsbench.cpp +++ b/tests/bench/qgsbench.cpp @@ -23,8 +23,8 @@ #ifndef Q_OS_WIN #include #endif -#include #include +#include #include #include @@ -49,8 +49,8 @@ const char *pre[] = { "user", "sys", "total", "wall" }; #ifdef Q_OS_WIN // slightly adapted from http://anoncvs.postgresql.org/cvsweb.cgi/pgsql/src/port/getrusage.c?rev=1.18;content-type=text%2Fplain -#include #include +#include #define RUSAGE_SELF 0 diff --git a/tests/qt_modeltest/modeltest.h b/tests/qt_modeltest/modeltest.h index 412f2b4f1ed..25e4ae92f67 100644 --- a/tests/qt_modeltest/modeltest.h +++ b/tests/qt_modeltest/modeltest.h @@ -48,8 +48,8 @@ #ifndef MODELTEST_H #define MODELTEST_H -#include #include +#include #include class CORE_EXPORT ModelTest : public QObject diff --git a/tests/qt_modeltest/tst_modeltest.cpp b/tests/qt_modeltest/tst_modeltest.cpp index efc130e4bc1..ddc87acab3f 100644 --- a/tests/qt_modeltest/tst_modeltest.cpp +++ b/tests/qt_modeltest/tst_modeltest.cpp @@ -45,11 +45,11 @@ ****************************************************************************/ -#include #include +#include -#include "modeltest.h" #include "dynamictreemodel.h" +#include "modeltest.h" class tst_ModelTest : public QObject diff --git a/tests/src/analysis/testopenstreetmap.cpp b/tests/src/analysis/testopenstreetmap.cpp index e49bfdbe482..679c017ad99 100644 --- a/tests/src/analysis/testopenstreetmap.cpp +++ b/tests/src/analysis/testopenstreetmap.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include #include +#include #include //#include diff --git a/tests/src/analysis/testqgsrastercalculator.cpp b/tests/src/analysis/testqgsrastercalculator.cpp index 27c55707949..dbe383e58a6 100644 --- a/tests/src/analysis/testqgsrastercalculator.cpp +++ b/tests/src/analysis/testqgsrastercalculator.cpp @@ -14,11 +14,11 @@ Email : nyall dot dawson at gmail dot com ***************************************************************************/ #include -#include "qgsrastercalculator.h" +#include "qgsapplication.h" #include "qgsrastercalcnode.h" +#include "qgsrastercalculator.h" #include "qgsrasterlayer.h" #include "qgsrastermatrix.h" -#include "qgsapplication.h" Q_DECLARE_METATYPE( QgsRasterCalcNode::Operator ); diff --git a/tests/src/analysis/testqgsvectoranalyzer.cpp b/tests/src/analysis/testqgsvectoranalyzer.cpp index 6698dba7337..883cb2fd444 100644 --- a/tests/src/analysis/testqgsvectoranalyzer.cpp +++ b/tests/src/analysis/testqgsvectoranalyzer.cpp @@ -15,8 +15,8 @@ Email : sherman at mrcc dot com #include //header for class being tested -#include #include +#include #include class TestQgsVectorAnalyzer : public QObject diff --git a/tests/src/app/testqgisappclipboard.cpp b/tests/src/app/testqgisappclipboard.cpp index 1f3e2c20860..ed33719c41a 100644 --- a/tests/src/app/testqgisappclipboard.cpp +++ b/tests/src/app/testqgisappclipboard.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include @@ -24,9 +23,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/tests/src/core/qgscompositionchecker.cpp b/tests/src/core/qgscompositionchecker.cpp index f7e3b6313d4..3534a2f29fb 100644 --- a/tests/src/core/qgscompositionchecker.cpp +++ b/tests/src/core/qgscompositionchecker.cpp @@ -13,13 +13,13 @@ * * ***************************************************************************/ -#include "qgscompositionchecker.h" -#include "qgscomposition.h" #include #include #include #include #include +#include "qgscompositionchecker.h" +#include "qgscomposition.h" QgsCompositionChecker::QgsCompositionChecker( const QString& testName, QgsComposition* composition ) : QgsMultiRenderChecker() diff --git a/tests/src/core/qgscompositionchecker.h b/tests/src/core/qgscompositionchecker.h index eb244de7c0b..33c48e77cad 100644 --- a/tests/src/core/qgscompositionchecker.h +++ b/tests/src/core/qgscompositionchecker.h @@ -16,8 +16,8 @@ #ifndef QGSCOMPOSITIONCHECKER_H #define QGSCOMPOSITIONCHECKER_H -#include "qgsmultirenderchecker.h" #include +#include "qgsmultirenderchecker.h" class QgsComposition; class QImage; diff --git a/tests/src/core/regression1141.cpp b/tests/src/core/regression1141.cpp index ace951b9226..c4400158cbe 100644 --- a/tests/src/core/regression1141.cpp +++ b/tests/src/core/regression1141.cpp @@ -12,29 +12,28 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include +#include #include +#include #include #include //qgis includes... -#include //defines QgsFieldMap -#include //logic for writing shpfiles -#include //we will need to pass a bunch of these for each rec -#include //each feature needs a geometry -#include //we will use point geometry -#include //needed for creating a srs -#include //search path for srs.db -#include #include //defines GEOWkt -#include +#include //search path for srs.db +#include //needed for creating a srs +#include //we will need to pass a bunch of these for each rec +#include +#include //each feature needs a geometry #include +#include //we will use point geometry +#include +#include //logic for writing shpfiles +#include //defines QgsFieldMap #if defined(linux) #include diff --git a/tests/src/core/regression992.cpp b/tests/src/core/regression992.cpp index 06e22266499..ec857d5281e 100644 --- a/tests/src/core/regression992.cpp +++ b/tests/src/core/regression992.cpp @@ -12,26 +12,25 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include //qgis includes... -#include -#include -#include #include -#include +#include #include +#include +#include +#include //qgis unit test includes #include diff --git a/tests/src/core/test_template.cpp b/tests/src/core/test_template.cpp index 8ecea932a23..29d0f362331 100644 --- a/tests/src/core/test_template.cpp +++ b/tests/src/core/test_template.cpp @@ -12,10 +12,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include -#include +#include //header for class being tested #include <[testClassLowerCaseName].h> diff --git a/tests/src/core/testcontrastenhancements.cpp b/tests/src/core/testcontrastenhancements.cpp index d7665f54584..a71330585fd 100644 --- a/tests/src/core/testcontrastenhancements.cpp +++ b/tests/src/core/testcontrastenhancements.cpp @@ -12,18 +12,18 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include #include #include +#include +#include //qgis includes... -#include #include #include #include #include +#include /** \ingroup UnitTests * This is a unit test for the ContrastEnhancements contrast enhancement classes. diff --git a/tests/src/core/testmaprendererjob.cpp b/tests/src/core/testmaprendererjob.cpp index 9bfea899015..370a3641669 100644 --- a/tests/src/core/testmaprendererjob.cpp +++ b/tests/src/core/testmaprendererjob.cpp @@ -1,6 +1,6 @@ -#include #include +#include #include "qgsapplication.h" #include "qgsmaplayerregistry.h" diff --git a/tests/src/core/testqgis.cpp b/tests/src/core/testqgis.cpp index c65b748c7db..e4c4923aebf 100644 --- a/tests/src/core/testqgis.cpp +++ b/tests/src/core/testqgis.cpp @@ -12,10 +12,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include #include #include -#include +#include //qgis includes... #include diff --git a/tests/src/core/testqgsapplication.cpp b/tests/src/core/testqgsapplication.cpp index e29778fa8c5..44324bbf084 100644 --- a/tests/src/core/testqgsapplication.cpp +++ b/tests/src/core/testqgsapplication.cpp @@ -12,8 +12,8 @@ Email : sherman at mrcc dot com * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include diff --git a/tests/src/core/testqgsatlascomposition.cpp b/tests/src/core/testqgsatlascomposition.cpp index 4b94bfb2895..6a09466183b 100644 --- a/tests/src/core/testqgsatlascomposition.cpp +++ b/tests/src/core/testqgsatlascomposition.cpp @@ -15,23 +15,23 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposermap.h" -#include "qgscomposermapoverview.h" -#include "qgsatlascomposition.h" -#include "qgscomposerlabel.h" -#include "qgsmaplayerregistry.h" -#include "qgsmaprenderer.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgssymbolv2.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfontutils.h" #include #include #include +#include "qgsapplication.h" +#include "qgsatlascomposition.h" +#include "qgscomposerlabel.h" +#include "qgscomposermap.h" +#include "qgscomposermapoverview.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaprenderer.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgssymbolv2.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" class TestQgsAtlasComposition : public QObject { diff --git a/tests/src/core/testqgsblendmodes.cpp b/tests/src/core/testqgsblendmodes.cpp index a310a55fdaf..f76ff3f3510 100644 --- a/tests/src/core/testqgsblendmodes.cpp +++ b/tests/src/core/testqgsblendmodes.cpp @@ -12,23 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include #include +#include +#include +#include //qgis includes... -#include -#include -#include #include -#include +#include #include +#include #include +#include #include +#include //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgsclipper.cpp b/tests/src/core/testqgsclipper.cpp index 1d10d435462..216c2e513a7 100644 --- a/tests/src/core/testqgsclipper.cpp +++ b/tests/src/core/testqgsclipper.cpp @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include +#include #include #include #include -#include +#include +#include //header for class being tested #include #include diff --git a/tests/src/core/testqgscolorscheme.cpp b/tests/src/core/testqgscolorscheme.cpp index 444d2cd1801..0c3342c41bc 100644 --- a/tests/src/core/testqgscolorscheme.cpp +++ b/tests/src/core/testqgscolorscheme.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgscolorscheme.h" #include #include #include +#include "qgscolorscheme.h" //dummy color scheme for testing class DummyColorScheme : public QgsColorScheme diff --git a/tests/src/core/testqgscolorschemeregistry.cpp b/tests/src/core/testqgscolorschemeregistry.cpp index c8676597241..5777ee61802 100644 --- a/tests/src/core/testqgscolorschemeregistry.cpp +++ b/tests/src/core/testqgscolorschemeregistry.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgscolorschemeregistry.h" -#include "qgscolorscheme.h" #include #include #include +#include "qgscolorscheme.h" +#include "qgscolorschemeregistry.h" //dummy color scheme for testing class DummyColorScheme : public QgsColorScheme diff --git a/tests/src/core/testqgscomposerdd.cpp b/tests/src/core/testqgscomposerdd.cpp index fc0f076a29d..a9d56bf702d 100644 --- a/tests/src/core/testqgscomposerdd.cpp +++ b/tests/src/core/testqgscomposerdd.cpp @@ -16,18 +16,18 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" +#include "qgscomposerattributetable.h" #include "qgscomposermap.h" #include "qgscomposertexttable.h" -#include "qgscomposerattributetable.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" +#include "qgsfeature.h" #include "qgsmaplayerregistry.h" #include "qgsmapsettings.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsfeature.h" -#include "qgssymbolv2.h" #include "qgssinglesymbolrendererv2.h" -#include "qgsdatadefined.h" +#include "qgssymbolv2.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include #include diff --git a/tests/src/core/testqgscomposereffects.cpp b/tests/src/core/testqgscomposereffects.cpp index 35c43b57e8b..652975e435f 100644 --- a/tests/src/core/testqgscomposereffects.cpp +++ b/tests/src/core/testqgscomposereffects.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposershape.h" -#include "qgsmaprenderer.h" -#include -#include #include +#include #include +#include +#include "qgsapplication.h" +#include "qgscomposershape.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsmaprenderer.h" class TestQgsComposerEffects : public QObject { diff --git a/tests/src/core/testqgscomposergroup.cpp b/tests/src/core/testqgscomposergroup.cpp index e66850a9f0c..1b7d3d2a6c6 100644 --- a/tests/src/core/testqgscomposergroup.cpp +++ b/tests/src/core/testqgscomposergroup.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgscomposeritemgroup.h" -#include "qgscomposerlabel.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include #include +#include "qgscomposeritemgroup.h" +#include "qgscomposerlabel.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" class TestQgsComposerGroup : public QObject { diff --git a/tests/src/core/testqgscomposerhtml.cpp b/tests/src/core/testqgscomposerhtml.cpp index 8372f286f23..cf35a54556b 100644 --- a/tests/src/core/testqgscomposerhtml.cpp +++ b/tests/src/core/testqgscomposerhtml.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposerhtml.h" -#include "qgscomposerframe.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgsfontutils.h" #include #include +#include "qgsapplication.h" +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" class TestQgsComposerHtml : public QObject { diff --git a/tests/src/core/testqgscomposerlabel.cpp b/tests/src/core/testqgscomposerlabel.cpp index 53cf50cbc31..459e9c2e33f 100644 --- a/tests/src/core/testqgscomposerlabel.cpp +++ b/tests/src/core/testqgscomposerlabel.cpp @@ -16,12 +16,12 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" #include "qgscomposerlabel.h" +#include "qgscomposition.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" -#include "qgsvectorlayer.h" #include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include #include diff --git a/tests/src/core/testqgscomposermap.cpp b/tests/src/core/testqgscomposermap.cpp index df6eb1a9e8d..67a11a6fb6e 100644 --- a/tests/src/core/testqgscomposermap.cpp +++ b/tests/src/core/testqgscomposermap.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ +#include +#include #include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include "qgscomposermap.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsmultibandcolorrenderer.h" #include "qgsrasterlayer.h" -#include -#include class TestQgsComposerMap : public QObject { diff --git a/tests/src/core/testqgscomposermapgrid.cpp b/tests/src/core/testqgscomposermapgrid.cpp index 15d5893ebe6..46d4a1ec747 100644 --- a/tests/src/core/testqgscomposermapgrid.cpp +++ b/tests/src/core/testqgscomposermapgrid.cpp @@ -15,16 +15,16 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposermap.h" -#include "qgscomposermapgrid.h" -#include "qgsmaplayerregistry.h" -#include "qgsmaprenderer.h" -#include "qgsfontutils.h" #include #include +#include "qgsapplication.h" +#include "qgscomposermapgrid.h" +#include "qgscomposermap.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaprenderer.h" class TestQgsComposerMapGrid : public QObject { diff --git a/tests/src/core/testqgscomposermapoverview.cpp b/tests/src/core/testqgscomposermapoverview.cpp index c324cd9ff6e..0b6b0d794a3 100644 --- a/tests/src/core/testqgscomposermapoverview.cpp +++ b/tests/src/core/testqgscomposermapoverview.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ +#include +#include #include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include "qgscomposermap.h" #include "qgscomposermapoverview.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsmultibandcolorrenderer.h" #include "qgsrasterlayer.h" -#include "qgsfontutils.h" -#include -#include class TestQgsComposerMapOverview : public QObject { diff --git a/tests/src/core/testqgscomposermodel.cpp b/tests/src/core/testqgscomposermodel.cpp index fa7da57fd4b..5fb5bcaa53c 100644 --- a/tests/src/core/testqgscomposermodel.cpp +++ b/tests/src/core/testqgscomposermodel.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgscomposition.h" -#include "qgscomposermodel.h" -#include "qgscomposerlabel.h" +#include #include #include -#include +#include "qgscomposerlabel.h" +#include "qgscomposermodel.h" +#include "qgscomposition.h" class TestQgsComposerModel : public QObject { diff --git a/tests/src/core/testqgscomposermultiframe.cpp b/tests/src/core/testqgscomposermultiframe.cpp index 8a43a08c6a1..853a3153ee5 100644 --- a/tests/src/core/testqgscomposermultiframe.cpp +++ b/tests/src/core/testqgscomposermultiframe.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgscomposerhtml.h" -#include "qgscomposerframe.h" -#include "qgscomposerlabel.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include #include +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" +#include "qgscomposerlabel.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" class TestQgsComposerMultiFrame : public QObject { diff --git a/tests/src/core/testqgscomposerobject.cpp b/tests/src/core/testqgscomposerobject.cpp index 5cb8155c184..33e2e0b57a5 100644 --- a/tests/src/core/testqgscomposerobject.cpp +++ b/tests/src/core/testqgscomposerobject.cpp @@ -15,13 +15,13 @@ * * ***************************************************************************/ -#include "qgscomposerobject.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgsdatadefined.h" -#include "qgsexpression.h" #include #include +#include "qgscomposerobject.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" +#include "qgsexpression.h" class TestQgsComposerObject : public QObject { diff --git a/tests/src/core/testqgscomposerpaper.cpp b/tests/src/core/testqgscomposerpaper.cpp index 6f4a10a8f3e..b6a9dc7a01f 100644 --- a/tests/src/core/testqgscomposerpaper.cpp +++ b/tests/src/core/testqgscomposerpaper.cpp @@ -16,18 +16,18 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include "qgscomposershape.h" -#include "qgssymbolv2.h" -#include "qgssinglesymbolrendererv2.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" #include "qgsfillsymbollayerv2.h" #include "qgslinesymbollayerv2.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgssymbolv2.h" -#include -#include #include +#include #include +#include class TestQgsComposerPaper : public QObject { diff --git a/tests/src/core/testqgscomposerpicture.cpp b/tests/src/core/testqgscomposerpicture.cpp index 0f0955711da..b8a58900f2e 100644 --- a/tests/src/core/testqgscomposerpicture.cpp +++ b/tests/src/core/testqgscomposerpicture.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposerpicture.h" -#include -#include #include +#include #include +#include +#include "qgsapplication.h" +#include "qgscomposerpicture.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" class TestQgsComposerPicture : public QObject { diff --git a/tests/src/core/testqgscomposerrotation.cpp b/tests/src/core/testqgscomposerrotation.cpp index d066f5a03e9..7da973824da 100644 --- a/tests/src/core/testqgscomposerrotation.cpp +++ b/tests/src/core/testqgscomposerrotation.cpp @@ -15,21 +15,21 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposershape.h" -#include "qgscomposermap.h" -#include "qgscomposerlabel.h" -#include "qgsmultibandcolorrenderer.h" -#include "qgsmaprenderer.h" -#include "qgsrasterlayer.h" -#include "qgsmaplayerregistry.h" -#include "qgsfontutils.h" -#include -#include #include +#include #include +#include +#include "qgsapplication.h" +#include "qgscomposerlabel.h" +#include "qgscomposermap.h" +#include "qgscomposershape.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaprenderer.h" +#include "qgsmultibandcolorrenderer.h" +#include "qgsrasterlayer.h" class TestQgsComposerRotation : public QObject { diff --git a/tests/src/core/testqgscomposerscalebar.cpp b/tests/src/core/testqgscomposerscalebar.cpp index 4b99fd1153b..5199ec92251 100644 --- a/tests/src/core/testqgscomposerscalebar.cpp +++ b/tests/src/core/testqgscomposerscalebar.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ +#include +#include #include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" #include "qgscomposermap.h" #include "qgscomposerscalebar.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfontutils.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsmultibandcolorrenderer.h" #include "qgsrasterlayer.h" -#include "qgsfontutils.h" -#include -#include class TestQgsComposerScaleBar : public QObject { diff --git a/tests/src/core/testqgscomposershapes.cpp b/tests/src/core/testqgscomposershapes.cpp index fc290e2a726..5e979ca0263 100644 --- a/tests/src/core/testqgscomposershapes.cpp +++ b/tests/src/core/testqgscomposershapes.cpp @@ -15,18 +15,18 @@ * * ***************************************************************************/ -#include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgscomposershape.h" -#include "qgsmapsettings.h" -#include "qgssymbolv2.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfillsymbollayerv2.h" -#include -#include #include +#include #include +#include +#include "qgsapplication.h" +#include "qgscomposershape.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfillsymbollayerv2.h" +#include "qgsmapsettings.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgssymbolv2.h" class TestQgsComposerShapes : public QObject { diff --git a/tests/src/core/testqgscomposertable.cpp b/tests/src/core/testqgscomposertable.cpp index 457fbdc567d..8da82efb3d6 100644 --- a/tests/src/core/testqgscomposertable.cpp +++ b/tests/src/core/testqgscomposertable.cpp @@ -16,14 +16,14 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" +#include "qgscomposerattributetable.h" #include "qgscomposermap.h" #include "qgscomposertexttable.h" -#include "qgscomposerattributetable.h" -#include "qgsmapsettings.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" +#include "qgscomposition.h" #include "qgsfeature.h" +#include "qgsmapsettings.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include #include diff --git a/tests/src/core/testqgscomposertablev2.cpp b/tests/src/core/testqgscomposertablev2.cpp index 829bfaaf311..b66d546f3e4 100644 --- a/tests/src/core/testqgscomposertablev2.cpp +++ b/tests/src/core/testqgscomposertablev2.cpp @@ -16,20 +16,20 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" -#include "qgscomposermap.h" #include "qgscomposerattributetablev2.h" -#include "qgscomposertablecolumn.h" #include "qgscomposerframe.h" -#include "qgsmapsettings.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" -#include "qgsfeature.h" +#include "qgscomposermap.h" +#include "qgscomposertablecolumn.h" #include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsfeature.h" #include "qgsfontutils.h" #include "qgsmaplayerregistry.h" +#include "qgsmapsettings.h" #include "qgsproject.h" #include "qgsrelationmanager.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" #include #include diff --git a/tests/src/core/testqgscomposerutils.cpp b/tests/src/core/testqgscomposerutils.cpp index fa46c9cdf7e..ed5147bbe0b 100644 --- a/tests/src/core/testqgscomposerutils.cpp +++ b/tests/src/core/testqgscomposerutils.cpp @@ -15,15 +15,15 @@ * * ***************************************************************************/ -#include "qgsapplication.h" //for standard test font -#include "qgscomposerutils.h" -#include "qgscomposition.h" -#include "qgscompositionchecker.h" -#include "qgsdatadefined.h" -#include "qgsfontutils.h" +#include #include #include -#include +#include "qgsapplication.h" //for standard test font +#include "qgscomposerutils.h" +#include "qgscompositionchecker.h" +#include "qgscomposition.h" +#include "qgsdatadefined.h" +#include "qgsfontutils.h" class TestQgsComposerUtils : public QObject { diff --git a/tests/src/core/testqgscomposition.cpp b/tests/src/core/testqgscomposition.cpp index 424faaed501..df3a58f8ec5 100644 --- a/tests/src/core/testqgscomposition.cpp +++ b/tests/src/core/testqgscomposition.cpp @@ -16,12 +16,12 @@ ***************************************************************************/ #include "qgsapplication.h" -#include "qgscomposition.h" +#include "qgscomposerarrow.h" +#include "qgscomposerframe.h" +#include "qgscomposerhtml.h" #include "qgscomposerlabel.h" #include "qgscomposershape.h" -#include "qgscomposerarrow.h" -#include "qgscomposerhtml.h" -#include "qgscomposerframe.h" +#include "qgscomposition.h" #include "qgsmapsettings.h" #include diff --git a/tests/src/core/testqgscoordinatereferencesystem.cpp b/tests/src/core/testqgscoordinatereferencesystem.cpp index 0f0f2b001ed..fbd56e9e4e4 100644 --- a/tests/src/core/testqgscoordinatereferencesystem.cpp +++ b/tests/src/core/testqgscoordinatereferencesystem.cpp @@ -12,8 +12,8 @@ Email : sherman at mrcc dot com * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include @@ -21,13 +21,13 @@ Email : sherman at mrcc dot com #include "qgslogger.h" //header for class being tested -#include #include +#include #include -#include -#include #include +#include +#include class TestQgsCoordinateReferenceSystem: public QObject { diff --git a/tests/src/core/testqgscoordinatetransform.cpp b/tests/src/core/testqgscoordinatetransform.cpp index b7f2be8b2cd..6656fcf72b2 100644 --- a/tests/src/core/testqgscoordinatetransform.cpp +++ b/tests/src/core/testqgscoordinatetransform.cpp @@ -14,10 +14,10 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include "qgscoordinatetransform.h" -#include "qgsapplication.h" #include #include +#include "qgsapplication.h" +#include "qgscoordinatetransform.h" class TestQgsCoordinateTransform: public QObject { diff --git a/tests/src/core/testqgsdatadefined.cpp b/tests/src/core/testqgsdatadefined.cpp index bae9aaa0ec4..13b52d67eaa 100644 --- a/tests/src/core/testqgsdatadefined.cpp +++ b/tests/src/core/testqgsdatadefined.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include #include #include +#include +#include +#include #include diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp index 58c069a4959..407e0627964 100644 --- a/tests/src/core/testqgsdataitem.cpp +++ b/tests/src/core/testqgsdataitem.cpp @@ -12,17 +12,17 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include #include -#include +#include //qgis includes... -#include -#include #include +#include #include +#include /** \ingroup UnitTests * This is a unit test for the QgsDataItem class. diff --git a/tests/src/core/testqgsdiagram.cpp b/tests/src/core/testqgsdiagram.cpp index 4cb91aafb47..17262f14a7f 100644 --- a/tests/src/core/testqgsdiagram.cpp +++ b/tests/src/core/testqgsdiagram.cpp @@ -12,37 +12,36 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include +#include #include #include -#include -#include -#include -#include -#include -#include +#include #include //qgis includes... // #include #include -#include -#include -#include +#include #include -#include +#include +#include +#include #include +#include +#include +#include +#include #include #include -#include -#include -#include -#include //qgis test includes -#include "qgsrenderchecker.h" #include "qgspallabeling.h" #include "qgsproject.h" +#include "qgsrenderchecker.h" /** \ingroup UnitTests * This is a unit test for the vector layer class. diff --git a/tests/src/core/testqgsdiagramexpression.cpp b/tests/src/core/testqgsdiagramexpression.cpp index f793cfe11e6..619488168cc 100644 --- a/tests/src/core/testqgsdiagramexpression.cpp +++ b/tests/src/core/testqgsdiagramexpression.cpp @@ -12,37 +12,36 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include +#include #include #include -#include -#include -#include -#include -#include -#include +#include #include //qgis includes... // #include #include -#include -#include -#include +#include #include -#include +#include +#include +#include #include +#include +#include +#include +#include #include #include -#include -#include -#include -#include //qgis test includes -#include "qgsrenderchecker.h" #include "qgspallabeling.h" #include "qgsproject.h" +#include "qgsrenderchecker.h" /** \ingroup UnitTests * This is a unit test for the vector layer class. diff --git a/tests/src/core/testqgsdistancearea.cpp b/tests/src/core/testqgsdistancearea.cpp index c106a46119f..668a11a0f94 100644 --- a/tests/src/core/testqgsdistancearea.cpp +++ b/tests/src/core/testqgsdistancearea.cpp @@ -12,13 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include +#include #include #include #include -#include +#include +#include //header for class being tested #include #include diff --git a/tests/src/core/testqgsexpression.cpp b/tests/src/core/testqgsexpression.cpp index fb5e3b74d5e..8a06cc49776 100644 --- a/tests/src/core/testqgsexpression.cpp +++ b/tests/src/core/testqgsexpression.cpp @@ -12,12 +12,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include -#include #include +#include +#include +#include #include //header for class being tested diff --git a/tests/src/core/testqgsfeature.cpp b/tests/src/core/testqgsfeature.cpp index 96dcd5778da..2b381db127e 100644 --- a/tests/src/core/testqgsfeature.cpp +++ b/tests/src/core/testqgsfeature.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include #include #include +#include +#include +#include #include "qgsfeature.h" #include "qgsfield.h" diff --git a/tests/src/core/testqgsfield.cpp b/tests/src/core/testqgsfield.cpp index 370e498d881..8d6cb040bbb 100644 --- a/tests/src/core/testqgsfield.cpp +++ b/tests/src/core/testqgsfield.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include #include #include +#include +#include +#include #include "qgsfield.h" diff --git a/tests/src/core/testqgsfields.cpp b/tests/src/core/testqgsfields.cpp index 55d023ba1a4..e198b99ef50 100644 --- a/tests/src/core/testqgsfields.cpp +++ b/tests/src/core/testqgsfields.cpp @@ -12,12 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include #include #include +#include +#include +#include #include "qgsfield.h" diff --git a/tests/src/core/testqgsgeometry.cpp b/tests/src/core/testqgsgeometry.cpp index 980183b9da1..fb3ac7e8d25 100644 --- a/tests/src/core/testqgsgeometry.cpp +++ b/tests/src/core/testqgsgeometry.cpp @@ -12,19 +12,18 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include +#include #include +#include +#include #include #include -#include -#include -#include -#include -#include +#include #include -#include -#include -#include #include //qgis includes... diff --git a/tests/src/core/testqgsgeometryimport.cpp b/tests/src/core/testqgsgeometryimport.cpp index 91e6fdf0a4f..25889c21810 100644 --- a/tests/src/core/testqgsgeometryimport.cpp +++ b/tests/src/core/testqgsgeometryimport.cpp @@ -13,15 +13,15 @@ * * ***************************************************************************/ +#include #include "qgsapplication.h" #include "qgsgeometry.h" #include "qgspoint.h" #include "qgswkbptr.h" -#include -#include #include +#include class TestQgsGeometryImport: public QObject { diff --git a/tests/src/core/testqgsgeometryutils.cpp b/tests/src/core/testqgsgeometryutils.cpp index c0fdde9af08..dabe22263a8 100644 --- a/tests/src/core/testqgsgeometryutils.cpp +++ b/tests/src/core/testqgsgeometryutils.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include #include +#include #include "qgsgeometryutils.h" class TestQgsGeometryUtils: public QObject diff --git a/tests/src/core/testqgsgradients.cpp b/tests/src/core/testqgsgradients.cpp index b0785ed2350..762cea6e8ce 100644 --- a/tests/src/core/testqgsgradients.cpp +++ b/tests/src/core/testqgsgradients.cpp @@ -12,28 +12,27 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include +#include //qgis test includes #include "qgsrenderchecker.h" diff --git a/tests/src/core/testqgshistogram.cpp b/tests/src/core/testqgshistogram.cpp index 97600bf2e26..041ff61d63a 100644 --- a/tests/src/core/testqgshistogram.cpp +++ b/tests/src/core/testqgshistogram.cpp @@ -17,9 +17,9 @@ #include #include "qgsapplication.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" #include "qgshistogram.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" /** \ingroup UnitTests * This is a unit test for QgsHistogram diff --git a/tests/src/core/testqgsimageoperation.cpp b/tests/src/core/testqgsimageoperation.cpp index 96ad6283317..c6d8e8ca596 100644 --- a/tests/src/core/testqgsimageoperation.cpp +++ b/tests/src/core/testqgsimageoperation.cpp @@ -15,12 +15,12 @@ * * ***************************************************************************/ -#include "qgsimageoperation.h" -#include "qgsvectorcolorrampv2.h" #include #include +#include "qgsimageoperation.h" #include "qgsrenderchecker.h" #include "qgssymbollayerv2utils.h" +#include "qgsvectorcolorrampv2.h" class TestQgsImageOperation : public QObject { diff --git a/tests/src/core/testqgsinvertedpolygonrenderer.cpp b/tests/src/core/testqgsinvertedpolygonrenderer.cpp index f6fa149c3cc..4af25917c20 100644 --- a/tests/src/core/testqgsinvertedpolygonrenderer.cpp +++ b/tests/src/core/testqgsinvertedpolygonrenderer.cpp @@ -12,24 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include +#include #include +#include +#include +#include //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgslegendrenderer.cpp b/tests/src/core/testqgslegendrenderer.cpp index 9c8173e1495..765ffbd6eb8 100644 --- a/tests/src/core/testqgslegendrenderer.cpp +++ b/tests/src/core/testqgslegendrenderer.cpp @@ -1,6 +1,6 @@ -#include #include +#include #include "qgsapplication.h" #include "qgscategorizedsymbolrendererv2.h" @@ -10,9 +10,9 @@ #include "qgslayertreemodel.h" #include "qgslayertreemodellegendnode.h" #include "qgslegendmodel.h" +#include "qgslegendrenderer.h" #include "qgsmaplayerlegend.h" #include "qgsmaplayerregistry.h" -#include "qgslegendrenderer.h" #include "qgsrasterlayer.h" #include "qgsrenderchecker.h" #include "qgssinglesymbolrendererv2.h" diff --git a/tests/src/core/testqgsmaplayer.cpp b/tests/src/core/testqgsmaplayer.cpp index 1d759fe707f..e8d5c2c0354 100644 --- a/tests/src/core/testqgsmaplayer.cpp +++ b/tests/src/core/testqgsmaplayer.cpp @@ -12,21 +12,20 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include //qgis includes... -#include -#include #include +#include #include +#include class TestSignalReceiver : public QObject { diff --git a/tests/src/core/testqgsmaplayerstylemanager.cpp b/tests/src/core/testqgsmaplayerstylemanager.cpp index 614b6eb6478..e3f67fb501c 100644 --- a/tests/src/core/testqgsmaplayerstylemanager.cpp +++ b/tests/src/core/testqgsmaplayerstylemanager.cpp @@ -1,6 +1,6 @@ -#include #include +#include #include "qgsapplication.h" #include "qgsmaplayerregistry.h" diff --git a/tests/src/core/testqgsmaprenderer.cpp b/tests/src/core/testqgsmaprenderer.cpp index 1bce92c790a..0cdca02ce78 100644 --- a/tests/src/core/testqgsmaprenderer.cpp +++ b/tests/src/core/testqgsmaprenderer.cpp @@ -12,34 +12,33 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include +#include #include #include +#include +#include #include -#include +#include #include #include //qgis includes... -#include //defines QgsFieldMap -#include //logic for writing shpfiles -#include //we will need to pass a bunch of these for each rec -#include //each feature needs a geometry -#include //we will use point geometry -#include //needed for creating a srs -#include //search path for srs.db -#include #include //defines GEOWkt -#include -#include -#include #include -#include +#include //search path for srs.db +#include //needed for creating a srs +#include //we will need to pass a bunch of these for each rec +#include +#include //each feature needs a geometry +#include #include +#include +#include //we will use point geometry +#include +#include //logic for writing shpfiles +#include +#include //defines QgsFieldMap //qgs unit test utility class #include "qgsrenderchecker.h" diff --git a/tests/src/core/testqgsmaprotation.cpp b/tests/src/core/testqgsmaprotation.cpp index 269570b89e3..743eb699cfc 100644 --- a/tests/src/core/testqgsmaprotation.cpp +++ b/tests/src/core/testqgsmaprotation.cpp @@ -12,22 +12,21 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include #include #include #include -#include -#include -#include +#include //qgis includes... +#include "qgsapplication.h" +#include "qgsmaplayerregistry.h" +#include "qgsmaprenderer.h" +#include "qgsmultibandcolorrenderer.h" #include "qgsrasterlayer.h" #include "qgsvectorlayer.h" -#include "qgsmultibandcolorrenderer.h" -#include "qgsmaplayerregistry.h" -#include "qgsapplication.h" -#include "qgsmaprenderer.h" -#include "qgsmaplayerregistry.h" //qgis unit test includes #include diff --git a/tests/src/core/testqgsmapsettings.cpp b/tests/src/core/testqgsmapsettings.cpp index 2bc94606057..4b3e4f13184 100644 --- a/tests/src/core/testqgsmapsettings.cpp +++ b/tests/src/core/testqgsmapsettings.cpp @@ -12,15 +12,14 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include -#include +#include //header for class being tested -#include +#include #include #include -#include +#include #include "qgslogger.h" class TestQgsMapSettings: public QObject diff --git a/tests/src/core/testqgsmaptopixel.cpp b/tests/src/core/testqgsmaptopixel.cpp index 299761c1bc4..5b0c526d3a2 100644 --- a/tests/src/core/testqgsmaptopixel.cpp +++ b/tests/src/core/testqgsmaptopixel.cpp @@ -12,14 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include -#include +#include //header for class being tested -#include #include #include +#include #include "qgslogger.h" class TestQgsMapToPixel: public QObject diff --git a/tests/src/core/testqgsnetworkcontentfetcher.cpp b/tests/src/core/testqgsnetworkcontentfetcher.cpp index 1960448fdf5..bfdb9de6895 100644 --- a/tests/src/core/testqgsnetworkcontentfetcher.cpp +++ b/tests/src/core/testqgsnetworkcontentfetcher.cpp @@ -15,11 +15,11 @@ * * ***************************************************************************/ -#include "qgsnetworkcontentfetcher.h" -#include "qgsapplication.h" +#include #include #include -#include +#include "qgsapplication.h" +#include "qgsnetworkcontentfetcher.h" class TestQgsNetworkContentFetcher : public QObject { diff --git a/tests/src/core/testqgsogcutils.cpp b/tests/src/core/testqgsogcutils.cpp index ab6f65fcb0e..309ba9dca4c 100644 --- a/tests/src/core/testqgsogcutils.cpp +++ b/tests/src/core/testqgsogcutils.cpp @@ -14,8 +14,8 @@ * * ***************************************************************************/ -#include #include +#include //qgis includes... #include diff --git a/tests/src/core/testqgspainteffect.cpp b/tests/src/core/testqgspainteffect.cpp index e831d09ba23..af49b7c7758 100644 --- a/tests/src/core/testqgspainteffect.cpp +++ b/tests/src/core/testqgspainteffect.cpp @@ -12,34 +12,34 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include #include #include +#include +#include +#include -#include "qgspainteffect.h" -#include "qgsblureffect.h" -#include "qgsshadoweffect.h" -#include "qgseffectstack.h" -#include "qgsgloweffect.h" -#include "qgspainteffectregistry.h" -#include "qgsvectorcolorrampv2.h" -#include "qgssymbollayerv2utils.h" -#include "qgsmapsettings.h" -#include "qgsvectorlayer.h" #include "qgsapplication.h" -#include "qgsmaplayerregistry.h" -#include "qgssymbolv2.h" -#include "qgssinglesymbolrendererv2.h" -#include "qgsfillsymbollayerv2.h" -#include "qgslinesymbollayerv2.h" -#include "qgsmarkersymbollayerv2.h" -#include "qgscomposition.h" +#include "qgsblureffect.h" #include "qgscomposermap.h" +#include "qgscomposition.h" +#include "qgseffectstack.h" +#include "qgsfillsymbollayerv2.h" +#include "qgsgloweffect.h" +#include "qgslinesymbollayerv2.h" +#include "qgsmaplayerregistry.h" +#include "qgsmapsettings.h" +#include "qgsmarkersymbollayerv2.h" +#include "qgspainteffect.h" +#include "qgspainteffectregistry.h" +#include "qgsshadoweffect.h" +#include "qgssinglesymbolrendererv2.h" +#include "qgssymbollayerv2utils.h" +#include "qgssymbolv2.h" +#include "qgsvectorcolorrampv2.h" +#include "qgsvectorlayer.h" //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgspainteffectregistry.cpp b/tests/src/core/testqgspainteffectregistry.cpp index 416394c6588..84dec0d090d 100644 --- a/tests/src/core/testqgspainteffectregistry.cpp +++ b/tests/src/core/testqgspainteffectregistry.cpp @@ -15,10 +15,10 @@ * * ***************************************************************************/ -#include "qgspainteffectregistry.h" -#include "qgspainteffect.h" #include #include +#include "qgspainteffect.h" +#include "qgspainteffectregistry.h" //dummy paint effect for testing class DummyPaintEffect : public QgsPaintEffect diff --git a/tests/src/core/testqgspallabeling.cpp b/tests/src/core/testqgspallabeling.cpp index 167552beeb5..f6aa9118f4a 100644 --- a/tests/src/core/testqgspallabeling.cpp +++ b/tests/src/core/testqgspallabeling.cpp @@ -12,11 +12,11 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include #include -#include +#include #include "qgspallabeling.h" diff --git a/tests/src/core/testqgspoint.cpp b/tests/src/core/testqgspoint.cpp index 5469321b358..68cb4c87633 100644 --- a/tests/src/core/testqgspoint.cpp +++ b/tests/src/core/testqgspoint.cpp @@ -12,14 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... diff --git a/tests/src/core/testqgspointlocator.cpp b/tests/src/core/testqgspointlocator.cpp index 09c3a564743..a81f366a8ef 100644 --- a/tests/src/core/testqgspointlocator.cpp +++ b/tests/src/core/testqgspointlocator.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include #include #include +#include #include "qgsapplication.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" #include "qgsgeometry.h" #include "qgsmaplayerregistry.h" #include "qgspointlocator.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" struct FilterExcludePoint : public QgsPointLocator::MatchFilter diff --git a/tests/src/core/testqgsproject.cpp b/tests/src/core/testqgsproject.cpp index a2acac4f676..8ae3726dacd 100644 --- a/tests/src/core/testqgsproject.cpp +++ b/tests/src/core/testqgsproject.cpp @@ -12,8 +12,8 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include +#include #include #include diff --git a/tests/src/core/testqgsrasterfilewriter.cpp b/tests/src/core/testqgsrasterfilewriter.cpp index 5bd3d1e0893..4f8e17eccd8 100644 --- a/tests/src/core/testqgsrasterfilewriter.cpp +++ b/tests/src/core/testqgsrasterfilewriter.cpp @@ -12,27 +12,26 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "cpl_conv.h" //qgis includes... -#include -#include -#include -#include #include +#include +#include +#include +#include /** \ingroup UnitTests * This is a unit test for the QgsRasterFileWriter class. diff --git a/tests/src/core/testqgsrasterfill.cpp b/tests/src/core/testqgsrasterfill.cpp index fc5e5d8222a..48ecfbc481a 100644 --- a/tests/src/core/testqgsrasterfill.cpp +++ b/tests/src/core/testqgsrasterfill.cpp @@ -12,27 +12,26 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgsrasterlayer.cpp b/tests/src/core/testqgsrasterlayer.cpp index ed132942c4a..b8106cf1de5 100644 --- a/tests/src/core/testqgsrasterlayer.cpp +++ b/tests/src/core/testqgsrasterlayer.cpp @@ -12,35 +12,32 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include "cpl_conv.h" //qgis includes... +#include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include //qgis unit test includes #include diff --git a/tests/src/core/testqgsrastersublayer.cpp b/tests/src/core/testqgsrastersublayer.cpp index 04984b29190..d3518497dac 100644 --- a/tests/src/core/testqgsrastersublayer.cpp +++ b/tests/src/core/testqgsrastersublayer.cpp @@ -12,35 +12,32 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include +#include +#include #include #include "cpl_conv.h" //qgis includes... +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include -#include #include #include #include -#include //qgis unit test includes #include diff --git a/tests/src/core/testqgsrectangle.cpp b/tests/src/core/testqgsrectangle.cpp index 71c243f8e72..6468f25fd26 100644 --- a/tests/src/core/testqgsrectangle.cpp +++ b/tests/src/core/testqgsrectangle.cpp @@ -12,13 +12,12 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include -#include +#include //header for class being tested -#include #include +#include #include "qgslogger.h" class TestQgsRectangle: public QObject diff --git a/tests/src/core/testqgsrenderers.cpp b/tests/src/core/testqgsrenderers.cpp index 5ad496071df..44780e0acf7 100644 --- a/tests/src/core/testqgsrenderers.cpp +++ b/tests/src/core/testqgsrenderers.cpp @@ -12,24 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include +#include #include +#include +#include +#include //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgsrulebasedrenderer.cpp b/tests/src/core/testqgsrulebasedrenderer.cpp index d417195e366..522a43c0dbe 100644 --- a/tests/src/core/testqgsrulebasedrenderer.cpp +++ b/tests/src/core/testqgsrulebasedrenderer.cpp @@ -12,9 +12,9 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include +#include //header for class being tested #include diff --git a/tests/src/core/testqgsscaleexpression.cpp b/tests/src/core/testqgsscaleexpression.cpp index 382cc49cb5a..97e0d075360 100644 --- a/tests/src/core/testqgsscaleexpression.cpp +++ b/tests/src/core/testqgsscaleexpression.cpp @@ -13,10 +13,9 @@ * * ***************************************************************************/ -#include #include #include -#include +#include #include diff --git a/tests/src/core/testqgsshapeburst.cpp b/tests/src/core/testqgsshapeburst.cpp index b28d8bd3407..d1716f773ce 100644 --- a/tests/src/core/testqgsshapeburst.cpp +++ b/tests/src/core/testqgsshapeburst.cpp @@ -12,28 +12,27 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include +#include #include +#include //qgis test includes #include "qgsmultirenderchecker.h" diff --git a/tests/src/core/testqgssnappingutils.cpp b/tests/src/core/testqgssnappingutils.cpp index 4518abcb8bc..c3494afbf67 100644 --- a/tests/src/core/testqgssnappingutils.cpp +++ b/tests/src/core/testqgssnappingutils.cpp @@ -13,16 +13,16 @@ * * ***************************************************************************/ -#include #include #include +#include #include "qgsapplication.h" -#include "qgsvectorlayer.h" -#include "qgsvectordataprovider.h" #include "qgsgeometry.h" #include "qgsmaplayerregistry.h" #include "qgssnappingutils.h" +#include "qgsvectordataprovider.h" +#include "qgsvectorlayer.h" struct FilterExcludePoint : public QgsPointLocator::MatchFilter diff --git a/tests/src/core/testqgsspatialindex.cpp b/tests/src/core/testqgsspatialindex.cpp index 9e89a8ab479..b96b763bf50 100644 --- a/tests/src/core/testqgsspatialindex.cpp +++ b/tests/src/core/testqgsspatialindex.cpp @@ -13,10 +13,9 @@ * * ***************************************************************************/ -#include #include #include -#include +#include #include #include diff --git a/tests/src/core/testqgsstatisticalsummary.cpp b/tests/src/core/testqgsstatisticalsummary.cpp index 083c152c51a..194fe0a399b 100644 --- a/tests/src/core/testqgsstatisticalsummary.cpp +++ b/tests/src/core/testqgsstatisticalsummary.cpp @@ -12,15 +12,15 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include -#include -#include #include #include +#include +#include +#include -#include "qgsstatisticalsummary.h" #include "qgis.h" +#include "qgsstatisticalsummary.h" class TestQgsStatisticSummary: public QObject { diff --git a/tests/src/core/testqgsstylev2.cpp b/tests/src/core/testqgsstylev2.cpp index c27e2cc9c8d..d97f6aceb7f 100644 --- a/tests/src/core/testqgsstylev2.cpp +++ b/tests/src/core/testqgsstylev2.cpp @@ -12,25 +12,24 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include +#include +#include //qgis includes... -#include "qgsmultirenderchecker.h" #include #include "qgsconfig.h" -#include "qgslogger.h" -#include "qgsvectorcolorrampv2.h" #include "qgscptcityarchive.h" -#include "qgsvectorlayer.h" -#include "qgsmaplayerregistry.h" -#include "qgslinesymbollayerv2.h" #include "qgsfillsymbollayerv2.h" +#include "qgslinesymbollayerv2.h" +#include "qgslogger.h" +#include "qgsmaplayerregistry.h" +#include "qgsmultirenderchecker.h" #include "qgssinglesymbolrendererv2.h" +#include "qgsvectorcolorrampv2.h" +#include "qgsvectorlayer.h" #include "qgsstylev2.h" diff --git a/tests/src/core/testqgsvectordataprovider.cpp b/tests/src/core/testqgsvectordataprovider.cpp index 5e9d966caf9..48c33fd445f 100644 --- a/tests/src/core/testqgsvectordataprovider.cpp +++ b/tests/src/core/testqgsvectordataprovider.cpp @@ -12,14 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include #include #include -#include +#include #include -#include #include +#include #include #include diff --git a/tests/src/core/testqgsvectorfilewriter.cpp b/tests/src/core/testqgsvectorfilewriter.cpp index 70d97037aab..12f3b9a9506 100644 --- a/tests/src/core/testqgsvectorfilewriter.cpp +++ b/tests/src/core/testqgsvectorfilewriter.cpp @@ -12,24 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include #include #include #include -#include -#include +#include #include -#include //defines QgsFieldMap -#include //logic for writing shpfiles +#include //defines GEOWkt +#include //search path for srs.db +#include //needed for creating a srs #include //we will need to pass a bunch of these for each rec +#include #include //each feature needs a geometry #include //we will use point geometry -#include //needed for creating a srs -#include //search path for srs.db -#include -#include //defines GEOWkt +#include //logic for writing shpfiles +#include //defines QgsFieldMap /** \ingroup UnitTests * This is a unit test for the QgsVectorFileWriter class. diff --git a/tests/src/core/testqgsvectorlayer.cpp b/tests/src/core/testqgsvectorlayer.cpp index 493a4c3c700..502a03eeb42 100644 --- a/tests/src/core/testqgsvectorlayer.cpp +++ b/tests/src/core/testqgsvectorlayer.cpp @@ -12,27 +12,26 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include +#include #include +#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include //qgis test includes #include "qgsrenderchecker.h" diff --git a/tests/src/core/testqgsvectorlayercache.cpp b/tests/src/core/testqgsvectorlayercache.cpp index fdcc083fa82..9b11fe5a81f 100644 --- a/tests/src/core/testqgsvectorlayercache.cpp +++ b/tests/src/core/testqgsvectorlayercache.cpp @@ -14,17 +14,17 @@ ***************************************************************************/ -#include #include #include +#include //qgis includes... -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include /** @ingroup UnitTests * This is a unit test for the vector layer cache diff --git a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp index 198be3f423e..15da58cb155 100644 --- a/tests/src/core/testqgsvectorlayerjoinbuffer.cpp +++ b/tests/src/core/testqgsvectorlayerjoinbuffer.cpp @@ -14,15 +14,15 @@ ***************************************************************************/ -#include #include +#include //qgis includes... -#include -#include #include -#include #include +#include +#include +#include /** @ingroup UnitTests * This is a unit test for the vector layer join buffer diff --git a/tests/src/core/testziplayer.cpp b/tests/src/core/testziplayer.cpp index 2968554b181..009a6f1dacd 100644 --- a/tests/src/core/testziplayer.cpp +++ b/tests/src/core/testziplayer.cpp @@ -12,19 +12,18 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include +#include +#include //qgis includes... #include -#include -#include -#include #include +#include +#include +#include #include "qgsconfig.h" #include diff --git a/tests/src/gui/testprojectionissues.cpp b/tests/src/gui/testprojectionissues.cpp index b8ea68d61a5..0609c580c6c 100644 --- a/tests/src/gui/testprojectionissues.cpp +++ b/tests/src/gui/testprojectionissues.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ +#include +#include #include "qgsapplication.h" #include "qgsmapcanvas.h" #include "qgsmaplayerregistry.h" #include "qgsmaprenderer.h" #include "qgsmultibandcolorrenderer.h" #include "qgsrasterlayer.h" -#include -#include class TestProjectionIssues : public QObject { diff --git a/tests/src/gui/testqgsdualview.cpp b/tests/src/gui/testqgsdualview.cpp index 1a02b6282ba..bdf0afc7341 100644 --- a/tests/src/gui/testqgsdualview.cpp +++ b/tests/src/gui/testqgsdualview.cpp @@ -16,13 +16,13 @@ #include -#include #include #include +#include #include -#include -#include #include +#include +#include class TestQgsDualView : public QObject { diff --git a/tests/src/gui/testqgsgui.cpp b/tests/src/gui/testqgsgui.cpp index 1fafad3d7c3..123ae372759 100644 --- a/tests/src/gui/testqgsgui.cpp +++ b/tests/src/gui/testqgsgui.cpp @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#include #include +#include class TestQgsGui : public QObject { diff --git a/tests/src/gui/testqgsmaptoolzoom.cpp b/tests/src/gui/testqgsmaptoolzoom.cpp index 94c06bb41d5..7b7ccb01f63 100644 --- a/tests/src/gui/testqgsmaptoolzoom.cpp +++ b/tests/src/gui/testqgsmaptoolzoom.cpp @@ -12,18 +12,17 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include #include #include -#include -#include +#include #include -#include -#include #include -#include #include +#include +#include class TestQgsMapToolZoom : public QObject { diff --git a/tests/src/gui/testqgsquickprint.cpp b/tests/src/gui/testqgsquickprint.cpp index 09485b1f33e..6b09a70162c 100644 --- a/tests/src/gui/testqgsquickprint.cpp +++ b/tests/src/gui/testqgsquickprint.cpp @@ -12,24 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include +#include #include #include -#include -#include -#include -#include -#include +#include #include //qgis includes... -#include -#include -#include #include -#include +#include #include +#include +#include #include +#include //qgis test includes #include diff --git a/tests/src/gui/testqgsrasterhistogram.cpp b/tests/src/gui/testqgsrasterhistogram.cpp index 1ba2abca4ce..c800dca803d 100644 --- a/tests/src/gui/testqgsrasterhistogram.cpp +++ b/tests/src/gui/testqgsrasterhistogram.cpp @@ -12,24 +12,23 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include -#include -#include -#include #include #include +#include +#include +#include #include //qgis includes... #include +#include #include #include -#include -#include "qgssinglebandgrayrendererwidget.h" #include "qgsmultibandcolorrendererwidget.h" -#include "qgssinglebandpseudocolorrendererwidget.h" #include "qgsrasterhistogramwidget.h" +#include "qgssinglebandgrayrendererwidget.h" +#include "qgssinglebandpseudocolorrendererwidget.h" //qgis unit test includes #include diff --git a/tests/src/gui/testqgsrubberband.cpp b/tests/src/gui/testqgsrubberband.cpp index a0ac5d3b1e1..d6a6b6f23ec 100644 --- a/tests/src/gui/testqgsrubberband.cpp +++ b/tests/src/gui/testqgsrubberband.cpp @@ -14,19 +14,18 @@ ***************************************************************************/ -#include -#include -#include +#include #include #include -#include +#include +#include #include #include -#include -#include -#include #include +#include +#include +#include class TestQgsRubberband : public QObject { diff --git a/tests/src/gui/testqgsscalecombobox.cpp b/tests/src/gui/testqgsscalecombobox.cpp index a4a71dd184d..647151e985d 100644 --- a/tests/src/gui/testqgsscalecombobox.cpp +++ b/tests/src/gui/testqgsscalecombobox.cpp @@ -15,14 +15,14 @@ * * ***************************************************************************/ +#include +#include +#include +#include +#include #include "qgsapplication.h" #include "qgslogger.h" #include "qgsscalecombobox.h" -#include -#include -#include -#include -#include class TestQgsScaleComboBox : public QObject { diff --git a/tests/src/gui/testrendererv2gui.cpp b/tests/src/gui/testrendererv2gui.cpp index 79fb79bee17..c080f0a2bc4 100644 --- a/tests/src/gui/testrendererv2gui.cpp +++ b/tests/src/gui/testrendererv2gui.cpp @@ -16,11 +16,11 @@ #include #include -#include #include #include #include #include +#include #include #include diff --git a/tests/src/providers/testqgsgdalprovider.cpp b/tests/src/providers/testqgsgdalprovider.cpp index 42bb858a51b..ca7f1bd0ae3 100644 --- a/tests/src/providers/testqgsgdalprovider.cpp +++ b/tests/src/providers/testqgsgdalprovider.cpp @@ -12,14 +12,13 @@ * (at your option) any later version. * * * ***************************************************************************/ -#include +#include +#include +#include #include #include #include -#include -#include -#include -#include +#include //qgis includes... #include diff --git a/tests/src/providers/testqgswcsprovider.cpp b/tests/src/providers/testqgswcsprovider.cpp index 23772162960..e0eb233381f 100644 --- a/tests/src/providers/testqgswcsprovider.cpp +++ b/tests/src/providers/testqgswcsprovider.cpp @@ -14,19 +14,18 @@ ***************************************************************************/ #include -#include +#include #include #include #include -#include -#include +#include -#include -#include -#include -#include -#include #include +#include +#include +#include +#include +#include #define TINY_VALUE std::numeric_limits::epsilon() * 20 diff --git a/tests/src/providers/testqgswcspublicservers.cpp b/tests/src/providers/testqgswcspublicservers.cpp index 3b72456652b..9655c0ca182 100644 --- a/tests/src/providers/testqgswcspublicservers.cpp +++ b/tests/src/providers/testqgswcspublicservers.cpp @@ -17,14 +17,14 @@ #include #include #include +#include +#include +#include #include #include #include #include #include -#include -#include -#include #include #include