From 25f2aba44dd45d2d09eba34194a8ed8df775a7cc Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Thu, 24 Jan 2019 17:33:22 +0100 Subject: [PATCH] Include qgis_sip.h instead of qgis.h where possible (#8961) This PR continues the work started in PR #8951. This commit replaces occurences of #include "qgis.h" by #include "qgis_sip.h", where possible = when files only depends on SIP_XXX features. --- python/core/auto_generated/qgstranslationcontext.sip.in | 1 + .../attributetable/qgsfieldconditionalformatwidget.sip.in | 2 -- .../symbology/qgsstyleexportimportdialog.sip.in | 1 + src/analysis/interpolation/NormVecDecorator.h | 1 - src/analysis/interpolation/TriDecorator.h | 2 +- src/analysis/interpolation/Triangulation.h | 2 +- src/analysis/network/qgsgraphanalyzer.h | 2 +- src/analysis/network/qgsgraphbuilder.h | 2 +- src/analysis/network/qgsgraphdirector.h | 2 +- src/analysis/processing/qgsalgorithmaddincrementalfield.h | 2 +- src/analysis/processing/qgsalgorithmarrayoffsetlines.h | 2 +- .../processing/qgsalgorithmarraytranslatedfeatures.h | 2 +- src/analysis/processing/qgsalgorithmassignprojection.h | 2 +- src/analysis/processing/qgsalgorithmboundary.h | 2 +- src/analysis/processing/qgsalgorithmboundingbox.h | 2 +- src/analysis/processing/qgsalgorithmbuffer.h | 2 +- src/analysis/processing/qgsalgorithmcategorizeusingstyle.h | 2 +- src/analysis/processing/qgsalgorithmcentroid.h | 2 +- src/analysis/processing/qgsalgorithmclip.h | 2 +- src/analysis/processing/qgsalgorithmconvexhull.h | 2 +- src/analysis/processing/qgsalgorithmdbscanclustering.h | 2 +- .../processing/qgsalgorithmdensifygeometriesbyinterval.h | 2 +- src/analysis/processing/qgsalgorithmdissolve.h | 2 +- src/analysis/processing/qgsalgorithmdrape.h | 2 +- src/analysis/processing/qgsalgorithmdropgeometry.h | 2 +- src/analysis/processing/qgsalgorithmdropmzvalues.h | 2 +- src/analysis/processing/qgsalgorithmexplode.h | 2 +- src/analysis/processing/qgsalgorithmexplodehstore.h | 2 +- src/analysis/processing/qgsalgorithmextendlines.h | 2 +- src/analysis/processing/qgsalgorithmextenttolayer.h | 2 +- src/analysis/processing/qgsalgorithmextractbinary.h | 2 +- src/analysis/processing/qgsalgorithmextractbyattribute.h | 2 +- src/analysis/processing/qgsalgorithmextractbyexpression.h | 2 +- src/analysis/processing/qgsalgorithmextractbyextent.h | 2 +- src/analysis/processing/qgsalgorithmextractbylocation.h | 2 +- src/analysis/processing/qgsalgorithmextractvertices.h | 2 +- src/analysis/processing/qgsalgorithmextractzmvalues.h | 2 +- src/analysis/processing/qgsalgorithmfiledownloader.h | 2 +- src/analysis/processing/qgsalgorithmfilter.h | 2 +- src/analysis/processing/qgsalgorithmfiltervertices.h | 2 +- src/analysis/processing/qgsalgorithmfixgeometries.h | 2 +- src/analysis/processing/qgsalgorithmforcerhr.h | 2 +- src/analysis/processing/qgsalgorithmimportphotos.h | 2 +- src/analysis/processing/qgsalgorithminterpolatepoint.h | 2 +- src/analysis/processing/qgsalgorithmjoinbyattribute.h | 2 +- src/analysis/processing/qgsalgorithmjoinwithlines.h | 2 +- src/analysis/processing/qgsalgorithmkmeansclustering.h | 2 +- src/analysis/processing/qgsalgorithmlineintersection.h | 2 +- src/analysis/processing/qgsalgorithmlinesubstring.h | 2 +- src/analysis/processing/qgsalgorithmloadlayer.h | 2 +- src/analysis/processing/qgsalgorithmmeancoordinates.h | 2 +- src/analysis/processing/qgsalgorithmmergelines.h | 2 +- src/analysis/processing/qgsalgorithmmergevector.h | 2 +- src/analysis/processing/qgsalgorithmminimumenclosingcircle.h | 2 +- src/analysis/processing/qgsalgorithmmultiparttosinglepart.h | 2 +- .../processing/qgsalgorithmmultiringconstantbuffer.h | 2 +- src/analysis/processing/qgsalgorithmnetworkanalysisbase.h | 2 +- src/analysis/processing/qgsalgorithmoffsetlines.h | 2 +- src/analysis/processing/qgsalgorithmorderbyexpression.h | 2 +- .../processing/qgsalgorithmorientedminimumboundingbox.h | 2 +- src/analysis/processing/qgsalgorithmpackage.h | 2 +- src/analysis/processing/qgsalgorithmpointonsurface.h | 2 +- src/analysis/processing/qgsalgorithmpolygonstolines.h | 2 +- src/analysis/processing/qgsalgorithmprojectpointcartesian.h | 2 +- src/analysis/processing/qgsalgorithmpromotetomultipart.h | 2 +- .../processing/qgsalgorithmrasterlayeruniquevalues.h | 2 +- src/analysis/processing/qgsalgorithmrastersurfacevolume.h | 2 +- src/analysis/processing/qgsalgorithmrasterzonalstats.h | 2 +- src/analysis/processing/qgsalgorithmreclassifybylayer.h | 2 +- .../processing/qgsalgorithmremoveduplicatesbyattribute.h | 2 +- .../processing/qgsalgorithmremoveduplicatevertices.h | 2 +- src/analysis/processing/qgsalgorithmremoveholes.h | 2 +- src/analysis/processing/qgsalgorithmremovenullgeometry.h | 2 +- src/analysis/processing/qgsalgorithmrenamelayer.h | 2 +- src/analysis/processing/qgsalgorithmreverselinedirection.h | 2 +- src/analysis/processing/qgsalgorithmrotate.h | 2 +- src/analysis/processing/qgsalgorithmsaveselectedfeatures.h | 2 +- src/analysis/processing/qgsalgorithmsegmentize.h | 2 +- .../processing/qgsalgorithmshortestpathlayertopoint.h | 2 +- .../processing/qgsalgorithmshortestpathpointtolayer.h | 2 +- .../processing/qgsalgorithmshortestpathpointtopoint.h | 2 +- src/analysis/processing/qgsalgorithmsimplify.h | 2 +- src/analysis/processing/qgsalgorithmsmooth.h | 2 +- src/analysis/processing/qgsalgorithmsnaptogrid.h | 2 +- src/analysis/processing/qgsalgorithmsplitlineantimeridian.h | 2 +- src/analysis/processing/qgsalgorithmsplitlinesbylength.h | 2 +- src/analysis/processing/qgsalgorithmsplitwithlines.h | 2 +- src/analysis/processing/qgsalgorithmstringconcatenation.h | 2 +- src/analysis/processing/qgsalgorithmsubdivide.h | 2 +- src/analysis/processing/qgsalgorithmswapxy.h | 2 +- src/analysis/processing/qgsalgorithmtaperedbuffer.h | 2 +- src/analysis/processing/qgsalgorithmtransect.h | 2 +- src/analysis/processing/qgsalgorithmtransform.h | 2 +- src/analysis/processing/qgsalgorithmtranslate.h | 2 +- src/analysis/processing/qgsalgorithmuniquevalueindex.h | 2 +- src/analysis/processing/qgsalgorithmvectorize.h | 2 +- src/analysis/processing/qgsalgorithmwedgebuffers.h | 2 +- src/analysis/processing/qgsalgorithmzonalhistogram.h | 2 +- src/analysis/processing/qgsnativealgorithms.h | 2 +- src/analysis/processing/qgsreclassifyutils.h | 2 +- src/analysis/raster/qgsalignraster.h | 2 +- src/app/decorations/qgsdecorationgrid.h | 1 - src/app/layout/qgslayoutaddpagesdialog.h | 2 +- src/app/layout/qgslayoutappmenuprovider.h | 2 +- src/app/layout/qgslayoutapputils.h | 2 -- src/app/layout/qgslayoutattributeselectiondialog.h | 2 +- src/app/layout/qgslayoutitemslistview.h | 2 +- src/app/layout/qgslayoutpagepropertieswidget.h | 2 +- src/app/layout/qgsreportsectionmodel.h | 2 +- src/app/pluginmanager/qgspluginmanager.h | 1 + src/app/qgscrashhandler.h | 1 - src/core/effects/qgsblureffect.h | 2 +- src/core/effects/qgscoloreffect.h | 2 +- src/core/effects/qgseffectstack.h | 2 +- src/core/effects/qgsimageoperation.h | 3 ++- src/core/effects/qgspainteffect.h | 3 ++- src/core/effects/qgspainteffectregistry.h | 3 ++- src/core/effects/qgsshadoweffect.h | 2 +- src/core/effects/qgstransformeffect.h | 2 +- src/core/expression/qgsexpressionfunction.cpp | 1 + src/core/geometry/qgsabstractgeometry.h | 1 - src/core/geometry/qgscircularstring.h | 2 +- src/core/geometry/qgscompoundcurve.h | 2 +- src/core/geometry/qgscurve.h | 2 +- src/core/geometry/qgscurvepolygon.h | 2 +- src/core/geometry/qgsgeometry.h | 2 +- src/core/geometry/qgsgeometrycollection.h | 2 +- src/core/geometry/qgsgeometryutils.h | 2 +- src/core/geometry/qgslinestring.h | 2 +- src/core/geometry/qgsmulticurve.h | 2 +- src/core/geometry/qgsmultilinestring.h | 2 +- src/core/geometry/qgsmultipoint.h | 2 +- src/core/geometry/qgsmultipolygon.h | 2 +- src/core/geometry/qgsmultisurface.h | 2 +- src/core/geometry/qgspoint.h | 2 +- src/core/geometry/qgspolygon.h | 2 +- src/core/geometry/qgsrectangle.h | 1 + src/core/geometry/qgsreferencedgeometry.h | 1 - src/core/geometry/qgssurface.h | 2 +- src/core/geometry/qgstriangle.h | 2 +- src/core/geometry/qgswkbptr.h | 2 +- src/core/layertree/qgslayertreegroup.h | 2 +- src/core/layertree/qgslayertreelayer.h | 2 +- src/core/layertree/qgslayertreemodellegendnode.h | 2 +- src/core/layertree/qgslayertreenode.h | 2 +- src/core/layertree/qgslayertreeregistrybridge.h | 2 +- src/core/layout/qgscompositionconverter.h | 1 - src/core/layout/qgslayoutframe.h | 2 +- src/core/layout/qgslayoutitemattributetable.h | 1 - src/core/layout/qgslayoutitemhtml.h | 2 +- src/core/layout/qgslayoutitemlegend.h | 2 +- src/core/layout/qgslayoutitemmapgrid.h | 1 - src/core/layout/qgslayoutitemmapoverview.h | 1 - src/core/layout/qgslayoutitemscalebar.h | 2 +- src/core/layout/qgslayoutitemtexttable.h | 2 +- src/core/layout/qgslayoutmanager.h | 2 +- src/core/layout/qgslayoutmeasurement.cpp | 2 +- src/core/layout/qgslayoutmodel.h | 2 +- src/core/layout/qgslayoutmultiframe.h | 2 +- src/core/layout/qgslayoutserializableobject.h | 2 +- src/core/layout/qgslayouttable.h | 1 - src/core/layout/qgslayoutundocommand.h | 2 +- src/core/layout/qgslayoutundostack.h | 2 +- src/core/layout/qgspagesizeregistry.cpp | 1 + src/core/metadata/qgsabstractmetadatabase.h | 5 ++++- src/core/metadata/qgslayermetadata.h | 2 +- src/core/metadata/qgslayermetadataformatter.h | 2 +- src/core/metadata/qgslayermetadatavalidator.h | 4 +++- src/core/metadata/qgsprojectmetadata.h | 2 +- src/core/processing/qgsprocessing.h | 1 - src/core/qgsapplication.h | 2 +- src/core/qgsattributes.cpp | 2 +- src/core/qgsattributes.h | 2 +- src/core/qgsattributetableconfig.h | 2 +- src/core/qgsclipper.h | 2 +- src/core/qgscolorscheme.h | 2 +- src/core/qgscoordinateformatter.h | 2 +- src/core/qgscoordinatereferencesystem.h | 3 ++- src/core/qgscoordinatetransformcontext.h | 2 +- src/core/qgscredentials.h | 2 +- src/core/qgsdataitem.h | 2 +- src/core/qgsdataitemprovider.h | 2 +- src/core/qgsdataitemproviderregistry.h | 2 +- src/core/qgsdatetimestatisticalsummary.h | 2 +- src/core/qgsdbfilterproxymodel.h | 2 +- src/core/qgsdiagramrenderer.h | 2 +- src/core/qgseditformconfig.h | 2 +- src/core/qgsellipsoidutils.h | 2 +- src/core/qgsexpressioncontext.h | 1 - src/core/qgsfeature.h | 2 +- src/core/qgsfeaturefilterprovider.h | 2 +- src/core/qgsfeaturesink.h | 2 +- src/core/qgsfeaturesource.h | 2 +- src/core/qgsfeaturestore.h | 2 +- src/core/qgsfeedback.h | 2 +- src/core/qgsfield.h | 2 +- src/core/qgsfieldformatterregistry.h | 2 +- src/core/qgsfieldmodel.h | 2 +- src/core/qgsfieldproxymodel.h | 2 +- src/core/qgsfields.h | 2 +- src/core/qgsfileutils.cpp | 1 + src/core/qgsfileutils.h | 3 ++- src/core/qgsfontutils.cpp | 1 + src/core/qgsgeometryvalidator.h | 2 +- src/core/qgsgml.h | 2 +- src/core/qgsgmlschema.h | 2 +- src/core/qgshtmlutils.cpp | 1 + src/core/qgshtmlutils.h | 4 +++- src/core/qgsimagecache.h | 2 +- src/core/qgsinterval.h | 2 +- src/core/qgslayerdefinition.h | 2 +- src/core/qgslegendstyle.cpp | 1 + src/core/qgslegendstyle.h | 2 +- src/core/qgsmaplayer.h | 2 +- src/core/qgsmaplayerlegend.h | 2 +- src/core/qgsmaplayermodel.h | 2 +- src/core/qgsmaplayerproxymodel.h | 2 +- src/core/qgsmaplayerstore.h | 2 +- src/core/qgsmaprendererjob.h | 1 - src/core/qgsmaprenderertask.h | 2 +- src/core/qgsmaptopixel.h | 1 + src/core/qgsmaptopixelgeometrysimplifier.h | 3 ++- src/core/qgsnetworkaccessmanager.h | 2 +- src/core/qgsogcutils.h | 1 - src/core/qgsopenclutils.cpp | 1 - src/core/qgspallabeling.h | 1 - src/core/qgspluginlayerregistry.h | 2 +- src/core/qgsproject.h | 1 - src/core/qgsprojecttranslator.h | 1 - src/core/qgsproperty.h | 2 +- src/core/qgspropertycollection.h | 2 +- src/core/qgsprovidermetadata.h | 2 +- src/core/qgspythonrunner.h | 2 +- src/core/qgsrange.h | 1 - src/core/qgsrelation.h | 2 +- src/core/qgsrenderchecker.h | 2 +- src/core/qgsscalecalculator.h | 2 +- src/core/qgssettings.h | 2 +- src/core/qgssnappingutils.h | 2 +- src/core/qgsspatialindex.h | 1 - src/core/qgssqlstatement.h | 1 - src/core/qgstaskmanager.h | 1 - src/core/qgstessellator.h | 2 +- src/core/qgstestutils.h | 2 +- src/core/qgstextrenderer.h | 2 +- src/core/qgstransaction.h | 2 +- src/core/qgstranslationcontext.h | 4 +++- src/core/qgsunittypes.h | 3 ++- src/core/qgsuserprofilemanager.h | 2 +- src/core/qgsvectordataprovider.h | 2 +- src/core/qgsvectorlayer.h | 2 +- src/core/qgsvectorlayercache.h | 1 - src/core/qgsvectorlayereditutils.h | 2 +- src/core/qgsvectorlayerexporter.h | 2 +- src/core/qgsvectorlayerjoinbuffer.h | 2 +- src/core/qgsvectorlayerrenderer.h | 2 +- src/core/qgsvectorlayertools.h | 2 +- src/core/qgsvectorlayerundocommand.h | 2 +- src/core/qgsxmlutils.h | 3 ++- src/core/qgsziputils.h | 2 +- src/core/raster/qgsbrightnesscontrastfilter.h | 2 +- src/core/raster/qgscolorrampshader.h | 2 +- src/core/raster/qgscontrastenhancement.h | 2 +- src/core/raster/qgscubicrasterresampler.cpp | 1 + src/core/raster/qgshillshaderenderer.h | 2 +- src/core/raster/qgshuesaturationfilter.h | 2 +- src/core/raster/qgsmultibandcolorrenderer.h | 2 +- src/core/raster/qgspalettedrasterrenderer.h | 2 +- src/core/raster/qgsrasteridentifyresult.h | 2 +- src/core/raster/qgsrasterinterface.h | 1 - src/core/raster/qgsrasterlayer.h | 2 +- src/core/raster/qgsrasterminmaxorigin.cpp | 1 + src/core/raster/qgsrasterminmaxorigin.h | 2 +- src/core/raster/qgsrasterpipe.h | 2 +- src/core/raster/qgsrasterresamplefilter.h | 2 +- src/core/raster/qgsrasterresampler.h | 4 +++- src/core/raster/qgssinglebandgrayrenderer.h | 2 +- src/core/raster/qgssinglebandpseudocolorrenderer.h | 2 +- src/core/symbology/qgsheatmaprenderer.h | 2 +- src/core/symbology/qgsmarkersymbollayer.h | 1 - src/core/symbology/qgssvgcache.h | 1 - src/core/symbology/qgssymbollayer.h | 2 +- src/gui/attributetable/qgsattributetablefiltermodel.h | 1 - src/gui/attributetable/qgsattributetableview.h | 1 - src/gui/attributetable/qgsdualview.h | 1 - src/gui/attributetable/qgsfeaturelistmodel.h | 1 - src/gui/attributetable/qgsfeaturelistview.h | 1 - src/gui/attributetable/qgsfeatureselectionmodel.h | 1 - src/gui/attributetable/qgsfieldconditionalformatwidget.h | 2 -- src/gui/auth/qgsauthauthoritieseditor.h | 2 +- src/gui/auth/qgsauthcertificateinfo.h | 2 +- src/gui/auth/qgsauthcertificatemanager.h | 2 +- src/gui/auth/qgsauthcerttrustpolicycombobox.h | 2 +- src/gui/auth/qgsauthconfigeditor.h | 2 +- src/gui/auth/qgsauthconfigselect.h | 2 +- src/gui/auth/qgsautheditorwidgets.h | 2 +- src/gui/auth/qgsauthidentitieseditor.h | 2 +- src/gui/auth/qgsauthimportcertdialog.h | 2 +- src/gui/auth/qgsauthimportidentitydialog.h | 1 - src/gui/auth/qgsauthserverseditor.h | 2 +- src/gui/auth/qgsauthsettingswidget.h | 2 +- src/gui/auth/qgsauthsslconfigwidget.h | 2 +- src/gui/auth/qgsauthsslimportdialog.h | 2 +- src/gui/auth/qgsauthtrustedcasdialog.h | 2 +- src/gui/editorwidgets/core/qgseditorconfigwidget.h | 2 +- src/gui/editorwidgets/core/qgseditorwidgetautoconf.h | 2 +- src/gui/editorwidgets/core/qgseditorwidgetfactory.h | 1 - src/gui/editorwidgets/core/qgseditorwidgetregistry.h | 1 - src/gui/editorwidgets/core/qgseditorwidgetwrapper.h | 2 +- src/gui/editorwidgets/core/qgssearchwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsdatetimeedit.h | 2 +- src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsdoublespinbox.h | 2 +- src/gui/editorwidgets/qgsmultiedittoolbutton.h | 2 +- src/gui/editorwidgets/qgsqmlwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsrelationreferencewidget.h | 2 +- src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsrelationwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgssearchwidgettoolbutton.h | 2 +- src/gui/editorwidgets/qgsspinbox.h | 2 +- src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h | 2 +- src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h | 2 +- src/gui/layout/qgslayoutitemcombobox.h | 2 +- src/gui/layout/qgslayoutnewitempropertiesdialog.h | 2 +- src/gui/layout/qgslayoutunitscombobox.cpp | 1 + src/gui/layout/qgslayoutview.h | 2 +- src/gui/layout/qgslayoutviewtool.h | 2 +- src/gui/layout/qgslayoutviewtooladditem.h | 2 +- src/gui/layout/qgslayoutviewtooladdnodeitem.h | 2 +- src/gui/layout/qgslayoutviewtooleditnodes.h | 2 +- src/gui/layout/qgslayoutviewtoolmoveitemcontent.h | 2 +- src/gui/layout/qgslayoutviewtoolpan.h | 2 +- src/gui/layout/qgslayoutviewtoolselect.h | 2 +- src/gui/layout/qgslayoutviewtooltemporarykeypan.h | 2 +- src/gui/layout/qgslayoutviewtooltemporarykeyzoom.h | 2 +- src/gui/layout/qgslayoutviewtooltemporarymousepan.h | 2 +- src/gui/layout/qgslayoutviewtoolzoom.h | 2 +- src/gui/qgisinterface.h | 2 +- src/gui/qgsabstractdatasourcewidget.h | 1 - src/gui/qgsactionmenu.h | 2 +- src/gui/qgsadvanceddigitizingdockwidget.h | 2 +- src/gui/qgsaggregatetoolbutton.cpp | 1 + src/gui/qgsattributedialog.h | 2 +- src/gui/qgsattributeform.h | 2 +- src/gui/qgsattributeformwidget.h | 2 +- src/gui/qgsblendmodecombobox.h | 2 +- src/gui/qgsbrowsertreeview.h | 2 +- src/gui/qgscheckablecombobox.h | 2 +- src/gui/qgscodeeditor.h | 2 +- src/gui/qgscollapsiblegroupbox.h | 2 +- src/gui/qgscolorbrewercolorrampdialog.h | 2 +- src/gui/qgscolorbutton.h | 2 +- src/gui/qgscolordialog.h | 2 +- src/gui/qgscolorrampbutton.h | 2 +- src/gui/qgscolorschemelist.h | 2 +- src/gui/qgscolorswatchgrid.h | 2 +- src/gui/qgscolorwidgets.h | 2 +- src/gui/qgscompoundcolorwidget.h | 2 +- src/gui/qgsconfigureshortcutsdialog.h | 2 +- src/gui/qgscredentialdialog.h | 2 +- src/gui/qgscurveeditorwidget.h | 2 +- src/gui/qgsdetaileditemdelegate.h | 2 +- src/gui/qgsdetaileditemwidget.h | 2 +- src/gui/qgsdial.cpp | 1 + src/gui/qgsdial.h | 2 +- src/gui/qgsdialog.h | 2 +- src/gui/qgsdockwidget.h | 2 +- src/gui/qgsencodingfiledialog.h | 2 +- src/gui/qgserrordialog.h | 2 +- src/gui/qgsexpressionbuilderwidget.h | 2 +- src/gui/qgsexpressionlineedit.h | 2 +- src/gui/qgsexpressionselectiondialog.h | 2 +- src/gui/qgsextentgroupbox.h | 2 +- src/gui/qgsexternalresourcewidget.h | 2 +- src/gui/qgsfeatureselectiondlg.h | 2 +- src/gui/qgsfieldcombobox.h | 2 +- src/gui/qgsfieldexpressionwidget.h | 2 +- src/gui/qgsfieldvalueslineedit.h | 2 +- src/gui/qgsfilewidget.h | 2 +- src/gui/qgsfilterlineedit.cpp | 1 + src/gui/qgsfilterlineedit.h | 2 +- src/gui/qgsfloatingwidget.h | 2 +- src/gui/qgsfocuswatcher.h | 2 +- src/gui/qgsfontbutton.h | 2 +- src/gui/qgsformannotation.h | 2 +- src/gui/qgsgradientcolorrampdialog.h | 2 +- src/gui/qgsgradientstopeditor.h | 2 +- src/gui/qgsgroupwmsdatadialog.h | 2 +- src/gui/qgsguiutils.cpp | 1 + src/gui/qgshistogramwidget.h | 2 +- src/gui/qgsidentifymenu.h | 2 +- src/gui/qgskeyvaluewidget.h | 2 +- src/gui/qgslimitedrandomcolorrampdialog.h | 2 +- src/gui/qgsmapcanvas.h | 1 - src/gui/qgsmapcanvasitem.h | 2 +- src/gui/qgsmaplayeractionregistry.h | 2 +- src/gui/qgsmaplayercombobox.h | 2 +- src/gui/qgsmenuheader.cpp | 1 + src/gui/qgsmenuheader.h | 2 +- src/gui/qgsmessagelogviewer.h | 2 +- src/gui/qgsnewgeopackagelayerdialog.h | 2 +- src/gui/qgsopacitywidget.cpp | 1 + src/gui/qgsopacitywidget.h | 2 +- src/gui/qgsoptionswidgetfactory.h | 2 +- src/gui/qgsorderbydialog.h | 2 +- src/gui/qgsowssourceselect.h | 1 - src/gui/qgspixmaplabel.h | 2 +- src/gui/qgspresetcolorrampdialog.h | 2 +- src/gui/qgsprevieweffect.h | 2 +- src/gui/qgsprojectionselectiondialog.h | 2 +- src/gui/qgsprojectionselectiontreewidget.h | 2 +- src/gui/qgsprojectionselectionwidget.h | 2 +- src/gui/qgsquerybuilder.h | 2 +- src/gui/qgsrasterpyramidsoptionswidget.h | 2 +- src/gui/qgsratiolockbutton.cpp | 1 + src/gui/qgsratiolockbutton.h | 2 +- src/gui/qgsrubberband.h | 2 +- src/gui/qgsscalecombobox.h | 2 +- src/gui/qgsscalerangewidget.h | 2 +- src/gui/qgsscalevisibilitydialog.h | 2 +- src/gui/qgsscalewidget.h | 2 +- src/gui/qgsscrollarea.h | 2 +- src/gui/qgsslider.cpp | 1 + src/gui/qgsslider.h | 2 +- src/gui/qgssourceselectprovider.h | 2 +- src/gui/qgssourceselectproviderregistry.h | 2 +- src/gui/qgssqlcomposerdialog.h | 2 +- src/gui/qgssubstitutionlistwidget.h | 2 +- src/gui/qgssymbolbutton.h | 2 +- src/gui/qgstaskmanagerwidget.h | 2 +- src/gui/qgstextformatwidget.h | 2 +- src/gui/qgstreewidgetitem.h | 2 +- src/gui/qgsunitselectionwidget.h | 2 +- src/gui/qgsuserinputwidget.h | 2 +- src/gui/qgsvariableeditorwidget.h | 2 +- src/gui/qgswindowmanagerinterface.h | 2 +- src/gui/symbology/characterwidget.h | 2 +- src/gui/symbology/qgs25drendererwidget.h | 2 +- src/gui/symbology/qgsarrowsymbollayerwidget.h | 2 +- src/gui/symbology/qgscategorizedsymbolrendererwidget.h | 2 +- src/gui/symbology/qgscptcitycolorrampdialog.h | 2 +- src/gui/symbology/qgsdatadefinedsizelegendwidget.h | 2 +- src/gui/symbology/qgsellipsesymbollayerwidget.h | 2 +- src/gui/symbology/qgsgraduatedhistogramwidget.h | 2 +- src/gui/symbology/qgsgraduatedsymbolrendererwidget.h | 2 +- src/gui/symbology/qgsheatmaprendererwidget.h | 2 +- src/gui/symbology/qgsinvertedpolygonrendererwidget.h | 2 +- src/gui/symbology/qgsnullsymbolrendererwidget.h | 2 +- src/gui/symbology/qgspointclusterrendererwidget.h | 2 +- src/gui/symbology/qgspointdisplacementrendererwidget.h | 2 +- src/gui/symbology/qgsrendererpropertiesdialog.h | 2 +- src/gui/symbology/qgsrulebasedrendererwidget.h | 2 +- src/gui/symbology/qgssinglesymbolrendererwidget.h | 2 +- src/gui/symbology/qgsstyleexportimportdialog.h | 2 ++ src/gui/symbology/qgssvgselectorwidget.h | 2 +- src/gui/symbology/qgssymbollayerwidget.h | 2 +- src/gui/symbology/qgssymbolselectordialog.h | 1 - src/gui/symbology/qgsvectorfieldsymbollayerwidget.h | 2 +- src/providers/db2/qgsdb2tablemodel.h | 4 +++- src/server/qgsbufferserverresponse.h | 3 ++- src/server/qgsserverinterface.h | 1 - src/server/services/qgsmodule.h | 1 - tests/src/core/testqgscolorschemeregistry.cpp | 1 + tests/src/core/testqgsnetworkaccessmanager.cpp | 1 + 466 files changed, 445 insertions(+), 444 deletions(-) diff --git a/python/core/auto_generated/qgstranslationcontext.sip.in b/python/core/auto_generated/qgstranslationcontext.sip.in index e27583ca184..773777b8a6c 100644 --- a/python/core/auto_generated/qgstranslationcontext.sip.in +++ b/python/core/auto_generated/qgstranslationcontext.sip.in @@ -9,6 +9,7 @@ + class QgsTranslationContext { %Docstring diff --git a/python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in b/python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in index 56fa9621c63..da0545f9ccc 100644 --- a/python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in +++ b/python/gui/auto_generated/attributetable/qgsfieldconditionalformatwidget.sip.in @@ -24,8 +24,6 @@ A widget for customizing conditional formatting options. explicit QgsFieldConditionalFormatWidget( QWidget *parent /TransferThis/ = 0 ); %Docstring Constructor for QgsFieldConditionalFormatWidget. - -:param parent: parent widget %End void viewRules(); diff --git a/python/gui/auto_generated/symbology/qgsstyleexportimportdialog.sip.in b/python/gui/auto_generated/symbology/qgsstyleexportimportdialog.sip.in index e94ad60e338..f0d1ddfee8f 100644 --- a/python/gui/auto_generated/symbology/qgsstyleexportimportdialog.sip.in +++ b/python/gui/auto_generated/symbology/qgsstyleexportimportdialog.sip.in @@ -10,6 +10,7 @@ + class QgsStyleExportImportDialog : QDialog { diff --git a/src/analysis/interpolation/NormVecDecorator.h b/src/analysis/interpolation/NormVecDecorator.h index af71c655f6e..1f83e831ac8 100644 --- a/src/analysis/interpolation/NormVecDecorator.h +++ b/src/analysis/interpolation/NormVecDecorator.h @@ -19,7 +19,6 @@ #include "TriDecorator.h" #include "qgis_sip.h" -#include "qgis.h" #include "TriangleInterpolator.h" #include "MathUtils.h" #include "qgslogger.h" diff --git a/src/analysis/interpolation/TriDecorator.h b/src/analysis/interpolation/TriDecorator.h index 1b1391aee97..c8988f0a316 100644 --- a/src/analysis/interpolation/TriDecorator.h +++ b/src/analysis/interpolation/TriDecorator.h @@ -18,7 +18,7 @@ #define TRIDECORATOR_H #include "Triangulation.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #define SIP_NO_FILE diff --git a/src/analysis/interpolation/Triangulation.h b/src/analysis/interpolation/Triangulation.h index ac4b541b1aa..e5688a8a4a3 100644 --- a/src/analysis/interpolation/Triangulation.h +++ b/src/analysis/interpolation/Triangulation.h @@ -18,7 +18,7 @@ #define TRIANGULATION_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "TriangleInterpolator.h" #include "qgis_analysis.h" diff --git a/src/analysis/network/qgsgraphanalyzer.h b/src/analysis/network/qgsgraphanalyzer.h index 06a4fb656fb..40d02c244a0 100644 --- a/src/analysis/network/qgsgraphanalyzer.h +++ b/src/analysis/network/qgsgraphanalyzer.h @@ -18,7 +18,7 @@ #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" class QgsGraph; diff --git a/src/analysis/network/qgsgraphbuilder.h b/src/analysis/network/qgsgraphbuilder.h index 0bc6b88e45e..881150e02bc 100644 --- a/src/analysis/network/qgsgraphbuilder.h +++ b/src/analysis/network/qgsgraphbuilder.h @@ -17,7 +17,7 @@ #define QGSGRAPHBUILDER_H #include "qgsgraphbuilderinterface.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsspatialindex.h" #include "qgis_analysis.h" diff --git a/src/analysis/network/qgsgraphdirector.h b/src/analysis/network/qgsgraphdirector.h index 1074e76cbd5..c8514849fbb 100644 --- a/src/analysis/network/qgsgraphdirector.h +++ b/src/analysis/network/qgsgraphdirector.h @@ -20,7 +20,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeedback.h" #include "qgsnetworkstrategy.h" #include "qgis_analysis.h" diff --git a/src/analysis/processing/qgsalgorithmaddincrementalfield.h b/src/analysis/processing/qgsalgorithmaddincrementalfield.h index dd0192063ea..f113045270d 100644 --- a/src/analysis/processing/qgsalgorithmaddincrementalfield.h +++ b/src/analysis/processing/qgsalgorithmaddincrementalfield.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmarrayoffsetlines.h b/src/analysis/processing/qgsalgorithmarrayoffsetlines.h index 31a474153bf..84df9a75c03 100644 --- a/src/analysis/processing/qgsalgorithmarrayoffsetlines.h +++ b/src/analysis/processing/qgsalgorithmarrayoffsetlines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmarraytranslatedfeatures.h b/src/analysis/processing/qgsalgorithmarraytranslatedfeatures.h index 561383eac7e..9aba15f026c 100644 --- a/src/analysis/processing/qgsalgorithmarraytranslatedfeatures.h +++ b/src/analysis/processing/qgsalgorithmarraytranslatedfeatures.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmassignprojection.h b/src/analysis/processing/qgsalgorithmassignprojection.h index 6109b36372a..1c22a29da62 100644 --- a/src/analysis/processing/qgsalgorithmassignprojection.h +++ b/src/analysis/processing/qgsalgorithmassignprojection.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmboundary.h b/src/analysis/processing/qgsalgorithmboundary.h index 8f5f26f9902..3e6dd98a5d9 100644 --- a/src/analysis/processing/qgsalgorithmboundary.h +++ b/src/analysis/processing/qgsalgorithmboundary.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmboundingbox.h b/src/analysis/processing/qgsalgorithmboundingbox.h index c5df2292a08..9d5d65dc847 100644 --- a/src/analysis/processing/qgsalgorithmboundingbox.h +++ b/src/analysis/processing/qgsalgorithmboundingbox.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmbuffer.h b/src/analysis/processing/qgsalgorithmbuffer.h index fa4dd4e2d0e..a68f641b3d5 100644 --- a/src/analysis/processing/qgsalgorithmbuffer.h +++ b/src/analysis/processing/qgsalgorithmbuffer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmcategorizeusingstyle.h b/src/analysis/processing/qgsalgorithmcategorizeusingstyle.h index 2760c6399f6..1c3da4b7307 100644 --- a/src/analysis/processing/qgsalgorithmcategorizeusingstyle.h +++ b/src/analysis/processing/qgsalgorithmcategorizeusingstyle.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" class QgsCategorizedSymbolRenderer; diff --git a/src/analysis/processing/qgsalgorithmcentroid.h b/src/analysis/processing/qgsalgorithmcentroid.h index 49e1bbfb4c6..125d86aecc8 100644 --- a/src/analysis/processing/qgsalgorithmcentroid.h +++ b/src/analysis/processing/qgsalgorithmcentroid.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmclip.h b/src/analysis/processing/qgsalgorithmclip.h index 71cdb251dcd..aabf5adaccc 100644 --- a/src/analysis/processing/qgsalgorithmclip.h +++ b/src/analysis/processing/qgsalgorithmclip.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmconvexhull.h b/src/analysis/processing/qgsalgorithmconvexhull.h index e7651761eff..3e3f7a945a0 100644 --- a/src/analysis/processing/qgsalgorithmconvexhull.h +++ b/src/analysis/processing/qgsalgorithmconvexhull.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmdbscanclustering.h b/src/analysis/processing/qgsalgorithmdbscanclustering.h index de3fdaa8ffd..9bb183d6ffc 100644 --- a/src/analysis/processing/qgsalgorithmdbscanclustering.h +++ b/src/analysis/processing/qgsalgorithmdbscanclustering.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #include "qgsprocessingalgorithm.h" #include diff --git a/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h b/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h index 79d91696bc0..6ccf69bffcd 100644 --- a/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h +++ b/src/analysis/processing/qgsalgorithmdensifygeometriesbyinterval.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmdissolve.h b/src/analysis/processing/qgsalgorithmdissolve.h index 050fdb4cb20..ac3924b3459 100644 --- a/src/analysis/processing/qgsalgorithmdissolve.h +++ b/src/analysis/processing/qgsalgorithmdissolve.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmdrape.h b/src/analysis/processing/qgsalgorithmdrape.h index f03d7ba68c0..09e4630aa85 100644 --- a/src/analysis/processing/qgsalgorithmdrape.h +++ b/src/analysis/processing/qgsalgorithmdrape.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmdropgeometry.h b/src/analysis/processing/qgsalgorithmdropgeometry.h index 130406be838..257d639d29d 100644 --- a/src/analysis/processing/qgsalgorithmdropgeometry.h +++ b/src/analysis/processing/qgsalgorithmdropgeometry.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmdropmzvalues.h b/src/analysis/processing/qgsalgorithmdropmzvalues.h index 9fd4a164d8f..553072615b1 100644 --- a/src/analysis/processing/qgsalgorithmdropmzvalues.h +++ b/src/analysis/processing/qgsalgorithmdropmzvalues.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmexplode.h b/src/analysis/processing/qgsalgorithmexplode.h index cb889513394..a7443416c39 100644 --- a/src/analysis/processing/qgsalgorithmexplode.h +++ b/src/analysis/processing/qgsalgorithmexplode.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmexplodehstore.h b/src/analysis/processing/qgsalgorithmexplodehstore.h index 5040cbe6405..be799b165aa 100644 --- a/src/analysis/processing/qgsalgorithmexplodehstore.h +++ b/src/analysis/processing/qgsalgorithmexplodehstore.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextendlines.h b/src/analysis/processing/qgsalgorithmextendlines.h index 41fb5c3f3d2..c032642ad89 100644 --- a/src/analysis/processing/qgsalgorithmextendlines.h +++ b/src/analysis/processing/qgsalgorithmextendlines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextenttolayer.h b/src/analysis/processing/qgsalgorithmextenttolayer.h index bfd7c6600b3..78163bee723 100644 --- a/src/analysis/processing/qgsalgorithmextenttolayer.h +++ b/src/analysis/processing/qgsalgorithmextenttolayer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextractbinary.h b/src/analysis/processing/qgsalgorithmextractbinary.h index 5c5791a1abc..b60e8f04811 100644 --- a/src/analysis/processing/qgsalgorithmextractbinary.h +++ b/src/analysis/processing/qgsalgorithmextractbinary.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #include "qgsprocessingalgorithm.h" diff --git a/src/analysis/processing/qgsalgorithmextractbyattribute.h b/src/analysis/processing/qgsalgorithmextractbyattribute.h index 11455795533..3e4bc628487 100644 --- a/src/analysis/processing/qgsalgorithmextractbyattribute.h +++ b/src/analysis/processing/qgsalgorithmextractbyattribute.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextractbyexpression.h b/src/analysis/processing/qgsalgorithmextractbyexpression.h index 9ee177a45c1..5ba4e685ccf 100644 --- a/src/analysis/processing/qgsalgorithmextractbyexpression.h +++ b/src/analysis/processing/qgsalgorithmextractbyexpression.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextractbyextent.h b/src/analysis/processing/qgsalgorithmextractbyextent.h index 87df6a29712..65cdbef3dd9 100644 --- a/src/analysis/processing/qgsalgorithmextractbyextent.h +++ b/src/analysis/processing/qgsalgorithmextractbyextent.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmextractbylocation.h b/src/analysis/processing/qgsalgorithmextractbylocation.h index d69eb8c7e06..eed44d548be 100644 --- a/src/analysis/processing/qgsalgorithmextractbylocation.h +++ b/src/analysis/processing/qgsalgorithmextractbylocation.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmextractvertices.h b/src/analysis/processing/qgsalgorithmextractvertices.h index 4eb790a2311..8e73901005c 100644 --- a/src/analysis/processing/qgsalgorithmextractvertices.h +++ b/src/analysis/processing/qgsalgorithmextractvertices.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmextractzmvalues.h b/src/analysis/processing/qgsalgorithmextractzmvalues.h index 094ec377a73..e1468561323 100644 --- a/src/analysis/processing/qgsalgorithmextractzmvalues.h +++ b/src/analysis/processing/qgsalgorithmextractzmvalues.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsstatisticalsummary.h" #include diff --git a/src/analysis/processing/qgsalgorithmfiledownloader.h b/src/analysis/processing/qgsalgorithmfiledownloader.h index 15fde8c389a..7f920246200 100644 --- a/src/analysis/processing/qgsalgorithmfiledownloader.h +++ b/src/analysis/processing/qgsalgorithmfiledownloader.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" class QgsProcessingFeedback; diff --git a/src/analysis/processing/qgsalgorithmfilter.h b/src/analysis/processing/qgsalgorithmfilter.h index 6fc7f4b7f27..8bdc6e9077a 100644 --- a/src/analysis/processing/qgsalgorithmfilter.h +++ b/src/analysis/processing/qgsalgorithmfilter.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" class QgsProcessingModelAlgorithm; diff --git a/src/analysis/processing/qgsalgorithmfiltervertices.h b/src/analysis/processing/qgsalgorithmfiltervertices.h index b4734d46a74..7c13dfdbd24 100644 --- a/src/analysis/processing/qgsalgorithmfiltervertices.h +++ b/src/analysis/processing/qgsalgorithmfiltervertices.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsmaptopixelgeometrysimplifier.h" diff --git a/src/analysis/processing/qgsalgorithmfixgeometries.h b/src/analysis/processing/qgsalgorithmfixgeometries.h index 58301c82b0a..31921b07070 100644 --- a/src/analysis/processing/qgsalgorithmfixgeometries.h +++ b/src/analysis/processing/qgsalgorithmfixgeometries.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmforcerhr.h b/src/analysis/processing/qgsalgorithmforcerhr.h index 8f58bdd9ddd..17d2fac85b1 100644 --- a/src/analysis/processing/qgsalgorithmforcerhr.h +++ b/src/analysis/processing/qgsalgorithmforcerhr.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmimportphotos.h b/src/analysis/processing/qgsalgorithmimportphotos.h index 340567236be..2feb79cad9a 100644 --- a/src/analysis/processing/qgsalgorithmimportphotos.h +++ b/src/analysis/processing/qgsalgorithmimportphotos.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #include "qgsprocessingalgorithm.h" diff --git a/src/analysis/processing/qgsalgorithminterpolatepoint.h b/src/analysis/processing/qgsalgorithminterpolatepoint.h index c4c8be4cd8d..dbeb97e7c0f 100644 --- a/src/analysis/processing/qgsalgorithminterpolatepoint.h +++ b/src/analysis/processing/qgsalgorithminterpolatepoint.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmjoinbyattribute.h b/src/analysis/processing/qgsalgorithmjoinbyattribute.h index b29b993a6b4..5d5dba5fc97 100644 --- a/src/analysis/processing/qgsalgorithmjoinbyattribute.h +++ b/src/analysis/processing/qgsalgorithmjoinbyattribute.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmjoinwithlines.h b/src/analysis/processing/qgsalgorithmjoinwithlines.h index 3d3370e9956..4f78e9b85b7 100644 --- a/src/analysis/processing/qgsalgorithmjoinwithlines.h +++ b/src/analysis/processing/qgsalgorithmjoinwithlines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmkmeansclustering.h b/src/analysis/processing/qgsalgorithmkmeansclustering.h index 3ec8a2c3dd3..eb565a35394 100644 --- a/src/analysis/processing/qgsalgorithmkmeansclustering.h +++ b/src/analysis/processing/qgsalgorithmkmeansclustering.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #include "qgsprocessingalgorithm.h" diff --git a/src/analysis/processing/qgsalgorithmlineintersection.h b/src/analysis/processing/qgsalgorithmlineintersection.h index 58cae24fc8e..f7b386e01f3 100644 --- a/src/analysis/processing/qgsalgorithmlineintersection.h +++ b/src/analysis/processing/qgsalgorithmlineintersection.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmlinesubstring.h b/src/analysis/processing/qgsalgorithmlinesubstring.h index 48d40acf142..ca5a0008a3d 100644 --- a/src/analysis/processing/qgsalgorithmlinesubstring.h +++ b/src/analysis/processing/qgsalgorithmlinesubstring.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmloadlayer.h b/src/analysis/processing/qgsalgorithmloadlayer.h index 90956d3528c..8ebbb8f6148 100644 --- a/src/analysis/processing/qgsalgorithmloadlayer.h +++ b/src/analysis/processing/qgsalgorithmloadlayer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmmeancoordinates.h b/src/analysis/processing/qgsalgorithmmeancoordinates.h index c6ddf582e37..93866da7d0f 100644 --- a/src/analysis/processing/qgsalgorithmmeancoordinates.h +++ b/src/analysis/processing/qgsalgorithmmeancoordinates.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmmergelines.h b/src/analysis/processing/qgsalgorithmmergelines.h index da7cafa413e..a6ed0cdcaad 100644 --- a/src/analysis/processing/qgsalgorithmmergelines.h +++ b/src/analysis/processing/qgsalgorithmmergelines.h @@ -21,7 +21,7 @@ #define SIP_NO_FILE #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsprocessingprovider.h" #include "qgsprocessingutils.h" diff --git a/src/analysis/processing/qgsalgorithmmergevector.h b/src/analysis/processing/qgsalgorithmmergevector.h index e675408d048..213360b7e49 100644 --- a/src/analysis/processing/qgsalgorithmmergevector.h +++ b/src/analysis/processing/qgsalgorithmmergevector.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h index 23b094be1df..5f652c86690 100644 --- a/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h +++ b/src/analysis/processing/qgsalgorithmminimumenclosingcircle.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h index 9b7f4a0fe1b..9c4918fcbed 100644 --- a/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h +++ b/src/analysis/processing/qgsalgorithmmultiparttosinglepart.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h b/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h index 940295efc44..38fcda14a33 100644 --- a/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h +++ b/src/analysis/processing/qgsalgorithmmultiringconstantbuffer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmnetworkanalysisbase.h b/src/analysis/processing/qgsalgorithmnetworkanalysisbase.h index 6f6aa809eb9..f469dbab2b8 100644 --- a/src/analysis/processing/qgsalgorithmnetworkanalysisbase.h +++ b/src/analysis/processing/qgsalgorithmnetworkanalysisbase.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsgraph.h" diff --git a/src/analysis/processing/qgsalgorithmoffsetlines.h b/src/analysis/processing/qgsalgorithmoffsetlines.h index 7d837ab8cd1..7608a58a52f 100644 --- a/src/analysis/processing/qgsalgorithmoffsetlines.h +++ b/src/analysis/processing/qgsalgorithmoffsetlines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmorderbyexpression.h b/src/analysis/processing/qgsalgorithmorderbyexpression.h index 3afc8c66db1..0e8f20e80fc 100644 --- a/src/analysis/processing/qgsalgorithmorderbyexpression.h +++ b/src/analysis/processing/qgsalgorithmorderbyexpression.h @@ -22,7 +22,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h index 4283d903408..638b0b3f7c5 100644 --- a/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h +++ b/src/analysis/processing/qgsalgorithmorientedminimumboundingbox.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmpackage.h b/src/analysis/processing/qgsalgorithmpackage.h index dc818d40577..4940aca8162 100644 --- a/src/analysis/processing/qgsalgorithmpackage.h +++ b/src/analysis/processing/qgsalgorithmpackage.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmpointonsurface.h b/src/analysis/processing/qgsalgorithmpointonsurface.h index b6e9d0a7d47..27298eb3040 100644 --- a/src/analysis/processing/qgsalgorithmpointonsurface.h +++ b/src/analysis/processing/qgsalgorithmpointonsurface.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmpolygonstolines.h b/src/analysis/processing/qgsalgorithmpolygonstolines.h index 86f9a279997..9c4e1d5e152 100644 --- a/src/analysis/processing/qgsalgorithmpolygonstolines.h +++ b/src/analysis/processing/qgsalgorithmpolygonstolines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmprojectpointcartesian.h b/src/analysis/processing/qgsalgorithmprojectpointcartesian.h index db21cc0afa4..1318b0cdb68 100644 --- a/src/analysis/processing/qgsalgorithmprojectpointcartesian.h +++ b/src/analysis/processing/qgsalgorithmprojectpointcartesian.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmpromotetomultipart.h b/src/analysis/processing/qgsalgorithmpromotetomultipart.h index 17adcfa5e91..77c164db8db 100644 --- a/src/analysis/processing/qgsalgorithmpromotetomultipart.h +++ b/src/analysis/processing/qgsalgorithmpromotetomultipart.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h index f7eefbf335c..aa779e9f3ec 100644 --- a/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h +++ b/src/analysis/processing/qgsalgorithmrasterlayeruniquevalues.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmrastersurfacevolume.h b/src/analysis/processing/qgsalgorithmrastersurfacevolume.h index 4486de4cd85..43366a07bb5 100644 --- a/src/analysis/processing/qgsalgorithmrastersurfacevolume.h +++ b/src/analysis/processing/qgsalgorithmrastersurfacevolume.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmrasterzonalstats.h b/src/analysis/processing/qgsalgorithmrasterzonalstats.h index a55ce62eba2..094d841b029 100644 --- a/src/analysis/processing/qgsalgorithmrasterzonalstats.h +++ b/src/analysis/processing/qgsalgorithmrasterzonalstats.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsrasterprojector.h" diff --git a/src/analysis/processing/qgsalgorithmreclassifybylayer.h b/src/analysis/processing/qgsalgorithmreclassifybylayer.h index 1cd56fd1855..c30251d78a3 100644 --- a/src/analysis/processing/qgsalgorithmreclassifybylayer.h +++ b/src/analysis/processing/qgsalgorithmreclassifybylayer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsreclassifyutils.h" diff --git a/src/analysis/processing/qgsalgorithmremoveduplicatesbyattribute.h b/src/analysis/processing/qgsalgorithmremoveduplicatesbyattribute.h index a91dd394137..4a04d2f5e17 100644 --- a/src/analysis/processing/qgsalgorithmremoveduplicatesbyattribute.h +++ b/src/analysis/processing/qgsalgorithmremoveduplicatesbyattribute.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmremoveduplicatevertices.h b/src/analysis/processing/qgsalgorithmremoveduplicatevertices.h index ae50babc45e..9beb0c52edb 100644 --- a/src/analysis/processing/qgsalgorithmremoveduplicatevertices.h +++ b/src/analysis/processing/qgsalgorithmremoveduplicatevertices.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmremoveholes.h b/src/analysis/processing/qgsalgorithmremoveholes.h index 3a248ffd00f..274b5a98ded 100644 --- a/src/analysis/processing/qgsalgorithmremoveholes.h +++ b/src/analysis/processing/qgsalgorithmremoveholes.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmremovenullgeometry.h b/src/analysis/processing/qgsalgorithmremovenullgeometry.h index c93b42830c4..0c4f01fe618 100644 --- a/src/analysis/processing/qgsalgorithmremovenullgeometry.h +++ b/src/analysis/processing/qgsalgorithmremovenullgeometry.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmrenamelayer.h b/src/analysis/processing/qgsalgorithmrenamelayer.h index 3e451f2396b..c414e1abd31 100644 --- a/src/analysis/processing/qgsalgorithmrenamelayer.h +++ b/src/analysis/processing/qgsalgorithmrenamelayer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmreverselinedirection.h b/src/analysis/processing/qgsalgorithmreverselinedirection.h index 1ac3a0c9186..7a87f74d0cb 100644 --- a/src/analysis/processing/qgsalgorithmreverselinedirection.h +++ b/src/analysis/processing/qgsalgorithmreverselinedirection.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmrotate.h b/src/analysis/processing/qgsalgorithmrotate.h index 0db8d58498e..589fe7cb269 100644 --- a/src/analysis/processing/qgsalgorithmrotate.h +++ b/src/analysis/processing/qgsalgorithmrotate.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h index f3c9af510ec..b9443c232c8 100644 --- a/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h +++ b/src/analysis/processing/qgsalgorithmsaveselectedfeatures.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsegmentize.h b/src/analysis/processing/qgsalgorithmsegmentize.h index 2e0622a9cd4..c7a43633602 100644 --- a/src/analysis/processing/qgsalgorithmsegmentize.h +++ b/src/analysis/processing/qgsalgorithmsegmentize.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsmaptopixelgeometrysimplifier.h" diff --git a/src/analysis/processing/qgsalgorithmshortestpathlayertopoint.h b/src/analysis/processing/qgsalgorithmshortestpathlayertopoint.h index 431bca1e7d0..3e6819b98f5 100644 --- a/src/analysis/processing/qgsalgorithmshortestpathlayertopoint.h +++ b/src/analysis/processing/qgsalgorithmshortestpathlayertopoint.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsalgorithmnetworkanalysisbase.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmshortestpathpointtolayer.h b/src/analysis/processing/qgsalgorithmshortestpathpointtolayer.h index cd7e2e2c50d..270c540da7f 100644 --- a/src/analysis/processing/qgsalgorithmshortestpathpointtolayer.h +++ b/src/analysis/processing/qgsalgorithmshortestpathpointtolayer.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsalgorithmnetworkanalysisbase.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmshortestpathpointtopoint.h b/src/analysis/processing/qgsalgorithmshortestpathpointtopoint.h index 8c525c730fe..806e90f34bf 100644 --- a/src/analysis/processing/qgsalgorithmshortestpathpointtopoint.h +++ b/src/analysis/processing/qgsalgorithmshortestpathpointtopoint.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsalgorithmnetworkanalysisbase.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsimplify.h b/src/analysis/processing/qgsalgorithmsimplify.h index 936c72dac02..0a5cfcfeab3 100644 --- a/src/analysis/processing/qgsalgorithmsimplify.h +++ b/src/analysis/processing/qgsalgorithmsimplify.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsmaptopixelgeometrysimplifier.h" #include "qgsapplication.h" diff --git a/src/analysis/processing/qgsalgorithmsmooth.h b/src/analysis/processing/qgsalgorithmsmooth.h index 7b3bb251320..fd1e10e51d1 100644 --- a/src/analysis/processing/qgsalgorithmsmooth.h +++ b/src/analysis/processing/qgsalgorithmsmooth.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsnaptogrid.h b/src/analysis/processing/qgsalgorithmsnaptogrid.h index ca955644f48..8528e65ea7f 100644 --- a/src/analysis/processing/qgsalgorithmsnaptogrid.h +++ b/src/analysis/processing/qgsalgorithmsnaptogrid.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsplitlineantimeridian.h b/src/analysis/processing/qgsalgorithmsplitlineantimeridian.h index b1a01c9e063..b4c98a80838 100644 --- a/src/analysis/processing/qgsalgorithmsplitlineantimeridian.h +++ b/src/analysis/processing/qgsalgorithmsplitlineantimeridian.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsplitlinesbylength.h b/src/analysis/processing/qgsalgorithmsplitlinesbylength.h index 97384a29039..d3478b7ae3f 100644 --- a/src/analysis/processing/qgsalgorithmsplitlinesbylength.h +++ b/src/analysis/processing/qgsalgorithmsplitlinesbylength.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsplitwithlines.h b/src/analysis/processing/qgsalgorithmsplitwithlines.h index 061e985ada5..2933484e7a0 100644 --- a/src/analysis/processing/qgsalgorithmsplitwithlines.h +++ b/src/analysis/processing/qgsalgorithmsplitwithlines.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmstringconcatenation.h b/src/analysis/processing/qgsalgorithmstringconcatenation.h index 9ecb51f6e42..4b1b57868e1 100644 --- a/src/analysis/processing/qgsalgorithmstringconcatenation.h +++ b/src/analysis/processing/qgsalgorithmstringconcatenation.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmsubdivide.h b/src/analysis/processing/qgsalgorithmsubdivide.h index 531eddba2e7..86e50f7bc95 100644 --- a/src/analysis/processing/qgsalgorithmsubdivide.h +++ b/src/analysis/processing/qgsalgorithmsubdivide.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmswapxy.h b/src/analysis/processing/qgsalgorithmswapxy.h index e656aa73efb..96457bd2ddf 100644 --- a/src/analysis/processing/qgsalgorithmswapxy.h +++ b/src/analysis/processing/qgsalgorithmswapxy.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmtaperedbuffer.h b/src/analysis/processing/qgsalgorithmtaperedbuffer.h index e5f842ac4c8..aaa84b71199 100644 --- a/src/analysis/processing/qgsalgorithmtaperedbuffer.h +++ b/src/analysis/processing/qgsalgorithmtaperedbuffer.h @@ -21,7 +21,7 @@ #define SIP_NO_FILE #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmtransect.h b/src/analysis/processing/qgsalgorithmtransect.h index b0993015857..62e545cbf76 100644 --- a/src/analysis/processing/qgsalgorithmtransect.h +++ b/src/analysis/processing/qgsalgorithmtransect.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmtransform.h b/src/analysis/processing/qgsalgorithmtransform.h index 053642e006c..fd2eed76a6e 100644 --- a/src/analysis/processing/qgsalgorithmtransform.h +++ b/src/analysis/processing/qgsalgorithmtransform.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmtranslate.h b/src/analysis/processing/qgsalgorithmtranslate.h index c25c9bc83a4..5e6b7f126ac 100644 --- a/src/analysis/processing/qgsalgorithmtranslate.h +++ b/src/analysis/processing/qgsalgorithmtranslate.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmuniquevalueindex.h b/src/analysis/processing/qgsalgorithmuniquevalueindex.h index f0cfe51cb52..226c730b2ee 100644 --- a/src/analysis/processing/qgsalgorithmuniquevalueindex.h +++ b/src/analysis/processing/qgsalgorithmuniquevalueindex.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmvectorize.h b/src/analysis/processing/qgsalgorithmvectorize.h index 58d6d8c6e19..f81440c9c41 100644 --- a/src/analysis/processing/qgsalgorithmvectorize.h +++ b/src/analysis/processing/qgsalgorithmvectorize.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" #include "qgsreclassifyutils.h" diff --git a/src/analysis/processing/qgsalgorithmwedgebuffers.h b/src/analysis/processing/qgsalgorithmwedgebuffers.h index c5c5f0be2eb..5d98a64c554 100644 --- a/src/analysis/processing/qgsalgorithmwedgebuffers.h +++ b/src/analysis/processing/qgsalgorithmwedgebuffers.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsalgorithmzonalhistogram.h b/src/analysis/processing/qgsalgorithmzonalhistogram.h index e4f52c490a0..20f0a7d5963 100644 --- a/src/analysis/processing/qgsalgorithmzonalhistogram.h +++ b/src/analysis/processing/qgsalgorithmzonalhistogram.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingalgorithm.h" ///@cond PRIVATE diff --git a/src/analysis/processing/qgsnativealgorithms.h b/src/analysis/processing/qgsnativealgorithms.h index 06877563708..db2e057402e 100644 --- a/src/analysis/processing/qgsnativealgorithms.h +++ b/src/analysis/processing/qgsnativealgorithms.h @@ -19,7 +19,7 @@ #define QGSNATIVEALGORITHMS_H #include "qgis_analysis.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprocessingprovider.h" /** diff --git a/src/analysis/processing/qgsreclassifyutils.h b/src/analysis/processing/qgsreclassifyutils.h index b8de834ced2..b7df0758b7e 100644 --- a/src/analysis/processing/qgsreclassifyutils.h +++ b/src/analysis/processing/qgsreclassifyutils.h @@ -20,7 +20,7 @@ #define SIP_NO_FILE -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_analysis.h" #include "qgsrasterrange.h" #include diff --git a/src/analysis/raster/qgsalignraster.h b/src/analysis/raster/qgsalignraster.h index 0d6ec7bed8b..212447a7e40 100644 --- a/src/analysis/raster/qgsalignraster.h +++ b/src/analysis/raster/qgsalignraster.h @@ -22,7 +22,7 @@ #include #include #include "qgis_analysis.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsogrutils.h" class QgsRectangle; diff --git a/src/app/decorations/qgsdecorationgrid.h b/src/app/decorations/qgsdecorationgrid.h index c2495285023..c93eae39d19 100644 --- a/src/app/decorations/qgsdecorationgrid.h +++ b/src/app/decorations/qgsdecorationgrid.h @@ -19,7 +19,6 @@ #define QGSDECORATIONGRID_H #include "qgsdecorationitem.h" -#include "qgis.h" class QPainter; class QgsLineSymbol; diff --git a/src/app/layout/qgslayoutaddpagesdialog.h b/src/app/layout/qgslayoutaddpagesdialog.h index d23f9ab7f50..126a06c0934 100644 --- a/src/app/layout/qgslayoutaddpagesdialog.h +++ b/src/app/layout/qgslayoutaddpagesdialog.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTADDPAGESDIALOG_H #define QGSLAYOUTADDPAGESDIALOG_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "ui_qgslayoutnewpagedialog.h" diff --git a/src/app/layout/qgslayoutappmenuprovider.h b/src/app/layout/qgslayoutappmenuprovider.h index fda8f1eb90e..1f3748fb803 100644 --- a/src/app/layout/qgslayoutappmenuprovider.h +++ b/src/app/layout/qgslayoutappmenuprovider.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTAPPMENUPROVIDER_H #define QGSLAYOUTAPPMENUPROVIDER_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutview.h" #include diff --git a/src/app/layout/qgslayoutapputils.h b/src/app/layout/qgslayoutapputils.h index 5947ddc6ed8..a330991fc79 100644 --- a/src/app/layout/qgslayoutapputils.h +++ b/src/app/layout/qgslayoutapputils.h @@ -16,8 +16,6 @@ #ifndef QGSLAYOUTAPPUTILS_H #define QGSLAYOUTAPPUTILS_H -#include "qgis.h" - /** * Utils for layout handling from app. */ diff --git a/src/app/layout/qgslayoutattributeselectiondialog.h b/src/app/layout/qgslayoutattributeselectiondialog.h index 7a2b107899a..b4d02c5c168 100644 --- a/src/app/layout/qgslayoutattributeselectiondialog.h +++ b/src/app/layout/qgslayoutattributeselectiondialog.h @@ -24,7 +24,7 @@ #include #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgslayoutattributeselectiondialogbase.h" #include "qgsexpressioncontextgenerator.h" diff --git a/src/app/layout/qgslayoutitemslistview.h b/src/app/layout/qgslayoutitemslistview.h index 9b45e2e094b..8bfd64e0e65 100644 --- a/src/app/layout/qgslayoutitemslistview.h +++ b/src/app/layout/qgslayoutitemslistview.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTITEMSLISTVIEW_H #define QGSLAYOUTITEMSLISTVIEW_H -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/app/layout/qgslayoutpagepropertieswidget.h b/src/app/layout/qgslayoutpagepropertieswidget.h index a616019289f..0d23fd3c65b 100644 --- a/src/app/layout/qgslayoutpagepropertieswidget.h +++ b/src/app/layout/qgslayoutpagepropertieswidget.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTPAGEPROPERTIESWIDGET_H #define QGSLAYOUTPAGEPROPERTIESWIDGET_H -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgslayoutpagepropertieswidget.h" #include "qgslayoutsize.h" diff --git a/src/app/layout/qgsreportsectionmodel.h b/src/app/layout/qgsreportsectionmodel.h index 1c68dcea000..0fec1ca38ea 100644 --- a/src/app/layout/qgsreportsectionmodel.h +++ b/src/app/layout/qgsreportsectionmodel.h @@ -16,7 +16,7 @@ #ifndef QGSREPORTSECTIONMODEL_H #define QGSREPORTSECTIONMODEL_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgsreport.h" #include diff --git a/src/app/pluginmanager/qgspluginmanager.h b/src/app/pluginmanager/qgspluginmanager.h index d8d76b1e57f..24868275a93 100644 --- a/src/app/pluginmanager/qgspluginmanager.h +++ b/src/app/pluginmanager/qgspluginmanager.h @@ -27,6 +27,7 @@ #include "qgsoptionsdialogbase.h" #include "qgsguiutils.h" #include "qgshelp.h" +#include "qgis.h" class QgsPluginSortFilterProxyModel; class QgsPythonUtils; diff --git a/src/app/qgscrashhandler.h b/src/app/qgscrashhandler.h index c9ebfc4fc44..0283453ec41 100644 --- a/src/app/qgscrashhandler.h +++ b/src/app/qgscrashhandler.h @@ -16,7 +16,6 @@ #ifndef QGSCRASHHANDLER_H #define QGSCRASHHANDLER_H -#include "qgis.h" #include "qgis_app.h" #ifdef WIN32 diff --git a/src/core/effects/qgsblureffect.h b/src/core/effects/qgsblureffect.h index d23ad36766f..1bfe60ad15a 100644 --- a/src/core/effects/qgsblureffect.h +++ b/src/core/effects/qgsblureffect.h @@ -19,7 +19,7 @@ #include "qgis_core.h" #include "qgspainteffect.h" -#include "qgis.h" +#include "qgis_sip.h" #include /** diff --git a/src/core/effects/qgscoloreffect.h b/src/core/effects/qgscoloreffect.h index 73e7e27080e..5137db056f2 100644 --- a/src/core/effects/qgscoloreffect.h +++ b/src/core/effects/qgscoloreffect.h @@ -20,7 +20,7 @@ #include "qgis_core.h" #include "qgspainteffect.h" #include "qgsimageoperation.h" -#include "qgis.h" +#include "qgis_sip.h" #include /** diff --git a/src/core/effects/qgseffectstack.h b/src/core/effects/qgseffectstack.h index a32d6d0564d..b653e071aee 100644 --- a/src/core/effects/qgseffectstack.h +++ b/src/core/effects/qgseffectstack.h @@ -18,7 +18,7 @@ #define QGSEFFECTSTACK_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgspainteffect.h" /** diff --git a/src/core/effects/qgsimageoperation.h b/src/core/effects/qgsimageoperation.h index 12142023268..54c44e4a286 100644 --- a/src/core/effects/qgsimageoperation.h +++ b/src/core/effects/qgsimageoperation.h @@ -19,10 +19,11 @@ #define QGSIMAGEOPERATION_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_core.h" +#include class QgsColorRamp; diff --git a/src/core/effects/qgspainteffect.h b/src/core/effects/qgspainteffect.h index 97fac7bc349..5101dd70837 100644 --- a/src/core/effects/qgspainteffect.h +++ b/src/core/effects/qgspainteffect.h @@ -18,7 +18,8 @@ #define QGSPAINTEFFECT_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" +#include "qgssymbollayer.h" #include #include #include diff --git a/src/core/effects/qgspainteffectregistry.h b/src/core/effects/qgspainteffectregistry.h index 8b57ab188d6..46299df54e0 100644 --- a/src/core/effects/qgspainteffectregistry.h +++ b/src/core/effects/qgspainteffectregistry.h @@ -17,7 +17,8 @@ #define QGSPAINTEFFECTREGISTRY_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" +#include "qgssymbollayer.h" #include #include diff --git a/src/core/effects/qgsshadoweffect.h b/src/core/effects/qgsshadoweffect.h index 80bcf46dfb7..18548fc80c7 100644 --- a/src/core/effects/qgsshadoweffect.h +++ b/src/core/effects/qgsshadoweffect.h @@ -19,7 +19,7 @@ #include "qgis_core.h" #include "qgspainteffect.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssymbol.h" #include diff --git a/src/core/effects/qgstransformeffect.h b/src/core/effects/qgstransformeffect.h index 8362a2b103b..126bebbb733 100644 --- a/src/core/effects/qgstransformeffect.h +++ b/src/core/effects/qgstransformeffect.h @@ -19,7 +19,7 @@ #include "qgis_core.h" #include "qgspainteffect.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmapunitscale.h" #include "qgsunittypes.h" #include diff --git a/src/core/expression/qgsexpressionfunction.cpp b/src/core/expression/qgsexpressionfunction.cpp index 8d9b448c9cf..e63e5d38195 100644 --- a/src/core/expression/qgsexpressionfunction.cpp +++ b/src/core/expression/qgsexpressionfunction.cpp @@ -52,6 +52,7 @@ #include "qgstransaction.h" #include "qgsthreadingutils.h" #include "qgsapplication.h" +#include "qgis.h" const QString QgsExpressionFunction::helpText() const { diff --git a/src/core/geometry/qgsabstractgeometry.h b/src/core/geometry/qgsabstractgeometry.h index e3f1166058a..a1bb924ba9d 100644 --- a/src/core/geometry/qgsabstractgeometry.h +++ b/src/core/geometry/qgsabstractgeometry.h @@ -21,7 +21,6 @@ email : marco.hugentobler at sourcepole dot com #include #include "qgis_core.h" -#include "qgis.h" #include "qgscoordinatetransform.h" #include "qgswkbtypes.h" #include "qgswkbptr.h" diff --git a/src/core/geometry/qgscircularstring.h b/src/core/geometry/qgscircularstring.h index 15fb6ed2795..81d0eae114b 100644 --- a/src/core/geometry/qgscircularstring.h +++ b/src/core/geometry/qgscircularstring.h @@ -21,7 +21,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscurve.h" diff --git a/src/core/geometry/qgscompoundcurve.h b/src/core/geometry/qgscompoundcurve.h index 1fe82150d0c..dc44b2f7f9a 100644 --- a/src/core/geometry/qgscompoundcurve.h +++ b/src/core/geometry/qgscompoundcurve.h @@ -19,7 +19,7 @@ #define QGSCOMPOUNDCURVE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscurve.h" /** diff --git a/src/core/geometry/qgscurve.h b/src/core/geometry/qgscurve.h index 67b699908db..549ca4daed9 100644 --- a/src/core/geometry/qgscurve.h +++ b/src/core/geometry/qgscurve.h @@ -19,7 +19,7 @@ #define QGSCURVE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsabstractgeometry.h" #include "qgsrectangle.h" diff --git a/src/core/geometry/qgscurvepolygon.h b/src/core/geometry/qgscurvepolygon.h index fbd702292e0..1b346c82d2f 100644 --- a/src/core/geometry/qgscurvepolygon.h +++ b/src/core/geometry/qgscurvepolygon.h @@ -19,7 +19,7 @@ #define QGSCURVEPOLYGON_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssurface.h" #include diff --git a/src/core/geometry/qgsgeometry.h b/src/core/geometry/qgsgeometry.h index b3e0c05f5a3..787801119bc 100644 --- a/src/core/geometry/qgsgeometry.h +++ b/src/core/geometry/qgsgeometry.h @@ -28,7 +28,7 @@ email : morb at ozemail dot com dot au #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsabstractgeometry.h" #include "qgspointxy.h" diff --git a/src/core/geometry/qgsgeometrycollection.h b/src/core/geometry/qgsgeometrycollection.h index eefe60e9bc1..4cdaa539231 100644 --- a/src/core/geometry/qgsgeometrycollection.h +++ b/src/core/geometry/qgsgeometrycollection.h @@ -20,7 +20,7 @@ email : marco.hugentobler at sourcepole dot com #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsabstractgeometry.h" class QgsPoint; diff --git a/src/core/geometry/qgsgeometryutils.h b/src/core/geometry/qgsgeometryutils.h index 91375803d56..5097c7694cd 100644 --- a/src/core/geometry/qgsgeometryutils.h +++ b/src/core/geometry/qgsgeometryutils.h @@ -19,7 +19,7 @@ email : marco.hugentobler at sourcepole dot com #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgspoint.h" #include "qgsabstractgeometry.h" #include "qgsvector3d.h" diff --git a/src/core/geometry/qgslinestring.h b/src/core/geometry/qgslinestring.h index b812523bee1..cf7127b61e2 100644 --- a/src/core/geometry/qgslinestring.h +++ b/src/core/geometry/qgslinestring.h @@ -22,7 +22,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscurve.h" #include "qgscompoundcurve.h" diff --git a/src/core/geometry/qgsmulticurve.h b/src/core/geometry/qgsmulticurve.h index 9a8947bc2d5..abcc4f9ab86 100644 --- a/src/core/geometry/qgsmulticurve.h +++ b/src/core/geometry/qgsmulticurve.h @@ -17,7 +17,7 @@ email : marco.hugentobler at sourcepole dot com #define QGSMULTICURVE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometrycollection.h" /** diff --git a/src/core/geometry/qgsmultilinestring.h b/src/core/geometry/qgsmultilinestring.h index dc87d9d2d46..15b5ac9b871 100644 --- a/src/core/geometry/qgsmultilinestring.h +++ b/src/core/geometry/qgsmultilinestring.h @@ -17,7 +17,7 @@ email : marco.hugentobler at sourcepole dot com #define QGSMULTILINESTRING_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmulticurve.h" /** diff --git a/src/core/geometry/qgsmultipoint.h b/src/core/geometry/qgsmultipoint.h index 78a950bfca0..2db6919e84f 100644 --- a/src/core/geometry/qgsmultipoint.h +++ b/src/core/geometry/qgsmultipoint.h @@ -17,7 +17,7 @@ email : marco.hugentobler at sourcepole dot com #define QGSMULTIPOINT_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometrycollection.h" /** diff --git a/src/core/geometry/qgsmultipolygon.h b/src/core/geometry/qgsmultipolygon.h index 1312481631e..263edeac68d 100644 --- a/src/core/geometry/qgsmultipolygon.h +++ b/src/core/geometry/qgsmultipolygon.h @@ -17,7 +17,7 @@ email : marco.hugentobler at sourcepole dot com #define QGSMULTIPOLYGON_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmultisurface.h" /** diff --git a/src/core/geometry/qgsmultisurface.h b/src/core/geometry/qgsmultisurface.h index 4253fc10db4..be7b077f602 100644 --- a/src/core/geometry/qgsmultisurface.h +++ b/src/core/geometry/qgsmultisurface.h @@ -17,7 +17,7 @@ email : marco.hugentobler at sourcepole dot com #define QGSMULTISURFACE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometrycollection.h" /** diff --git a/src/core/geometry/qgspoint.h b/src/core/geometry/qgspoint.h index 9102de03c9b..88ea53c841c 100644 --- a/src/core/geometry/qgspoint.h +++ b/src/core/geometry/qgspoint.h @@ -19,7 +19,7 @@ #define QGSPOINT_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsabstractgeometry.h" #include "qgsrectangle.h" diff --git a/src/core/geometry/qgspolygon.h b/src/core/geometry/qgspolygon.h index 61924c13c04..f46130aa0fc 100644 --- a/src/core/geometry/qgspolygon.h +++ b/src/core/geometry/qgspolygon.h @@ -19,7 +19,7 @@ #define QGSPOLYGON_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscurvepolygon.h" /** diff --git a/src/core/geometry/qgsrectangle.h b/src/core/geometry/qgsrectangle.h index e528ddd7941..92b368aa0a4 100644 --- a/src/core/geometry/qgsrectangle.h +++ b/src/core/geometry/qgsrectangle.h @@ -19,6 +19,7 @@ #define QGSRECTANGLE_H #include "qgis_core.h" +#include "qgis.h" #include #include #include diff --git a/src/core/geometry/qgsreferencedgeometry.h b/src/core/geometry/qgsreferencedgeometry.h index 0584b8e9a3b..9ef446024f8 100644 --- a/src/core/geometry/qgsreferencedgeometry.h +++ b/src/core/geometry/qgsreferencedgeometry.h @@ -18,7 +18,6 @@ #ifndef QGSREFERENCEDGEOMETRY_H #define QGSREFERENCEDGEOMETRY_H -#include "qgis.h" #include "qgis_sip.h" #include "qgis_core.h" #include "qgscoordinatereferencesystem.h" diff --git a/src/core/geometry/qgssurface.h b/src/core/geometry/qgssurface.h index 1570d583aa4..26dcd0468f2 100644 --- a/src/core/geometry/qgssurface.h +++ b/src/core/geometry/qgssurface.h @@ -19,7 +19,7 @@ #define QGSSURFACE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsabstractgeometry.h" #include "qgsrectangle.h" diff --git a/src/core/geometry/qgstriangle.h b/src/core/geometry/qgstriangle.h index a182cef7a42..5b34db8b279 100644 --- a/src/core/geometry/qgstriangle.h +++ b/src/core/geometry/qgstriangle.h @@ -19,7 +19,7 @@ #define QGSTRIANGLE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgspolygon.h" #include "qgscircle.h" #include "qgslinestring.h" diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h index 0a002fb3790..d95e36352c8 100644 --- a/src/core/geometry/qgswkbptr.h +++ b/src/core/geometry/qgswkbptr.h @@ -17,7 +17,7 @@ #include "qgis_core.h" #include "qgswkbtypes.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsexception.h" #include "qpolygon.h" diff --git a/src/core/layertree/qgslayertreegroup.h b/src/core/layertree/qgslayertreegroup.h index 0ed695ef66a..278bf0f9ab2 100644 --- a/src/core/layertree/qgslayertreegroup.h +++ b/src/core/layertree/qgslayertreegroup.h @@ -17,7 +17,7 @@ #define QGSLAYERTREEGROUP_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayertreenode.h" class QgsMapLayer; diff --git a/src/core/layertree/qgslayertreelayer.h b/src/core/layertree/qgslayertreelayer.h index bb30ddf1b4a..a1d9fe8460b 100644 --- a/src/core/layertree/qgslayertreelayer.h +++ b/src/core/layertree/qgslayertreelayer.h @@ -17,7 +17,7 @@ #define QGSLAYERTREELAYER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayertreenode.h" #include "qgsmaplayerref.h" #include "qgsreadwritecontext.h" diff --git a/src/core/layertree/qgslayertreemodellegendnode.h b/src/core/layertree/qgslayertreemodellegendnode.h index ac4d0bcbd2f..c677bcab1b6 100644 --- a/src/core/layertree/qgslayertreemodellegendnode.h +++ b/src/core/layertree/qgslayertreemodellegendnode.h @@ -24,7 +24,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterdataprovider.h" // for QgsImageFetcher dtor visibility diff --git a/src/core/layertree/qgslayertreenode.h b/src/core/layertree/qgslayertreenode.h index 98d03ab49fb..d474918265e 100644 --- a/src/core/layertree/qgslayertreenode.h +++ b/src/core/layertree/qgslayertreenode.h @@ -21,7 +21,7 @@ #include "qgsobjectcustomproperties.h" #include "qgsreadwritecontext.h" -#include "qgis.h" +#include "qgis_sip.h" class QDomElement; diff --git a/src/core/layertree/qgslayertreeregistrybridge.h b/src/core/layertree/qgslayertreeregistrybridge.h index 5b7d89befc1..223e23e75e6 100644 --- a/src/core/layertree/qgslayertreeregistrybridge.h +++ b/src/core/layertree/qgslayertreeregistrybridge.h @@ -20,7 +20,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsLayerTreeGroup; class QgsLayerTreeNode; diff --git a/src/core/layout/qgscompositionconverter.h b/src/core/layout/qgscompositionconverter.h index fa9dbd35c75..56fd1e1fc20 100644 --- a/src/core/layout/qgscompositionconverter.h +++ b/src/core/layout/qgscompositionconverter.h @@ -20,7 +20,6 @@ #include #include -#include "qgis.h" #include "qgis_sip.h" #define SIP_NO_FILE diff --git a/src/core/layout/qgslayoutframe.h b/src/core/layout/qgslayoutframe.h index 67e17b4c091..2cb6378dd9a 100644 --- a/src/core/layout/qgslayoutframe.h +++ b/src/core/layout/qgslayoutframe.h @@ -17,7 +17,7 @@ #define QGSLAYOUTFRAME_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutitem.h" class QgsLayout; diff --git a/src/core/layout/qgslayoutitemattributetable.h b/src/core/layout/qgslayoutitemattributetable.h index 220a075ad30..843973b4175 100644 --- a/src/core/layout/qgslayoutitemattributetable.h +++ b/src/core/layout/qgslayoutitemattributetable.h @@ -20,7 +20,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgslayouttable.h" #include "qgsvectorlayerref.h" diff --git a/src/core/layout/qgslayoutitemhtml.h b/src/core/layout/qgslayoutitemhtml.h index f6f74a05f02..be6d2bc171f 100644 --- a/src/core/layout/qgslayoutitemhtml.h +++ b/src/core/layout/qgslayoutitemhtml.h @@ -17,7 +17,7 @@ #define QGSLAYOUTITEMHTML_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutmultiframe.h" #include "qgsfeature.h" #include "qgsdistancearea.h" diff --git a/src/core/layout/qgslayoutitemlegend.h b/src/core/layout/qgslayoutitemlegend.h index 4fa94dcc21a..430933f61bb 100644 --- a/src/core/layout/qgslayoutitemlegend.h +++ b/src/core/layout/qgslayoutitemlegend.h @@ -19,7 +19,7 @@ #define QGSLAYOUTITEMLEGEND_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutitem.h" #include "qgslayertreemodel.h" #include "qgslegendsettings.h" diff --git a/src/core/layout/qgslayoutitemmapgrid.h b/src/core/layout/qgslayoutitemmapgrid.h index 851af284578..5be0448472b 100644 --- a/src/core/layout/qgslayoutitemmapgrid.h +++ b/src/core/layout/qgslayoutitemmapgrid.h @@ -20,7 +20,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgslayoutitemmapitem.h" #include "qgssymbol.h" #include diff --git a/src/core/layout/qgslayoutitemmapoverview.h b/src/core/layout/qgslayoutitemmapoverview.h index f52b17f8018..762cd23b87c 100644 --- a/src/core/layout/qgslayoutitemmapoverview.h +++ b/src/core/layout/qgslayoutitemmapoverview.h @@ -20,7 +20,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgslayoutitemmapitem.h" #include "qgssymbol.h" #include diff --git a/src/core/layout/qgslayoutitemscalebar.h b/src/core/layout/qgslayoutitemscalebar.h index 6a8994f6a5c..0db38c47208 100644 --- a/src/core/layout/qgslayoutitemscalebar.h +++ b/src/core/layout/qgslayoutitemscalebar.h @@ -17,7 +17,7 @@ #define QGSLAYOUTITEMSCALEBAR_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutitem.h" #include "scalebar/qgsscalebarsettings.h" #include "scalebar/qgsscalebarrenderer.h" diff --git a/src/core/layout/qgslayoutitemtexttable.h b/src/core/layout/qgslayoutitemtexttable.h index 78dea089fca..009b9c3f31f 100644 --- a/src/core/layout/qgslayoutitemtexttable.h +++ b/src/core/layout/qgslayoutitemtexttable.h @@ -19,7 +19,7 @@ #define QGSLAYOUTTEXTTABLE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayouttable.h" /** diff --git a/src/core/layout/qgslayoutmanager.h b/src/core/layout/qgslayoutmanager.h index 1408f9cdfcd..6348e8325da 100644 --- a/src/core/layout/qgslayoutmanager.h +++ b/src/core/layout/qgslayoutmanager.h @@ -17,7 +17,7 @@ #define QGSLAYOUTMANAGER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmasterlayoutinterface.h" #include diff --git a/src/core/layout/qgslayoutmeasurement.cpp b/src/core/layout/qgslayoutmeasurement.cpp index d5db46d8950..4add56bbf50 100644 --- a/src/core/layout/qgslayoutmeasurement.cpp +++ b/src/core/layout/qgslayoutmeasurement.cpp @@ -16,7 +16,7 @@ ***************************************************************************/ #include "qgslayoutmeasurement.h" - +#include "qgis.h" #include QgsLayoutMeasurement::QgsLayoutMeasurement( const double length, const QgsUnitTypes::LayoutUnit units ) diff --git a/src/core/layout/qgslayoutmodel.h b/src/core/layout/qgslayoutmodel.h index bcda57ced80..2f8537b1a27 100644 --- a/src/core/layout/qgslayoutmodel.h +++ b/src/core/layout/qgslayoutmodel.h @@ -19,7 +19,7 @@ #define QGSLAYOUTMODEL_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutitemregistry.h" #include diff --git a/src/core/layout/qgslayoutmultiframe.h b/src/core/layout/qgslayoutmultiframe.h index 54a9b5f650e..79b99e70345 100644 --- a/src/core/layout/qgslayoutmultiframe.h +++ b/src/core/layout/qgslayoutmultiframe.h @@ -17,7 +17,7 @@ #define QGSLAYOUTMULTIFRAME_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutobject.h" #include "qgslayoutundocommand.h" #include "qgsapplication.h" diff --git a/src/core/layout/qgslayoutserializableobject.h b/src/core/layout/qgslayoutserializableobject.h index c43422872d0..ef3a8cf5b45 100644 --- a/src/core/layout/qgslayoutserializableobject.h +++ b/src/core/layout/qgslayoutserializableobject.h @@ -18,7 +18,7 @@ #ifndef QGSLAYOUTSERIALIZABLEOBJECT_H #define QGSLAYOUTSERIALIZABLEOBJECT_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgslayoutundocommand.h" diff --git a/src/core/layout/qgslayouttable.h b/src/core/layout/qgslayouttable.h index 2fd1241b1cd..3f98af86e4f 100644 --- a/src/core/layout/qgslayouttable.h +++ b/src/core/layout/qgslayouttable.h @@ -20,7 +20,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgslayoutmultiframe.h" #include #include diff --git a/src/core/layout/qgslayoutundocommand.h b/src/core/layout/qgslayoutundocommand.h index e3b12f93139..38b2e766662 100644 --- a/src/core/layout/qgslayoutundocommand.h +++ b/src/core/layout/qgslayoutundocommand.h @@ -19,7 +19,7 @@ #define QGSLAYOUTUNDOCOMMAND_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_core.h" diff --git a/src/core/layout/qgslayoutundostack.h b/src/core/layout/qgslayoutundostack.h index 5f76263c610..14b404e6c87 100644 --- a/src/core/layout/qgslayoutundostack.h +++ b/src/core/layout/qgslayoutundostack.h @@ -18,7 +18,7 @@ #ifndef QGSLAYOUTUNDOSTACK_H #define QGSLAYOUTUNDOSTACK_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgslayoutundocommand.h" #include "qgslayoutitem.h" diff --git a/src/core/layout/qgspagesizeregistry.cpp b/src/core/layout/qgspagesizeregistry.cpp index 745a62e1e69..52c34786cca 100644 --- a/src/core/layout/qgspagesizeregistry.cpp +++ b/src/core/layout/qgspagesizeregistry.cpp @@ -16,6 +16,7 @@ #include "qgspagesizeregistry.h" #include "qgslayoutmeasurementconverter.h" +#include "qgis.h" // // QgsPageSizeRegistry diff --git a/src/core/metadata/qgsabstractmetadatabase.h b/src/core/metadata/qgsabstractmetadatabase.h index 1e3bd7e4b22..05d4baf4526 100644 --- a/src/core/metadata/qgsabstractmetadatabase.h +++ b/src/core/metadata/qgsabstractmetadatabase.h @@ -18,8 +18,11 @@ #ifndef QGSABSTRACTMETADATABASE_H #define QGSABSTRACTMETADATABASE_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" +#include +#include +#include class QDomElement; class QDomDocument; diff --git a/src/core/metadata/qgslayermetadata.h b/src/core/metadata/qgslayermetadata.h index 09e15e85792..2210539ccf8 100644 --- a/src/core/metadata/qgslayermetadata.h +++ b/src/core/metadata/qgslayermetadata.h @@ -18,7 +18,7 @@ #ifndef QGSLAYERMETADATA_H #define QGSLAYERMETADATA_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgscoordinatereferencesystem.h" #include "qgsbox3d.h" diff --git a/src/core/metadata/qgslayermetadataformatter.h b/src/core/metadata/qgslayermetadataformatter.h index 23a651a6411..f17c4bdbe3e 100644 --- a/src/core/metadata/qgslayermetadataformatter.h +++ b/src/core/metadata/qgslayermetadataformatter.h @@ -20,7 +20,7 @@ #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgslayermetadata.h" diff --git a/src/core/metadata/qgslayermetadatavalidator.h b/src/core/metadata/qgslayermetadatavalidator.h index eae210b385a..bb883fd9336 100644 --- a/src/core/metadata/qgslayermetadatavalidator.h +++ b/src/core/metadata/qgslayermetadatavalidator.h @@ -18,8 +18,10 @@ #ifndef QGSLAYERMETADATAVALIDATOR_H #define QGSLAYERMETADATAVALIDATOR_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" +#include +#include class QgsAbstractMetadataBase; class QgsLayerMetadata; diff --git a/src/core/metadata/qgsprojectmetadata.h b/src/core/metadata/qgsprojectmetadata.h index c85cc0744ad..bc4b950b218 100644 --- a/src/core/metadata/qgsprojectmetadata.h +++ b/src/core/metadata/qgsprojectmetadata.h @@ -18,7 +18,7 @@ #ifndef QGSPROJECTMETADATA_H #define QGSPROJECTMETADATA_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgsabstractmetadatabase.h" diff --git a/src/core/processing/qgsprocessing.h b/src/core/processing/qgsprocessing.h index b802329f499..e3a8a6d0b7d 100644 --- a/src/core/processing/qgsprocessing.h +++ b/src/core/processing/qgsprocessing.h @@ -19,7 +19,6 @@ #define QGSPROCESSING_H #include "qgis_core.h" -#include "qgis.h" // // Output definitions diff --git a/src/core/qgsapplication.h b/src/core/qgsapplication.h index 69716f84a3d..75a17fb49ac 100644 --- a/src/core/qgsapplication.h +++ b/src/core/qgsapplication.h @@ -20,7 +20,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsconfig.h" #include "qgstranslationcontext.h" diff --git a/src/core/qgsattributes.cpp b/src/core/qgsattributes.cpp index 29db7e508ef..ff25ddc3cc8 100644 --- a/src/core/qgsattributes.cpp +++ b/src/core/qgsattributes.cpp @@ -15,7 +15,7 @@ ***************************************************************************/ #include "qgsattributes.h" - +#include "qgis.h" QgsAttributeMap QgsAttributes::toMap() const diff --git a/src/core/qgsattributes.h b/src/core/qgsattributes.h index afea91a5b8c..699f647cf34 100644 --- a/src/core/qgsattributes.h +++ b/src/core/qgsattributes.h @@ -19,7 +19,7 @@ #define QGSATTRIBUTES_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/core/qgsattributetableconfig.h b/src/core/qgsattributetableconfig.h index 91eb6191fa0..53172dd39a0 100644 --- a/src/core/qgsattributetableconfig.h +++ b/src/core/qgsattributetableconfig.h @@ -21,7 +21,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" class QgsFields; diff --git a/src/core/qgsclipper.h b/src/core/qgsclipper.h index 1f7f62c4569..1b24fc438ea 100644 --- a/src/core/qgsclipper.h +++ b/src/core/qgsclipper.h @@ -20,7 +20,7 @@ #define QGSCLIPPER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgspointxy.h" #include "qgsrectangle.h" diff --git a/src/core/qgscolorscheme.h b/src/core/qgscolorscheme.h index 3d3c45f664b..ccc23973217 100644 --- a/src/core/qgscolorscheme.h +++ b/src/core/qgscolorscheme.h @@ -24,7 +24,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup core diff --git a/src/core/qgscoordinateformatter.h b/src/core/qgscoordinateformatter.h index 96b0f361261..02f7bba6009 100644 --- a/src/core/qgscoordinateformatter.h +++ b/src/core/qgscoordinateformatter.h @@ -19,7 +19,7 @@ #define QGSCOORDINATEFORMATTER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgspointxy.h" /** diff --git a/src/core/qgscoordinatereferencesystem.h b/src/core/qgscoordinatereferencesystem.h index 4d46c07866d..7ccd4112e20 100644 --- a/src/core/qgscoordinatereferencesystem.h +++ b/src/core/qgscoordinatereferencesystem.h @@ -28,9 +28,10 @@ #include #include #include +#include //qgis includes -#include "qgis.h" +#include "qgis_sip.h" #include "qgsunittypes.h" #include "qgsrectangle.h" #include "qgssqliteutils.h" diff --git a/src/core/qgscoordinatetransformcontext.h b/src/core/qgscoordinatetransformcontext.h index 1232c0badc7..67877d72682 100644 --- a/src/core/qgscoordinatetransformcontext.h +++ b/src/core/qgscoordinatetransformcontext.h @@ -19,7 +19,7 @@ #define QGSCOORDINATETRANSFORMCONTEXT_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdatumtransform.h" #include diff --git a/src/core/qgscredentials.h b/src/core/qgscredentials.h index 1f8d4dd8193..dbbad2d451c 100644 --- a/src/core/qgscredentials.h +++ b/src/core/qgscredentials.h @@ -24,7 +24,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup core diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h index db6f95d1448..208aaa57d18 100644 --- a/src/core/qgsdataitem.h +++ b/src/core/qgsdataitem.h @@ -17,7 +17,7 @@ #ifndef QGSDATAITEM_H #define QGSDATAITEM_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include #include diff --git a/src/core/qgsdataitemprovider.h b/src/core/qgsdataitemprovider.h index 67b5c238441..da6e71a2ce9 100644 --- a/src/core/qgsdataitemprovider.h +++ b/src/core/qgsdataitemprovider.h @@ -17,7 +17,7 @@ #define QGSDATAITEMPROVIDER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdataitem.h" class QgsDataItem; diff --git a/src/core/qgsdataitemproviderregistry.h b/src/core/qgsdataitemproviderregistry.h index 538cdf491c0..8be8b4842d4 100644 --- a/src/core/qgsdataitemproviderregistry.h +++ b/src/core/qgsdataitemproviderregistry.h @@ -17,7 +17,7 @@ #define QGSDATAITEMPROVIDERREGISTRY_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" diff --git a/src/core/qgsdatetimestatisticalsummary.h b/src/core/qgsdatetimestatisticalsummary.h index a517f0516e3..5a8240f0395 100644 --- a/src/core/qgsdatetimestatisticalsummary.h +++ b/src/core/qgsdatetimestatisticalsummary.h @@ -17,7 +17,7 @@ #define QGSDATETIMESTATISTICALSUMMARY_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsinterval.h" #include #include diff --git a/src/core/qgsdbfilterproxymodel.h b/src/core/qgsdbfilterproxymodel.h index e47be2fc4d8..bf46a025d3e 100644 --- a/src/core/qgsdbfilterproxymodel.h +++ b/src/core/qgsdbfilterproxymodel.h @@ -19,7 +19,7 @@ #define QGSDBFILTERPROXYMODEL_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h index ce0604c8e3d..029a923d52d 100644 --- a/src/core/qgsdiagramrenderer.h +++ b/src/core/qgsdiagramrenderer.h @@ -16,7 +16,7 @@ #define QGSDIAGRAMRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgseditformconfig.h b/src/core/qgseditformconfig.h index f74ea62bccf..4a765af48e6 100644 --- a/src/core/qgseditformconfig.h +++ b/src/core/qgseditformconfig.h @@ -19,7 +19,7 @@ #define QGSEDITFORMCONFIG_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgsellipsoidutils.h b/src/core/qgsellipsoidutils.h index f4fe66850cc..7aaa27f7c98 100644 --- a/src/core/qgsellipsoidutils.h +++ b/src/core/qgsellipsoidutils.h @@ -17,7 +17,7 @@ #define QGSELLIPSOIDUTILS_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscoordinatereferencesystem.h" #include diff --git a/src/core/qgsexpressioncontext.h b/src/core/qgsexpressioncontext.h index 30bfbc09361..1f1be8dc446 100644 --- a/src/core/qgsexpressioncontext.h +++ b/src/core/qgsexpressioncontext.h @@ -17,7 +17,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgsfeature.h b/src/core/qgsfeature.h index 20921d7a6f0..a357629f748 100644 --- a/src/core/qgsfeature.h +++ b/src/core/qgsfeature.h @@ -17,7 +17,7 @@ email : sherman at mrcc.com #define QGSFEATURE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/core/qgsfeaturefilterprovider.h b/src/core/qgsfeaturefilterprovider.h index 785cfdfff31..826f55b9f1f 100644 --- a/src/core/qgsfeaturefilterprovider.h +++ b/src/core/qgsfeaturefilterprovider.h @@ -19,7 +19,7 @@ #define QGSFEATUREFILTERPROVIDER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" diff --git a/src/core/qgsfeaturesink.h b/src/core/qgsfeaturesink.h index efb3de79614..28cb0ee8d11 100644 --- a/src/core/qgsfeaturesink.h +++ b/src/core/qgsfeaturesink.h @@ -19,7 +19,7 @@ #define QGSFEATURESINK_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeature.h" #include "qgsfeatureiterator.h" diff --git a/src/core/qgsfeaturesource.h b/src/core/qgsfeaturesource.h index 7d46febd84d..5d889014711 100644 --- a/src/core/qgsfeaturesource.h +++ b/src/core/qgsfeaturesource.h @@ -19,7 +19,7 @@ #define QGSFEATURESOURCE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeaturerequest.h" class QgsFeatureIterator; diff --git a/src/core/qgsfeaturestore.h b/src/core/qgsfeaturestore.h index 1dde6a008c2..47e4c3ef852 100644 --- a/src/core/qgsfeaturestore.h +++ b/src/core/qgsfeaturestore.h @@ -16,7 +16,7 @@ #define QGSFEATURESTORE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeature.h" #include "qgsfields.h" #include "qgsfeaturesink.h" diff --git a/src/core/qgsfeedback.h b/src/core/qgsfeedback.h index 3c049ff0cee..6565c9c5abf 100644 --- a/src/core/qgsfeedback.h +++ b/src/core/qgsfeedback.h @@ -19,7 +19,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup core diff --git a/src/core/qgsfield.h b/src/core/qgsfield.h index b5934134667..7238a749731 100644 --- a/src/core/qgsfield.h +++ b/src/core/qgsfield.h @@ -22,7 +22,7 @@ #include #include "qgsfield_p.h" #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" typedef QList QgsAttributeList SIP_SKIP; diff --git a/src/core/qgsfieldformatterregistry.h b/src/core/qgsfieldformatterregistry.h index 8c922c48791..f89d3f65313 100644 --- a/src/core/qgsfieldformatterregistry.h +++ b/src/core/qgsfieldformatterregistry.h @@ -20,7 +20,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" class QgsFieldFormatter; diff --git a/src/core/qgsfieldmodel.h b/src/core/qgsfieldmodel.h index 8e615a47120..0c1fa59aa0a 100644 --- a/src/core/qgsfieldmodel.h +++ b/src/core/qgsfieldmodel.h @@ -23,7 +23,7 @@ #include "qgsfields.h" #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsVectorLayer; diff --git a/src/core/qgsfieldproxymodel.h b/src/core/qgsfieldproxymodel.h index 26daea815f6..480a6aa9bce 100644 --- a/src/core/qgsfieldproxymodel.h +++ b/src/core/qgsfieldproxymodel.h @@ -20,7 +20,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsFieldModel; diff --git a/src/core/qgsfields.h b/src/core/qgsfields.h index 630410abfd0..2f69c92644e 100644 --- a/src/core/qgsfields.h +++ b/src/core/qgsfields.h @@ -17,7 +17,7 @@ #define QGSFIELDS_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgsfield.h" diff --git a/src/core/qgsfileutils.cpp b/src/core/qgsfileutils.cpp index 350d177c9f9..720c2410bca 100644 --- a/src/core/qgsfileutils.cpp +++ b/src/core/qgsfileutils.cpp @@ -13,6 +13,7 @@ * * ***************************************************************************/ #include "qgsfileutils.h" +#include "qgis.h" #include #include #include diff --git a/src/core/qgsfileutils.h b/src/core/qgsfileutils.h index b4c79244c75..5e29706f21b 100644 --- a/src/core/qgsfileutils.h +++ b/src/core/qgsfileutils.h @@ -18,7 +18,8 @@ #ifndef QGSFILEUTILS_H #define QGSFILEUTILS_H -#include "qgis.h" +#include "qgis_core.h" +#include /** * \ingroup core diff --git a/src/core/qgsfontutils.cpp b/src/core/qgsfontutils.cpp index 1749ee12611..2bc62209ca7 100644 --- a/src/core/qgsfontutils.cpp +++ b/src/core/qgsfontutils.cpp @@ -18,6 +18,7 @@ #include "qgsapplication.h" #include "qgslogger.h" #include "qgssettings.h" +#include "qgis.h" #include #include diff --git a/src/core/qgsgeometryvalidator.h b/src/core/qgsgeometryvalidator.h index b0a7802ac84..217b399475b 100644 --- a/src/core/qgsgeometryvalidator.h +++ b/src/core/qgsgeometryvalidator.h @@ -17,7 +17,7 @@ email : jef at norbit dot de #define QGSGEOMETRYVALIDATOR_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgsgeometry.h" diff --git a/src/core/qgsgml.h b/src/core/qgsgml.h index 7346e41989c..0058bb03862 100644 --- a/src/core/qgsgml.h +++ b/src/core/qgsgml.h @@ -17,7 +17,7 @@ #include "qgis_core.h" #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfields.h" #include "qgsrectangle.h" #include "qgswkbptr.h" diff --git a/src/core/qgsgmlschema.h b/src/core/qgsgmlschema.h index a034a1348a7..6170dbe32fd 100644 --- a/src/core/qgsgmlschema.h +++ b/src/core/qgsgmlschema.h @@ -17,7 +17,7 @@ #include "qgis_core.h" #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgserror.h" #include "qgsfields.h" #include diff --git a/src/core/qgshtmlutils.cpp b/src/core/qgshtmlutils.cpp index b38b5873fc1..20e274f6f8a 100644 --- a/src/core/qgshtmlutils.cpp +++ b/src/core/qgshtmlutils.cpp @@ -13,6 +13,7 @@ * * ***************************************************************************/ #include "qgshtmlutils.h" +#include QString QgsHtmlUtils::buildBulletList( const QStringList &values ) { diff --git a/src/core/qgshtmlutils.h b/src/core/qgshtmlutils.h index 57c4951108f..fdfaa6db186 100644 --- a/src/core/qgshtmlutils.h +++ b/src/core/qgshtmlutils.h @@ -18,7 +18,9 @@ #ifndef QGSHTMLUTILS_H #define QGSHTMLUTILS_H -#include "qgis.h" +#include "qgis_core.h" +#include "qgis_sip.h" +#include /** * \ingroup core diff --git a/src/core/qgsimagecache.h b/src/core/qgsimagecache.h index 0406690f29c..254880fa03e 100644 --- a/src/core/qgsimagecache.h +++ b/src/core/qgsimagecache.h @@ -19,7 +19,7 @@ #define QGSIMAGECACHE_H #include "qgsabstractcontentcache.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include diff --git a/src/core/qgsinterval.h b/src/core/qgsinterval.h index f21c79d3520..09baf5b1268 100644 --- a/src/core/qgsinterval.h +++ b/src/core/qgsinterval.h @@ -24,7 +24,7 @@ #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" class QString; diff --git a/src/core/qgslayerdefinition.h b/src/core/qgslayerdefinition.h index 2269739931d..a3edcef85c2 100644 --- a/src/core/qgslayerdefinition.h +++ b/src/core/qgslayerdefinition.h @@ -17,7 +17,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/core/qgslegendstyle.cpp b/src/core/qgslegendstyle.cpp index 1ac7c7f5b14..d0b44abdc58 100644 --- a/src/core/qgslegendstyle.cpp +++ b/src/core/qgslegendstyle.cpp @@ -18,6 +18,7 @@ #include "qgslegendstyle.h" #include "qgsfontutils.h" #include "qgssettings.h" +#include "qgis.h" #include #include diff --git a/src/core/qgslegendstyle.h b/src/core/qgslegendstyle.h index d3d02366049..853f8265043 100644 --- a/src/core/qgslegendstyle.h +++ b/src/core/qgslegendstyle.h @@ -25,7 +25,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup core diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h index 00f53ef5ed7..9d2ec9834df 100644 --- a/src/core/qgsmaplayer.h +++ b/src/core/qgsmaplayer.h @@ -28,7 +28,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgserror.h" #include "qgsobjectcustomproperties.h" #include "qgsrectangle.h" diff --git a/src/core/qgsmaplayerlegend.h b/src/core/qgsmaplayerlegend.h index 217e6fd12be..e3baf01bf88 100644 --- a/src/core/qgsmaplayerlegend.h +++ b/src/core/qgsmaplayerlegend.h @@ -17,7 +17,7 @@ #define QGSMAPLAYERLEGEND_H #include -#include "qgis.h" +#include "qgis_sip.h" class QDomDocument; class QDomElement; diff --git a/src/core/qgsmaplayermodel.h b/src/core/qgsmaplayermodel.h index 5dbbe7e7efe..8a3e8644a5b 100644 --- a/src/core/qgsmaplayermodel.h +++ b/src/core/qgsmaplayermodel.h @@ -21,7 +21,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsMapLayer; diff --git a/src/core/qgsmaplayerproxymodel.h b/src/core/qgsmaplayerproxymodel.h index b57163e9575..90a63b33aa3 100644 --- a/src/core/qgsmaplayerproxymodel.h +++ b/src/core/qgsmaplayerproxymodel.h @@ -20,7 +20,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsMapLayerModel; class QgsMapLayer; diff --git a/src/core/qgsmaplayerstore.h b/src/core/qgsmaplayerstore.h index 46b2e932831..50eb11e2a54 100644 --- a/src/core/qgsmaplayerstore.h +++ b/src/core/qgsmaplayerstore.h @@ -20,7 +20,7 @@ #define QGSMAPLAYERSTORE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmaplayer.h" #include diff --git a/src/core/qgsmaprendererjob.h b/src/core/qgsmaprendererjob.h index 9f59681b8fa..4a9d2b9fee4 100644 --- a/src/core/qgsmaprendererjob.h +++ b/src/core/qgsmaprendererjob.h @@ -18,7 +18,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgsmaprenderertask.h b/src/core/qgsmaprenderertask.h index 74a78e95ab8..3839b6d3018 100644 --- a/src/core/qgsmaprenderertask.h +++ b/src/core/qgsmaprenderertask.h @@ -18,7 +18,7 @@ #ifndef QGSMAPRENDERERTASK_H #define QGSMAPRENDERERTASK_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgsannotation.h" #include "qgsannotationmanager.h" diff --git a/src/core/qgsmaptopixel.h b/src/core/qgsmaptopixel.h index 5145761bb51..d7410a8cd3a 100644 --- a/src/core/qgsmaptopixel.h +++ b/src/core/qgsmaptopixel.h @@ -23,6 +23,7 @@ #include #include "qgsunittypes.h" #include +#include class QgsPointXY; class QPoint; diff --git a/src/core/qgsmaptopixelgeometrysimplifier.h b/src/core/qgsmaptopixelgeometrysimplifier.h index 1c5a5916dfe..ba0c0f56581 100644 --- a/src/core/qgsmaptopixelgeometrysimplifier.h +++ b/src/core/qgsmaptopixelgeometrysimplifier.h @@ -18,9 +18,10 @@ #define QGSMAPTOPIXELGEOMETRYSIMPLIFIER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometrysimplifier.h" #include +#include class QgsAbstractGeometry; class QgsWkbPtr; diff --git a/src/core/qgsnetworkaccessmanager.h b/src/core/qgsnetworkaccessmanager.h index 9b751b291a8..a3139cc1ade 100644 --- a/src/core/qgsnetworkaccessmanager.h +++ b/src/core/qgsnetworkaccessmanager.h @@ -19,8 +19,8 @@ #define QGSNETWORKACCESSMANAGER_H #include -#include "qgis.h" #include "qgsnetworkreply.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgsogcutils.h b/src/core/qgsogcutils.h index 780666150ce..94a6d9760fa 100644 --- a/src/core/qgsogcutils.h +++ b/src/core/qgsogcutils.h @@ -23,7 +23,6 @@ class QString; #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include #include diff --git a/src/core/qgsopenclutils.cpp b/src/core/qgsopenclutils.cpp index a9e850237d6..bc070a1ac51 100644 --- a/src/core/qgsopenclutils.cpp +++ b/src/core/qgsopenclutils.cpp @@ -18,7 +18,6 @@ #include "qgsmessagelog.h" #include "qgslogger.h" - #include #include #include diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h index db3b93314e4..255674fa895 100644 --- a/src/core/qgspallabeling.h +++ b/src/core/qgspallabeling.h @@ -23,7 +23,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgspluginlayerregistry.h b/src/core/qgspluginlayerregistry.h index 50d63ebe5bb..625758cdb84 100644 --- a/src/core/qgspluginlayerregistry.h +++ b/src/core/qgspluginlayerregistry.h @@ -20,7 +20,7 @@ #define QGSPLUGINLAYERREGSITRY_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_core.h" diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h index b8692f77dd8..a9fb1ca6ae1 100644 --- a/src/core/qgsproject.h +++ b/src/core/qgsproject.h @@ -23,7 +23,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgsprojecttranslator.h b/src/core/qgsprojecttranslator.h index 7e479c240ee..6d744283341 100644 --- a/src/core/qgsprojecttranslator.h +++ b/src/core/qgsprojecttranslator.h @@ -18,7 +18,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include /** diff --git a/src/core/qgsproperty.h b/src/core/qgsproperty.h index 30b41eb46d4..6d1fedbcc33 100644 --- a/src/core/qgsproperty.h +++ b/src/core/qgsproperty.h @@ -16,7 +16,7 @@ #define QGSPROPERTY_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsproperty_p.h" #include "qgsexpression.h" #include "qgsexpressioncontext.h" diff --git a/src/core/qgspropertycollection.h b/src/core/qgspropertycollection.h index 46b1d7911d4..5d05870b7f4 100644 --- a/src/core/qgspropertycollection.h +++ b/src/core/qgspropertycollection.h @@ -16,7 +16,7 @@ #define QGSPROPERTYCOLLECTION_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgsprovidermetadata.h b/src/core/qgsprovidermetadata.h index d455469e641..cb84ebf3e15 100644 --- a/src/core/qgsprovidermetadata.h +++ b/src/core/qgsprovidermetadata.h @@ -21,7 +21,7 @@ #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdataprovider.h" #include "qgis_core.h" #include diff --git a/src/core/qgspythonrunner.h b/src/core/qgspythonrunner.h index 2e71fb82ee3..e17a75446cc 100644 --- a/src/core/qgspythonrunner.h +++ b/src/core/qgspythonrunner.h @@ -16,7 +16,7 @@ #define QGSPYTHONRUNNER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" diff --git a/src/core/qgsrange.h b/src/core/qgsrange.h index 5bbfda0e196..6818f3cdd91 100644 --- a/src/core/qgsrange.h +++ b/src/core/qgsrange.h @@ -18,7 +18,6 @@ #ifndef QGSRANGE_H #define QGSRANGE_H -#include "qgis.h" #include "qgis_sip.h" #include "qgis_core.h" diff --git a/src/core/qgsrelation.h b/src/core/qgsrelation.h index 9c5b1c26346..66f01396d2c 100644 --- a/src/core/qgsrelation.h +++ b/src/core/qgsrelation.h @@ -24,7 +24,7 @@ #include "qgsfields.h" #include "qgsreadwritecontext.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsFeatureIterator; class QgsFeature; diff --git a/src/core/qgsrenderchecker.h b/src/core/qgsrenderchecker.h index 9d167945bb5..08aeff64464 100644 --- a/src/core/qgsrenderchecker.h +++ b/src/core/qgsrenderchecker.h @@ -17,7 +17,7 @@ #define QGSRENDERCHECKER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgsscalecalculator.h b/src/core/qgsscalecalculator.h index 4939b6fc6a5..3fb5fef98f2 100644 --- a/src/core/qgsscalecalculator.h +++ b/src/core/qgsscalecalculator.h @@ -20,7 +20,7 @@ #define QGSSCALECALCULATOR_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsunittypes.h" class QString; diff --git a/src/core/qgssettings.h b/src/core/qgssettings.h index 25c57e8aad3..982008a3804 100644 --- a/src/core/qgssettings.h +++ b/src/core/qgssettings.h @@ -21,7 +21,7 @@ #include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgslogger.h" /** diff --git a/src/core/qgssnappingutils.h b/src/core/qgssnappingutils.h index f32786b01ed..54a881bd426 100644 --- a/src/core/qgssnappingutils.h +++ b/src/core/qgssnappingutils.h @@ -18,7 +18,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmapsettings.h" #include "qgstolerance.h" #include "qgspointlocator.h" diff --git a/src/core/qgsspatialindex.h b/src/core/qgsspatialindex.h index b9839ee47a8..e51e5c40dc3 100644 --- a/src/core/qgsspatialindex.h +++ b/src/core/qgsspatialindex.h @@ -39,7 +39,6 @@ class QgsRectangle; class QgsPointXY; #include "qgis_core.h" -#include "qgis_sip.h" #include "qgsfeaturesink.h" #include #include diff --git a/src/core/qgssqlstatement.h b/src/core/qgssqlstatement.h index b8fd0f99628..879111e474a 100644 --- a/src/core/qgssqlstatement.h +++ b/src/core/qgssqlstatement.h @@ -19,7 +19,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgstaskmanager.h b/src/core/qgstaskmanager.h index 2243d05d21f..d9a5b85fb08 100644 --- a/src/core/qgstaskmanager.h +++ b/src/core/qgstaskmanager.h @@ -20,7 +20,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/core/qgstessellator.h b/src/core/qgstessellator.h index aa8dafb3dc4..7314d50ec0a 100644 --- a/src/core/qgstessellator.h +++ b/src/core/qgstessellator.h @@ -17,7 +17,7 @@ #define QGSTESSELLATOR_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsPolygon; class QgsMultiPolygon; diff --git a/src/core/qgstestutils.h b/src/core/qgstestutils.h index 0d3924d487d..0d4c4eeb169 100644 --- a/src/core/qgstestutils.h +++ b/src/core/qgstestutils.h @@ -17,7 +17,7 @@ #define QGSTESTUTILS_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeaturerequest.h" class QgsVectorDataProvider; diff --git a/src/core/qgstextrenderer.h b/src/core/qgstextrenderer.h index 320a205a4cb..3ac7c6c1ad6 100644 --- a/src/core/qgstextrenderer.h +++ b/src/core/qgstextrenderer.h @@ -17,7 +17,7 @@ #ifndef QGSTEXTRENDERER_H #define QGSTEXTRENDERER_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgsmapunitscale.h" #include "qgsunittypes.h" diff --git a/src/core/qgstransaction.h b/src/core/qgstransaction.h index 96a9c7a4dac..c9df3f191af 100644 --- a/src/core/qgstransaction.h +++ b/src/core/qgstransaction.h @@ -19,7 +19,7 @@ #define QGSTRANSACTION_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/qgstranslationcontext.h b/src/core/qgstranslationcontext.h index 5125d56abb7..9febed40080 100644 --- a/src/core/qgstranslationcontext.h +++ b/src/core/qgstranslationcontext.h @@ -18,7 +18,9 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" +#include +#include + class QgsProject; diff --git a/src/core/qgsunittypes.h b/src/core/qgsunittypes.h index 4c13c55c57b..ae731e2b99d 100644 --- a/src/core/qgsunittypes.h +++ b/src/core/qgsunittypes.h @@ -19,7 +19,8 @@ #define QGSUNITTYPES_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" +#include /*************************************************************************** * This class is considered CRITICAL and any change MUST be accompanied with diff --git a/src/core/qgsuserprofilemanager.h b/src/core/qgsuserprofilemanager.h index 127f1da1dce..09508a642df 100644 --- a/src/core/qgsuserprofilemanager.h +++ b/src/core/qgsuserprofilemanager.h @@ -19,7 +19,7 @@ #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_core.h" #include "qgserror.h" #include "qgsuserprofile.h" diff --git a/src/core/qgsvectordataprovider.h b/src/core/qgsvectordataprovider.h index b3b13547370..b9ff690ba7d 100644 --- a/src/core/qgsvectordataprovider.h +++ b/src/core/qgsvectordataprovider.h @@ -24,7 +24,7 @@ class QTextCodec; #include //QGIS Includes -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdataprovider.h" #include "qgsfeature.h" #include "qgsaggregatecalculator.h" diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h index 523a9577dde..78ecb374717 100644 --- a/src/core/qgsvectorlayer.h +++ b/src/core/qgsvectorlayer.h @@ -27,7 +27,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmaplayer.h" #include "qgsfeature.h" #include "qgsfeaturerequest.h" diff --git a/src/core/qgsvectorlayercache.h b/src/core/qgsvectorlayercache.h index 3aa3505e1c2..3c0cff51f9b 100644 --- a/src/core/qgsvectorlayercache.h +++ b/src/core/qgsvectorlayercache.h @@ -21,7 +21,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgsfield.h" #include "qgsfeaturerequest.h" #include "qgsfeatureiterator.h" diff --git a/src/core/qgsvectorlayereditutils.h b/src/core/qgsvectorlayereditutils.h index 37d72df912f..6b8d93e57a3 100644 --- a/src/core/qgsvectorlayereditutils.h +++ b/src/core/qgsvectorlayereditutils.h @@ -17,7 +17,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometry.h" #include "qgsfeatureid.h" #include "qgsvectorlayer.h" diff --git a/src/core/qgsvectorlayerexporter.h b/src/core/qgsvectorlayerexporter.h index 3735203f4fd..656efff6a13 100644 --- a/src/core/qgsvectorlayerexporter.h +++ b/src/core/qgsvectorlayerexporter.h @@ -19,7 +19,7 @@ #define QGSVECTORLAYEREXPORTER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeature.h" #include "qgsfeaturesink.h" #include "qgstaskmanager.h" diff --git a/src/core/qgsvectorlayerjoinbuffer.h b/src/core/qgsvectorlayerjoinbuffer.h index cd69f1725b3..42d18ff42ae 100644 --- a/src/core/qgsvectorlayerjoinbuffer.h +++ b/src/core/qgsvectorlayerjoinbuffer.h @@ -19,7 +19,7 @@ #define QGSVECTORLAYERJOINBUFFER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsvectorlayerjoininfo.h" #include "qgsfeaturesink.h" diff --git a/src/core/qgsvectorlayerrenderer.h b/src/core/qgsvectorlayerrenderer.h index f9bb4e86fac..fa877fd6889 100644 --- a/src/core/qgsvectorlayerrenderer.h +++ b/src/core/qgsvectorlayerrenderer.h @@ -34,7 +34,7 @@ class QgsSingleSymbolRenderer; typedef QList QgsAttributeList; -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfields.h" // QgsFields #include "qgsfeatureiterator.h" #include "qgsvectorsimplifymethod.h" diff --git a/src/core/qgsvectorlayertools.h b/src/core/qgsvectorlayertools.h index 77acaf0ea49..3a26520aeb0 100644 --- a/src/core/qgsvectorlayertools.h +++ b/src/core/qgsvectorlayertools.h @@ -17,7 +17,7 @@ #define QGSVECTORLAYERTOOLS_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgsfeature.h" diff --git a/src/core/qgsvectorlayerundocommand.h b/src/core/qgsvectorlayerundocommand.h index 04ca3f778a1..5e673f02e14 100644 --- a/src/core/qgsvectorlayerundocommand.h +++ b/src/core/qgsvectorlayerundocommand.h @@ -17,7 +17,7 @@ #define QGSVECTORLAYERUNDOCOMMAND_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/core/qgsxmlutils.h b/src/core/qgsxmlutils.h index f50c9c06031..6c19a3ab3dc 100644 --- a/src/core/qgsxmlutils.h +++ b/src/core/qgsxmlutils.h @@ -20,9 +20,10 @@ class QDomDocument; class QgsRectangle; #include +#include #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsunittypes.h" diff --git a/src/core/qgsziputils.h b/src/core/qgsziputils.h index 73e68995555..8cea9b616c9 100644 --- a/src/core/qgsziputils.h +++ b/src/core/qgsziputils.h @@ -17,7 +17,7 @@ #define QGSZIPUTILS_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #ifdef SIP_RUN diff --git a/src/core/raster/qgsbrightnesscontrastfilter.h b/src/core/raster/qgsbrightnesscontrastfilter.h index 367f8dc88b1..8340e1721b5 100644 --- a/src/core/raster/qgsbrightnesscontrastfilter.h +++ b/src/core/raster/qgsbrightnesscontrastfilter.h @@ -19,7 +19,7 @@ #define QGSBRIGHTNESSCONTRASTFILTER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterinterface.h" class QDomElement; diff --git a/src/core/raster/qgscolorrampshader.h b/src/core/raster/qgscolorrampshader.h index 72dfd5f1473..7f1646b58bb 100644 --- a/src/core/raster/qgscolorrampshader.h +++ b/src/core/raster/qgscolorrampshader.h @@ -22,7 +22,7 @@ originally part of the larger QgsRasterLayer class #define QGSCOLORRAMPSHADER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/raster/qgscontrastenhancement.h b/src/core/raster/qgscontrastenhancement.h index 818d5d43098..8bed76f9078 100644 --- a/src/core/raster/qgscontrastenhancement.h +++ b/src/core/raster/qgscontrastenhancement.h @@ -24,7 +24,7 @@ class originally created circa 2004 by T.Sutton, Gary E.Sherman, Steve Halasz #include "qgis_core.h" #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsraster.h" #include diff --git a/src/core/raster/qgscubicrasterresampler.cpp b/src/core/raster/qgscubicrasterresampler.cpp index 086418aa236..e8fffa5f04f 100644 --- a/src/core/raster/qgscubicrasterresampler.cpp +++ b/src/core/raster/qgscubicrasterresampler.cpp @@ -17,6 +17,7 @@ #include "qgscubicrasterresampler.h" #include +#include QgsCubicRasterResampler *QgsCubicRasterResampler::clone() const { diff --git a/src/core/raster/qgshillshaderenderer.h b/src/core/raster/qgshillshaderenderer.h index d5b3e574c18..63ba73737b4 100644 --- a/src/core/raster/qgshillshaderenderer.h +++ b/src/core/raster/qgshillshaderenderer.h @@ -20,7 +20,7 @@ #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterrenderer.h" class QgsRasterBlock; diff --git a/src/core/raster/qgshuesaturationfilter.h b/src/core/raster/qgshuesaturationfilter.h index 284ab423431..12086c5889d 100644 --- a/src/core/raster/qgshuesaturationfilter.h +++ b/src/core/raster/qgshuesaturationfilter.h @@ -19,7 +19,7 @@ #define QGSHUESATURATIONFILTER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterinterface.h" class QDomElement; diff --git a/src/core/raster/qgsmultibandcolorrenderer.h b/src/core/raster/qgsmultibandcolorrenderer.h index a9394261885..c4a0e6b687b 100644 --- a/src/core/raster/qgsmultibandcolorrenderer.h +++ b/src/core/raster/qgsmultibandcolorrenderer.h @@ -19,7 +19,7 @@ #define QGSMULTIBANDCOLORRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterrenderer.h" class QgsContrastEnhancement; diff --git a/src/core/raster/qgspalettedrasterrenderer.h b/src/core/raster/qgspalettedrasterrenderer.h index 0eb652a5b2e..f2ce3537833 100644 --- a/src/core/raster/qgspalettedrasterrenderer.h +++ b/src/core/raster/qgspalettedrasterrenderer.h @@ -19,7 +19,7 @@ #define QGSPALETTEDRASTERRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgsrasterrenderer.h" diff --git a/src/core/raster/qgsrasteridentifyresult.h b/src/core/raster/qgsrasteridentifyresult.h index 57af057a914..3fc79b78a12 100644 --- a/src/core/raster/qgsrasteridentifyresult.h +++ b/src/core/raster/qgsrasteridentifyresult.h @@ -19,7 +19,7 @@ #define QGSRASTERIDENTIFYRESULT_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsraster.h" #include "qgserror.h" diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h index c54c77a0179..d7036716fcb 100644 --- a/src/core/raster/qgsrasterinterface.h +++ b/src/core/raster/qgsrasterinterface.h @@ -19,7 +19,6 @@ #define QGSRASTERINTERFACE_H #include "qgis_core.h" -#include "qgis.h" #include "qgis_sip.h" #include diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h index 3dc448d83fe..5ff6ad40da4 100644 --- a/src/core/raster/qgsrasterlayer.h +++ b/src/core/raster/qgsrasterlayer.h @@ -30,7 +30,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmaplayer.h" #include "qgsraster.h" #include "qgsrasterdataprovider.h" diff --git a/src/core/raster/qgsrasterminmaxorigin.cpp b/src/core/raster/qgsrasterminmaxorigin.cpp index 2756aa5523c..69ec076cef3 100644 --- a/src/core/raster/qgsrasterminmaxorigin.cpp +++ b/src/core/raster/qgsrasterminmaxorigin.cpp @@ -20,6 +20,7 @@ #include #include +#include QgsRasterMinMaxOrigin::QgsRasterMinMaxOrigin() : mCumulativeCutLower( CUMULATIVE_CUT_LOWER ) diff --git a/src/core/raster/qgsrasterminmaxorigin.h b/src/core/raster/qgsrasterminmaxorigin.h index 9b9aed24754..2a5ec9394e8 100644 --- a/src/core/raster/qgsrasterminmaxorigin.h +++ b/src/core/raster/qgsrasterminmaxorigin.h @@ -19,7 +19,7 @@ #define QGSRASTERMINMAXORIGIN_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_core.h" diff --git a/src/core/raster/qgsrasterpipe.h b/src/core/raster/qgsrasterpipe.h index b8a2894f2c7..974edf4b595 100644 --- a/src/core/raster/qgsrasterpipe.h +++ b/src/core/raster/qgsrasterpipe.h @@ -19,7 +19,7 @@ #define QGSRASTERPIPE_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/core/raster/qgsrasterresamplefilter.h b/src/core/raster/qgsrasterresamplefilter.h index 0adf3c2f6e2..772c20758f1 100644 --- a/src/core/raster/qgsrasterresamplefilter.h +++ b/src/core/raster/qgsrasterresamplefilter.h @@ -19,7 +19,7 @@ #define QGSRASTERRESAMPLEFILTER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterinterface.h" #include "qgsrasterresampler.h" diff --git a/src/core/raster/qgsrasterresampler.h b/src/core/raster/qgsrasterresampler.h index 21ea38ec543..1b40c0516a6 100644 --- a/src/core/raster/qgsrasterresampler.h +++ b/src/core/raster/qgsrasterresampler.h @@ -19,8 +19,10 @@ #define QGSRASTERRESAMPLER_H #include -#include "qgis.h" +#include "qgis_core.h" +#include "qgis_sip.h" +class QString; class QImage; /** diff --git a/src/core/raster/qgssinglebandgrayrenderer.h b/src/core/raster/qgssinglebandgrayrenderer.h index 4890d89b280..08aaaca3d7b 100644 --- a/src/core/raster/qgssinglebandgrayrenderer.h +++ b/src/core/raster/qgssinglebandgrayrenderer.h @@ -19,7 +19,7 @@ #define QGSSINGLEBANDGRAYRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrasterrenderer.h" #include diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.h b/src/core/raster/qgssinglebandpseudocolorrenderer.h index 83b1d69a096..5198561fa8a 100644 --- a/src/core/raster/qgssinglebandpseudocolorrenderer.h +++ b/src/core/raster/qgssinglebandpseudocolorrenderer.h @@ -19,7 +19,7 @@ #define QGSSINGLEBANDPSEUDOCOLORRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgscolorramp.h" #include "qgscolorrampshader.h" #include "qgsrasterrenderer.h" diff --git a/src/core/symbology/qgsheatmaprenderer.h b/src/core/symbology/qgsheatmaprenderer.h index 85dae35d1e6..80020e6c5ac 100644 --- a/src/core/symbology/qgsheatmaprenderer.h +++ b/src/core/symbology/qgsheatmaprenderer.h @@ -16,7 +16,7 @@ #define QGSHEATMAPRENDERER_H #include "qgis_core.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrenderer.h" #include "qgssymbol.h" #include "qgsexpression.h" diff --git a/src/core/symbology/qgsmarkersymbollayer.h b/src/core/symbology/qgsmarkersymbollayer.h index bf5621e6899..5c3fc066707 100644 --- a/src/core/symbology/qgsmarkersymbollayer.h +++ b/src/core/symbology/qgsmarkersymbollayer.h @@ -18,7 +18,6 @@ #include "qgis_core.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgssymbollayer.h" #define DEFAULT_SIMPLEMARKER_NAME "circle" diff --git a/src/core/symbology/qgssvgcache.h b/src/core/symbology/qgssvgcache.h index 3c4ffa940c3..1c716dbfe4f 100644 --- a/src/core/symbology/qgssvgcache.h +++ b/src/core/symbology/qgssvgcache.h @@ -20,7 +20,6 @@ #include "qgsabstractcontentcache.h" #include "qgis.h" -#include "qgis_core.h" #include diff --git a/src/core/symbology/qgssymbollayer.h b/src/core/symbology/qgssymbollayer.h index 619961249fe..686666e249a 100644 --- a/src/core/symbology/qgssymbollayer.h +++ b/src/core/symbology/qgssymbollayer.h @@ -19,7 +19,7 @@ #define DEFAULT_SCALE_METHOD QgsSymbol::ScaleDiameter #include "qgis_core.h" -#include "qgis.h" +// #include "qgis.h" #include #include #include diff --git a/src/gui/attributetable/qgsattributetablefiltermodel.h b/src/gui/attributetable/qgsattributetablefiltermodel.h index b5c541b91a3..c42e2f9bb9e 100644 --- a/src/gui/attributetable/qgsattributetablefiltermodel.h +++ b/src/gui/attributetable/qgsattributetablefiltermodel.h @@ -18,7 +18,6 @@ #define QGSATTRIBUTETABLEFILTERMODEL_H #include -#include "qgis.h" #include #include "qgsattributetablemodel.h" diff --git a/src/gui/attributetable/qgsattributetableview.h b/src/gui/attributetable/qgsattributetableview.h index c2cc570dbde..c3d07f88e00 100644 --- a/src/gui/attributetable/qgsattributetableview.h +++ b/src/gui/attributetable/qgsattributetableview.h @@ -17,7 +17,6 @@ #define QGSATTRIBUTETABLEVIEW_H #include -#include "qgis.h" #include #include "qgsfeatureid.h" diff --git a/src/gui/attributetable/qgsdualview.h b/src/gui/attributetable/qgsdualview.h index b4a204e3731..848cc0ed98d 100644 --- a/src/gui/attributetable/qgsdualview.h +++ b/src/gui/attributetable/qgsdualview.h @@ -17,7 +17,6 @@ #define QGSDUALVIEW_H #include -#include "qgis.h" #include "ui_qgsdualviewbase.h" diff --git a/src/gui/attributetable/qgsfeaturelistmodel.h b/src/gui/attributetable/qgsfeaturelistmodel.h index 8472f93a2e9..bd744e4a4d1 100644 --- a/src/gui/attributetable/qgsfeaturelistmodel.h +++ b/src/gui/attributetable/qgsfeaturelistmodel.h @@ -16,7 +16,6 @@ #define QGSATTRIBUTEEDITORMODEL_H #include "qgsexpression.h" -#include "qgis.h" #include #include diff --git a/src/gui/attributetable/qgsfeaturelistview.h b/src/gui/attributetable/qgsfeaturelistview.h index 8828ab08bb6..138645fb0ab 100644 --- a/src/gui/attributetable/qgsfeaturelistview.h +++ b/src/gui/attributetable/qgsfeaturelistview.h @@ -18,7 +18,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include #include "qgsactionmenu.h" diff --git a/src/gui/attributetable/qgsfeatureselectionmodel.h b/src/gui/attributetable/qgsfeatureselectionmodel.h index 3bb1f09f4ef..4d4e89290bd 100644 --- a/src/gui/attributetable/qgsfeatureselectionmodel.h +++ b/src/gui/attributetable/qgsfeatureselectionmodel.h @@ -16,7 +16,6 @@ #define QGSFEATURESELECTIONMODEL_H #include -#include "qgis.h" #include "qgsfeatureid.h" #include "qgis_gui.h" diff --git a/src/gui/attributetable/qgsfieldconditionalformatwidget.h b/src/gui/attributetable/qgsfieldconditionalformatwidget.h index 7376c2a8dba..cc6e46c55a6 100644 --- a/src/gui/attributetable/qgsfieldconditionalformatwidget.h +++ b/src/gui/attributetable/qgsfieldconditionalformatwidget.h @@ -16,7 +16,6 @@ #define QGSFIELDCONDITIONALFORMATWIDGET_H #include -#include "qgis.h" #include #include @@ -37,7 +36,6 @@ class GUI_EXPORT QgsFieldConditionalFormatWidget : public QWidget, private Ui::Q /** * Constructor for QgsFieldConditionalFormatWidget. - * \param parent parent widget */ explicit QgsFieldConditionalFormatWidget( QWidget *parent SIP_TRANSFERTHIS = nullptr ); diff --git a/src/gui/auth/qgsauthauthoritieseditor.h b/src/gui/auth/qgsauthauthoritieseditor.h index 1cc28a00563..2de44aaf42f 100644 --- a/src/gui/auth/qgsauthauthoritieseditor.h +++ b/src/gui/auth/qgsauthauthoritieseditor.h @@ -18,7 +18,7 @@ #define QGSAUTHAUTHORITIESEDITOR_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "ui_qgsauthauthoritieseditor.h" diff --git a/src/gui/auth/qgsauthcertificateinfo.h b/src/gui/auth/qgsauthcertificateinfo.h index 4edda399dbb..64d9a2781f2 100644 --- a/src/gui/auth/qgsauthcertificateinfo.h +++ b/src/gui/auth/qgsauthcertificateinfo.h @@ -19,7 +19,7 @@ #define QGSAUTHCERTIFICATEINFO_H #include -#include "qgis.h" +#include "qgis_sip.h" #ifndef QT_NO_SSL #include diff --git a/src/gui/auth/qgsauthcertificatemanager.h b/src/gui/auth/qgsauthcertificatemanager.h index 640c60947d6..556607868be 100644 --- a/src/gui/auth/qgsauthcertificatemanager.h +++ b/src/gui/auth/qgsauthcertificatemanager.h @@ -18,7 +18,7 @@ #define QGSAUTHCERTIFICATEMANAGER_H #include "ui_qgsauthcertificatemanager.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/auth/qgsauthcerttrustpolicycombobox.h b/src/gui/auth/qgsauthcerttrustpolicycombobox.h index ce6fbe2fe9a..3f9655c0edf 100644 --- a/src/gui/auth/qgsauthcerttrustpolicycombobox.h +++ b/src/gui/auth/qgsauthcerttrustpolicycombobox.h @@ -18,7 +18,7 @@ #define QGSAUTHCERTTRUSTPOLICYCOMBOBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsauthcertutils.h" #include "qgis_gui.h" diff --git a/src/gui/auth/qgsauthconfigeditor.h b/src/gui/auth/qgsauthconfigeditor.h index 1e5019c41f5..674fd9d80c8 100644 --- a/src/gui/auth/qgsauthconfigeditor.h +++ b/src/gui/auth/qgsauthconfigeditor.h @@ -18,7 +18,7 @@ #define QGSAUTHCONFIGEDITOR_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "ui_qgsauthconfigeditor.h" diff --git a/src/gui/auth/qgsauthconfigselect.h b/src/gui/auth/qgsauthconfigselect.h index c973a5b5b20..c4af783e240 100644 --- a/src/gui/auth/qgsauthconfigselect.h +++ b/src/gui/auth/qgsauthconfigselect.h @@ -19,7 +19,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsauthconfigselect.h" #include "qgsauthconfig.h" diff --git a/src/gui/auth/qgsautheditorwidgets.h b/src/gui/auth/qgsautheditorwidgets.h index ff3763a5608..efe2857c07f 100644 --- a/src/gui/auth/qgsautheditorwidgets.h +++ b/src/gui/auth/qgsautheditorwidgets.h @@ -18,7 +18,7 @@ #define QGSAUTHEDITORWIDGETS_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsautheditorwidgets.h" #include "ui_qgsauthmethodplugins.h" #include "qgis_gui.h" diff --git a/src/gui/auth/qgsauthidentitieseditor.h b/src/gui/auth/qgsauthidentitieseditor.h index 11838e5275e..87617e36296 100644 --- a/src/gui/auth/qgsauthidentitieseditor.h +++ b/src/gui/auth/qgsauthidentitieseditor.h @@ -18,7 +18,7 @@ #define QGSAUTHIDENTITIESEDITOR_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "ui_qgsauthidentitieseditor.h" diff --git a/src/gui/auth/qgsauthimportcertdialog.h b/src/gui/auth/qgsauthimportcertdialog.h index 2afda8428de..95b90c3bc21 100644 --- a/src/gui/auth/qgsauthimportcertdialog.h +++ b/src/gui/auth/qgsauthimportcertdialog.h @@ -18,7 +18,7 @@ #define QGSAUTHIMPORTCERTDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsauthimportcertdialog.h" #include diff --git a/src/gui/auth/qgsauthimportidentitydialog.h b/src/gui/auth/qgsauthimportidentitydialog.h index 7943cefd07b..ef7b5ebb669 100644 --- a/src/gui/auth/qgsauthimportidentitydialog.h +++ b/src/gui/auth/qgsauthimportidentitydialog.h @@ -19,7 +19,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include "ui_qgsauthimportidentitydialog.h" #include diff --git a/src/gui/auth/qgsauthserverseditor.h b/src/gui/auth/qgsauthserverseditor.h index b8b6bc3df66..0e36b076be7 100644 --- a/src/gui/auth/qgsauthserverseditor.h +++ b/src/gui/auth/qgsauthserverseditor.h @@ -18,7 +18,7 @@ #define QGSAUTHSERVERSEDITOR_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsauthserverseditor.h" #include "qgsauthmanager.h" diff --git a/src/gui/auth/qgsauthsettingswidget.h b/src/gui/auth/qgsauthsettingswidget.h index 6093da4cd08..89f74af16de 100644 --- a/src/gui/auth/qgsauthsettingswidget.h +++ b/src/gui/auth/qgsauthsettingswidget.h @@ -17,7 +17,7 @@ #define QGSAUTHSETTINGSWIDGET_H #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsauthsettingswidget.h" diff --git a/src/gui/auth/qgsauthsslconfigwidget.h b/src/gui/auth/qgsauthsslconfigwidget.h index 4a141450a9f..4da5d5a9e6e 100644 --- a/src/gui/auth/qgsauthsslconfigwidget.h +++ b/src/gui/auth/qgsauthsslconfigwidget.h @@ -18,7 +18,7 @@ #define QGSAUTHSSLCONFIGWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "ui_qgsauthsslconfigwidget.h" diff --git a/src/gui/auth/qgsauthsslimportdialog.h b/src/gui/auth/qgsauthsslimportdialog.h index 110ba5a2e23..50c2d60fa53 100644 --- a/src/gui/auth/qgsauthsslimportdialog.h +++ b/src/gui/auth/qgsauthsslimportdialog.h @@ -63,7 +63,7 @@ #define QGSAUTHSSLIMPORTDIALOG_H #include "ui_qgsauthsslimportdialog.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/auth/qgsauthtrustedcasdialog.h b/src/gui/auth/qgsauthtrustedcasdialog.h index fed6f77316f..3c358f66f78 100644 --- a/src/gui/auth/qgsauthtrustedcasdialog.h +++ b/src/gui/auth/qgsauthtrustedcasdialog.h @@ -18,7 +18,7 @@ #define QGSAUTHTRUSTEDCASDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsauthtrustedcasdialog.h" #include diff --git a/src/gui/editorwidgets/core/qgseditorconfigwidget.h b/src/gui/editorwidgets/core/qgseditorconfigwidget.h index b1ceb0b122e..3025a4ec218 100644 --- a/src/gui/editorwidgets/core/qgseditorconfigwidget.h +++ b/src/gui/editorwidgets/core/qgseditorconfigwidget.h @@ -17,7 +17,7 @@ #define QGSEDITORCONFIGWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgseditorwidgetwrapper.h" diff --git a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h index 90984001754..2422c6c3808 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetautoconf.h @@ -16,7 +16,7 @@ #define QGSEDITORWIDGETAUTOCONF_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h index 3c39592beb8..0c1c7bd5289 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h @@ -18,7 +18,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include #include #include diff --git a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h index 4441593f81a..8ffc559e3cd 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetregistry.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetregistry.h @@ -18,7 +18,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include #include "qgseditorwidgetfactory.h" #include "qgsattributeeditorcontext.h" diff --git a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h index ae5984c8f55..022b6843c83 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSEDITORWIDGETWRAPPER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h b/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h index 2119bf05b6f..586a50c488e 100644 --- a/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgssearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSSEARCHWIDGETWRAPPER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h b/src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h index ee9020c48f8..8b19703ca6a 100644 --- a/src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgscheckboxsearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSCHECKBOXSEARCHWIDGETWRAPPER_H #include "qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/editorwidgets/qgsdatetimeedit.h b/src/gui/editorwidgets/qgsdatetimeedit.h index f344ab38be9..cc6e44b33bd 100644 --- a/src/gui/editorwidgets/qgsdatetimeedit.h +++ b/src/gui/editorwidgets/qgsdatetimeedit.h @@ -17,7 +17,7 @@ #define QGSDATETIMEEDIT_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h b/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h index cd40592d55f..36eefe417d6 100644 --- a/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsdatetimesearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSDATETIMESEARCHWIDGETWRAPPER_H #include "qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include diff --git a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h index 0f4ed5e8ed1..d202b1c349a 100644 --- a/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsdefaultsearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSDEFAULTSEARCHWIDGETWRAPPER_H #include "qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfilterlineedit.h" #include diff --git a/src/gui/editorwidgets/qgsdoublespinbox.h b/src/gui/editorwidgets/qgsdoublespinbox.h index a323fd3f2e5..a9ee5ddf687 100644 --- a/src/gui/editorwidgets/qgsdoublespinbox.h +++ b/src/gui/editorwidgets/qgsdoublespinbox.h @@ -17,7 +17,7 @@ #define QGSDOUBLESPINBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsSpinBoxLineEdit; diff --git a/src/gui/editorwidgets/qgsmultiedittoolbutton.h b/src/gui/editorwidgets/qgsmultiedittoolbutton.h index 61a1afa72c1..0ef6923dff2 100644 --- a/src/gui/editorwidgets/qgsmultiedittoolbutton.h +++ b/src/gui/editorwidgets/qgsmultiedittoolbutton.h @@ -17,7 +17,7 @@ #define QGSMULTIEDITTOOLBUTTON_H #include "qgsfields.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/editorwidgets/qgsqmlwidgetwrapper.h b/src/gui/editorwidgets/qgsqmlwidgetwrapper.h index fbfcfa8a42c..2801ffb35d3 100644 --- a/src/gui/editorwidgets/qgsqmlwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsqmlwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSQMLWIDGETWRAPPER_H #include "qgswidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include diff --git a/src/gui/editorwidgets/qgsrelationreferencewidget.h b/src/gui/editorwidgets/qgsrelationreferencewidget.h index 831b4d8d31d..184af26c4c2 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidget.h +++ b/src/gui/editorwidgets/qgsrelationreferencewidget.h @@ -17,7 +17,7 @@ #define QGSRELATIONREFERENCEWIDGET_H #include "qgsattributeeditorcontext.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeature.h" #include diff --git a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h index c425ab0dbed..31b84c41271 100644 --- a/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrelationreferencewidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSRELATIONREFERENCEWIDGETWRAPPER_H #include "qgseditorwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsRelationReferenceWidget; diff --git a/src/gui/editorwidgets/qgsrelationwidgetwrapper.h b/src/gui/editorwidgets/qgsrelationwidgetwrapper.h index e270c8f2937..e09a6af5e9d 100644 --- a/src/gui/editorwidgets/qgsrelationwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsrelationwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSRELATIONWIDGETWRAPPER_H #include "qgswidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsRelationEditorWidget; diff --git a/src/gui/editorwidgets/qgssearchwidgettoolbutton.h b/src/gui/editorwidgets/qgssearchwidgettoolbutton.h index 865daa5ca0c..12fc7bf6afa 100644 --- a/src/gui/editorwidgets/qgssearchwidgettoolbutton.h +++ b/src/gui/editorwidgets/qgssearchwidgettoolbutton.h @@ -17,7 +17,7 @@ #define QGSSEARCHWIDGETTOOLBUTTON_H #include "editorwidgets/core/qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/editorwidgets/qgsspinbox.h b/src/gui/editorwidgets/qgsspinbox.h index cff822144f1..a5dbe6ae97d 100644 --- a/src/gui/editorwidgets/qgsspinbox.h +++ b/src/gui/editorwidgets/qgsspinbox.h @@ -17,7 +17,7 @@ #define QGSSPINBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsSpinBoxLineEdit; diff --git a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h index 2bc97cd0be7..56b5fa17280 100644 --- a/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsvaluemapsearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSVALUEMAPSEARCHWIDGETWRAPPER_H #include "qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h b/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h index aafd9abad06..4da473c97a9 100644 --- a/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h +++ b/src/gui/editorwidgets/qgsvaluerelationsearchwidgetwrapper.h @@ -17,7 +17,7 @@ #define QGSVALUERELATIONSEARCHWIDGETWRAPPER_H #include "qgssearchwidgetwrapper.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsvaluerelationfieldformatter.h" #include diff --git a/src/gui/layout/qgslayoutitemcombobox.h b/src/gui/layout/qgslayoutitemcombobox.h index 114f02fc1d4..3d434cc95db 100644 --- a/src/gui/layout/qgslayoutitemcombobox.h +++ b/src/gui/layout/qgslayoutitemcombobox.h @@ -17,7 +17,7 @@ #define QGSLAYOUTITEMCOMBOBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgslayoutitem.h" #include "qgslayoutitemregistry.h" #include "qgis_gui.h" diff --git a/src/gui/layout/qgslayoutnewitempropertiesdialog.h b/src/gui/layout/qgslayoutnewitempropertiesdialog.h index 9802833ddc8..5f22e528b87 100644 --- a/src/gui/layout/qgslayoutnewitempropertiesdialog.h +++ b/src/gui/layout/qgslayoutnewitempropertiesdialog.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTNEWITEMPROPERTIESDIALOG_H #define QGSLAYOUTNEWITEMPROPERTIESDIALOG_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "ui_qgslayoutnewitemproperties.h" diff --git a/src/gui/layout/qgslayoutunitscombobox.cpp b/src/gui/layout/qgslayoutunitscombobox.cpp index ca6b21eba49..bac20cb7792 100644 --- a/src/gui/layout/qgslayoutunitscombobox.cpp +++ b/src/gui/layout/qgslayoutunitscombobox.cpp @@ -15,6 +15,7 @@ #include "qgslayoutunitscombobox.h" #include "qgslayoutmeasurementconverter.h" +#include "qgis.h" QgsLayoutUnitsComboBox::QgsLayoutUnitsComboBox( QWidget *parent ) : QComboBox( parent ) diff --git a/src/gui/layout/qgslayoutview.h b/src/gui/layout/qgslayoutview.h index 1de9bfde4dc..b8a662f13bd 100644 --- a/src/gui/layout/qgslayoutview.h +++ b/src/gui/layout/qgslayoutview.h @@ -17,7 +17,7 @@ #ifndef QGSLAYOUTVIEW_H #define QGSLAYOUTVIEW_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgsprevieweffect.h" // for QgsPreviewEffect::PreviewMode #include "qgis_gui.h" #include "qgslayoutitempage.h" diff --git a/src/gui/layout/qgslayoutviewtool.h b/src/gui/layout/qgslayoutviewtool.h index f3a2631bccb..edf32e82579 100644 --- a/src/gui/layout/qgslayoutviewtool.h +++ b/src/gui/layout/qgslayoutviewtool.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOL_H #define QGSLAYOUTVIEWTOOL_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include #include diff --git a/src/gui/layout/qgslayoutviewtooladditem.h b/src/gui/layout/qgslayoutviewtooladditem.h index 8d21f021aa5..e314f52906d 100644 --- a/src/gui/layout/qgslayoutviewtooladditem.h +++ b/src/gui/layout/qgslayoutviewtooladditem.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLADDITEM_H #define QGSLAYOUTVIEWTOOLADDITEM_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" #include "qgslayoutviewrubberband.h" diff --git a/src/gui/layout/qgslayoutviewtooladdnodeitem.h b/src/gui/layout/qgslayoutviewtooladdnodeitem.h index bd052c7dacd..d4bc94686ca 100644 --- a/src/gui/layout/qgslayoutviewtooladdnodeitem.h +++ b/src/gui/layout/qgslayoutviewtooladdnodeitem.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLADDNODEITEM_H #define QGSLAYOUTVIEWTOOLADDNODEITEM_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" #include diff --git a/src/gui/layout/qgslayoutviewtooleditnodes.h b/src/gui/layout/qgslayoutviewtooleditnodes.h index ccf30205404..dfe40eaaff2 100644 --- a/src/gui/layout/qgslayoutviewtooleditnodes.h +++ b/src/gui/layout/qgslayoutviewtooleditnodes.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLEDITNODES_H #define QGSLAYOUTVIEWTOOLEDITNODES_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" diff --git a/src/gui/layout/qgslayoutviewtoolmoveitemcontent.h b/src/gui/layout/qgslayoutviewtoolmoveitemcontent.h index 695f24603ca..b4bc4942f51 100644 --- a/src/gui/layout/qgslayoutviewtoolmoveitemcontent.h +++ b/src/gui/layout/qgslayoutviewtoolmoveitemcontent.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLMOVEITEMCONTENT_H #define QGSLAYOUTVIEWTOOLMOVEITEMCONTENT_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" diff --git a/src/gui/layout/qgslayoutviewtoolpan.h b/src/gui/layout/qgslayoutviewtoolpan.h index b94c682c496..96ebec7be5d 100644 --- a/src/gui/layout/qgslayoutviewtoolpan.h +++ b/src/gui/layout/qgslayoutviewtoolpan.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLPAN_H #define QGSLAYOUTVIEWTOOLPAN_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" diff --git a/src/gui/layout/qgslayoutviewtoolselect.h b/src/gui/layout/qgslayoutviewtoolselect.h index 45e413af4ca..56bb46a7dbf 100644 --- a/src/gui/layout/qgslayoutviewtoolselect.h +++ b/src/gui/layout/qgslayoutviewtoolselect.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLSELECT_H #define QGSLAYOUTVIEWTOOLSELECT_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" #include "qgslayoutviewrubberband.h" diff --git a/src/gui/layout/qgslayoutviewtooltemporarykeypan.h b/src/gui/layout/qgslayoutviewtooltemporarykeypan.h index 162dd503a59..ac0eb58fdcd 100644 --- a/src/gui/layout/qgslayoutviewtooltemporarykeypan.h +++ b/src/gui/layout/qgslayoutviewtooltemporarykeypan.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLTEMPORARYKEYPAN_H #define QGSLAYOUTVIEWTOOLTEMPORARYKEYPAN_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" diff --git a/src/gui/layout/qgslayoutviewtooltemporarykeyzoom.h b/src/gui/layout/qgslayoutviewtooltemporarykeyzoom.h index 9a705f4b9ae..cd00cb8e4e0 100644 --- a/src/gui/layout/qgslayoutviewtooltemporarykeyzoom.h +++ b/src/gui/layout/qgslayoutviewtooltemporarykeyzoom.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLTEMPORARYKEYZOOM_H #define QGSLAYOUTVIEWTOOLTEMPORARYKEYZOOM_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtoolzoom.h" #include "qgslayoutviewrubberband.h" diff --git a/src/gui/layout/qgslayoutviewtooltemporarymousepan.h b/src/gui/layout/qgslayoutviewtooltemporarymousepan.h index f0f4f51f2be..6a76fa883b6 100644 --- a/src/gui/layout/qgslayoutviewtooltemporarymousepan.h +++ b/src/gui/layout/qgslayoutviewtooltemporarymousepan.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLTEMPORARYMOUSEPAN_H #define QGSLAYOUTVIEWTOOLTEMPORARYMOUSEPAN_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" diff --git a/src/gui/layout/qgslayoutviewtoolzoom.h b/src/gui/layout/qgslayoutviewtoolzoom.h index d74b16c731f..a96f11308ba 100644 --- a/src/gui/layout/qgslayoutviewtoolzoom.h +++ b/src/gui/layout/qgslayoutviewtoolzoom.h @@ -16,7 +16,7 @@ #ifndef QGSLAYOUTVIEWTOOLZOOM_H #define QGSLAYOUTVIEWTOOLZOOM_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgslayoutviewtool.h" #include "qgslayoutviewrubberband.h" diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h index 11ee02f9620..bc9035cf170 100644 --- a/src/gui/qgisinterface.h +++ b/src/gui/qgisinterface.h @@ -55,7 +55,7 @@ class QgsBrowserModel; #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsmaplayer.h" #include "qgis_gui.h" diff --git a/src/gui/qgsabstractdatasourcewidget.h b/src/gui/qgsabstractdatasourcewidget.h index 802ab170d60..7a292e78c72 100644 --- a/src/gui/qgsabstractdatasourcewidget.h +++ b/src/gui/qgsabstractdatasourcewidget.h @@ -20,7 +20,6 @@ #define QGSABSTRACTDATASOURCEWIDGET_H #include "qgis_sip.h" -#include "qgis.h" #include "qgis_gui.h" #include "qgsproviderregistry.h" diff --git a/src/gui/qgsactionmenu.h b/src/gui/qgsactionmenu.h index 3ddd366c204..88898886bb8 100644 --- a/src/gui/qgsactionmenu.h +++ b/src/gui/qgsactionmenu.h @@ -17,7 +17,7 @@ #define QGSACTIONMENU_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgsfeature.h" diff --git a/src/gui/qgsadvanceddigitizingdockwidget.h b/src/gui/qgsadvanceddigitizingdockwidget.h index e3071cc39fc..9d16abb586e 100644 --- a/src/gui/qgsadvanceddigitizingdockwidget.h +++ b/src/gui/qgsadvanceddigitizingdockwidget.h @@ -22,7 +22,7 @@ #include "ui_qgsadvanceddigitizingdockwidgetbase.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdockwidget.h" #include "qgsmessagebaritem.h" #include "qgspointxy.h" diff --git a/src/gui/qgsaggregatetoolbutton.cpp b/src/gui/qgsaggregatetoolbutton.cpp index 38e0f08404d..938c231e043 100644 --- a/src/gui/qgsaggregatetoolbutton.cpp +++ b/src/gui/qgsaggregatetoolbutton.cpp @@ -15,6 +15,7 @@ #include "qgsaggregatetoolbutton.h" #include "qgsaggregatecalculator.h" +#include "qgis.h" #include diff --git a/src/gui/qgsattributedialog.h b/src/gui/qgsattributedialog.h index f6cb2f2b469..cc62b223596 100644 --- a/src/gui/qgsattributedialog.h +++ b/src/gui/qgsattributedialog.h @@ -18,7 +18,7 @@ #define QGSATTRIBUTEDIALOG_H #include "qgsattributeeditorcontext.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsattributeform.h" #include "qgstrackedvectorlayertools.h" #include "qgsactionmenu.h" diff --git a/src/gui/qgsattributeform.h b/src/gui/qgsattributeform.h index 645d7573229..9886304082e 100644 --- a/src/gui/qgsattributeform.h +++ b/src/gui/qgsattributeform.h @@ -17,7 +17,7 @@ #define QGSATTRIBUTEFORM_H #include "qgsfeature.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsattributeeditorcontext.h" #include "qgseditorwidgetwrapper.h" diff --git a/src/gui/qgsattributeformwidget.h b/src/gui/qgsattributeformwidget.h index 83055e093bd..4510dd0af60 100644 --- a/src/gui/qgsattributeformwidget.h +++ b/src/gui/qgsattributeformwidget.h @@ -15,7 +15,7 @@ #ifndef QGSATTRIBUTEFORMWIDGET_H #define QGSATTRIBUTEFORMWIDGET_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgsattributeeditorcontext.h" #include "qgssearchwidgetwrapper.h" diff --git a/src/gui/qgsblendmodecombobox.h b/src/gui/qgsblendmodecombobox.h index c3e955e7fbd..e9e763b4d01 100644 --- a/src/gui/qgsblendmodecombobox.h +++ b/src/gui/qgsblendmodecombobox.h @@ -19,7 +19,7 @@ #define QGSBLENDMODECOMBOBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include // For QPainter::CompositionMode enum #include "qgis_gui.h" diff --git a/src/gui/qgsbrowsertreeview.h b/src/gui/qgsbrowsertreeview.h index 61f5c1d3051..52911fcd8f8 100644 --- a/src/gui/qgsbrowsertreeview.h +++ b/src/gui/qgsbrowsertreeview.h @@ -17,7 +17,7 @@ #define QGSBROWSERTREEVIEW_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsBrowserModel; diff --git a/src/gui/qgscheckablecombobox.h b/src/gui/qgscheckablecombobox.h index 900557184f3..44cc41274e8 100644 --- a/src/gui/qgscheckablecombobox.h +++ b/src/gui/qgscheckablecombobox.h @@ -23,7 +23,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QEvent; diff --git a/src/gui/qgscodeeditor.h b/src/gui/qgscodeeditor.h index 17d77d6e0b6..1e0c1cb630b 100644 --- a/src/gui/qgscodeeditor.h +++ b/src/gui/qgscodeeditor.h @@ -20,7 +20,7 @@ #include // qscintilla includes #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" diff --git a/src/gui/qgscollapsiblegroupbox.h b/src/gui/qgscollapsiblegroupbox.h index e49a8a34040..f1bd36b4125 100644 --- a/src/gui/qgscollapsiblegroupbox.h +++ b/src/gui/qgscollapsiblegroupbox.h @@ -22,7 +22,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgssettings.h" #include "qgis_gui.h" diff --git a/src/gui/qgscolorbrewercolorrampdialog.h b/src/gui/qgscolorbrewercolorrampdialog.h index 33c0ca7da44..f51ca478408 100644 --- a/src/gui/qgscolorbrewercolorrampdialog.h +++ b/src/gui/qgscolorbrewercolorrampdialog.h @@ -21,7 +21,7 @@ #include "qgscolorramp.h" #include "ui_qgscolorbrewercolorrampwidgetbase.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsColorBrewerColorRamp; diff --git a/src/gui/qgscolorbutton.h b/src/gui/qgscolorbutton.h index f801bf323b8..b6ac1b2331b 100644 --- a/src/gui/qgscolorbutton.h +++ b/src/gui/qgscolorbutton.h @@ -19,7 +19,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QMimeData; class QgsColorSchemeRegistry; diff --git a/src/gui/qgscolordialog.h b/src/gui/qgscolordialog.h index 8fc5021e42a..7a52c303206 100644 --- a/src/gui/qgscolordialog.h +++ b/src/gui/qgscolordialog.h @@ -20,7 +20,7 @@ #include #include "ui_qgscolordialog.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgshelp.h" class QColor; diff --git a/src/gui/qgscolorrampbutton.h b/src/gui/qgscolorrampbutton.h index e5b97f1d285..629d993fcc5 100644 --- a/src/gui/qgscolorrampbutton.h +++ b/src/gui/qgscolorrampbutton.h @@ -22,7 +22,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsPanelWidget; diff --git a/src/gui/qgscolorschemelist.h b/src/gui/qgscolorschemelist.h index 0d7fe9a2682..b1bb27f0758 100644 --- a/src/gui/qgscolorschemelist.h +++ b/src/gui/qgscolorschemelist.h @@ -21,7 +21,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QMimeData; class QgsPanelWidget; diff --git a/src/gui/qgscolorswatchgrid.h b/src/gui/qgscolorswatchgrid.h index 5ced708c2ea..164e2f180a3 100644 --- a/src/gui/qgscolorswatchgrid.h +++ b/src/gui/qgscolorswatchgrid.h @@ -19,7 +19,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup gui diff --git a/src/gui/qgscolorwidgets.h b/src/gui/qgscolorwidgets.h index 95e40bd59b7..0676e0534d9 100644 --- a/src/gui/qgscolorwidgets.h +++ b/src/gui/qgscolorwidgets.h @@ -19,7 +19,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QColor; class QSpinBox; diff --git a/src/gui/qgscompoundcolorwidget.h b/src/gui/qgscompoundcolorwidget.h index 75996afdc36..238234a0285 100644 --- a/src/gui/qgscompoundcolorwidget.h +++ b/src/gui/qgscompoundcolorwidget.h @@ -17,7 +17,7 @@ #define QGSCOMPOUNDCOLORWIDGET_H #include "qgsguiutils.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgspanelwidget.h" #include "ui_qgscompoundcolorwidget.h" #include "qgis_gui.h" diff --git a/src/gui/qgsconfigureshortcutsdialog.h b/src/gui/qgsconfigureshortcutsdialog.h index ade73a2a4c6..a290a904c66 100644 --- a/src/gui/qgsconfigureshortcutsdialog.h +++ b/src/gui/qgsconfigureshortcutsdialog.h @@ -17,7 +17,7 @@ #define QGSCONFIGURESHORTCUTSDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsconfigureshortcutsdialog.h" #include "qgshelp.h" diff --git a/src/gui/qgscredentialdialog.h b/src/gui/qgscredentialdialog.h index 61c50e9fe89..fdc1b03974b 100644 --- a/src/gui/qgscredentialdialog.h +++ b/src/gui/qgscredentialdialog.h @@ -22,7 +22,7 @@ #include "qgscredentials.h" #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QPushButton; diff --git a/src/gui/qgscurveeditorwidget.h b/src/gui/qgscurveeditorwidget.h index 913cb3cc46e..2521f7e2ac3 100644 --- a/src/gui/qgscurveeditorwidget.h +++ b/src/gui/qgscurveeditorwidget.h @@ -17,7 +17,7 @@ #define QGSCURVEEDITORWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/gui/qgsdetaileditemdelegate.h b/src/gui/qgsdetaileditemdelegate.h index e6f0f400c7a..1121054ef58 100644 --- a/src/gui/qgsdetaileditemdelegate.h +++ b/src/gui/qgsdetaileditemdelegate.h @@ -18,7 +18,7 @@ #define QGSDETAILEDITEMDELEGATE_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsdetaileditemwidget.h b/src/gui/qgsdetaileditemwidget.h index 23f6725a00e..e9bda752d48 100644 --- a/src/gui/qgsdetaileditemwidget.h +++ b/src/gui/qgsdetaileditemwidget.h @@ -18,7 +18,7 @@ #define QGSDETAILEDITEMWIDGET_H #include "ui_qgsdetaileditemwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdetaileditemdata.h" #include "qgis_gui.h" diff --git a/src/gui/qgsdial.cpp b/src/gui/qgsdial.cpp index 39da2e89a73..5d892504138 100644 --- a/src/gui/qgsdial.cpp +++ b/src/gui/qgsdial.cpp @@ -21,6 +21,7 @@ #include #include #include +#include QgsDial::QgsDial( QWidget *parent ) : QDial( parent ) { diff --git a/src/gui/qgsdial.h b/src/gui/qgsdial.h index 7febfcb2fbb..68583e8bf1d 100644 --- a/src/gui/qgsdial.h +++ b/src/gui/qgsdial.h @@ -18,7 +18,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QPaintEvent; diff --git a/src/gui/qgsdialog.h b/src/gui/qgsdialog.h index d7cdf96a81d..fd1e87b5843 100644 --- a/src/gui/qgsdialog.h +++ b/src/gui/qgsdialog.h @@ -24,7 +24,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup gui diff --git a/src/gui/qgsdockwidget.h b/src/gui/qgsdockwidget.h index 93704b37ffa..8c43a10a667 100644 --- a/src/gui/qgsdockwidget.h +++ b/src/gui/qgsdockwidget.h @@ -19,7 +19,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup gui diff --git a/src/gui/qgsencodingfiledialog.h b/src/gui/qgsencodingfiledialog.h index 60dad4aa30d..cf04d379557 100644 --- a/src/gui/qgsencodingfiledialog.h +++ b/src/gui/qgsencodingfiledialog.h @@ -18,7 +18,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QComboBox; class QPushButton; diff --git a/src/gui/qgserrordialog.h b/src/gui/qgserrordialog.h index b6049556378..a6074612a47 100644 --- a/src/gui/qgserrordialog.h +++ b/src/gui/qgserrordialog.h @@ -23,7 +23,7 @@ #include "qgsguiutils.h" #include "qgserror.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup gui diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h index b9965f0b529..9eecb9f2e4e 100644 --- a/src/gui/qgsexpressionbuilderwidget.h +++ b/src/gui/qgsexpressionbuilderwidget.h @@ -17,7 +17,7 @@ #define QGSEXPRESSIONBUILDER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsexpressionbuilder.h" #include "qgsdistancearea.h" #include "qgsexpressioncontext.h" diff --git a/src/gui/qgsexpressionlineedit.h b/src/gui/qgsexpressionlineedit.h index 55d8eca04ad..f60eabcb84d 100644 --- a/src/gui/qgsexpressionlineedit.h +++ b/src/gui/qgsexpressionlineedit.h @@ -17,7 +17,7 @@ #define QGSEXPRESSIONLINEEDIT_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsexpressioncontext.h" #include "qgsdistancearea.h" #include "qgis_gui.h" diff --git a/src/gui/qgsexpressionselectiondialog.h b/src/gui/qgsexpressionselectiondialog.h index f119d4e6aa7..35172176a2a 100644 --- a/src/gui/qgsexpressionselectiondialog.h +++ b/src/gui/qgsexpressionselectiondialog.h @@ -17,7 +17,7 @@ #define QGSEXPRESSIONSELECTIONDIALOG_H #include "ui_qgsexpressionselectiondialogbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgshelp.h" #include diff --git a/src/gui/qgsextentgroupbox.h b/src/gui/qgsextentgroupbox.h index 2acb01e2e14..a72fbe057b0 100644 --- a/src/gui/qgsextentgroupbox.h +++ b/src/gui/qgsextentgroupbox.h @@ -19,7 +19,7 @@ #include "qgscollapsiblegroupbox.h" #include "qgsmaptool.h" #include "qgsmaptoolextent.h" -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsextentgroupboxwidget.h" diff --git a/src/gui/qgsexternalresourcewidget.h b/src/gui/qgsexternalresourcewidget.h index 8144d1a7eb7..ee0e60df9b4 100644 --- a/src/gui/qgsexternalresourcewidget.h +++ b/src/gui/qgsexternalresourcewidget.h @@ -25,7 +25,7 @@ class QgsPixmapLabel; #include "qgsfilewidget.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #ifdef SIP_RUN diff --git a/src/gui/qgsfeatureselectiondlg.h b/src/gui/qgsfeatureselectiondlg.h index 55cca3fb9a7..08e245fecf5 100644 --- a/src/gui/qgsfeatureselectiondlg.h +++ b/src/gui/qgsfeatureselectiondlg.h @@ -19,7 +19,7 @@ class QgsGenericFeatureSelectionManager; #include "ui_qgsfeatureselectiondlg.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #ifdef SIP_RUN diff --git a/src/gui/qgsfieldcombobox.h b/src/gui/qgsfieldcombobox.h index 4fd63fab41e..8cf8b6102bc 100644 --- a/src/gui/qgsfieldcombobox.h +++ b/src/gui/qgsfieldcombobox.h @@ -21,7 +21,7 @@ #include "qgsfieldproxymodel.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsMapLayer; class QgsVectorLayer; diff --git a/src/gui/qgsfieldexpressionwidget.h b/src/gui/qgsfieldexpressionwidget.h index 02d2a44106e..40cb7b66600 100644 --- a/src/gui/qgsfieldexpressionwidget.h +++ b/src/gui/qgsfieldexpressionwidget.h @@ -23,7 +23,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsdistancearea.h" #include "qgsexpressioncontextgenerator.h" #include "qgsexpressioncontext.h" diff --git a/src/gui/qgsfieldvalueslineedit.h b/src/gui/qgsfieldvalueslineedit.h index bbb078269b2..b996d8c5b42 100644 --- a/src/gui/qgsfieldvalueslineedit.h +++ b/src/gui/qgsfieldvalueslineedit.h @@ -16,7 +16,7 @@ #define QGSFIELDVALUESLINEEDIT_H #include "qgsfilterlineedit.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeedback.h" #include diff --git a/src/gui/qgsfilewidget.h b/src/gui/qgsfilewidget.h index 7a2a5bdad31..d8412b6bb80 100644 --- a/src/gui/qgsfilewidget.h +++ b/src/gui/qgsfilewidget.h @@ -25,7 +25,7 @@ class QHBoxLayout; #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfilterlineedit.h" /** diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp index 113bc6c50ae..1419001e6ca 100644 --- a/src/gui/qgsfilterlineedit.cpp +++ b/src/gui/qgsfilterlineedit.cpp @@ -18,6 +18,7 @@ #include "qgsfilterlineedit.h" #include "qgsapplication.h" #include "qgsanimatedicon.h" +#include "qgis.h" #include #include diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h index 0d1cebf5333..0ed35c5b937 100644 --- a/src/gui/qgsfilterlineedit.h +++ b/src/gui/qgsfilterlineedit.h @@ -20,7 +20,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QToolButton; diff --git a/src/gui/qgsfloatingwidget.h b/src/gui/qgsfloatingwidget.h index 0a57da7c936..2fa12b494d8 100644 --- a/src/gui/qgsfloatingwidget.h +++ b/src/gui/qgsfloatingwidget.h @@ -16,7 +16,7 @@ #define QGSFLOATINGWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsFloatingWidgetEventFilter; diff --git a/src/gui/qgsfocuswatcher.h b/src/gui/qgsfocuswatcher.h index 8d0746dc658..406bff9207b 100644 --- a/src/gui/qgsfocuswatcher.h +++ b/src/gui/qgsfocuswatcher.h @@ -17,7 +17,7 @@ #define QGSFOCUSWATCHER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgsfontbutton.h b/src/gui/qgsfontbutton.h index ac55cff8800..1d3ecbf8de1 100644 --- a/src/gui/qgsfontbutton.h +++ b/src/gui/qgsfontbutton.h @@ -16,7 +16,7 @@ #define QGSFONTBUTTON_H #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgstextrenderer.h" #include diff --git a/src/gui/qgsformannotation.h b/src/gui/qgsformannotation.h index 17752bf0b8a..68d45e2203c 100644 --- a/src/gui/qgsformannotation.h +++ b/src/gui/qgsformannotation.h @@ -19,7 +19,7 @@ #define QGSFORMANNOTATION_H #include "qgsannotation.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsfeature.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsgradientcolorrampdialog.h b/src/gui/qgsgradientcolorrampdialog.h index bee12598949..c15ba87bdbd 100644 --- a/src/gui/qgsgradientcolorrampdialog.h +++ b/src/gui/qgsgradientcolorrampdialog.h @@ -17,7 +17,7 @@ #define QGSGRADIENTCOLORRAMPDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsgradientcolorrampdialogbase.h" #include "qgshelp.h" diff --git a/src/gui/qgsgradientstopeditor.h b/src/gui/qgsgradientstopeditor.h index c9f665d290d..c9ab2ecacf3 100644 --- a/src/gui/qgsgradientstopeditor.h +++ b/src/gui/qgsgradientstopeditor.h @@ -17,7 +17,7 @@ #define QGSGRADIENTSTOPEDITOR_H #include "qgscolorramp.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsgroupwmsdatadialog.h b/src/gui/qgsgroupwmsdatadialog.h index 33eab6caaff..f79a04b7675 100644 --- a/src/gui/qgsgroupwmsdatadialog.h +++ b/src/gui/qgsgroupwmsdatadialog.h @@ -18,7 +18,7 @@ #include "ui_qgsgroupwmsdatadialogbase.h" #include "qgsguiutils.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgsguiutils.cpp b/src/gui/qgsguiutils.cpp index 4c50ae8afde..08acdc3228b 100644 --- a/src/gui/qgsguiutils.cpp +++ b/src/gui/qgsguiutils.cpp @@ -18,6 +18,7 @@ #include "qgsencodingfiledialog.h" #include "qgslogger.h" #include "qgis_gui.h" +#include "qgis.h" #include #include diff --git a/src/gui/qgshistogramwidget.h b/src/gui/qgshistogramwidget.h index d5391a6e7d2..c07056fdec7 100644 --- a/src/gui/qgshistogramwidget.h +++ b/src/gui/qgshistogramwidget.h @@ -18,7 +18,7 @@ #define QGSHISTOGRAMWIDGET_H #include "ui_qgshistogramwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgshistogram.h" #include "qgsstatisticalsummary.h" diff --git a/src/gui/qgsidentifymenu.h b/src/gui/qgsidentifymenu.h index 52d198228a5..4e7d9e0b99a 100644 --- a/src/gui/qgsidentifymenu.h +++ b/src/gui/qgsidentifymenu.h @@ -21,7 +21,7 @@ #include "qgsmaplayeractionregistry.h" #include "qgsmaptoolidentify.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #ifndef SIP_RUN /// \cond PRIVATE diff --git a/src/gui/qgskeyvaluewidget.h b/src/gui/qgskeyvaluewidget.h index acb158205ae..2adf6812d40 100644 --- a/src/gui/qgskeyvaluewidget.h +++ b/src/gui/qgskeyvaluewidget.h @@ -17,7 +17,7 @@ #define QGSKEYVALUEWIDGET_H #include "qgstablewidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include #include "qgis_gui.h" diff --git a/src/gui/qgslimitedrandomcolorrampdialog.h b/src/gui/qgslimitedrandomcolorrampdialog.h index 5dfe9efd15d..595daba8c3b 100644 --- a/src/gui/qgslimitedrandomcolorrampdialog.h +++ b/src/gui/qgslimitedrandomcolorrampdialog.h @@ -17,7 +17,7 @@ #define QGsLIMITEDRANDOMCOLORRAMPDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgspanelwidget.h" #include "qgscolorramp.h" #include "ui_qgslimitedrandomcolorrampwidgetbase.h" diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index b2247d8e1fc..4e2a10b1d7a 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -25,7 +25,6 @@ #include "qgsrectangle.h" #include "qgsfeatureid.h" #include "qgsgeometry.h" -#include "qgis.h" #include #include diff --git a/src/gui/qgsmapcanvasitem.h b/src/gui/qgsmapcanvasitem.h index b0de63e5636..cdee78166d4 100644 --- a/src/gui/qgsmapcanvasitem.h +++ b/src/gui/qgsmapcanvasitem.h @@ -17,7 +17,7 @@ #define QGSMAPCANVASITEM_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrectangle.h" #include "qgis_gui.h" diff --git a/src/gui/qgsmaplayeractionregistry.h b/src/gui/qgsmaplayeractionregistry.h index e06e01595c7..37c6196d251 100644 --- a/src/gui/qgsmaplayeractionregistry.h +++ b/src/gui/qgsmaplayeractionregistry.h @@ -17,7 +17,7 @@ #define QGSMAPLAYERACTIONREGISTRY_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/gui/qgsmaplayercombobox.h b/src/gui/qgsmaplayercombobox.h index 291c651d9a3..3c2b63fb61c 100644 --- a/src/gui/qgsmaplayercombobox.h +++ b/src/gui/qgsmaplayercombobox.h @@ -21,7 +21,7 @@ #include "qgsmaplayerproxymodel.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsMapLayer; class QgsVectorLayer; diff --git a/src/gui/qgsmenuheader.cpp b/src/gui/qgsmenuheader.cpp index ae432ad4ad7..8923b47796a 100644 --- a/src/gui/qgsmenuheader.cpp +++ b/src/gui/qgsmenuheader.cpp @@ -16,6 +16,7 @@ ***************************************************************************/ #include "qgsmenuheader.h" +#include "qgis.h" #include #include diff --git a/src/gui/qgsmenuheader.h b/src/gui/qgsmenuheader.h index 070748fca62..2b337c9fc54 100644 --- a/src/gui/qgsmenuheader.h +++ b/src/gui/qgsmenuheader.h @@ -20,7 +20,7 @@ #include #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" /** * \ingroup gui diff --git a/src/gui/qgsmessagelogviewer.h b/src/gui/qgsmessagelogviewer.h index 82b0eaeeca7..fba7db1745a 100644 --- a/src/gui/qgsmessagelogviewer.h +++ b/src/gui/qgsmessagelogviewer.h @@ -23,7 +23,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QStatusBar; class QCloseEvent; diff --git a/src/gui/qgsnewgeopackagelayerdialog.h b/src/gui/qgsnewgeopackagelayerdialog.h index cd61d2c590e..5b900ae6827 100644 --- a/src/gui/qgsnewgeopackagelayerdialog.h +++ b/src/gui/qgsnewgeopackagelayerdialog.h @@ -20,7 +20,7 @@ #include "ui_qgsnewgeopackagelayerdialogbase.h" #include "qgsguiutils.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgsopacitywidget.cpp b/src/gui/qgsopacitywidget.cpp index 162c85a8f05..494ff1c90a3 100644 --- a/src/gui/qgsopacitywidget.cpp +++ b/src/gui/qgsopacitywidget.cpp @@ -15,6 +15,7 @@ #include "qgsopacitywidget.h" #include "qgsdoublespinbox.h" +#include "qgis.h" #include #include diff --git a/src/gui/qgsopacitywidget.h b/src/gui/qgsopacitywidget.h index 10739177fd4..738f05faa2b 100644 --- a/src/gui/qgsopacitywidget.h +++ b/src/gui/qgsopacitywidget.h @@ -17,7 +17,7 @@ #define QGSOPACITYWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsDoubleSpinBox; diff --git a/src/gui/qgsoptionswidgetfactory.h b/src/gui/qgsoptionswidgetfactory.h index 0a98c78208e..8b1b5b59def 100644 --- a/src/gui/qgsoptionswidgetfactory.h +++ b/src/gui/qgsoptionswidgetfactory.h @@ -18,7 +18,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsoptionsdialoghighlightwidget.h" /** diff --git a/src/gui/qgsorderbydialog.h b/src/gui/qgsorderbydialog.h index 4fdbc181bc3..79070e84a4f 100644 --- a/src/gui/qgsorderbydialog.h +++ b/src/gui/qgsorderbydialog.h @@ -18,7 +18,7 @@ #define QGSORDERBYDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsorderbydialogbase.h" #include "qgsfeaturerequest.h" diff --git a/src/gui/qgsowssourceselect.h b/src/gui/qgsowssourceselect.h index 692ef6438b1..021bbd61584 100644 --- a/src/gui/qgsowssourceselect.h +++ b/src/gui/qgsowssourceselect.h @@ -21,7 +21,6 @@ #define QGSOWSSOURCESELECT_H #include "ui_qgsowssourceselectbase.h" #include "qgis_sip.h" -#include "qgis.h" #include "qgsdatasourceuri.h" #include "qgsguiutils.h" #include "qgsproviderregistry.h" diff --git a/src/gui/qgspixmaplabel.h b/src/gui/qgspixmaplabel.h index afdb5863f05..7340c513a61 100644 --- a/src/gui/qgspixmaplabel.h +++ b/src/gui/qgspixmaplabel.h @@ -17,7 +17,7 @@ #define QGSPIXMAPLABEL_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgspresetcolorrampdialog.h b/src/gui/qgspresetcolorrampdialog.h index 718498acc87..fd15ef2edb6 100644 --- a/src/gui/qgspresetcolorrampdialog.h +++ b/src/gui/qgspresetcolorrampdialog.h @@ -17,7 +17,7 @@ #define QGSPRESETCOLORRAMPDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgspanelwidget.h" #include "qgscolorramp.h" #include "ui_qgspresetcolorrampwidgetbase.h" diff --git a/src/gui/qgsprevieweffect.h b/src/gui/qgsprevieweffect.h index 3de850ef0bb..4b2ec7f073f 100644 --- a/src/gui/qgsprevieweffect.h +++ b/src/gui/qgsprevieweffect.h @@ -19,7 +19,7 @@ #define QGSPREVIEWEFFECT_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgsprojectionselectiondialog.h b/src/gui/qgsprojectionselectiondialog.h index 7ea3efbfb3e..03c0e231f2d 100644 --- a/src/gui/qgsprojectionselectiondialog.h +++ b/src/gui/qgsprojectionselectiondialog.h @@ -18,7 +18,7 @@ #ifndef QGSGENERICPROJECTIONSELECTOR_H #define QGSGENERICPROJECTIONSELECTOR_H #include "ui_qgsgenericprojectionselectorbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsguiutils.h" #include diff --git a/src/gui/qgsprojectionselectiontreewidget.h b/src/gui/qgsprojectionselectiontreewidget.h index f172b7e00fa..6cb99391317 100644 --- a/src/gui/qgsprojectionselectiontreewidget.h +++ b/src/gui/qgsprojectionselectiontreewidget.h @@ -16,7 +16,7 @@ #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgscoordinatereferencesystem.h" diff --git a/src/gui/qgsprojectionselectionwidget.h b/src/gui/qgsprojectionselectionwidget.h index aac768c518b..d24e1864809 100644 --- a/src/gui/qgsprojectionselectionwidget.h +++ b/src/gui/qgsprojectionselectionwidget.h @@ -18,7 +18,7 @@ #define QGSPROJECTIONSELECTIONWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/gui/qgsquerybuilder.h b/src/gui/qgsquerybuilder.h index ab8f7a3d0f0..1a4c691ebc7 100644 --- a/src/gui/qgsquerybuilder.h +++ b/src/gui/qgsquerybuilder.h @@ -15,7 +15,7 @@ #ifndef QGSQUERYBUILDER_H #define QGSQUERYBUILDER_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/gui/qgsrasterpyramidsoptionswidget.h b/src/gui/qgsrasterpyramidsoptionswidget.h index d207a00431c..c83d99bee21 100644 --- a/src/gui/qgsrasterpyramidsoptionswidget.h +++ b/src/gui/qgsrasterpyramidsoptionswidget.h @@ -19,7 +19,7 @@ #define QGSRASTERPYRAMIDSOPTIONSWIDGET_H #include "ui_qgsrasterpyramidsoptionswidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QCheckBox; diff --git a/src/gui/qgsratiolockbutton.cpp b/src/gui/qgsratiolockbutton.cpp index 11a574dd86a..ac77b3fd7f6 100644 --- a/src/gui/qgsratiolockbutton.cpp +++ b/src/gui/qgsratiolockbutton.cpp @@ -14,6 +14,7 @@ ***************************************************************************/ #include "qgsratiolockbutton.h" +#include "qgis.h" #include #include diff --git a/src/gui/qgsratiolockbutton.h b/src/gui/qgsratiolockbutton.h index 6a380842565..1b37718f3be 100644 --- a/src/gui/qgsratiolockbutton.h +++ b/src/gui/qgsratiolockbutton.h @@ -20,7 +20,7 @@ #include #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include class QDoubleSpinBox; diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h index 62f1a6b0863..8695805c139 100644 --- a/src/gui/qgsrubberband.h +++ b/src/gui/qgsrubberband.h @@ -16,7 +16,7 @@ #define QGSRUBBERBAND_H #include "qgsmapcanvasitem.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsgeometry.h" #include diff --git a/src/gui/qgsscalecombobox.h b/src/gui/qgsscalecombobox.h index d8b084b14ff..8589e48c951 100644 --- a/src/gui/qgsscalecombobox.h +++ b/src/gui/qgsscalecombobox.h @@ -19,7 +19,7 @@ #define QGSSCALECOMBOBOX_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" /** diff --git a/src/gui/qgsscalerangewidget.h b/src/gui/qgsscalerangewidget.h index d65af6d0223..e6bd44e31a9 100644 --- a/src/gui/qgsscalerangewidget.h +++ b/src/gui/qgsscalerangewidget.h @@ -17,7 +17,7 @@ #define QGSSCALERANGEWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsscalevisibilitydialog.h b/src/gui/qgsscalevisibilitydialog.h index a624a83d975..ac819c3dcb5 100644 --- a/src/gui/qgsscalevisibilitydialog.h +++ b/src/gui/qgsscalevisibilitydialog.h @@ -17,7 +17,7 @@ #define QGSSCALEVISIBILITYDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsscalewidget.h b/src/gui/qgsscalewidget.h index 83de11efbc3..ff916a3e3fc 100644 --- a/src/gui/qgsscalewidget.h +++ b/src/gui/qgsscalewidget.h @@ -22,7 +22,7 @@ #include "qgsscalecombobox.h" #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsMapCanvas; diff --git a/src/gui/qgsscrollarea.h b/src/gui/qgsscrollarea.h index 4a42036e2cc..3dca1028238 100644 --- a/src/gui/qgsscrollarea.h +++ b/src/gui/qgsscrollarea.h @@ -17,7 +17,7 @@ #define QGSSCROLLAREA_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include class ScrollAreaFilter; diff --git a/src/gui/qgsslider.cpp b/src/gui/qgsslider.cpp index 83e92b278f0..fd29a242561 100644 --- a/src/gui/qgsslider.cpp +++ b/src/gui/qgsslider.cpp @@ -21,6 +21,7 @@ #include #include #include +#include QgsSlider::QgsSlider( QWidget *parent ) : QSlider( parent ) { diff --git a/src/gui/qgsslider.h b/src/gui/qgsslider.h index 4b6b54893d4..b0c92b0a626 100644 --- a/src/gui/qgsslider.h +++ b/src/gui/qgsslider.h @@ -16,7 +16,7 @@ ***************************************************************************/ #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgssourceselectprovider.h b/src/gui/qgssourceselectprovider.h index 189f2fce05d..49d09705b37 100644 --- a/src/gui/qgssourceselectprovider.h +++ b/src/gui/qgssourceselectprovider.h @@ -18,7 +18,7 @@ #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsguiutils.h" #include "qgsproviderregistry.h" #include "qgsabstractdatasourcewidget.h" diff --git a/src/gui/qgssourceselectproviderregistry.h b/src/gui/qgssourceselectproviderregistry.h index 5843c0fda68..9d4d2005245 100644 --- a/src/gui/qgssourceselectproviderregistry.h +++ b/src/gui/qgssourceselectproviderregistry.h @@ -17,7 +17,7 @@ #define QGSSOURCESELECTPROVIDERREGISTRY_H #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" class QgsSourceSelectProvider; diff --git a/src/gui/qgssqlcomposerdialog.h b/src/gui/qgssqlcomposerdialog.h index 1f95129ba6a..d3510abc58c 100644 --- a/src/gui/qgssqlcomposerdialog.h +++ b/src/gui/qgssqlcomposerdialog.h @@ -20,7 +20,7 @@ email : even.rouault at spatialys.com #define QGSSQLCOMPOSERDIALOG_H #include "ui_qgssqlcomposerdialogbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsguiutils.h" #include diff --git a/src/gui/qgssubstitutionlistwidget.h b/src/gui/qgssubstitutionlistwidget.h index 574fa5e6985..d1b8b126035 100644 --- a/src/gui/qgssubstitutionlistwidget.h +++ b/src/gui/qgssubstitutionlistwidget.h @@ -19,7 +19,7 @@ #define QGSSUBSTITUTIONLISTWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgspanelwidget.h" #include "ui_qgssubstitutionlistwidgetbase.h" #include "qgsstringutils.h" diff --git a/src/gui/qgssymbolbutton.h b/src/gui/qgssymbolbutton.h index de08530df1a..65d85e732ff 100644 --- a/src/gui/qgssymbolbutton.h +++ b/src/gui/qgssymbolbutton.h @@ -16,7 +16,7 @@ #define QGSSYMBOLBUTTON_H #include "qgis_gui.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssymbol.h" #include #include diff --git a/src/gui/qgstaskmanagerwidget.h b/src/gui/qgstaskmanagerwidget.h index 1ab8cc5d4d4..879cd22c9cb 100644 --- a/src/gui/qgstaskmanagerwidget.h +++ b/src/gui/qgstaskmanagerwidget.h @@ -18,7 +18,7 @@ #define QGSTASKMANAGERWIDGET_H #include "qgsfloatingwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgstaskmanager.h" #include #include diff --git a/src/gui/qgstextformatwidget.h b/src/gui/qgstextformatwidget.h index f2d977ef4aa..805b7fdd3eb 100644 --- a/src/gui/qgstextformatwidget.h +++ b/src/gui/qgstextformatwidget.h @@ -18,7 +18,7 @@ #define QGSTEXTFORMATWIDGET_H #include "ui_qgstextformatwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgstextrenderer.h" #include "qgsstringutils.h" #include "qgsguiutils.h" diff --git a/src/gui/qgstreewidgetitem.h b/src/gui/qgstreewidgetitem.h index 17a0c041a40..019c0a74842 100644 --- a/src/gui/qgstreewidgetitem.h +++ b/src/gui/qgstreewidgetitem.h @@ -20,7 +20,7 @@ #define QGSTREEWIDGETITEM_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgis_gui.h" diff --git a/src/gui/qgsunitselectionwidget.h b/src/gui/qgsunitselectionwidget.h index d775a3817fc..3fc26333529 100644 --- a/src/gui/qgsunitselectionwidget.h +++ b/src/gui/qgsunitselectionwidget.h @@ -19,7 +19,7 @@ #define QGSUNITSELECTIONWIDGET_H #include -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgspanelwidget.h" #include "qgssymbol.h" diff --git a/src/gui/qgsuserinputwidget.h b/src/gui/qgsuserinputwidget.h index 7b937af1fb0..a6d8cede8c7 100644 --- a/src/gui/qgsuserinputwidget.h +++ b/src/gui/qgsuserinputwidget.h @@ -17,7 +17,7 @@ #ifndef QGSUSERINPUTWIDGET_H #define QGSUSERINPUTWIDGET_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include "qgsfloatingwidget.h" diff --git a/src/gui/qgsvariableeditorwidget.h b/src/gui/qgsvariableeditorwidget.h index e97b29baf8f..3c5b2e52098 100644 --- a/src/gui/qgsvariableeditorwidget.h +++ b/src/gui/qgsvariableeditorwidget.h @@ -16,7 +16,7 @@ #ifndef QGSVARIABLEEDITORWIDGET_H #define QGSVARIABLEEDITORWIDGET_H -#include "qgis.h" +#include "qgis_sip.h" #include #include #include diff --git a/src/gui/qgswindowmanagerinterface.h b/src/gui/qgswindowmanagerinterface.h index fe02fd7db0c..039642797ca 100644 --- a/src/gui/qgswindowmanagerinterface.h +++ b/src/gui/qgswindowmanagerinterface.h @@ -16,7 +16,7 @@ #ifndef QGSWINDOWMANAGERINTERFACE_H #define QGSWINDOWMANAGERINTERFACE_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsVectorLayer; diff --git a/src/gui/symbology/characterwidget.h b/src/gui/symbology/characterwidget.h index 8533ba36639..75730e54103 100644 --- a/src/gui/symbology/characterwidget.h +++ b/src/gui/symbology/characterwidget.h @@ -52,7 +52,7 @@ #include #include #include -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QMouseEvent; diff --git a/src/gui/symbology/qgs25drendererwidget.h b/src/gui/symbology/qgs25drendererwidget.h index 5a9c62c6c4d..553f4a49e95 100644 --- a/src/gui/symbology/qgs25drendererwidget.h +++ b/src/gui/symbology/qgs25drendererwidget.h @@ -17,7 +17,7 @@ #define QGS25DRENDERERWIDGET_H #include "ui_qgs25drendererwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgsarrowsymbollayerwidget.h b/src/gui/symbology/qgsarrowsymbollayerwidget.h index 7c6278658c9..2907b056718 100644 --- a/src/gui/symbology/qgsarrowsymbollayerwidget.h +++ b/src/gui/symbology/qgsarrowsymbollayerwidget.h @@ -16,7 +16,7 @@ #define QGSARROWSYMBOLLAYERWIDGET_H #include "ui_qgsarrowsymbollayerwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssymbollayerwidget.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h index 0b926993732..047a3b4bfcc 100644 --- a/src/gui/symbology/qgscategorizedsymbolrendererwidget.h +++ b/src/gui/symbology/qgscategorizedsymbolrendererwidget.h @@ -16,7 +16,7 @@ #define QGSCATEGORIZEDSYMBOLRENDERERWIDGET_H #include "qgscategorizedsymbolrenderer.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgsproxystyle.h" #include diff --git a/src/gui/symbology/qgscptcitycolorrampdialog.h b/src/gui/symbology/qgscptcitycolorrampdialog.h index ad8ff9526f4..5db20e0c241 100644 --- a/src/gui/symbology/qgscptcitycolorrampdialog.h +++ b/src/gui/symbology/qgscptcitycolorrampdialog.h @@ -18,7 +18,7 @@ #include "ui_qgscptcitycolorrampdialogbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include #include "qgscptcityarchive.h" diff --git a/src/gui/symbology/qgsdatadefinedsizelegendwidget.h b/src/gui/symbology/qgsdatadefinedsizelegendwidget.h index 60f8466fb4c..5b16fe83d59 100644 --- a/src/gui/symbology/qgsdatadefinedsizelegendwidget.h +++ b/src/gui/symbology/qgsdatadefinedsizelegendwidget.h @@ -16,7 +16,7 @@ #ifndef QGSDATADEFINEDSIZELEGENDWIDGET_H #define QGSDATADEFINEDSIZELEGENDWIDGET_H -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" #include diff --git a/src/gui/symbology/qgsellipsesymbollayerwidget.h b/src/gui/symbology/qgsellipsesymbollayerwidget.h index 265509955a6..b9d11e02316 100644 --- a/src/gui/symbology/qgsellipsesymbollayerwidget.h +++ b/src/gui/symbology/qgsellipsesymbollayerwidget.h @@ -16,7 +16,7 @@ #define QGSELLIPSESYMBOLLAYERWIDGET_H #include "ui_widget_ellipse.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssymbollayerwidget.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgsgraduatedhistogramwidget.h b/src/gui/symbology/qgsgraduatedhistogramwidget.h index 6a650d4a575..e7b49eed47b 100644 --- a/src/gui/symbology/qgsgraduatedhistogramwidget.h +++ b/src/gui/symbology/qgsgraduatedhistogramwidget.h @@ -18,7 +18,7 @@ #define QGSGRADUATEDHISTOGRAMWIDGET_H #include "qgshistogramwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QwtPlotPicker; diff --git a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h index 9aac7ce6866..0c5e6ff45dc 100644 --- a/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h +++ b/src/gui/symbology/qgsgraduatedsymbolrendererwidget.h @@ -17,7 +17,7 @@ #define QGSGRADUATEDSYMBOLRENDERERWIDGET_H #include "qgsgraduatedsymbolrenderer.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgsproxystyle.h" #include diff --git a/src/gui/symbology/qgsheatmaprendererwidget.h b/src/gui/symbology/qgsheatmaprendererwidget.h index 58781eb6cca..519572d9878 100644 --- a/src/gui/symbology/qgsheatmaprendererwidget.h +++ b/src/gui/symbology/qgsheatmaprendererwidget.h @@ -16,7 +16,7 @@ #define QGSHEATMAPRENDERERWIDGET_H #include "ui_qgsheatmaprendererwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgsinvertedpolygonrendererwidget.h b/src/gui/symbology/qgsinvertedpolygonrendererwidget.h index b67b68437b0..1e2714c709d 100644 --- a/src/gui/symbology/qgsinvertedpolygonrendererwidget.h +++ b/src/gui/symbology/qgsinvertedpolygonrendererwidget.h @@ -16,7 +16,7 @@ #define QGSINVERTEDPOLYGONRENDERERWIDGET_H #include "ui_qgsinvertedpolygonrendererwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsinvertedpolygonrenderer.h" #include "qgsrendererwidget.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgsnullsymbolrendererwidget.h b/src/gui/symbology/qgsnullsymbolrendererwidget.h index 52335e48095..d23e7f2052d 100644 --- a/src/gui/symbology/qgsnullsymbolrendererwidget.h +++ b/src/gui/symbology/qgsnullsymbolrendererwidget.h @@ -16,7 +16,7 @@ #define QGSNULLSYMBOLRENDERERWIDGET_H #include "qgsrendererwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsNullSymbolRenderer; diff --git a/src/gui/symbology/qgspointclusterrendererwidget.h b/src/gui/symbology/qgspointclusterrendererwidget.h index 8897140e407..18c1760936b 100644 --- a/src/gui/symbology/qgspointclusterrendererwidget.h +++ b/src/gui/symbology/qgspointclusterrendererwidget.h @@ -19,7 +19,7 @@ #define QGSPOINTCLUSTERRENDERERWIDGET_H #include "ui_qgspointclusterrendererwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgsexpressioncontextgenerator.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgspointdisplacementrendererwidget.h b/src/gui/symbology/qgspointdisplacementrendererwidget.h index df8e89f1da8..34bffcf8c98 100644 --- a/src/gui/symbology/qgspointdisplacementrendererwidget.h +++ b/src/gui/symbology/qgspointdisplacementrendererwidget.h @@ -19,7 +19,7 @@ #define QGSPOINTDISPLACEMENTRENDERERWIDGET_H #include "ui_qgspointdisplacementrendererwidgetbase.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrendererwidget.h" #include "qgsexpressioncontextgenerator.h" #include "qgis_gui.h" diff --git a/src/gui/symbology/qgsrendererpropertiesdialog.h b/src/gui/symbology/qgsrendererpropertiesdialog.h index f7ad56671df..95493eb9efe 100644 --- a/src/gui/symbology/qgsrendererpropertiesdialog.h +++ b/src/gui/symbology/qgsrendererpropertiesdialog.h @@ -18,7 +18,7 @@ #define QGSRENDERERPROPERTIESDIALOG_H #include -#include "qgis.h" +#include "qgis_sip.h" #include "ui_qgsrendererpropsdialogbase.h" diff --git a/src/gui/symbology/qgsrulebasedrendererwidget.h b/src/gui/symbology/qgsrulebasedrendererwidget.h index 0c60511e29b..ff28d3d6eef 100644 --- a/src/gui/symbology/qgsrulebasedrendererwidget.h +++ b/src/gui/symbology/qgsrulebasedrendererwidget.h @@ -17,7 +17,7 @@ #define QGSRULEBASEDRENDERERWIDGET_H #include "qgsrendererwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsrulebasedrenderer.h" class QMenu; diff --git a/src/gui/symbology/qgssinglesymbolrendererwidget.h b/src/gui/symbology/qgssinglesymbolrendererwidget.h index 5b062d432cb..5875eaab03c 100644 --- a/src/gui/symbology/qgssinglesymbolrendererwidget.h +++ b/src/gui/symbology/qgssinglesymbolrendererwidget.h @@ -16,7 +16,7 @@ #define QGSSINGLESYMBOLRENDERERWIDGET_H #include "qgsrendererwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgis_gui.h" class QgsSingleSymbolRenderer; diff --git a/src/gui/symbology/qgsstyleexportimportdialog.h b/src/gui/symbology/qgsstyleexportimportdialog.h index 99ef96dad27..db0617d2065 100644 --- a/src/gui/symbology/qgsstyleexportimportdialog.h +++ b/src/gui/symbology/qgsstyleexportimportdialog.h @@ -30,6 +30,8 @@ #include "qgis_sip.h" #include "qgshelp.h" +#include + class QgsStyle; class QgsStyleGroupSelectionDialog; class QgsTemporaryCursorOverride; diff --git a/src/gui/symbology/qgssvgselectorwidget.h b/src/gui/symbology/qgssvgselectorwidget.h index d79f5f28a95..e30300f7151 100644 --- a/src/gui/symbology/qgssvgselectorwidget.h +++ b/src/gui/symbology/qgssvgselectorwidget.h @@ -18,7 +18,7 @@ #define QGSSVGSELECTORWIDGET_H #include "ui_widget_svgselector.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsguiutils.h" #include diff --git a/src/gui/symbology/qgssymbollayerwidget.h b/src/gui/symbology/qgssymbollayerwidget.h index d410734706d..479d231f81e 100644 --- a/src/gui/symbology/qgssymbollayerwidget.h +++ b/src/gui/symbology/qgssymbollayerwidget.h @@ -18,7 +18,7 @@ #define QGSSYMBOLLAYERWIDGET_H #include "qgspropertyoverridebutton.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgssymbolwidgetcontext.h" #include "qgssymbollayer.h" #include diff --git a/src/gui/symbology/qgssymbolselectordialog.h b/src/gui/symbology/qgssymbolselectordialog.h index 6455b2e6a1a..c4f8eb3ee81 100644 --- a/src/gui/symbology/qgssymbolselectordialog.h +++ b/src/gui/symbology/qgssymbolselectordialog.h @@ -18,7 +18,6 @@ #include #include "qgis_sip.h" -#include "qgis.h" #include "ui_qgssymbolselectordialogbase.h" diff --git a/src/gui/symbology/qgsvectorfieldsymbollayerwidget.h b/src/gui/symbology/qgsvectorfieldsymbollayerwidget.h index c56e7e84a58..d9f7385065a 100644 --- a/src/gui/symbology/qgsvectorfieldsymbollayerwidget.h +++ b/src/gui/symbology/qgsvectorfieldsymbollayerwidget.h @@ -16,7 +16,7 @@ #define QGSVECTORFIELDSYMBOLLAYERWIDGET_H #include "qgssymbollayerwidget.h" -#include "qgis.h" +#include "qgis_sip.h" #include "ui_widget_vectorfield.h" #include "qgis_gui.h" diff --git a/src/providers/db2/qgsdb2tablemodel.h b/src/providers/db2/qgsdb2tablemodel.h index a05a561dfd6..3040c22b0e8 100644 --- a/src/providers/db2/qgsdb2tablemodel.h +++ b/src/providers/db2/qgsdb2tablemodel.h @@ -19,8 +19,10 @@ #define QGSDB2TABLEMODEL_H #include +#include +#include #include "qgsdataitem.h" -#include "qgis.h" +#include "qgswkbtypes.h" //! Layer Property structure struct QgsDb2LayerProperty diff --git a/src/server/qgsbufferserverresponse.h b/src/server/qgsbufferserverresponse.h index 5e2d4b8b268..875658031b8 100644 --- a/src/server/qgsbufferserverresponse.h +++ b/src/server/qgsbufferserverresponse.h @@ -20,12 +20,13 @@ #define QGSBUFFERSERVERRESPONSE_H #include "qgis_server.h" -#include "qgis.h" +#include "qgis_sip.h" #include "qgsserverresponse.h" #include #include #include +#include /** * \ingroup server diff --git a/src/server/qgsserverinterface.h b/src/server/qgsserverinterface.h index 89e5e6ff690..2fd760ea820 100644 --- a/src/server/qgsserverinterface.h +++ b/src/server/qgsserverinterface.h @@ -40,7 +40,6 @@ class QgsServerCacheFilter; #endif #include "qgsserviceregistry.h" #include "qgis_server.h" -#include "qgis_sip.h" SIP_IF_MODULE( HAVE_SERVER_PYTHON_PLUGINS ) diff --git a/src/server/services/qgsmodule.h b/src/server/services/qgsmodule.h index d11abd55fe0..6cec51ed19a 100644 --- a/src/server/services/qgsmodule.h +++ b/src/server/services/qgsmodule.h @@ -17,7 +17,6 @@ * * ***************************************************************************/ -#include "qgis.h" #include "qgsservicemodule.h" #include "qgsserviceregistry.h" #include "qgsservice.h" diff --git a/tests/src/core/testqgscolorschemeregistry.cpp b/tests/src/core/testqgscolorschemeregistry.cpp index e895f720419..4d3ed221f84 100644 --- a/tests/src/core/testqgscolorschemeregistry.cpp +++ b/tests/src/core/testqgscolorschemeregistry.cpp @@ -17,6 +17,7 @@ #include "qgscolorschemeregistry.h" #include "qgscolorscheme.h" +#include "qgis.h" #include #include #include "qgstest.h" diff --git a/tests/src/core/testqgsnetworkaccessmanager.cpp b/tests/src/core/testqgsnetworkaccessmanager.cpp index bfc65498b2b..c2d69e485dd 100644 --- a/tests/src/core/testqgsnetworkaccessmanager.cpp +++ b/tests/src/core/testqgsnetworkaccessmanager.cpp @@ -18,6 +18,7 @@ #include "qgsnetworkcontentfetcher.h" #include "qgsnetworkaccessmanager.h" #include "qgsapplication.h" +#include "qgis.h" #include #include "qgstest.h" #include "qgssettings.h"