From 7219b1f54da2eab6ee7dd5a9934e25a12aebaa0e Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 19 Oct 2021 23:30:56 +0200 Subject: [PATCH] fix MSVC build: reverts fee62e4, dff05dd and e3a77b9484c effectivly reverting 3fb0f66 (followup #45348) Using --no-public-is-protected (default on Windows) also works on Linux and fixes #45331 too --- cmake/SIPMacros.cmake | 2 +- .../processing/qgs3dalgorithms.sip.in | 2 +- .../qgsabstractvectorlayer3drenderer.sip.in | 2 +- .../auto_generated/qgslayoutitem3dmap.sip.in | 2 +- .../symbols/qgspointcloud3dsymbol.sip.in | 2 +- .../interpolation/qgsinterpolator.sip.in | 2 +- .../network/qgsgraphdirector.sip.in | 2 +- .../qgsalgorithmbatchgeocode.sip.in | 2 +- .../processing/qgsnativealgorithms.sip.in | 2 +- .../raster/qgsalignraster.sip.in | 6 ++-- .../raster/qgsderivativefilter.sip.in | 2 +- .../raster/qgsninecellfilter.sip.in | 2 +- .../raster/qgsruggednessfilter.sip.in | 2 +- .../raster/qgstotalcurvaturefilter.sip.in | 2 +- .../geometry_checker/qgsfeaturepool.sip.in | 2 +- .../geometry_checker/qgsgeometrycheck.sip.in | 2 +- .../qgsgeometrycheckerror.sip.in | 2 +- .../qgssinglegeometrycheck.sip.in | 2 +- .../3d/qgs3drendererregistry.sip.in | 4 +-- .../3d/qgsabstract3drenderer.sip.in | 2 +- .../3d/qgsabstract3dsymbol.sip.in | 2 +- .../annotations/qgsannotation.sip.in | 2 +- .../annotations/qgsannotationitem.sip.in | 2 +- .../qgsannotationitemeditoperation.sip.in | 2 +- .../annotations/qgshtmlannotation.sip.in | 2 +- .../annotations/qgssvgannotation.sip.in | 2 +- .../annotations/qgstextannotation.sip.in | 2 +- .../auto_generated/auth/qgsauthmanager.sip.in | 4 +-- .../auto_generated/auth/qgsauthmethod.sip.in | 2 +- .../browser/qgsbrowsermodel.sip.in | 2 +- .../browser/qgsbrowserproxymodel.sip.in | 2 +- .../browser/qgsdatacollectionitem.sip.in | 2 +- .../auto_generated/browser/qgsdataitem.sip.in | 2 +- .../browser/qgsdirectoryitem.sip.in | 4 +-- .../browser/qgslayeritem.sip.in | 2 +- .../auto_generated/browser/qgszipitem.sip.in | 2 +- .../auto_generated/callouts/qgscallout.sip.in | 10 +++--- .../callouts/qgscalloutsregistry.sip.in | 4 +-- .../qgsclassificationmethod.sip.in | 2 +- .../auto_generated/diagram/qgsdiagram.sip.in | 2 +- .../editform/qgsattributeeditorelement.sip.in | 2 +- .../effects/qgsblureffect.sip.in | 2 +- .../effects/qgscoloreffect.sip.in | 2 +- .../effects/qgseffectstack.sip.in | 2 +- .../effects/qgsgloweffect.sip.in | 6 ++-- .../effects/qgspainteffect.sip.in | 4 +-- .../effects/qgspainteffectregistry.sip.in | 2 +- .../effects/qgsshadoweffect.sip.in | 6 ++-- .../effects/qgstransformeffect.sip.in | 2 +- .../expression/qgsexpressionfunction.sip.in | 2 +- .../expression/qgsexpressionnode.sip.in | 2 +- .../externalstorage/qgsexternalstorage.sip.in | 4 +-- .../geometry/qgsabstractgeometry.sip.in | 4 +-- .../geometry/qgscircularstring.sip.in | 2 +- .../geometry/qgscompoundcurve.sip.in | 2 +- .../auto_generated/geometry/qgscurve.sip.in | 2 +- .../geometry/qgscurvepolygon.sip.in | 4 +-- .../auto_generated/geometry/qgsellipse.sip.in | 2 +- .../geometry/qgsgeometrycollection.sip.in | 4 +-- .../geometry/qgsgeometryengine.sip.in | 2 +- .../geometry/qgslinestring.sip.in | 2 +- .../geometry/qgsmultilinestring.sip.in | 2 +- .../geometry/qgsmultipoint.sip.in | 2 +- .../geometry/qgsmultipolygon.sip.in | 2 +- .../auto_generated/geometry/qgspoint.sip.in | 2 +- .../auto_generated/geometry/qgspolygon.sip.in | 2 +- .../auto_generated/geometry/qgssurface.sip.in | 2 +- .../auto_generated/geometry/qgswkbptr.sip.in | 2 +- .../auto_generated/gps/qgsbabelformat.sip.in | 2 +- .../gps/qgsgpsconnection.sip.in | 2 +- .../gps/qgsnmeaconnection.sip.in | 2 +- .../labeling/qgsrulebasedlabeling.sip.in | 2 +- .../labeling/qgsvectorlayerlabeling.sip.in | 2 +- .../qgslayertreefilterproxymodel.sip.in | 2 +- .../layertree/qgslayertreegroup.sip.in | 2 +- .../layertree/qgslayertreelayer.sip.in | 2 +- .../layertree/qgslayertreemodel.sip.in | 4 +-- .../qgslayertreemodellegendnode.sip.in | 4 +-- .../layertree/qgslayertreenode.sip.in | 4 +-- .../qgslayertreeregistrybridge.sip.in | 2 +- .../layout/qgsabstractreportsection.sip.in | 5 ++- .../layout/qgslayouteffect.sip.in | 2 +- .../layout/qgslayoutexporter.sip.in | 2 +- .../layout/qgslayoutframe.sip.in | 2 +- .../layout/qgslayoutitem.sip.in | 2 +- .../layout/qgslayoutitemattributetable.sip.in | 2 +- .../layout/qgslayoutitemgroup.sip.in | 2 +- .../layout/qgslayoutitemhtml.sip.in | 2 +- .../layout/qgslayoutitemlabel.sip.in | 2 +- .../layout/qgslayoutitemlegend.sip.in | 2 +- .../layout/qgslayoutitemmanualtable.sip.in | 2 +- .../layout/qgslayoutitemmap.sip.in | 2 +- .../layout/qgslayoutitemmapitem.sip.in | 6 ++-- .../layout/qgslayoutitemmarker.sip.in | 2 +- .../layout/qgslayoutitemnodeitem.sip.in | 2 +- .../layout/qgslayoutitempage.sip.in | 2 +- .../layout/qgslayoutitempicture.sip.in | 2 +- .../layout/qgslayoutitempolygon.sip.in | 2 +- .../layout/qgslayoutitempolyline.sip.in | 2 +- .../layout/qgslayoutitemscalebar.sip.in | 2 +- .../layout/qgslayoutitemshape.sip.in | 2 +- .../layout/qgslayoutmodel.sip.in | 2 +- .../layout/qgslayoutmultiframe.sip.in | 2 +- .../layout/qgslayoutobject.sip.in | 2 +- .../layout/qgslayouttable.sip.in | 2 +- .../layout/qgslayoutundocommand.sip.in | 2 +- .../layout/qgsreportsectionfieldgroup.sip.in | 2 +- .../layout/qgsreportsectionlayout.sip.in | 2 +- .../qgsmaprenderercustompainterjob.sip.in | 2 +- .../maprenderer/qgsmaprendererjob.sip.in | 2 +- .../maprenderer/qgsmaprenderertask.sip.in | 2 +- .../mesh/qgsmeshadvancedediting.sip.in | 2 +- .../mesh/qgsmeshdataprovider.sip.in | 2 +- .../auto_generated/mesh/qgsmeshdataset.sip.in | 2 +- .../metadata/qgsabstractmetadatabase.sip.in | 2 +- .../network/qgsfiledownloader.sip.in | 2 +- .../network/qgsnetworkaccessmanager.sip.in | 2 +- .../network/qgsnewsfeedmodel.sip.in | 2 +- .../qgsbasicnumericformat.sip.in | 2 +- .../qgsfractionnumericformat.sip.in | 2 +- .../qgspointcloudclassifiedrenderer.sip.in | 2 +- .../pointcloud/qgspointcloudrenderer.sip.in | 2 +- .../qgspointcloudrendererregistry.sip.in | 4 +-- .../models/qgsprocessingmodelalgorithm.sip.in | 2 +- .../models/qgsprocessingmodelcomponent.sip.in | 2 +- .../processing/qgsprocessingalgorithm.sip.in | 4 +-- .../qgsprocessingalgrunnertask.sip.in | 2 +- .../processing/qgsprocessingoutputs.sip.in | 2 +- .../processing/qgsprocessingparameters.sip.in | 6 ++-- .../processing/qgsprocessingprovider.sip.in | 2 +- .../project/qgsprojectbadlayerhandler.sip.in | 8 ++--- ...sabstractdatabaseproviderconnection.sip.in | 2 +- .../providers/qgsdataprovider.sip.in | 2 +- .../providers/qgsprovidermetadata.sip.in | 2 +- .../providers/qgsprovidersublayermodel.sip.in | 4 +-- .../providers/qgsprovidersublayertask.sip.in | 2 +- .../qgsabstractcontentcache.sip.in | 4 +-- .../qgscachedfeatureiterator.sip.in | 4 +-- .../core/auto_generated/qgscolorramp.sip.in | 10 +++--- .../core/auto_generated/qgscolorscheme.sip.in | 4 +-- .../core/auto_generated/qgscredentials.sip.in | 6 ++-- .../qgsdbfilterproxymodel.sip.in | 2 +- .../auto_generated/qgsdiagramrenderer.sip.in | 6 ++-- .../auto_generated/qgsfeatureiterator.sip.in | 6 ++-- .../qgsfeaturepickermodelbase.sip.in | 2 +- .../auto_generated/qgsfeaturerequest.sip.in | 4 +-- .../core/auto_generated/qgsfieldmodel.sip.in | 2 +- .../qgsgeometrysimplifier.sip.in | 2 +- .../auto_generated/qgsmapdecoration.sip.in | 2 +- python/core/auto_generated/qgsmaplayer.sip.in | 2 +- .../auto_generated/qgsmaplayermodel.sip.in | 2 +- .../auto_generated/qgsmaplayerrenderer.sip.in | 2 +- .../qgsmaplayerserverproperties.sip.in | 4 +-- .../core/auto_generated/qgsmapsettings.sip.in | 2 +- .../qgsmaptopixelgeometrysimplifier.sip.in | 2 +- .../core/auto_generated/qgsmessagelog.sip.in | 2 +- .../qgsobjectcustomproperties.sip.in | 2 +- .../auto_generated/qgsowsconnection.sip.in | 2 +- .../core/auto_generated/qgspluginlayer.sip.in | 2 +- .../qgspluginlayerregistry.sip.in | 2 +- .../auto_generated/qgspointlocator.sip.in | 4 +-- .../qgspropertytransformer.sip.in | 2 +- .../auto_generated/qgspythonrunner.sip.in | 2 +- python/core/auto_generated/qgsrange.sip.in | 2 +- .../auto_generated/qgsrenderchecker.sip.in | 2 +- .../auto_generated/qgssimplifymethod.sip.in | 2 +- .../auto_generated/qgssnappingutils.sip.in | 2 +- .../auto_generated/qgssqlstatement.sip.in | 30 ++++++++--------- .../core/auto_generated/qgstaskmanager.sip.in | 2 +- python/core/auto_generated/qgstracer.sip.in | 2 +- .../core/auto_generated/qgstransaction.sip.in | 2 +- .../auto_generated/qgsvectorfilewriter.sip.in | 2 +- .../qgsvectorfilewritertask.sip.in | 2 +- .../raster/qgscolorrampshader.sip.in | 2 +- .../qgscontrastenhancementfunction.sip.in | 2 +- .../raster/qgsrasterdataprovider.sip.in | 2 +- .../raster/qgsrasterdrawer.sip.in | 2 +- .../raster/qgsrasterfilewritertask.sip.in | 2 +- .../raster/qgsrasterinterface.sip.in | 8 +++-- .../raster/qgsrasterlayer.sip.in | 2 +- .../raster/qgsrasterrenderer.sip.in | 2 +- .../raster/qgsrasterresamplefilter.sip.in | 2 +- .../raster/qgsrastershaderfunction.sip.in | 2 +- .../scalebar/qgsscalebarrenderer.sip.in | 2 +- .../settings/qgssettingsregistry.sip.in | 2 +- .../qgscategorizedsymbolrenderer.sip.in | 4 +-- .../symbology/qgscptcityarchive.sip.in | 14 ++++---- .../symbology/qgsfillsymbollayer.sip.in | 16 +++++----- .../qgsgraduatedsymbolrenderer.sip.in | 2 +- .../symbology/qgslinesymbollayer.sip.in | 6 ++-- .../symbology/qgsmarkersymbollayer.sip.in | 8 ++--- .../symbology/qgsmergedfeaturerenderer.sip.in | 5 ++- .../symbology/qgspointdistancerenderer.sip.in | 2 +- .../symbology/qgsrenderer.sip.in | 4 +-- .../symbology/qgsrendererrange.sip.in | 4 +-- .../symbology/qgsrendererregistry.sip.in | 4 +-- .../symbology/qgsrulebasedrenderer.sip.in | 4 +-- .../symbology/qgssinglesymbolrenderer.sip.in | 2 +- .../symbology/qgssvgcache.sip.in | 2 +- .../auto_generated/symbology/qgssymbol.sip.in | 2 +- .../symbology/qgssymbollayer.sip.in | 8 ++--- .../symbology/qgssymbollayerregistry.sip.in | 4 +-- .../vector/qgsvectordataprovider.sip.in | 2 +- .../vector/qgsvectorlayer.sip.in | 2 +- .../vector/qgsvectorlayercache.sip.in | 2 +- .../vector/qgsvectorlayereditbuffer.sip.in | 4 +-- .../vector/qgsvectorlayerexporter.sip.in | 2 +- .../qgsvectorlayerfeatureiterator.sip.in | 4 +-- .../vector/qgsvectorlayerjoininfo.sip.in | 2 +- .../vector/qgsvectorlayerundocommand.sip.in | 2 +- ...gsvectorlayerundopassthroughcommand.sip.in | 2 +- .../qgsmapboxglstyleconverter.sip.in | 5 ++- .../qgsannotationitemwidget.sip.in | 2 +- .../qgsattributetablefiltermodel.sip.in | 2 +- .../qgsattributetableview.sip.in | 2 +- .../attributetable/qgsdualview.sip.in | 2 +- .../attributetable/qgsfeaturelistview.sip.in | 2 +- .../qgsfeaturelistviewdelegate.sip.in | 2 +- .../auth/qgsauthauthoritieseditor.sip.in | 2 +- .../auth/qgsauthidentitieseditor.sip.in | 2 +- .../auth/qgsauthmethodedit.sip.in | 2 +- .../auth/qgsauthserverseditor.sip.in | 2 +- .../auth/qgsauthtrustedcasdialog.sip.in | 2 +- .../callouts/qgscalloutwidget.sip.in | 2 +- .../codeeditors/qgscodeeditor.sip.in | 2 +- .../codeeditors/qgscodeeditorcss.sip.in | 2 +- .../qgscodeeditorexpression.sip.in | 2 +- .../codeeditors/qgscodeeditorhtml.sip.in | 2 +- .../codeeditors/qgscodeeditorjs.sip.in | 2 +- .../codeeditors/qgscodeeditorjson.sip.in | 2 +- .../codeeditors/qgscodeeditorpython.sip.in | 2 +- .../codeeditors/qgscodeeditorsql.sip.in | 2 +- .../core/qgseditorconfigwidget.sip.in | 2 +- .../core/qgseditorwidgetwrapper.sip.in | 2 +- .../core/qgssearchwidgetwrapper.sip.in | 2 +- .../core/qgswidgetwrapper.sip.in | 2 +- .../qgscheckboxsearchwidgetwrapper.sip.in | 2 +- .../editorwidgets/qgsdatetimeedit.sip.in | 6 ++-- .../qgsdatetimesearchwidgetwrapper.sip.in | 2 +- .../qgsdefaultsearchwidgetwrapper.sip.in | 2 +- .../editorwidgets/qgsdoublespinbox.sip.in | 2 +- ...elationreferencesearchwidgetwrapper.sip.in | 2 +- .../qgsrelationreferencewidget.sip.in | 2 +- .../qgsrelationreferencewidgetwrapper.sip.in | 2 +- .../qgsrelationwidgetwrapper.sip.in | 2 +- .../editorwidgets/qgsspinbox.sip.in | 2 +- .../qgsvaluemapsearchwidgetwrapper.sip.in | 2 +- ...qgsvaluerelationsearchwidgetwrapper.sip.in | 2 +- .../qgseffectstackpropertieswidget.sip.in | 4 +-- .../qgslabelsettingswidgetbase.sip.in | 2 +- .../qgslayertreeembeddedwidgetregistry.sip.in | 2 +- .../layertree/qgslayertreeview.sip.in | 6 ++-- .../qgslayertreeviewdefaultactions.sip.in | 4 +-- .../layout/qgslayoutitemwidget.sip.in | 2 +- .../layout/qgslayoutruler.sip.in | 2 +- .../layout/qgslayoutview.sip.in | 2 +- .../layout/qgslayoutviewrubberband.sip.in | 2 +- .../layout/qgslayoutviewtool.sip.in | 2 +- .../layout/qgslayoutviewtoolzoom.sip.in | 2 +- .../locator/qgslocatorwidget.sip.in | 2 +- .../qgspointcloudrendererwidget.sip.in | 2 +- .../qgsmodelcomponentgraphicitem.sip.in | 12 +++---- .../models/qgsmodeldesignerdialog.sip.in | 2 +- .../models/qgsmodelgraphicitem.sip.in | 2 +- .../models/qgsmodelgraphicsscene.sip.in | 2 +- .../qgsprocessingalgorithmdialogbase.sip.in | 2 +- .../qgsprocessingmaplayercombobox.sip.in | 2 +- ...gsprocessingmultipleselectiondialog.sip.in | 2 +- ...gsprocessingoutputdestinationwidget.sip.in | 2 +- .../qgsprocessingparameterswidget.sip.in | 2 +- .../qgsprocessingtoolboxtreeview.sip.in | 2 +- .../qgsprocessingwidgetwrapper.sip.in | 8 ++--- .../qgsabstractdatasourcewidget.sip.in | 2 +- .../qgsabstractrelationeditorwidget.sip.in | 2 +- .../qgsattributeformwidget.sip.in | 2 +- .../auto_generated/qgsbrowsertreeview.sip.in | 2 +- .../auto_generated/qgsbrowserwidget.sip.in | 2 +- .../qgscharacterselectordialog.sip.in | 2 +- .../qgscheckablecombobox.sip.in | 4 +-- .../qgscollapsiblegroupbox.sip.in | 6 ++-- .../gui/auto_generated/qgscolorbutton.sip.in | 2 +- .../gui/auto_generated/qgscolordialog.sip.in | 2 +- .../auto_generated/qgscolorrampbutton.sip.in | 2 +- .../auto_generated/qgscolorschemelist.sip.in | 2 +- .../auto_generated/qgscolorswatchgrid.sip.in | 2 +- .../gui/auto_generated/qgscolorwidgets.sip.in | 12 +++---- .../qgscompoundcolorwidget.sip.in | 2 +- .../qgsconfigureshortcutsdialog.sip.in | 2 +- .../auto_generated/qgscredentialdialog.sip.in | 2 +- .../qgscurveeditorwidget.sip.in | 2 +- python/gui/auto_generated/qgsdial.sip.in | 2 +- python/gui/auto_generated/qgsdialog.sip.in | 2 +- .../gui/auto_generated/qgsdockwidget.sip.in | 2 +- .../qgsexpressionbuilderdialog.sip.in | 2 +- .../qgsexpressionbuilderwidget.sip.in | 2 +- .../qgsexpressionhighlighter.sip.in | 2 +- .../qgsexpressionlineedit.sip.in | 2 +- .../qgsexpressionselectiondialog.sip.in | 2 +- .../qgsexpressiontreeview.sip.in | 2 +- .../gui/auto_generated/qgsextentwidget.sip.in | 2 +- .../qgsexternalstoragefilewidget.sip.in | 2 +- .../qgsfeatureselectiondlg.sip.in | 2 +- .../qgsfieldexpressionwidget.sip.in | 2 +- .../qgsfilecontentsourcelineedit.sip.in | 2 +- .../gui/auto_generated/qgsfilewidget.sip.in | 2 +- .../auto_generated/qgsfilterlineedit.sip.in | 2 +- .../auto_generated/qgsfloatingwidget.sip.in | 2 +- .../gui/auto_generated/qgsfontbutton.sip.in | 2 +- .../auto_generated/qgsformannotation.sip.in | 2 +- .../qgsgeometryrubberband.sip.in | 2 +- .../qgsgradientstopeditor.sip.in | 2 +- python/gui/auto_generated/qgshighlight.sip.in | 2 +- .../qgshighlightablelineedit.sip.in | 2 +- .../auto_generated/qgshistogramwidget.sip.in | 2 +- .../gui/auto_generated/qgsidentifymenu.sip.in | 2 +- .../qgslegendpatchshapebutton.sip.in | 2 +- python/gui/auto_generated/qgsmapcanvas.sip.in | 2 +- .../auto_generated/qgsmapcanvasitem.sip.in | 4 +-- .../qgsmapcanvassnappingutils.sip.in | 2 +- .../auto_generated/qgsmapcanvastracer.sip.in | 2 +- .../qgsmaplayeractionregistry.sip.in | 2 +- .../auto_generated/qgsmaplayercombobox.sip.in | 2 +- .../qgsmaplayerconfigwidget.sip.in | 2 +- .../qgsmapoverviewcanvas.sip.in | 2 +- python/gui/auto_generated/qgsmaptool.sip.in | 2 +- .../qgsmaptooladvanceddigitizing.sip.in | 2 +- .../auto_generated/qgsmaptoolcapture.sip.in | 2 +- .../qgsmaptooldigitizefeature.sip.in | 2 +- .../gui/auto_generated/qgsmaptooledit.sip.in | 5 ++- .../auto_generated/qgsmaptoolidentify.sip.in | 2 +- .../qgsmaptoolidentifyfeature.sip.in | 2 +- .../gui/auto_generated/qgsmaptoolzoom.sip.in | 2 +- .../gui/auto_generated/qgsmenuheader.sip.in | 2 +- .../gui/auto_generated/qgsmessagebar.sip.in | 2 +- .../auto_generated/qgsmessagelogviewer.sip.in | 2 +- .../qgsnewauxiliaryfielddialog.sip.in | 2 +- .../qgsnewauxiliarylayerdialog.sip.in | 2 +- .../qgsnewhttpconnection.sip.in | 5 ++- .../auto_generated/qgsnewnamedialog.sip.in | 2 +- .../qgsnewvectortabledialog.sip.in | 2 +- .../qgsoptionsdialogbase.sip.in | 2 +- .../qgsoptionsdialoghighlightwidget.sip.in | 2 +- ...gsoptionsdialoghighlightwidgetsimpl.sip.in | 12 +++---- .../qgsoptionswidgetfactory.sip.in | 2 +- .../auto_generated/qgsorderbydialog.sip.in | 2 +- .../auto_generated/qgsowssourceselect.sip.in | 2 +- .../gui/auto_generated/qgspanelwidget.sip.in | 2 +- .../auto_generated/qgspanelwidgetstack.sip.in | 2 +- .../auto_generated/qgsprevieweffect.sip.in | 2 +- .../qgsprojectionselectiontreewidget.sip.in | 2 +- .../qgsprojectionselectionwidget.sip.in | 2 +- .../qgspropertyoverridebutton.sip.in | 2 +- .../qgsrasterformatsaveoptionswidget.sip.in | 2 +- .../auto_generated/qgsratiolockbutton.sip.in | 2 +- .../qgsrelationeditorwidget.sip.in | 2 +- .../auto_generated/qgsrichtexteditor.sip.in | 2 +- .../gui/auto_generated/qgsrubberband.sip.in | 2 +- .../auto_generated/qgsscalecombobox.sip.in | 2 +- .../gui/auto_generated/qgsscrollarea.sip.in | 2 +- python/gui/auto_generated/qgsslider.sip.in | 2 +- python/gui/auto_generated/qgsstatusbar.sip.in | 2 +- .../qgsstyleitemslistwidget.sip.in | 2 +- .../auto_generated/qgssublayersdialog.sip.in | 2 +- .../gui/auto_generated/qgssymbolbutton.sip.in | 2 +- .../auto_generated/qgstablewidgetbase.sip.in | 2 +- .../qgstemporalcontrollerwidget.sip.in | 2 +- .../auto_generated/qgstextformatwidget.sip.in | 5 ++- .../auto_generated/qgsuserinputwidget.sip.in | 2 +- .../qgsvariableeditorwidget.sip.in | 2 +- .../raster/qgscolorrampshaderwidget.sip.in | 2 +- .../raster/qgsrasterrendererwidget.sip.in | 2 +- .../raster/qgsrastertransparencywidget.sip.in | 2 +- .../symbology/characterwidget.sip.in | 2 +- .../symbology/qgsbrushstylecombobox.sip.in | 2 +- .../qgscategorizedsymbolrendererwidget.sip.in | 6 ++-- .../qgsellipsesymbollayerwidget.sip.in | 2 +- .../qgsgraduatedhistogramwidget.sip.in | 2 +- .../qgsgraduatedsymbolrendererwidget.sip.in | 4 +-- .../qgsinvertedpolygonrendererwidget.sip.in | 2 +- .../symbology/qgslayerpropertieswidget.sip.in | 4 +-- .../qgsnullsymbolrendererwidget.sip.in | 2 +- .../symbology/qgspenstylecombobox.sip.in | 2 +- .../qgsrendererpropertiesdialog.sip.in | 2 +- .../symbology/qgsrendererwidget.sip.in | 10 +++--- .../qgsrulebasedrendererwidget.sip.in | 6 ++-- .../qgssinglesymbolrendererwidget.sip.in | 2 +- .../qgssmartgroupeditordialog.sip.in | 4 +-- .../symbology/qgsstylemanagerdialog.sip.in | 2 +- .../symbology/qgssvgselectorwidget.sip.in | 6 ++-- .../symbology/qgssymbollayerwidget.sip.in | 32 +++++++++---------- .../symbology/qgssymbolselectordialog.sip.in | 2 +- .../qgsvectorfieldsymbollayerwidget.sip.in | 2 +- .../tableeditor/qgstableeditordialog.sip.in | 2 +- .../tableeditor/qgstableeditorwidget.sip.in | 2 +- .../auto_generated/qgsserverlogger.sip.in | 2 +- .../qgsserverogcapihandler.sip.in | 2 +- .../auto_generated/qgsserverparameters.sip.in | 2 +- .../auto_generated/qgsserverrequest.sip.in | 2 +- scripts/sipify.pl | 12 ------- src/core/mesh/qgsmesheditor.h | 5 ++- src/core/mesh/qgstopologicalmesh.h | 6 ++++ src/core/raster/qgsrasterinterface.h | 6 ++-- tests/code_layout/sipifyheader.expected.sip | 2 +- 403 files changed, 569 insertions(+), 576 deletions(-) diff --git a/cmake/SIPMacros.cmake b/cmake/SIPMacros.cmake index 21328c9d83ba..4a9c400e6ff1 100644 --- a/cmake/SIPMacros.cmake +++ b/cmake/SIPMacros.cmake @@ -101,7 +101,7 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} ) ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} ) - SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT5_SIP_DIR} ${SIP_BUILD_EXTRA_OPTIONS}) + SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT5_SIP_DIR} ${SIP_BUILD_EXTRA_OPTIONS}) ADD_CUSTOM_COMMAND( OUTPUT ${_sip_output_files} diff --git a/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in b/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in index 3bf758881bae..e99c91b366d1 100644 --- a/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in +++ b/python/3d/auto_generated/processing/qgs3dalgorithms.sip.in @@ -40,7 +40,7 @@ Constructor for Qgs3DAlgorithms. virtual bool supportsNonFileBasedOutput() const; - public: + protected: virtual void loadAlgorithms(); diff --git a/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in b/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in index c1662ec8436f..b0dcaac1b293 100644 --- a/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in +++ b/python/3d/auto_generated/qgsabstractvectorlayer3drenderer.sip.in @@ -97,7 +97,7 @@ Returns tiling settings of the renderer virtual void resolveReferences( const QgsProject &project ); - public: + protected: void copyBaseProperties( QgsAbstractVectorLayer3DRenderer *r ) const; %Docstring Copies common properties of this object to another object diff --git a/python/3d/auto_generated/qgslayoutitem3dmap.sip.in b/python/3d/auto_generated/qgslayoutitem3dmap.sip.in index 0b7986ce22b8..1304f4bd1542 100644 --- a/python/3d/auto_generated/qgslayoutitem3dmap.sip.in +++ b/python/3d/auto_generated/qgslayoutitem3dmap.sip.in @@ -102,7 +102,7 @@ overridden to show "3D Map 1" type names virtual void refresh(); - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in b/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in index 95d1594f0ee2..b2395af9fcb8 100644 --- a/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in +++ b/python/3d/auto_generated/symbols/qgspointcloud3dsymbol.sip.in @@ -72,7 +72,7 @@ Sets the point size Returns the byte stride for the geometries used to for the vertex buffer %End - public: + protected: }; class QgsSingleColorPointCloud3DSymbol : QgsPointCloud3DSymbol diff --git a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in index 52f4bdb177f4..cbe124ec6a4b 100644 --- a/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in +++ b/python/analysis/auto_generated/interpolation/qgsinterpolator.sip.in @@ -98,7 +98,7 @@ Calculates interpolation value for map coordinates x, y %End - public: + protected: Result cacheBaseData( QgsFeedback *feedback = 0 ); %Docstring diff --git a/python/analysis/auto_generated/network/qgsgraphdirector.sip.in b/python/analysis/auto_generated/network/qgsgraphdirector.sip.in index 1b707214a838..42edfe59ff9c 100644 --- a/python/analysis/auto_generated/network/qgsgraphdirector.sip.in +++ b/python/analysis/auto_generated/network/qgsgraphdirector.sip.in @@ -61,7 +61,7 @@ Add optimization strategy Returns director name %End - public: + protected: }; /************************************************************************ diff --git a/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in b/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in index 95416e58f308..83020ec9a278 100644 --- a/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in +++ b/python/analysis/auto_generated/processing/qgsalgorithmbatchgeocode.sip.in @@ -80,7 +80,7 @@ exists for the lifetime of this algorithm. virtual bool supportInPlaceEdit( const QgsMapLayer *layer ) const; - public: + protected: virtual QString outputName() const; virtual bool prepareAlgorithm( const QVariantMap ¶meters, QgsProcessingContext &context, QgsProcessingFeedback *feedback ); diff --git a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in index 06029ca04b2c..718e624e4540 100644 --- a/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in +++ b/python/analysis/auto_generated/processing/qgsnativealgorithms.sip.in @@ -40,7 +40,7 @@ Constructor for QgsNativeAlgorithms. virtual bool supportsNonFileBasedOutput() const; - public: + protected: virtual void loadAlgorithms(); diff --git a/python/analysis/auto_generated/raster/qgsalignraster.sip.in b/python/analysis/auto_generated/raster/qgsalignraster.sip.in index 74cd996f2a54..232fe965922a 100644 --- a/python/analysis/auto_generated/raster/qgsalignraster.sip.in +++ b/python/analysis/auto_generated/raster/qgsalignraster.sip.in @@ -84,7 +84,7 @@ Write contents of the object to standard error stream - for debugging Gets raster value at the given coordinates (from the first band) %End - public: + protected: private: RasterInfo( const QgsAlignRaster::RasterInfo &rh ); @@ -264,7 +264,7 @@ write contents of the object to standard error stream - for debugging Returns the index of the layer which has smallest cell size (returns -1 on error) %End - public: + protected: bool createAndWarp( const Item &raster ); %Docstring @@ -276,7 +276,7 @@ Internal function for processing of one raster (1. create output, 2. do the alig Determine suggested output of raster warp to a different CRS. Returns ``True`` on success %End - public: + protected: diff --git a/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in b/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in index 2fd74ad9bb3d..4e6a4590c7ef 100644 --- a/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in +++ b/python/analysis/auto_generated/raster/qgsderivativefilter.sip.in @@ -27,7 +27,7 @@ Needs to be subclassed (e.g. for slope and aspect). float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ) = 0; - public: + protected: float calcFirstDerX( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 ); %Docstring Calculates the first order derivative in x-direction according to Horn (1981) diff --git a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in index 548d4d3325a8..c0fd31084db8 100644 --- a/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in +++ b/python/analysis/auto_generated/raster/qgsninecellfilter.sip.in @@ -75,7 +75,7 @@ First index of the input cell is the row, second index is the column :return: the calculated cell value for the central cell x22 %End - public: + protected: }; diff --git a/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in b/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in index 3dae6c61909c..22be0dd85c5d 100644 --- a/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in +++ b/python/analysis/auto_generated/raster/qgsruggednessfilter.sip.in @@ -23,7 +23,7 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top public: QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat ); - public: + protected: virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, diff --git a/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in b/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in index 3a4f223c02e3..2bc8aebffea4 100644 --- a/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in +++ b/python/analysis/auto_generated/raster/qgstotalcurvaturefilter.sip.in @@ -21,7 +21,7 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy public: QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat ); - public: + protected: virtual float processNineCellWindow( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in index 450c6d159c62..6dfc9531ec36 100644 --- a/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in +++ b/python/analysis/auto_generated/vector/geometry_checker/qgsfeaturepool.sip.in @@ -86,7 +86,7 @@ Should be preferred over :py:func:`~QgsFeaturePool.layer`.name() because it can the background thread. %End - public: + protected: void insertFeature( const QgsFeature &feature, bool skipLock = false ); %Docstring diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in index bc1bbd9ac6b6..ab5c37c94210 100644 --- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in +++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheck.sip.in @@ -231,7 +231,7 @@ Returns the context .. versionadded:: 3.4 %End - public: + protected: diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in index fb11e12d91fe..ff5d608c8b0f 100644 --- a/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in +++ b/python/analysis/auto_generated/vector/geometry_checker/qgsgeometrycheckerror.sip.in @@ -179,7 +179,7 @@ Returns an icon that should be shown for this kind of error. .. versionadded:: 3.8 %End - public: + protected: QgsGeometryCheckError( const QgsGeometryCheck *check, const QString &layerId, diff --git a/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in b/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in index f83eed3bf00e..3dfcc3337681 100644 --- a/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in +++ b/python/analysis/auto_generated/vector/geometry_checker/qgssinglegeometrycheck.sip.in @@ -76,7 +76,7 @@ The vertex id of the error. May be invalid depending on the check. .. versionadded:: 3.4 %End - public: + protected: }; class QgsGeometryCheckErrorSingle : QgsGeometryCheckError diff --git a/python/core/auto_generated/3d/qgs3drendererregistry.sip.in b/python/core/auto_generated/3d/qgs3drendererregistry.sip.in index fb221a98fdb6..9b88283a4f6c 100644 --- a/python/core/auto_generated/3d/qgs3drendererregistry.sip.in +++ b/python/core/auto_generated/3d/qgs3drendererregistry.sip.in @@ -37,14 +37,14 @@ Returns new instance of the renderer given the DOM element. Returns ``None`` on Pure virtual function: must be implemented in derived classes. %End - public: + protected: explicit Qgs3DRendererAbstractMetadata( const QString &type ); %Docstring Constructor of the base class %End - public: + protected: }; diff --git a/python/core/auto_generated/3d/qgsabstract3drenderer.sip.in b/python/core/auto_generated/3d/qgsabstract3drenderer.sip.in index 039008a47525..0a182600945d 100644 --- a/python/core/auto_generated/3d/qgsabstract3drenderer.sip.in +++ b/python/core/auto_generated/3d/qgsabstract3drenderer.sip.in @@ -53,7 +53,7 @@ Reads renderer's properties from given XML element Resolves references to other objects - second phase of loading - after :py:func:`~QgsAbstract3DRenderer.readXml` %End - public: + protected: QgsAbstract3DRenderer(); %Docstring Default constructor diff --git a/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in b/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in index 1f8ba7034245..d5fc046a3fee 100644 --- a/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in +++ b/python/core/auto_generated/3d/qgsabstract3dsymbol.sip.in @@ -86,7 +86,7 @@ Sets the symbol layer's property collection, used for data defined overrides. %End - public: + protected: void copyBaseSettings( QgsAbstract3DSymbol *destination ) const; %Docstring diff --git a/python/core/auto_generated/annotations/qgsannotation.sip.in b/python/core/auto_generated/annotations/qgsannotation.sip.in index c0187766303c..3a4d4fa7a6c9 100644 --- a/python/core/auto_generated/annotations/qgsannotation.sip.in +++ b/python/core/auto_generated/annotations/qgsannotation.sip.in @@ -359,7 +359,7 @@ to be moved to reflect this. Emitted when the map layer associated with the annotation changes. %End - public: + protected: virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const = 0; %Docstring diff --git a/python/core/auto_generated/annotations/qgsannotationitem.sip.in b/python/core/auto_generated/annotations/qgsannotationitem.sip.in index 2abc67352cd2..20177b0444b0 100644 --- a/python/core/auto_generated/annotations/qgsannotationitem.sip.in +++ b/python/core/auto_generated/annotations/qgsannotationitem.sip.in @@ -205,7 +205,7 @@ exactly 2mm thick when a map is rendered at 1:1000, or 1mm thick when rendered a .. seealso:: :py:func:`setUseSymbologyReferenceScale` %End - public: + protected: void copyCommonProperties( const QgsAnnotationItem *other ); %Docstring diff --git a/python/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in b/python/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in index 108a4879cafd..d9b303432eb5 100644 --- a/python/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in +++ b/python/core/auto_generated/annotations/qgsannotationitemeditoperation.sip.in @@ -47,7 +47,7 @@ Returns the operation type. Returns the associated item ID. %End - public: + protected: }; diff --git a/python/core/auto_generated/annotations/qgshtmlannotation.sip.in b/python/core/auto_generated/annotations/qgshtmlannotation.sip.in index 594682b7b696..9cc775a6135f 100644 --- a/python/core/auto_generated/annotations/qgshtmlannotation.sip.in +++ b/python/core/auto_generated/annotations/qgshtmlannotation.sip.in @@ -75,7 +75,7 @@ Returns html source text Returns a new QgsHtmlAnnotation object. %End - public: + protected: virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const; diff --git a/python/core/auto_generated/annotations/qgssvgannotation.sip.in b/python/core/auto_generated/annotations/qgssvgannotation.sip.in index 378338df4c01..4ea4081bb57a 100644 --- a/python/core/auto_generated/annotations/qgssvgannotation.sip.in +++ b/python/core/auto_generated/annotations/qgssvgannotation.sip.in @@ -54,7 +54,7 @@ Returns the file path for the source SVG file. Returns a new QgsSvgAnnotation object. %End - public: + protected: virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const; diff --git a/python/core/auto_generated/annotations/qgstextannotation.sip.in b/python/core/auto_generated/annotations/qgstextannotation.sip.in index 77671cd78327..c901050b1b9e 100644 --- a/python/core/auto_generated/annotations/qgstextannotation.sip.in +++ b/python/core/auto_generated/annotations/qgstextannotation.sip.in @@ -56,7 +56,7 @@ within the annotation. Ownership is not transferred. Returns a new QgsTextAnnotation object. %End - public: + protected: virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const; diff --git a/python/core/auto_generated/auth/qgsauthmanager.sip.in b/python/core/auto_generated/auth/qgsauthmanager.sip.in index 695f37450f11..4805e289068d 100644 --- a/python/core/auto_generated/auth/qgsauthmanager.sip.in +++ b/python/core/auto_generated/auth/qgsauthmanager.sip.in @@ -842,12 +842,12 @@ Clear all authentication configs from authentication method caches Clear an authentication config from its associated authentication method cache %End - public: + protected: public: - public: + protected: }; diff --git a/python/core/auto_generated/auth/qgsauthmethod.sip.in b/python/core/auto_generated/auth/qgsauthmethod.sip.in index c46732ae4db3..d0f34a597b54 100644 --- a/python/core/auto_generated/auth/qgsauthmethod.sip.in +++ b/python/core/auto_generated/auth/qgsauthmethod.sip.in @@ -153,7 +153,7 @@ Update an authentication configuration in place Useful for updating previously stored authcfgs, when an authentication method has been significantly updated %End - public: + protected: explicit QgsAuthMethod(); %Docstring diff --git a/python/core/auto_generated/browser/qgsbrowsermodel.sip.in b/python/core/auto_generated/browser/qgsbrowsermodel.sip.in index 12d225e13177..e88d3496cf66 100644 --- a/python/core/auto_generated/browser/qgsbrowsermodel.sip.in +++ b/python/core/auto_generated/browser/qgsbrowsermodel.sip.in @@ -237,7 +237,7 @@ Delayed initialization, needed because the provider registry must be already pop .. seealso:: :py:func:`initialized` %End - public: + protected: void addRootItems(); %Docstring Populates the model diff --git a/python/core/auto_generated/browser/qgsbrowserproxymodel.sip.in b/python/core/auto_generated/browser/qgsbrowserproxymodel.sip.in index 8a83450d6096..786a0e180c43 100644 --- a/python/core/auto_generated/browser/qgsbrowserproxymodel.sip.in +++ b/python/core/auto_generated/browser/qgsbrowserproxymodel.sip.in @@ -187,7 +187,7 @@ Sets show layers to ``showLayers`` .. versionadded:: 3.14 %End - public: + protected: virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; diff --git a/python/core/auto_generated/browser/qgsdatacollectionitem.sip.in b/python/core/auto_generated/browser/qgsdatacollectionitem.sip.in index 7464d188d013..a71570a05e0f 100644 --- a/python/core/auto_generated/browser/qgsdatacollectionitem.sip.in +++ b/python/core/auto_generated/browser/qgsdatacollectionitem.sip.in @@ -62,7 +62,7 @@ Returns the standard browser data collection icon. virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const; - public: + protected: static QIcon openDirIcon( const QColor &fillColor = QColor(), const QColor &strokeColor = QColor() ); %Docstring diff --git a/python/core/auto_generated/browser/qgsdataitem.sip.in b/python/core/auto_generated/browser/qgsdataitem.sip.in index 401fa89f5bcd..dfc320e438a8 100644 --- a/python/core/auto_generated/browser/qgsdataitem.sip.in +++ b/python/core/auto_generated/browser/qgsdataitem.sip.in @@ -419,7 +419,7 @@ Ownership of the returned objects is transferred to the caller. .. versionadded:: 3.16 %End - public: + protected: virtual void populate( const QVector &children ); virtual void refresh( const QVector &children ); diff --git a/python/core/auto_generated/browser/qgsdirectoryitem.sip.in b/python/core/auto_generated/browser/qgsdirectoryitem.sip.in index 29ccba28d793..d340b12f4798 100644 --- a/python/core/auto_generated/browser/qgsdirectoryitem.sip.in +++ b/python/core/auto_generated/browser/qgsdirectoryitem.sip.in @@ -187,7 +187,7 @@ This is a persistent setting, which is saved in QSettings. void directoryChanged(); - public: + protected: void init(); @@ -208,7 +208,7 @@ Browser parameter widget implementation for directory items. public: QgsDirectoryParamWidget( const QString &path, QWidget *parent /TransferThis/ = 0 ); - public: + protected: virtual void mousePressEvent( QMouseEvent *event ); diff --git a/python/core/auto_generated/browser/qgslayeritem.sip.in b/python/core/auto_generated/browser/qgslayeritem.sip.in index c18005d837bf..9c37b022cc84 100644 --- a/python/core/auto_generated/browser/qgslayeritem.sip.in +++ b/python/core/auto_generated/browser/qgslayeritem.sip.in @@ -106,7 +106,7 @@ Use :py:class:`QgsDataItemGuiProvider`.deleteLayer instead QGIS 3.10 %End - public: + protected: public: diff --git a/python/core/auto_generated/browser/qgszipitem.sip.in b/python/core/auto_generated/browser/qgszipitem.sip.in index 311296828300..eabb28c02daa 100644 --- a/python/core/auto_generated/browser/qgszipitem.sip.in +++ b/python/core/auto_generated/browser/qgszipitem.sip.in @@ -17,7 +17,7 @@ A zip file: contains layers, using GDAL/OGR VSIFILE mechanism %TypeHeaderCode #include "qgszipitem.h" %End - public: + protected: public: QgsZipItem( QgsDataItem *parent, const QString &name, const QString &path ); diff --git a/python/core/auto_generated/callouts/qgscallout.sip.in b/python/core/auto_generated/callouts/qgscallout.sip.in index f10ca8356bae..4226e1fd275b 100644 --- a/python/core/auto_generated/callouts/qgscallout.sip.in +++ b/python/core/auto_generated/callouts/qgscallout.sip.in @@ -420,7 +420,7 @@ Sets the blending ``mode`` used for drawing callouts. .. versionadded:: 3.20 %End - public: + protected: virtual void draw( QgsRenderContext &context, const QRectF &bodyBoundingBox, const double angle, const QgsGeometry &anchor, QgsCalloutContext &calloutContext ) = 0; %Docstring @@ -718,7 +718,7 @@ Sets whether callout lines should be drawn to all feature parts. .. seealso:: :py:func:`drawCalloutToAllParts` %End - public: + protected: virtual void draw( QgsRenderContext &context, const QRectF &bodyBoundingBox, const double angle, const QgsGeometry &anchor, QgsCallout::QgsCalloutContext &calloutContext ); @@ -765,7 +765,7 @@ serialized in the ``properties`` map (corresponding to the output from virtual QgsManhattanLineCallout *clone() const; - public: + protected: virtual QgsCurve *createCalloutLine( const QgsPoint &start, const QgsPoint &end, QgsRenderContext &context, const QRectF &bodyBoundingBox, const double angle, const QgsGeometry &anchor, QgsCallout::QgsCalloutContext &calloutContext ) const /Factory/; @@ -844,7 +844,7 @@ Sets the callout line's curve ``orientation``. .. seealso:: :py:func:`orientation` %End - public: + protected: virtual QgsCurve *createCalloutLine( const QgsPoint &start, const QgsPoint &end, QgsRenderContext &context, const QRectF &bodyBoundingBox, const double angle, const QgsGeometry &anchor, QgsCalloutContext &calloutContext ) const /Factory/; @@ -1141,7 +1141,7 @@ Returns the map unit scale for the corner radius. %End - public: + protected: virtual void draw( QgsRenderContext &context, const QRectF &bodyBoundingBox, const double angle, const QgsGeometry &anchor, QgsCallout::QgsCalloutContext &calloutContext ); diff --git a/python/core/auto_generated/callouts/qgscalloutsregistry.sip.in b/python/core/auto_generated/callouts/qgscalloutsregistry.sip.in index 982762db7f2c..3a701c279490 100644 --- a/python/core/auto_generated/callouts/qgscalloutsregistry.sip.in +++ b/python/core/auto_generated/callouts/qgscalloutsregistry.sip.in @@ -81,7 +81,7 @@ Creates a widget for configuring callouts of this type. Can return ``None`` if t Ownership of the widget is transferred to the caller. %End - public: + protected: }; @@ -106,7 +106,7 @@ Convenience metadata class that uses static functions to create callouts and the virtual QgsCalloutWidget *createCalloutWidget( QgsVectorLayer *vl ) /Factory/; - public: + protected: private: QgsCalloutMetadata(); diff --git a/python/core/auto_generated/classification/qgsclassificationmethod.sip.in b/python/core/auto_generated/classification/qgsclassificationmethod.sip.in index 0908c3dc48f9..e120f55c7f7a 100644 --- a/python/core/auto_generated/classification/qgsclassificationmethod.sip.in +++ b/python/core/auto_generated/classification/qgsclassificationmethod.sip.in @@ -322,7 +322,7 @@ One could use :py:class:`QgsProcessingParameters`.parameterAsXxxx to retrieve th static const int MAX_PRECISION; static const int MIN_PRECISION; - public: + protected: void copyBase( QgsClassificationMethod *c ) const; %Docstring diff --git a/python/core/auto_generated/diagram/qgsdiagram.sip.in b/python/core/auto_generated/diagram/qgsdiagram.sip.in index cf87b094134d..b3015203709e 100644 --- a/python/core/auto_generated/diagram/qgsdiagram.sip.in +++ b/python/core/auto_generated/diagram/qgsdiagram.sip.in @@ -83,7 +83,7 @@ Returns the size of the legend item for the diagram corresponding to a specified .. versionadded:: 2.16 %End - public: + protected: QgsDiagram(); %Docstring diff --git a/python/core/auto_generated/editform/qgsattributeeditorelement.sip.in b/python/core/auto_generated/editform/qgsattributeeditorelement.sip.in index 97821d287217..2dd63c341c97 100644 --- a/python/core/auto_generated/editform/qgsattributeeditorelement.sip.in +++ b/python/core/auto_generated/editform/qgsattributeeditorelement.sip.in @@ -124,7 +124,7 @@ Controls if this element should be labeled with a title (field, relation or grou .. versionadded:: 2.18 %End - public: + protected: }; diff --git a/python/core/auto_generated/effects/qgsblureffect.sip.in b/python/core/auto_generated/effects/qgsblureffect.sip.in index 9b285907c521..404839c7febd 100644 --- a/python/core/auto_generated/effects/qgsblureffect.sip.in +++ b/python/core/auto_generated/effects/qgsblureffect.sip.in @@ -202,7 +202,7 @@ Returns the blend mode for the effect .. seealso:: :py:func:`setBlendMode` %End - public: + protected: virtual void draw( QgsRenderContext &context ); diff --git a/python/core/auto_generated/effects/qgscoloreffect.sip.in b/python/core/auto_generated/effects/qgscoloreffect.sip.in index fbf6d0a9d9c8..cda82501bbde 100644 --- a/python/core/auto_generated/effects/qgscoloreffect.sip.in +++ b/python/core/auto_generated/effects/qgscoloreffect.sip.in @@ -248,7 +248,7 @@ Returns the blend mode for the effect .. seealso:: :py:func:`setBlendMode` %End - public: + protected: virtual void draw( QgsRenderContext &context ); diff --git a/python/core/auto_generated/effects/qgseffectstack.sip.in b/python/core/auto_generated/effects/qgseffectstack.sip.in index 4c7b7b882588..32f9908ad184 100644 --- a/python/core/auto_generated/effects/qgseffectstack.sip.in +++ b/python/core/auto_generated/effects/qgseffectstack.sip.in @@ -148,7 +148,7 @@ Returns a pointer to the effect at a specified index within the stack - public: + protected: virtual void draw( QgsRenderContext &context ); diff --git a/python/core/auto_generated/effects/qgsgloweffect.sip.in b/python/core/auto_generated/effects/qgsgloweffect.sip.in index 233ee5cb490c..fabbbd85efc9 100644 --- a/python/core/auto_generated/effects/qgsgloweffect.sip.in +++ b/python/core/auto_generated/effects/qgsgloweffect.sip.in @@ -325,7 +325,7 @@ color ramp or by specificing a single color. %End - public: + protected: virtual QRectF boundingRect( const QRectF &rect, const QgsRenderContext &context ) const; @@ -374,7 +374,7 @@ Creates a new QgsOuterGlowEffect effect from a properties string map. virtual QgsOuterGlowEffect *clone() const /Factory/; - public: + protected: virtual bool shadeExterior() const; @@ -410,7 +410,7 @@ Creates a new QgsInnerGlowEffect effect from a properties string map. virtual QgsInnerGlowEffect *clone() const /Factory/; - public: + protected: virtual bool shadeExterior() const; diff --git a/python/core/auto_generated/effects/qgspainteffect.sip.in b/python/core/auto_generated/effects/qgspainteffect.sip.in index ae607f7f5e07..dacdf881c4e1 100644 --- a/python/core/auto_generated/effects/qgspainteffect.sip.in +++ b/python/core/auto_generated/effects/qgspainteffect.sip.in @@ -225,7 +225,7 @@ effect if the paint effect is used in a :py:class:`QgsEffectStack`. .. seealso:: :py:func:`drawMode` %End - public: + protected: virtual void draw( QgsRenderContext &context ) = 0; @@ -399,7 +399,7 @@ Returns the blend mode for the effect .. seealso:: :py:func:`setBlendMode` %End - public: + protected: virtual void draw( QgsRenderContext &context ); diff --git a/python/core/auto_generated/effects/qgspainteffectregistry.sip.in b/python/core/auto_generated/effects/qgspainteffectregistry.sip.in index a2079eaadfdf..59cbeedc6878 100644 --- a/python/core/auto_generated/effects/qgspainteffectregistry.sip.in +++ b/python/core/auto_generated/effects/qgspainteffectregistry.sip.in @@ -74,7 +74,7 @@ if there's no GUI for the paint effect class. :return: configuration widget %End - public: + protected: }; diff --git a/python/core/auto_generated/effects/qgsshadoweffect.sip.in b/python/core/auto_generated/effects/qgsshadoweffect.sip.in index 42982410e8ae..30d982a68f93 100644 --- a/python/core/auto_generated/effects/qgsshadoweffect.sip.in +++ b/python/core/auto_generated/effects/qgsshadoweffect.sip.in @@ -276,7 +276,7 @@ Returns the blend mode for the effect .. seealso:: :py:func:`setBlendMode` %End - public: + protected: virtual QRectF boundingRect( const QRectF &rect, const QgsRenderContext &context ) const; @@ -325,7 +325,7 @@ Creates a new QgsDropShadowEffect effect from a properties string map. virtual QgsDropShadowEffect *clone() const /Factory/; - public: + protected: virtual bool exteriorShadow() const; @@ -362,7 +362,7 @@ Creates a new QgsInnerShadowEffect effect from a properties string map. virtual QgsInnerShadowEffect *clone() const /Factory/; - public: + protected: virtual bool exteriorShadow() const; diff --git a/python/core/auto_generated/effects/qgstransformeffect.sip.in b/python/core/auto_generated/effects/qgstransformeffect.sip.in index f4b5e3875569..aa4d927c3985 100644 --- a/python/core/auto_generated/effects/qgstransformeffect.sip.in +++ b/python/core/auto_generated/effects/qgstransformeffect.sip.in @@ -309,7 +309,7 @@ Returns whether transform will be reflected along the y-axis .. seealso:: :py:func:`reflectX` %End - public: + protected: virtual void draw( QgsRenderContext &context ); diff --git a/python/core/auto_generated/expression/qgsexpressionfunction.sip.in b/python/core/auto_generated/expression/qgsexpressionfunction.sip.in index e34b7d5353a9..eaf8f08cb51f 100644 --- a/python/core/auto_generated/expression/qgsexpressionfunction.sip.in +++ b/python/core/auto_generated/expression/qgsexpressionfunction.sip.in @@ -270,7 +270,7 @@ Returns ``True`` if the function handles NULL values in arguments by itself, and NULL value handling should be skipped. %End - public: + protected: static bool allParamsStatic( const QgsExpressionNodeFunction *node, QgsExpression *parent, const QgsExpressionContext *context ); %Docstring diff --git a/python/core/auto_generated/expression/qgsexpressionnode.sip.in b/python/core/auto_generated/expression/qgsexpressionnode.sip.in index 37657fbe6eed..fcf88d854632 100644 --- a/python/core/auto_generated/expression/qgsexpressionnode.sip.in +++ b/python/core/auto_generated/expression/qgsexpressionnode.sip.in @@ -294,7 +294,7 @@ Returns a reference to the current object if no optimizations were applied. .. versionadded:: 3.20 %End - public: + protected: QgsExpressionNode(); %Docstring diff --git a/python/core/auto_generated/externalstorage/qgsexternalstorage.sip.in b/python/core/auto_generated/externalstorage/qgsexternalstorage.sip.in index fc47e3fad206..01fae80f9e1d 100644 --- a/python/core/auto_generated/externalstorage/qgsexternalstorage.sip.in +++ b/python/core/auto_generated/externalstorage/qgsexternalstorage.sip.in @@ -71,7 +71,7 @@ After using this method, user should wait for :py:func:`QgsExternalStorageStored It's possible to give ``authCfg`` authentication configuration id in case its needed. %End - public: + protected: virtual QgsExternalStorageStoredContent *doStore( const QString &filePath, const QString &url, const QString &authCfg = QString() ) const = 0 /Factory/; %Docstring @@ -135,7 +135,7 @@ The signal is emitted whenever content fetching/storing estimated progression va The signal is emitted when content fetching/storing has been canceled %End - public: + protected: void reportError( const QString &errorMsg ); %Docstring diff --git a/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in b/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in index b3d1f8dd75e6..8fd12658fd5a 100644 --- a/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in +++ b/python/core/auto_generated/geometry/qgsabstractgeometry.sip.in @@ -849,7 +849,7 @@ To create it, the geometry is default constructed and then the WKB is changed. .. versionadded:: 3.0 %End - public: + protected: int sortIndex() const; %Docstring @@ -917,7 +917,7 @@ Returns point at index (for geometries without child geometries - i.e. curve / p .. versionadded:: 3.0 %End - public: + protected: void setZMTypeFromSubGeometry( const QgsAbstractGeometry *subggeom, QgsWkbTypes::Type baseGeomType ); %Docstring diff --git a/python/core/auto_generated/geometry/qgscircularstring.sip.in b/python/core/auto_generated/geometry/qgscircularstring.sip.in index b32417b0c384..8e28f2bb0283 100644 --- a/python/core/auto_generated/geometry/qgscircularstring.sip.in +++ b/python/core/auto_generated/geometry/qgscircularstring.sip.in @@ -218,7 +218,7 @@ Appends the contents of another circular ``string`` to the end of this circular sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: int compareToSameClass( const QgsAbstractGeometry *other ) const final; virtual QgsRectangle calculateBoundingBox() const; diff --git a/python/core/auto_generated/geometry/qgscompoundcurve.sip.in b/python/core/auto_generated/geometry/qgscompoundcurve.sip.in index a082093d7d56..6eb62322cf15 100644 --- a/python/core/auto_generated/geometry/qgscompoundcurve.sip.in +++ b/python/core/auto_generated/geometry/qgscompoundcurve.sip.in @@ -215,7 +215,7 @@ Appends first point if not already closed. sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: int compareToSameClass( const QgsAbstractGeometry *other ) const final; virtual QgsRectangle calculateBoundingBox() const; diff --git a/python/core/auto_generated/geometry/qgscurve.sip.in b/python/core/auto_generated/geometry/qgscurve.sip.in index 24807da566e1..262c06e8845f 100644 --- a/python/core/auto_generated/geometry/qgscurve.sip.in +++ b/python/core/auto_generated/geometry/qgscurve.sip.in @@ -318,7 +318,7 @@ Scrolls the curve vertices so that they start with the vertex at the given index - public: + protected: virtual void clearCache() const; diff --git a/python/core/auto_generated/geometry/qgscurvepolygon.sip.in b/python/core/auto_generated/geometry/qgscurvepolygon.sip.in index 48cb842b58e6..b84e74808ca9 100644 --- a/python/core/auto_generated/geometry/qgscurvepolygon.sip.in +++ b/python/core/auto_generated/geometry/qgscurvepolygon.sip.in @@ -292,7 +292,7 @@ Returns approximate rotation angle for a vertex. Usually average angle between a sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: virtual int childCount() const; @@ -300,7 +300,7 @@ Returns approximate rotation angle for a vertex. Usually average angle between a int compareToSameClass( const QgsAbstractGeometry *other ) const final; - public: + protected: virtual QgsRectangle calculateBoundingBox() const; diff --git a/python/core/auto_generated/geometry/qgsellipse.sip.in b/python/core/auto_generated/geometry/qgsellipse.sip.in index 17c643b009a4..223c14e2c9fb 100644 --- a/python/core/auto_generated/geometry/qgsellipse.sip.in +++ b/python/core/auto_generated/geometry/qgsellipse.sip.in @@ -254,7 +254,7 @@ Members will be truncated to the specified precision. sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: }; diff --git a/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in b/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in index 85bde2200216..cb0a66624eef 100644 --- a/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in +++ b/python/core/auto_generated/geometry/qgsgeometrycollection.sip.in @@ -321,14 +321,14 @@ Iterates through all geometries in the collection. virtual QgsGeometryCollection *createEmptyWithSameType() const /Factory/; - public: + protected: virtual int childCount() const; virtual QgsAbstractGeometry *childGeometry( int index ) const; int compareToSameClass( const QgsAbstractGeometry *other ) const final; - public: + protected: virtual bool wktOmitChildType() const; %Docstring diff --git a/python/core/auto_generated/geometry/qgsgeometryengine.sip.in b/python/core/auto_generated/geometry/qgsgeometryengine.sip.in index 6923bb53f271..7d747e3d2991 100644 --- a/python/core/auto_generated/geometry/qgsgeometryengine.sip.in +++ b/python/core/auto_generated/geometry/qgsgeometryengine.sip.in @@ -316,7 +316,7 @@ these just results in noise. In this case setting ``enabled`` to ``False`` will .. versionadded:: 3.16 %End - public: + protected: void logError( const QString &engineName, const QString &message ) const; %Docstring diff --git a/python/core/auto_generated/geometry/qgslinestring.sip.in b/python/core/auto_generated/geometry/qgslinestring.sip.in index 74dd22be7454..9834aaa89dc6 100644 --- a/python/core/auto_generated/geometry/qgslinestring.sip.in +++ b/python/core/auto_generated/geometry/qgslinestring.sip.in @@ -822,7 +822,7 @@ corresponds to the last point in the line. %End - public: + protected: int compareToSameClass( const QgsAbstractGeometry *other ) const final; virtual QgsRectangle calculateBoundingBox() const; diff --git a/python/core/auto_generated/geometry/qgsmultilinestring.sip.in b/python/core/auto_generated/geometry/qgsmultilinestring.sip.in index 429ccba17f28..bd1164eeec49 100644 --- a/python/core/auto_generated/geometry/qgsmultilinestring.sip.in +++ b/python/core/auto_generated/geometry/qgsmultilinestring.sip.in @@ -88,7 +88,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: virtual bool wktOmitChildType() const; diff --git a/python/core/auto_generated/geometry/qgsmultipoint.sip.in b/python/core/auto_generated/geometry/qgsmultipoint.sip.in index 1fdf0bccb341..951311a68e5f 100644 --- a/python/core/auto_generated/geometry/qgsmultipoint.sip.in +++ b/python/core/auto_generated/geometry/qgsmultipoint.sip.in @@ -90,7 +90,7 @@ Returns the point with the specified ``index``. sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: virtual bool wktOmitChildType() const; diff --git a/python/core/auto_generated/geometry/qgsmultipolygon.sip.in b/python/core/auto_generated/geometry/qgsmultipolygon.sip.in index 2368355a2494..e43c7a4ce116 100644 --- a/python/core/auto_generated/geometry/qgsmultipolygon.sip.in +++ b/python/core/auto_generated/geometry/qgsmultipolygon.sip.in @@ -90,7 +90,7 @@ Returns the geometry converted to the more generic curve type :py:class:`QgsMult sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: virtual bool wktOmitChildType() const; diff --git a/python/core/auto_generated/geometry/qgspoint.sip.in b/python/core/auto_generated/geometry/qgspoint.sip.in index 33e4341b7cee..7f43210e2716 100644 --- a/python/core/auto_generated/geometry/qgspoint.sip.in +++ b/python/core/auto_generated/geometry/qgspoint.sip.in @@ -481,7 +481,7 @@ Angle undefined. Always returns 0.0 sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: int compareToSameClass( const QgsAbstractGeometry *other ) const final; virtual int childCount() const; diff --git a/python/core/auto_generated/geometry/qgspolygon.sip.in b/python/core/auto_generated/geometry/qgspolygon.sip.in index 5e0fd103ddb4..aa86a66431f6 100644 --- a/python/core/auto_generated/geometry/qgspolygon.sip.in +++ b/python/core/auto_generated/geometry/qgspolygon.sip.in @@ -91,7 +91,7 @@ negative if the point lies outside the polygon. sipRes = PyUnicode_FromString( str.toUtf8().constData() ); %End - public: + protected: }; diff --git a/python/core/auto_generated/geometry/qgssurface.sip.in b/python/core/auto_generated/geometry/qgssurface.sip.in index 3aa56bfa63d2..f11cfc53cabe 100644 --- a/python/core/auto_generated/geometry/qgssurface.sip.in +++ b/python/core/auto_generated/geometry/qgssurface.sip.in @@ -33,7 +33,7 @@ Ownership is transferred to the caller. - public: + protected: virtual void clearCache() const; diff --git a/python/core/auto_generated/geometry/qgswkbptr.sip.in b/python/core/auto_generated/geometry/qgswkbptr.sip.in index e3f2657d715c..41a2da707704 100644 --- a/python/core/auto_generated/geometry/qgswkbptr.sip.in +++ b/python/core/auto_generated/geometry/qgswkbptr.sip.in @@ -40,7 +40,7 @@ A const WKB pointer. %TypeHeaderCode #include "qgswkbptr.h" %End - public: + protected: diff --git a/python/core/auto_generated/gps/qgsbabelformat.sip.in b/python/core/auto_generated/gps/qgsbabelformat.sip.in index 9f399929f2e0..32d0f0bbbc3b 100644 --- a/python/core/auto_generated/gps/qgsbabelformat.sip.in +++ b/python/core/auto_generated/gps/qgsbabelformat.sip.in @@ -68,7 +68,7 @@ Generates a command for exporting GPS data into a different format using babel. Returns an empty list if the format does not support exports (see :py:func:`~QgsAbstractBabelFormat.capabilities`). %End - public: + protected: explicit QgsAbstractBabelFormat( const QString &name = QString() ); %Docstring diff --git a/python/core/auto_generated/gps/qgsgpsconnection.sip.in b/python/core/auto_generated/gps/qgsgpsconnection.sip.in index 1383d74316fc..f2d8c6d8eb55 100644 --- a/python/core/auto_generated/gps/qgsgpsconnection.sip.in +++ b/python/core/auto_generated/gps/qgsgpsconnection.sip.in @@ -188,7 +188,7 @@ Returns the current gps information (lat, lon, etc.) void stateChanged( const QgsGpsInformation &info ); void nmeaSentenceReceived( const QString &substring ); // added to capture 'raw' data - public: + protected: protected slots: virtual void parseData() = 0; diff --git a/python/core/auto_generated/gps/qgsnmeaconnection.sip.in b/python/core/auto_generated/gps/qgsnmeaconnection.sip.in index 107e054cc045..51e40dc2c591 100644 --- a/python/core/auto_generated/gps/qgsnmeaconnection.sip.in +++ b/python/core/auto_generated/gps/qgsnmeaconnection.sip.in @@ -36,7 +36,7 @@ Ownership of ``device`` is transferred to the connection. Parse available data source content %End - public: + protected: void processStringBuffer(); %Docstring Splits mStringBuffer into sentences and calls libnmea diff --git a/python/core/auto_generated/labeling/qgsrulebasedlabeling.sip.in b/python/core/auto_generated/labeling/qgsrulebasedlabeling.sip.in index 6462ae3e55b0..97d525104640 100644 --- a/python/core/auto_generated/labeling/qgsrulebasedlabeling.sip.in +++ b/python/core/auto_generated/labeling/qgsrulebasedlabeling.sip.in @@ -317,7 +317,7 @@ Set pal settings for a specific provider (takes ownership). virtual void toSld( QDomNode &parent, const QVariantMap &props ) const; - public: + protected: }; diff --git a/python/core/auto_generated/labeling/qgsvectorlayerlabeling.sip.in b/python/core/auto_generated/labeling/qgsvectorlayerlabeling.sip.in index 541fe8f63896..dd652df503f3 100644 --- a/python/core/auto_generated/labeling/qgsvectorlayerlabeling.sip.in +++ b/python/core/auto_generated/labeling/qgsvectorlayerlabeling.sip.in @@ -112,7 +112,7 @@ Returns the default layer settings to use for the specified vector ``layer``. .. versionadded:: 3.20 %End - public: + protected: virtual void writeTextSymbolizer( QDomNode &parent, QgsPalLayerSettings &settings, const QVariantMap &props ) const; %Docstring diff --git a/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in b/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in index 9642f62adb56..1a40044e7066 100644 --- a/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreefilterproxymodel.sip.in @@ -84,7 +84,7 @@ If the list is empty, all types are shown. Sets the filter text to search for a layer in the tree %End - public: + protected: virtual bool isLayerChecked( QgsMapLayer *layer ) const; %Docstring Returns if the layer is checked or not diff --git a/python/core/auto_generated/layertree/qgslayertreegroup.sip.in b/python/core/auto_generated/layertree/qgslayertreegroup.sip.in index 01ea6922788f..65cfc626a799 100644 --- a/python/core/auto_generated/layertree/qgslayertreegroup.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreegroup.sip.in @@ -212,7 +212,7 @@ of -1 will determine automatically (either first one currently checked or none) void nodeVisibilityChanged( QgsLayerTreeNode *node ); - public: + protected: void updateChildVisibilityMutuallyExclusive(); %Docstring diff --git a/python/core/auto_generated/layertree/qgslayertreelayer.sip.in b/python/core/auto_generated/layertree/qgslayertreelayer.sip.in index fb1d1611ad65..1ebc4bdbda45 100644 --- a/python/core/auto_generated/layertree/qgslayertreelayer.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreelayer.sip.in @@ -229,7 +229,7 @@ Emitted when a previously available layer got unloaded (from layer registry). .. versionadded:: 2.6 %End - public: + protected: void attachToLayer(); diff --git a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in index 017a4adb04b0..272b80e00d35 100644 --- a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in @@ -365,7 +365,7 @@ Emitted when layer flags have changed. void invalidateLegendMapBasedData(); - public: + protected: void removeLegendFromLayer( QgsLayerTreeLayer *nodeLayer ); void addLegendToLayer( QgsLayerTreeLayer *nodeL ); @@ -411,7 +411,7 @@ Filter nodes from :py:class:`QgsMapLayerLegend` according to the current filteri void legendCleanup(); void legendInvalidateMapBasedData(); - public: + protected: diff --git a/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in b/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in index a25a1c1e8da6..00e07e5ad286 100644 --- a/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreemodellegendnode.sip.in @@ -276,7 +276,7 @@ Emitted when the size of this node changes. .. versionadded:: 3.16 %End - public: + protected: explicit QgsLayerTreeModelLegendNode( QgsLayerTreeLayer *nodeL, QObject *parent /TransferThis/ = 0 ); %Docstring Construct the node with pointer to its parent layer node @@ -287,7 +287,7 @@ Construct the node with pointer to its parent layer node Returns a temporary context or ``None`` if legendMapViewData are not valid %End - public: + protected: }; diff --git a/python/core/auto_generated/layertree/qgslayertreenode.sip.in b/python/core/auto_generated/layertree/qgslayertreenode.sip.in index c6dd33fa211f..968db1e87ff8 100644 --- a/python/core/auto_generated/layertree/qgslayertreenode.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreenode.sip.in @@ -295,7 +295,7 @@ Emitted when the name of the node is changed .. versionadded:: 3.0 %End - public: + protected: QgsLayerTreeNode( NodeType t, bool checked = true ); %Docstring @@ -322,7 +322,7 @@ Low-level insertion of children to the node. The children must not have any pare Low-level removal of children from the node. %End - public: + protected: }; diff --git a/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in b/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in index 0125cbc39deb..b167cdbe2217 100644 --- a/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in +++ b/python/core/auto_generated/layertree/qgslayertreeregistrybridge.sip.in @@ -87,7 +87,7 @@ Tell others we have just added layers to the tree (used in QGIS to auto-select f void removeLayersFromRegistry( const QStringList &layerIds ); - public: + protected: }; diff --git a/python/core/auto_generated/layout/qgsabstractreportsection.sip.in b/python/core/auto_generated/layout/qgsabstractreportsection.sip.in index b1cfaec3c634..85139056795c 100644 --- a/python/core/auto_generated/layout/qgsabstractreportsection.sip.in +++ b/python/core/auto_generated/layout/qgsabstractreportsection.sip.in @@ -355,9 +355,8 @@ should be canceled. .. versionadded:: 3.10 %End - public: + protected: -protected: enum SubSection { Header, @@ -366,7 +365,7 @@ protected: Footer, End, }; -protected slots: + void copyCommonProperties( QgsAbstractReportSection *destination ) const; %Docstring Copies the common properties of a report section to a ``destination`` section. diff --git a/python/core/auto_generated/layout/qgslayouteffect.sip.in b/python/core/auto_generated/layout/qgslayouteffect.sip.in index 121c8238c1df..38fe490a5882 100644 --- a/python/core/auto_generated/layout/qgslayouteffect.sip.in +++ b/python/core/auto_generated/layout/qgslayouteffect.sip.in @@ -46,7 +46,7 @@ the item. .. seealso:: :py:func:`setCompositionMode` %End - public: + protected: virtual void draw( QPainter *painter ); diff --git a/python/core/auto_generated/layout/qgslayoutexporter.sip.in b/python/core/auto_generated/layout/qgslayoutexporter.sip.in index 3de95ae79a05..1ddf21c346f6 100644 --- a/python/core/auto_generated/layout/qgslayoutexporter.sip.in +++ b/python/core/auto_generated/layout/qgslayoutexporter.sip.in @@ -412,7 +412,7 @@ such as opacity which will prevent these individual items from being exported as .. versionadded:: 3.20 %End - public: + protected: virtual QString generateFileName( const PageExportDetails &details ) const; %Docstring diff --git a/python/core/auto_generated/layout/qgslayoutframe.sip.in b/python/core/auto_generated/layout/qgslayoutframe.sip.in index 7a9c591a19f1..d3678dfa761f 100644 --- a/python/core/auto_generated/layout/qgslayoutframe.sip.in +++ b/python/core/auto_generated/layout/qgslayoutframe.sip.in @@ -118,7 +118,7 @@ Returns whether the frame is empty. virtual ExportLayerBehavior exportLayerBehavior() const; - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitem.sip.in b/python/core/auto_generated/layout/qgslayoutitem.sip.in index aaa899360d90..3aa045cfb94a 100644 --- a/python/core/auto_generated/layout/qgslayoutitem.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitem.sip.in @@ -1133,7 +1133,7 @@ Emitted when the item's clipping path has changed. .. versionadded:: 3.16 %End - public: + protected: virtual void drawDebugRect( QPainter *painter ); %Docstring diff --git a/python/core/auto_generated/layout/qgslayoutitemattributetable.sip.in b/python/core/auto_generated/layout/qgslayoutitemattributetable.sip.in index 55b2f036d775..0a8b346c3b70 100644 --- a/python/core/auto_generated/layout/qgslayoutitemattributetable.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemattributetable.sip.in @@ -331,7 +331,7 @@ properties of the linked vector layer. .. versionadded:: 3.12 %End - public: + protected: virtual bool writePropertiesToElement( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemgroup.sip.in b/python/core/auto_generated/layout/qgslayoutitemgroup.sip.in index d71666473314..264fb647215b 100644 --- a/python/core/auto_generated/layout/qgslayoutitemgroup.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemgroup.sip.in @@ -73,7 +73,7 @@ Returns a list of items contained by the group. virtual ExportLayerBehavior exportLayerBehavior() const; - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); virtual bool writePropertiesToElement( QDomElement &parentElement, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemhtml.sip.in b/python/core/auto_generated/layout/qgslayoutitemhtml.sip.in index c7030a48b3c6..84c7348fb956 100644 --- a/python/core/auto_generated/layout/qgslayoutitemhtml.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemhtml.sip.in @@ -252,7 +252,7 @@ Recalculates the frame sizes for the current viewport dimensions virtual void refreshDataDefinedProperty( QgsLayoutObject::DataDefinedProperty property = QgsLayoutObject::AllProperties ); - public: + protected: virtual bool writePropertiesToElement( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemlabel.sip.in b/python/core/auto_generated/layout/qgslayoutitemlabel.sip.in index 173a91a584ba..c5ec52c42ed9 100644 --- a/python/core/auto_generated/layout/qgslayoutitemlabel.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemlabel.sip.in @@ -240,7 +240,7 @@ and replacing them with their current values. .. versionadded:: 3.20 %End - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemlegend.sip.in b/python/core/auto_generated/layout/qgslayoutitemlegend.sip.in index 8035851d3edf..c54392f20b8b 100644 --- a/python/core/auto_generated/layout/qgslayoutitemlegend.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemlegend.sip.in @@ -596,7 +596,7 @@ Returns the legend's renderer settings object. virtual void refreshDataDefinedProperty( QgsLayoutObject::DataDefinedProperty property = QgsLayoutObject::AllProperties ); - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemmanualtable.sip.in b/python/core/auto_generated/layout/qgslayoutitemmanualtable.sip.in index ce069c070a20..20f5793ccf98 100644 --- a/python/core/auto_generated/layout/qgslayoutitemmanualtable.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemmanualtable.sip.in @@ -131,7 +131,7 @@ Replaces the headers in the table with a specified list of :py:class:`QgsLayoutT .. seealso:: :py:func:`headers` %End - public: + protected: virtual bool writePropertiesToElement( QDomElement &elem, QDomDocument &doc, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgslayoutitemmap.sip.in b/python/core/auto_generated/layout/qgslayoutitemmap.sip.in index 03e163dcf197..10c964f6599e 100644 --- a/python/core/auto_generated/layout/qgslayoutitemmap.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemmap.sip.in @@ -927,7 +927,7 @@ Returns the map's item based clip path settings. .. versionadded:: 3.16 %End - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitemmapitem.sip.in b/python/core/auto_generated/layout/qgslayoutitemmapitem.sip.in index 11676e77747e..159f6fe580dd 100644 --- a/python/core/auto_generated/layout/qgslayoutitemmapitem.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemmapitem.sip.in @@ -197,7 +197,7 @@ Returns the internal map layer used by this item, if available. virtual QgsExpressionContext createExpressionContext() const; - public: + protected: @@ -291,7 +291,7 @@ Returns ``True`` if the stack has any currently enabled items. Returns a reference to the item at the specified ``index`` within the stack. %End - public: + protected: void addItem( QgsLayoutItemMapItem *item /Transfer/ ); %Docstring @@ -354,7 +354,7 @@ Returns a reference to an item which matching ``itemId`` within the stack. Returns a list of :py:class:`QgsLayoutItemMapItems` contained by the stack. %End - public: + protected: diff --git a/python/core/auto_generated/layout/qgslayoutitemmarker.sip.in b/python/core/auto_generated/layout/qgslayoutitemmarker.sip.in index 1d0d64888176..4738ad85a0ec 100644 --- a/python/core/auto_generated/layout/qgslayoutitemmarker.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemmarker.sip.in @@ -128,7 +128,7 @@ Sets the ``offset`` added to the marker's rotation from a map's North. virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const; - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in b/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in index 2f529effef49..622d6d6c4cfb 100644 --- a/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemnodeitem.sip.in @@ -113,7 +113,7 @@ Deselects any selected nodes. virtual double estimatedFrameBleed() const; - public: + protected: QgsLayoutNodesItem( QgsLayout *layout ); %Docstring diff --git a/python/core/auto_generated/layout/qgslayoutitempage.sip.in b/python/core/auto_generated/layout/qgslayoutitempage.sip.in index 51ae5e8d3daa..8d00ae8f6294 100644 --- a/python/core/auto_generated/layout/qgslayoutitempage.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitempage.sip.in @@ -138,7 +138,7 @@ page orientation. virtual void redraw(); - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitempicture.sip.in b/python/core/auto_generated/layout/qgslayoutitempicture.sip.in index 20e538e5c3a6..275b441b0092 100644 --- a/python/core/auto_generated/layout/qgslayoutitempicture.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitempicture.sip.in @@ -340,7 +340,7 @@ Forces a recalculation of the picture's frame size Emitted on picture rotation change %End - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitempolygon.sip.in b/python/core/auto_generated/layout/qgslayoutitempolygon.sip.in index c8c7b82f382c..ca1365505be8 100644 --- a/python/core/auto_generated/layout/qgslayoutitempolygon.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitempolygon.sip.in @@ -71,7 +71,7 @@ Ownership of ``symbol`` is not transferred. .. seealso:: :py:func:`symbol` %End - public: + protected: virtual bool _addNode( int indexPoint, QPointF newPoint, double radius ); virtual bool _removeNode( int nodeIndex ); diff --git a/python/core/auto_generated/layout/qgslayoutitempolyline.sip.in b/python/core/auto_generated/layout/qgslayoutitempolyline.sip.in index 515e9a653489..1f40a32340d1 100644 --- a/python/core/auto_generated/layout/qgslayoutitempolyline.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitempolyline.sip.in @@ -216,7 +216,7 @@ Returns the pen width in millimeters for the stroke of the arrow head. virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const; - public: + protected: virtual bool _addNode( int indexPoint, QPointF newPoint, double radius ); diff --git a/python/core/auto_generated/layout/qgslayoutitemscalebar.sip.in b/python/core/auto_generated/layout/qgslayoutitemscalebar.sip.in index 4f12ee3df374..910d17e585be 100644 --- a/python/core/auto_generated/layout/qgslayoutitemscalebar.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemscalebar.sip.in @@ -812,7 +812,7 @@ Adjusts the scale bar box size and updates the item. virtual ExportLayerBehavior exportLayerBehavior() const; - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutitemshape.sip.in b/python/core/auto_generated/layout/qgslayoutitemshape.sip.in index b9a97f798209..8a1a1bf30d71 100644 --- a/python/core/auto_generated/layout/qgslayoutitemshape.sip.in +++ b/python/core/auto_generated/layout/qgslayoutitemshape.sip.in @@ -109,7 +109,7 @@ Returns the corner radius for rounded rectangle corners. virtual bool accept( QgsStyleEntityVisitorInterface *visitor ) const; - public: + protected: virtual void draw( QgsLayoutItemRenderContext &context ); diff --git a/python/core/auto_generated/layout/qgslayoutmodel.sip.in b/python/core/auto_generated/layout/qgslayoutmodel.sip.in index 02d2898194dd..6fc2dce2d347 100644 --- a/python/core/auto_generated/layout/qgslayoutmodel.sip.in +++ b/python/core/auto_generated/layout/qgslayoutmodel.sip.in @@ -202,7 +202,7 @@ Returns ``None`` if no flag based filtering is occurring. .. versionadded:: 3.16 %End - public: + protected: virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; virtual bool lessThan( const QModelIndex &left, const QModelIndex &right ) const; diff --git a/python/core/auto_generated/layout/qgslayoutmultiframe.sip.in b/python/core/auto_generated/layout/qgslayoutmultiframe.sip.in index 74a5ded605ca..c5b9dfdda5af 100644 --- a/python/core/auto_generated/layout/qgslayoutmultiframe.sip.in +++ b/python/core/auto_generated/layout/qgslayoutmultiframe.sip.in @@ -379,7 +379,7 @@ Emitted when the contents of the multi frame have changed and the frames must be redrawn. %End - public: + protected: virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; %Docstring diff --git a/python/core/auto_generated/layout/qgslayoutobject.sip.in b/python/core/auto_generated/layout/qgslayoutobject.sip.in index a1e8fb0f00d4..b9f9c365ac5e 100644 --- a/python/core/auto_generated/layout/qgslayoutobject.sip.in +++ b/python/core/auto_generated/layout/qgslayoutobject.sip.in @@ -311,7 +311,7 @@ Refreshes the object, causing a recalculation of any property overrides. Emitted when the object's properties change. %End - public: + protected: bool writeObjectPropertiesToElement( QDomElement &parentElement, QDomDocument &document, const QgsReadWriteContext &context ) const; %Docstring diff --git a/python/core/auto_generated/layout/qgslayouttable.sip.in b/python/core/auto_generated/layout/qgslayouttable.sip.in index 34125e4b1ef3..f103694dd07e 100644 --- a/python/core/auto_generated/layout/qgslayouttable.sip.in +++ b/python/core/auto_generated/layout/qgslayouttable.sip.in @@ -638,7 +638,7 @@ new data. virtual void recalculateFrameSizes(); - public: + protected: diff --git a/python/core/auto_generated/layout/qgslayoutundocommand.sip.in b/python/core/auto_generated/layout/qgslayoutundocommand.sip.in index 2206a8f77f7b..607cc7421936 100644 --- a/python/core/auto_generated/layout/qgslayoutundocommand.sip.in +++ b/python/core/auto_generated/layout/qgslayoutundocommand.sip.in @@ -78,7 +78,7 @@ Returns the after state for the layout. Returns ``True`` if both the before and after states are valid and different. %End - public: + protected: virtual void saveState( QDomDocument &stateDoc ) const = 0; %Docstring diff --git a/python/core/auto_generated/layout/qgsreportsectionfieldgroup.sip.in b/python/core/auto_generated/layout/qgsreportsectionfieldgroup.sip.in index d6bcc6aef533..c11ccbcfa7d0 100644 --- a/python/core/auto_generated/layout/qgsreportsectionfieldgroup.sip.in +++ b/python/core/auto_generated/layout/qgsreportsectionfieldgroup.sip.in @@ -181,7 +181,7 @@ Sets the visibility mode for the footer. virtual void reloadSettings(); - public: + protected: virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/layout/qgsreportsectionlayout.sip.in b/python/core/auto_generated/layout/qgsreportsectionlayout.sip.in index 90da781c1fc3..acd99b790474 100644 --- a/python/core/auto_generated/layout/qgsreportsectionlayout.sip.in +++ b/python/core/auto_generated/layout/qgsreportsectionlayout.sip.in @@ -92,7 +92,7 @@ Sets whether the body for the section is ``enabled``. virtual void reloadSettings(); - public: + protected: virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const; diff --git a/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in b/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in index 66b8cdb140b0..95fe52c8ec38 100644 --- a/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in +++ b/python/core/auto_generated/maprenderer/qgsmaprenderercustompainterjob.sip.in @@ -28,7 +28,7 @@ Constructor for QgsMapRendererAbstractCustomPainterJob, using the given map ``settings``. %End - public: + protected: void preparePainter( QPainter *painter, const QColor &backgroundColor = Qt::transparent ); %Docstring diff --git a/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in b/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in index b2caa2125f15..7d9fe99edc50 100644 --- a/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in +++ b/python/core/auto_generated/maprenderer/qgsmaprendererjob.sip.in @@ -195,7 +195,7 @@ Rendering labels is not yet done. If the fully rendered layer including labels i emitted when asynchronous rendering is finished (or canceled). %End - public: + protected: diff --git a/python/core/auto_generated/maprenderer/qgsmaprenderertask.sip.in b/python/core/auto_generated/maprenderer/qgsmaprenderertask.sip.in index 99939e99abe0..a51f3bfbd63c 100644 --- a/python/core/auto_generated/maprenderer/qgsmaprenderertask.sip.in +++ b/python/core/auto_generated/maprenderer/qgsmaprenderertask.sip.in @@ -86,7 +86,7 @@ Emitted when the map rendering is successfully completed. Emitted when map rendering failed. %End - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/mesh/qgsmeshadvancedediting.sip.in b/python/core/auto_generated/mesh/qgsmeshadvancedediting.sip.in index eb3f2ea5e059..0670be69525e 100644 --- a/python/core/auto_generated/mesh/qgsmeshadvancedediting.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshadvancedediting.sip.in @@ -63,7 +63,7 @@ if not, this edit has to be applied again with :py:func:`QgsMeshEditor.advancedE Returns a short text string describing what this advanced edit does. Default implementation return a void string. %End - public: + protected: }; diff --git a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in index 3e33caaaef03..4c06aa27e464 100644 --- a/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshdataprovider.sip.in @@ -410,7 +410,7 @@ Returns a list of dataset indexes of the dataset in a specific dataset group tha .. versionadded:: 3.22 %End - public: + protected: }; diff --git a/python/core/auto_generated/mesh/qgsmeshdataset.sip.in b/python/core/auto_generated/mesh/qgsmeshdataset.sip.in index ba70be496966..942306013c58 100644 --- a/python/core/auto_generated/mesh/qgsmeshdataset.sip.in +++ b/python/core/auto_generated/mesh/qgsmeshdataset.sip.in @@ -764,7 +764,7 @@ Returns some information about the dataset group Sets the reference time of the dataset group %End - public: + protected: }; diff --git a/python/core/auto_generated/metadata/qgsabstractmetadatabase.sip.in b/python/core/auto_generated/metadata/qgsabstractmetadatabase.sip.in index 3f23505cc499..6e6daa6a2e2c 100644 --- a/python/core/auto_generated/metadata/qgsabstractmetadatabase.sip.in +++ b/python/core/auto_generated/metadata/qgsabstractmetadatabase.sip.in @@ -435,7 +435,7 @@ Any existing values in this object will be overwritten by non-empty values from .. versionadded:: 3.20 %End - public: + protected: QgsAbstractMetadataBase(); %Docstring diff --git a/python/core/auto_generated/network/qgsfiledownloader.sip.in b/python/core/auto_generated/network/qgsfiledownloader.sip.in index 2469b5539c1d..19f6a31d65c5 100644 --- a/python/core/auto_generated/network/qgsfiledownloader.sip.in +++ b/python/core/auto_generated/network/qgsfiledownloader.sip.in @@ -91,7 +91,7 @@ has been processed. Called to start the download %End - public: + protected: ~QgsFileDownloader(); }; diff --git a/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in b/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in index 9a71f496b753..17c72635b82f 100644 --- a/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in +++ b/python/core/auto_generated/network/qgsnetworkaccessmanager.sip.in @@ -577,7 +577,7 @@ Emitted when the cookies changed. .. versionadded:: 3.22 %End - public: + protected: virtual QNetworkReply *createRequest( QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice *outgoingData = 0 ); diff --git a/python/core/auto_generated/network/qgsnewsfeedmodel.sip.in b/python/core/auto_generated/network/qgsnewsfeedmodel.sip.in index dd6fbfecc5ae..7f6af9324366 100644 --- a/python/core/auto_generated/network/qgsnewsfeedmodel.sip.in +++ b/python/core/auto_generated/network/qgsnewsfeedmodel.sip.in @@ -80,7 +80,7 @@ The ``parser`` argument must specify a valid :py:class:`QgsNewsFeedParser` objec must exist for the lifetime of this model. %End - public: + protected: virtual bool lessThan( const QModelIndex &left, const QModelIndex &right ) const; diff --git a/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in index f141ad63c49f..3a5ddf4bf6bd 100644 --- a/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in +++ b/python/core/auto_generated/numericformats/qgsbasicnumericformat.sip.in @@ -158,7 +158,7 @@ then the QGIS locale separator is used instead. .. seealso:: :py:func:`decimalSeparator` %End - public: + protected: virtual void setConfiguration( const QVariantMap &configuration, const QgsReadWriteContext &context ); %Docstring diff --git a/python/core/auto_generated/numericformats/qgsfractionnumericformat.sip.in b/python/core/auto_generated/numericformats/qgsfractionnumericformat.sip.in index 91e4c7675663..6b18ec06599e 100644 --- a/python/core/auto_generated/numericformats/qgsfractionnumericformat.sip.in +++ b/python/core/auto_generated/numericformats/qgsfractionnumericformat.sip.in @@ -154,7 +154,7 @@ Converts numbers in an ``input`` string to unicode subscript equivalents. .. seealso:: :py:func:`toUnicodeSuperscript` %End - public: + protected: virtual void setConfiguration( const QVariantMap &configuration, const QgsReadWriteContext &context ); %Docstring diff --git a/python/core/auto_generated/pointcloud/qgspointcloudclassifiedrenderer.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudclassifiedrenderer.sip.in index d144c7e263cd..c445b7653889 100644 --- a/python/core/auto_generated/pointcloud/qgspointcloudclassifiedrenderer.sip.in +++ b/python/core/auto_generated/pointcloud/qgspointcloudclassifiedrenderer.sip.in @@ -95,7 +95,7 @@ Sets whether the category is currently enabled and should be rendered. .. seealso:: :py:func:`renderState` %End - public: + protected: }; typedef QList QgsPointCloudCategoryList; diff --git a/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in index 92282790cb93..f5963f2557b4 100644 --- a/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in +++ b/python/core/auto_generated/pointcloud/qgspointcloudrenderer.sip.in @@ -434,7 +434,7 @@ Creates a set of legend nodes representing the renderer. Returns a list of all rule keys for legend nodes created by the renderer. %End - public: + protected: static void pointXY( QgsPointCloudRenderContext &context, const char *ptr, int i, double &x, double &y ); %Docstring diff --git a/python/core/auto_generated/pointcloud/qgspointcloudrendererregistry.sip.in b/python/core/auto_generated/pointcloud/qgspointcloudrendererregistry.sip.in index 4a8cca4f0d9c..5407134c662b 100644 --- a/python/core/auto_generated/pointcloud/qgspointcloudrendererregistry.sip.in +++ b/python/core/auto_generated/pointcloud/qgspointcloudrendererregistry.sip.in @@ -72,7 +72,7 @@ Pure virtual function: must be implemented in derived classes. %End - public: + protected: }; @@ -95,7 +95,7 @@ Convenience metadata class that uses static functions to create point cloud rend - public: + protected: private: QgsPointCloudRendererMetadata(); diff --git a/python/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in b/python/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in index d84fa3f2eb5f..01b31f0e8290 100644 --- a/python/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in +++ b/python/core/auto_generated/processing/models/qgsprocessingmodelalgorithm.sip.in @@ -556,7 +556,7 @@ run through the designer. .. versionadded:: 3.14 %End - public: + protected: virtual QgsProcessingAlgorithm *createInstance() const /Factory/; diff --git a/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in b/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in index d968d18beaea..e375686da230 100644 --- a/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in +++ b/python/core/auto_generated/processing/models/qgsprocessingmodelcomponent.sip.in @@ -130,7 +130,7 @@ Clones the component. Ownership is transferred to the caller. %End - public: + protected: QgsProcessingModelComponent( const QString &description = QString() ); %Docstring diff --git a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in index 1b4af0f05ded..36cbdcd63844 100644 --- a/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingalgorithm.sip.in @@ -450,7 +450,7 @@ string. Associates this algorithm with its provider. No transfer of ownership is involved. %End - public: + protected: virtual QgsProcessingAlgorithm *createInstance() const = 0 /Factory,VirtualErrorHandler=processing_exception_handler/; %Docstring @@ -1144,7 +1144,7 @@ can break valid model execution - so use with extreme caution, and consider usin ``feedback`` to instead report non-fatal processing failures for features instead. %End - public: + protected: virtual void initAlgorithm( const QVariantMap &configuration = QVariantMap() ); diff --git a/python/core/auto_generated/processing/qgsprocessingalgrunnertask.sip.in b/python/core/auto_generated/processing/qgsprocessingalgrunnertask.sip.in index 416b3f4a8f2c..62bcda71c779 100644 --- a/python/core/auto_generated/processing/qgsprocessingalgrunnertask.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingalgrunnertask.sip.in @@ -44,7 +44,7 @@ execution without errors then ``successful`` will be ``True``. The ``results`` a contains the results reported by the algorithm. %End - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in b/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in index a3d726a00266..7c44a3495271 100644 --- a/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingoutputs.sip.in @@ -118,7 +118,7 @@ Returns ``True`` if the output was automatically created when adding a parameter .. versionadded:: 3.14 %End - public: + protected: diff --git a/python/core/auto_generated/processing/qgsprocessingparameters.sip.in b/python/core/auto_generated/processing/qgsprocessingparameters.sip.in index 1aa31555a678..817ab0806b61 100644 --- a/python/core/auto_generated/processing/qgsprocessingparameters.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingparameters.sip.in @@ -714,7 +714,7 @@ The ``variables`` list should contain the variable names only, without the usual .. versionadded:: 3.8 %End - public: + protected: @@ -2844,7 +2844,7 @@ Sets the geometry ``types`` for sources acceptable by the parameter. .. seealso:: :py:func:`dataTypes` %End - public: + protected: }; @@ -3269,7 +3269,7 @@ a value of ``False`` indicates that the destination should not be created by def .. seealso:: :py:func:`createByDefault` %End - public: + protected: QgsProcessingProvider *originalProvider() const; %Docstring diff --git a/python/core/auto_generated/processing/qgsprocessingprovider.sip.in b/python/core/auto_generated/processing/qgsprocessingprovider.sip.in index 02dc5bce5834..2a9751839944 100644 --- a/python/core/auto_generated/processing/qgsprocessingprovider.sip.in +++ b/python/core/auto_generated/processing/qgsprocessingprovider.sip.in @@ -283,7 +283,7 @@ algorithms. .. seealso:: :py:func:`refreshAlgorithms` %End - public: + protected: virtual void loadAlgorithms() = 0; %Docstring diff --git a/python/core/auto_generated/project/qgsprojectbadlayerhandler.sip.in b/python/core/auto_generated/project/qgsprojectbadlayerhandler.sip.in index 7c2b04055ee4..206fb8e2fe59 100644 --- a/python/core/auto_generated/project/qgsprojectbadlayerhandler.sip.in +++ b/python/core/auto_generated/project/qgsprojectbadlayerhandler.sip.in @@ -34,17 +34,15 @@ log. virtual ~QgsProjectBadLayerHandler(); - public: + protected: -protected: enum DataType { IS_VECTOR, IS_RASTER, IS_BOGUS }; -protected slots: -protected: + enum ProviderType { IS_FILE, @@ -52,7 +50,7 @@ protected: IS_URL, IS_Unknown }; -protected slots: + DataType dataType( const QDomNode &layerNode ); %Docstring diff --git a/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in b/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in index 65f21a5c560a..278171c790de 100644 --- a/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in +++ b/python/core/auto_generated/providers/qgsabstractdatabaseproviderconnection.sip.in @@ -693,7 +693,7 @@ Subclasses should add provider- and/or connection- specific words. .. versionadded:: 3.22 %End - public: + protected: void checkCapability( Capability capability ) const; diff --git a/python/core/auto_generated/providers/qgsdataprovider.sip.in b/python/core/auto_generated/providers/qgsdataprovider.sip.in index 68256554ceb6..59b34c9675cf 100644 --- a/python/core/auto_generated/providers/qgsdataprovider.sip.in +++ b/python/core/auto_generated/providers/qgsdataprovider.sip.in @@ -484,7 +484,7 @@ Emitted when the datasource issues a notification. %End - public: + protected: diff --git a/python/core/auto_generated/providers/qgsprovidermetadata.sip.in b/python/core/auto_generated/providers/qgsprovidermetadata.sip.in index 5acfdac85e5a..edca0759fb14 100644 --- a/python/core/auto_generated/providers/qgsprovidermetadata.sip.in +++ b/python/core/auto_generated/providers/qgsprovidermetadata.sip.in @@ -679,7 +679,7 @@ relating to the connection have been updated. .. versionadded:: 3.14 %End - public: + protected: }; diff --git a/python/core/auto_generated/providers/qgsprovidersublayermodel.sip.in b/python/core/auto_generated/providers/qgsprovidersublayermodel.sip.in index fc88cab69a7e..b5fd05363ad5 100644 --- a/python/core/auto_generated/providers/qgsprovidersublayermodel.sip.in +++ b/python/core/auto_generated/providers/qgsprovidersublayermodel.sip.in @@ -197,7 +197,7 @@ Adds a non-layer item (e.g. an embedded QGIS project item) to the model. virtual QVariant headerData( int section, Qt::Orientation orientation, int role = Qt::DisplayRole ) const; - public: + protected: @@ -251,7 +251,7 @@ Sets whether system and internal tables will be shown in the model. .. seealso:: :py:func:`includeSystemTables` %End - public: + protected: virtual bool filterAcceptsRow( int source_row, const QModelIndex &source_parent ) const; virtual bool lessThan( const QModelIndex &source_left, const QModelIndex &source_right ) const; diff --git a/python/core/auto_generated/providers/qgsprovidersublayertask.sip.in b/python/core/auto_generated/providers/qgsprovidersublayertask.sip.in index f99624c97ade..18e00f0dd0e7 100644 --- a/python/core/auto_generated/providers/qgsprovidersublayertask.sip.in +++ b/python/core/auto_generated/providers/qgsprovidersublayertask.sip.in @@ -51,7 +51,7 @@ Returns the sublayer details as calculated by the task. virtual void cancel(); - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/qgsabstractcontentcache.sip.in b/python/core/auto_generated/qgsabstractcontentcache.sip.in index ba96c0c8f36c..d08d7f18344c 100644 --- a/python/core/auto_generated/qgsabstractcontentcache.sip.in +++ b/python/core/auto_generated/qgsabstractcontentcache.sip.in @@ -58,7 +58,7 @@ Returns the memory usage in bytes for the entry. Dumps debugging strings containing the item's properties. For testing purposes only. %End - public: + protected: virtual bool isEqual( const QgsAbstractContentCacheEntry *other ) const = 0; %Docstring @@ -99,7 +99,7 @@ Constructor for QgsAbstractContentCacheBase, with the specified ``parent`` objec Emitted when the cache has finished retrieving content from a remote ``url``. %End - public: + protected: virtual bool checkReply( QNetworkReply *reply, const QString &path ) const; %Docstring diff --git a/python/core/auto_generated/qgscachedfeatureiterator.sip.in b/python/core/auto_generated/qgscachedfeatureiterator.sip.in index bf868172b52f..4aa85041bc94 100644 --- a/python/core/auto_generated/qgscachedfeatureiterator.sip.in +++ b/python/core/auto_generated/qgscachedfeatureiterator.sip.in @@ -46,7 +46,7 @@ Close this iterator. No further features will be available. :return: ``True`` if successful %End - public: + protected: virtual bool fetchFeature( QgsFeature &f ); @@ -108,7 +108,7 @@ Close this iterator. No further features will be available. :return: ``True`` if successful %End - public: + protected: virtual bool fetchFeature( QgsFeature &f ); diff --git a/python/core/auto_generated/qgscolorramp.sip.in b/python/core/auto_generated/qgscolorramp.sip.in index 3b69ca524a82..cd9922941111 100644 --- a/python/core/auto_generated/qgscolorramp.sip.in +++ b/python/core/auto_generated/qgscolorramp.sip.in @@ -292,7 +292,7 @@ Copy color ramp stops to a QGradient .. versionadded:: 2.1 %End - public: + protected: }; @@ -461,7 +461,7 @@ Sets the maximum value for generated colors .. seealso:: :py:func:`valMax` %End - public: + protected: }; class QgsRandomColorRamp: QgsColorRamp @@ -519,7 +519,7 @@ Returns the string identifier for QgsRandomColorRamp. virtual QVariantMap properties() const; - public: + protected: }; @@ -717,7 +717,7 @@ color brewer scheme name .. seealso:: :py:func:`listSchemeNames` %End - public: + protected: void loadPalette(); %Docstring @@ -808,7 +808,7 @@ Returns the string identifier for QgsCptCityColorRamp. QString descFileName() const; QgsStringMap copyingInfo() const; - public: + protected: }; diff --git a/python/core/auto_generated/qgscolorscheme.sip.in b/python/core/auto_generated/qgscolorscheme.sip.in index d38b4c50c0a8..3f1ec51f9591 100644 --- a/python/core/auto_generated/qgscolorscheme.sip.in +++ b/python/core/auto_generated/qgscolorscheme.sip.in @@ -146,7 +146,7 @@ Constructor for QgsGplColorScheme. virtual bool setColors( const QgsNamedColorList &colors, const QString &context = QString(), const QColor &baseColor = QColor() ); - public: + protected: virtual QString gplFilePath() = 0; %Docstring @@ -212,7 +212,7 @@ Sets whether a this scheme should be shown in color button menus. .. versionadded:: 3.0 %End - public: + protected: diff --git a/python/core/auto_generated/qgscredentials.sip.in b/python/core/auto_generated/qgscredentials.sip.in index b1c1d1d52d7d..7bf746d0b6df 100644 --- a/python/core/auto_generated/qgscredentials.sip.in +++ b/python/core/auto_generated/qgscredentials.sip.in @@ -95,7 +95,7 @@ Returns pointer to mutex .. versionadded:: 2.4 %End - public: + protected: QgsCredentials(); %Docstring @@ -142,7 +142,7 @@ This class doesn't prompt or return credentials signals that object will be destroyed and shouldn't be used anymore %End - public: + protected: virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ); virtual bool requestMasterPassword( QString &password /In,Out/, bool stored = false ); @@ -172,7 +172,7 @@ GUI. signals that object will be destroyed and shouldn't be used anymore %End - public: + protected: virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ); virtual bool requestMasterPassword( QString &password /In,Out/, bool stored = false ); diff --git a/python/core/auto_generated/qgsdbfilterproxymodel.sip.in b/python/core/auto_generated/qgsdbfilterproxymodel.sip.in index cc037ca8a50e..702adc345936 100644 --- a/python/core/auto_generated/qgsdbfilterproxymodel.sip.in +++ b/python/core/auto_generated/qgsdbfilterproxymodel.sip.in @@ -39,7 +39,7 @@ Calls QSortFilterProxyModel.setFilterWildcard and triggers update Calls QSortFilterProxyModel.setFilterRegExp and triggers update %End - public: + protected: virtual bool filterAcceptsRow( int row, const QModelIndex &source_parent ) const; }; diff --git a/python/core/auto_generated/qgsdiagramrenderer.sip.in b/python/core/auto_generated/qgsdiagramrenderer.sip.in index 78dd3df7b1ec..49d7f7b98662 100644 --- a/python/core/auto_generated/qgsdiagramrenderer.sip.in +++ b/python/core/auto_generated/qgsdiagramrenderer.sip.in @@ -744,7 +744,7 @@ Sets whether the renderer will show legend items for diagram attributes. .. versionadded:: 2.16 %End - public: + protected: QgsDiagramRenderer( const QgsDiagramRenderer &other ); virtual bool diagramSettings( const QgsFeature &feature, const QgsRenderContext &c, QgsDiagramSettings &s ) const = 0; @@ -825,7 +825,7 @@ Constructor for QgsSingleCategoryDiagramRenderer virtual QList< QgsLayerTreeModelLegendNode * > legendItems( QgsLayerTreeLayer *nodeLayer ) const /Factory/; - public: + protected: virtual bool diagramSettings( const QgsFeature &feature, const QgsRenderContext &c, QgsDiagramSettings &s ) const; @@ -926,7 +926,7 @@ Returns configuration of appearance of legend. Will return ``None`` if no config .. versionadded:: 3.0 %End - public: + protected: virtual bool diagramSettings( const QgsFeature &feature, const QgsRenderContext &c, QgsDiagramSettings &s ) const; diff --git a/python/core/auto_generated/qgsfeatureiterator.sip.in b/python/core/auto_generated/qgsfeatureiterator.sip.in index ada527f634fe..0e53077fe231 100644 --- a/python/core/auto_generated/qgsfeatureiterator.sip.in +++ b/python/core/auto_generated/qgsfeatureiterator.sip.in @@ -75,7 +75,7 @@ This indicates that there is something wrong with the expression compiler. .. versionadded:: 3.2 %End - public: + protected: virtual bool fetchFeature( QgsFeature &f ) = 0; %Docstring @@ -182,7 +182,7 @@ Helper template that cares of two things: 1. automatic deletion of source if own ~QgsAbstractFeatureIteratorFromSource(); - public: + protected: void iteratorClosed(); %Docstring to be called by from subclass in :py:func:`~QgsAbstractFeatureIteratorFromSource.close` @@ -274,7 +274,7 @@ This indicates that there is something wrong with the expression compiler. %End - public: + protected: }; diff --git a/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in b/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in index dd871f44adab..bf1a2413ab25 100644 --- a/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in +++ b/python/core/auto_generated/qgsfeaturepickermodelbase.sip.in @@ -241,7 +241,7 @@ Emitted when the fetching limit for the feature request changes %End - public: + protected: QVariant extraIdentifierValue() const; %Docstring diff --git a/python/core/auto_generated/qgsfeaturerequest.sip.in b/python/core/auto_generated/qgsfeaturerequest.sip.in index 5481ce60c90a..08eae54189a3 100644 --- a/python/core/auto_generated/qgsfeaturerequest.sip.in +++ b/python/core/auto_generated/qgsfeaturerequest.sip.in @@ -965,7 +965,7 @@ if it should be canceled, if set. .. versionadded:: 3.20 %End - public: + protected: @@ -1006,7 +1006,7 @@ Gets an iterator for features matching the specified request %End - public: + protected: void iteratorOpened( QgsAbstractFeatureIterator *it ); void iteratorClosed( QgsAbstractFeatureIterator *it ); diff --git a/python/core/auto_generated/qgsfieldmodel.sip.in b/python/core/auto_generated/qgsfieldmodel.sip.in index 753ce6de16f9..cb36bdd136f9 100644 --- a/python/core/auto_generated/qgsfieldmodel.sip.in +++ b/python/core/auto_generated/qgsfieldmodel.sip.in @@ -185,7 +185,7 @@ Set the layer from which fields are displayed. Called when the model must be updated. %End - public: + protected: }; diff --git a/python/core/auto_generated/qgsgeometrysimplifier.sip.in b/python/core/auto_generated/qgsgeometrysimplifier.sip.in index 30c59488d85f..aa752dbf079d 100644 --- a/python/core/auto_generated/qgsgeometrysimplifier.sip.in +++ b/python/core/auto_generated/qgsgeometrysimplifier.sip.in @@ -75,7 +75,7 @@ is specified in layer units. virtual QgsAbstractGeometry *simplify( const QgsAbstractGeometry *geometry ) const /Factory/; - public: + protected: }; diff --git a/python/core/auto_generated/qgsmapdecoration.sip.in b/python/core/auto_generated/qgsmapdecoration.sip.in index 4b1188351459..d880cec3a3a0 100644 --- a/python/core/auto_generated/qgsmapdecoration.sip.in +++ b/python/core/auto_generated/qgsmapdecoration.sip.in @@ -42,7 +42,7 @@ Returns the map decoration display name. .. versionadded:: 3.14 %End - public: + protected: void setDisplayName( const QString &name ); %Docstring diff --git a/python/core/auto_generated/qgsmaplayer.sip.in b/python/core/auto_generated/qgsmaplayer.sip.in index 408ff5c0cd5d..3ed98aa9a203 100644 --- a/python/core/auto_generated/qgsmaplayer.sip.in +++ b/python/core/auto_generated/qgsmaplayer.sip.in @@ -1828,7 +1828,7 @@ Emitted when modifications has been done on layer .. versionadded:: 3.22 %End - public: + protected: void clone( QgsMapLayer *layer ) const; %Docstring diff --git a/python/core/auto_generated/qgsmaplayermodel.sip.in b/python/core/auto_generated/qgsmaplayermodel.sip.in index a1bc5c73a446..2d5a15728df0 100644 --- a/python/core/auto_generated/qgsmaplayermodel.sip.in +++ b/python/core/auto_generated/qgsmaplayermodel.sip.in @@ -230,7 +230,7 @@ Returns the icon corresponding to a specified map ``layer``. void removeLayers( const QStringList &layerIds ); void addLayers( const QList &layers ); - public: + protected: }; diff --git a/python/core/auto_generated/qgsmaplayerrenderer.sip.in b/python/core/auto_generated/qgsmaplayerrenderer.sip.in index 66023695cbf1..d2840a74a597 100644 --- a/python/core/auto_generated/qgsmaplayerrenderer.sip.in +++ b/python/core/auto_generated/qgsmaplayerrenderer.sip.in @@ -121,7 +121,7 @@ Ownership of items is transferred to the caller. .. versionadded:: 3.22 %End - public: + protected: diff --git a/python/core/auto_generated/qgsmaplayerserverproperties.sip.in b/python/core/auto_generated/qgsmaplayerserverproperties.sip.in index e7c825d06178..d9b18bb61fff 100644 --- a/python/core/auto_generated/qgsmaplayerserverproperties.sip.in +++ b/python/core/auto_generated/qgsmaplayerserverproperties.sip.in @@ -74,7 +74,7 @@ Add a metadataUrl for the layer Gets the parent layer %End - public: + protected: @@ -183,7 +183,7 @@ Returns the QGIS Server WMS Dimension list. Gets the parent layer %End - public: + protected: diff --git a/python/core/auto_generated/qgsmapsettings.sip.in b/python/core/auto_generated/qgsmapsettings.sip.in index 57b3fee5cdd8..4c649f57963b 100644 --- a/python/core/auto_generated/qgsmapsettings.sip.in +++ b/python/core/auto_generated/qgsmapsettings.sip.in @@ -905,7 +905,7 @@ Sets the ``range`` of z-values which will be visible in the map. .. versionadded:: 3.18 %End - public: + protected: diff --git a/python/core/auto_generated/qgsmaptopixelgeometrysimplifier.sip.in b/python/core/auto_generated/qgsmaptopixelgeometrysimplifier.sip.in index f460d11c90e9..3ff1bc5632b8 100644 --- a/python/core/auto_generated/qgsmaptopixelgeometrysimplifier.sip.in +++ b/python/core/auto_generated/qgsmaptopixelgeometrysimplifier.sip.in @@ -43,7 +43,7 @@ Constructor SimplifyEnvelope, }; - public: + protected: diff --git a/python/core/auto_generated/qgsmessagelog.sip.in b/python/core/auto_generated/qgsmessagelog.sip.in index f9a03f11eb77..a809f63008d9 100644 --- a/python/core/auto_generated/qgsmessagelog.sip.in +++ b/python/core/auto_generated/qgsmessagelog.sip.in @@ -122,7 +122,7 @@ be the right choice for applications without GUI. Constructor for QgsMessageLogConsole. %End - public: + protected: QString formatLogMessage( const QString &message, const QString &tag, Qgis::MessageLevel level = Qgis::MessageLevel::Info ) const; %Docstring diff --git a/python/core/auto_generated/qgsobjectcustomproperties.sip.in b/python/core/auto_generated/qgsobjectcustomproperties.sip.in index cada55c17650..5607e65f8d8e 100644 --- a/python/core/auto_generated/qgsobjectcustomproperties.sip.in +++ b/python/core/auto_generated/qgsobjectcustomproperties.sip.in @@ -77,7 +77,7 @@ Writes the store contents to an XML node. .. seealso:: :py:func:`readXml` %End - public: + protected: }; diff --git a/python/core/auto_generated/qgsowsconnection.sip.in b/python/core/auto_generated/qgsowsconnection.sip.in index cab10d089417..936e311c0e26 100644 --- a/python/core/auto_generated/qgsowsconnection.sip.in +++ b/python/core/auto_generated/qgsowsconnection.sip.in @@ -90,7 +90,7 @@ Retrieves the selected connection for the specified service Marks the specified connection for the specified service as selected %End - public: + protected: }; diff --git a/python/core/auto_generated/qgspluginlayer.sip.in b/python/core/auto_generated/qgspluginlayer.sip.in index 9ac1c193df08..cbdb8f55146c 100644 --- a/python/core/auto_generated/qgspluginlayer.sip.in +++ b/python/core/auto_generated/qgspluginlayer.sip.in @@ -62,7 +62,7 @@ Set source string. This is used for example in layer tree to show tooltip. virtual QgsDataProvider *dataProvider(); - public: + protected: }; diff --git a/python/core/auto_generated/qgspluginlayerregistry.sip.in b/python/core/auto_generated/qgspluginlayerregistry.sip.in index 641db3b5b2dd..da69eb3073d0 100644 --- a/python/core/auto_generated/qgspluginlayerregistry.sip.in +++ b/python/core/auto_generated/qgspluginlayerregistry.sip.in @@ -44,7 +44,7 @@ Returns new layer of this type, using layer URI (specific to this plugin layer t Show plugin layer properties dialog. Return ``False`` if the dialog cannot be shown. %End - public: + protected: }; diff --git a/python/core/auto_generated/qgspointlocator.sip.in b/python/core/auto_generated/qgspointlocator.sip.in index d9009b55c40e..596e568aa3f6 100644 --- a/python/core/auto_generated/qgspointlocator.sip.in +++ b/python/core/auto_generated/qgspointlocator.sip.in @@ -206,7 +206,7 @@ The parameter ``destinationCrs`` depends of where the instance of this Match is bool operator==( const QgsPointLocator::Match &other ) const; - public: + protected: }; typedef QList MatchList; @@ -335,7 +335,7 @@ Emitted whenever index has been built and initialization is finished features, otherwise ``True`` %End - public: + protected: bool rebuildIndex( int maxFeaturesToIndex = -1 ); protected slots: diff --git a/python/core/auto_generated/qgspropertytransformer.sip.in b/python/core/auto_generated/qgspropertytransformer.sip.in index 0380ef4fa9ba..4aac3c66726e 100644 --- a/python/core/auto_generated/qgspropertytransformer.sip.in +++ b/python/core/auto_generated/qgspropertytransformer.sip.in @@ -302,7 +302,7 @@ Attempts to parse an expression into a corresponding property transformer. be parsed to a transformer. %End - public: + protected: double transformNumeric( double input ) const; %Docstring diff --git a/python/core/auto_generated/qgspythonrunner.sip.in b/python/core/auto_generated/qgspythonrunner.sip.in index 526702ab0fe9..eda81e63ccc0 100644 --- a/python/core/auto_generated/qgspythonrunner.sip.in +++ b/python/core/auto_generated/qgspythonrunner.sip.in @@ -47,7 +47,7 @@ This method should be called during app initialization. Takes ownership of the object, deletes previous instance. %End - public: + protected: QgsPythonRunner(); %Docstring Protected constructor: can be instantiated only from children diff --git a/python/core/auto_generated/qgsrange.sip.in b/python/core/auto_generated/qgsrange.sip.in index dce7c96807d4..c7ed567dee34 100644 --- a/python/core/auto_generated/qgsrange.sip.in +++ b/python/core/auto_generated/qgsrange.sip.in @@ -121,7 +121,7 @@ Returns ``True`` if this range overlaps another range. bool operator!=( const QgsRange &other ) const; - public: + protected: }; diff --git a/python/core/auto_generated/qgsrenderchecker.sip.in b/python/core/auto_generated/qgsrenderchecker.sip.in index 0f39ff2ebc68..a63b74c2e6ae 100644 --- a/python/core/auto_generated/qgsrenderchecker.sip.in +++ b/python/core/auto_generated/qgsrenderchecker.sip.in @@ -223,7 +223,7 @@ Only will return something if you call enableDashBuffering( ``True`` ); before. :return: buffered dash messages %End - public: + protected: }; // class QgsRenderChecker diff --git a/python/core/auto_generated/qgssimplifymethod.sip.in b/python/core/auto_generated/qgssimplifymethod.sip.in index 652072c1547b..0794d772c77d 100644 --- a/python/core/auto_generated/qgssimplifymethod.sip.in +++ b/python/core/auto_generated/qgssimplifymethod.sip.in @@ -74,7 +74,7 @@ Gets whether the simplification executes after fetch the geometries from provide Creates a geometry simplifier according to specified method %End - public: + protected: }; /************************************************************************ diff --git a/python/core/auto_generated/qgssnappingutils.sip.in b/python/core/auto_generated/qgssnappingutils.sip.in index 880f15927c85..06e751722b90 100644 --- a/python/core/auto_generated/qgssnappingutils.sip.in +++ b/python/core/auto_generated/qgssnappingutils.sip.in @@ -226,7 +226,7 @@ Toggles the state of snapping Emitted when the snapping settings object changes. %End - public: + protected: virtual void prepareIndexStarting( int count ); %Docstring diff --git a/python/core/auto_generated/qgssqlstatement.sip.in b/python/core/auto_generated/qgssqlstatement.sip.in index cd339be1ce3d..45b3ab83ed88 100644 --- a/python/core/auto_generated/qgssqlstatement.sip.in +++ b/python/core/auto_generated/qgssqlstatement.sip.in @@ -300,7 +300,7 @@ Creates a deep copy of this list. Ownership is transferred to the caller Dump list %End - public: + protected: }; class NodeUnaryOperator : QgsSQLStatement::Node @@ -337,7 +337,7 @@ Operand virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; class NodeBinaryOperator : QgsSQLStatement::Node @@ -389,7 +389,7 @@ Precedence Is left associative ? %End - public: + protected: }; @@ -432,7 +432,7 @@ Values list virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; class NodeBetweenOperator : QgsSQLStatement::Node @@ -478,7 +478,7 @@ Maximum bound virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; class NodeFunction : QgsSQLStatement::Node @@ -515,7 +515,7 @@ Returns arguments virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; @@ -547,7 +547,7 @@ The value of the literal. virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; class NodeColumnRef : QgsSQLStatement::Node @@ -606,7 +606,7 @@ Whether this is prefixed by DISTINCT Clone with same type return %End - public: + protected: }; class NodeSelectedColumn : QgsSQLStatement::Node @@ -652,7 +652,7 @@ Alias name Clone with same type return %End - public: + protected: }; class NodeCast : QgsSQLStatement::Node @@ -689,7 +689,7 @@ Type virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; class NodeTableDef : QgsSQLStatement::Node @@ -733,7 +733,7 @@ Table alias Clone with same type return %End - public: + protected: }; class NodeJoin : QgsSQLStatement::Node @@ -788,7 +788,7 @@ Join type Clone with same type return %End - public: + protected: }; class NodeColumnSorted : QgsSQLStatement::Node @@ -829,7 +829,7 @@ Whether the column is sorted in ascending order Clone with same type return %End - public: + protected: }; class NodeSelect : QgsSQLStatement::Node @@ -898,7 +898,7 @@ Returns the list of order by columns virtual QgsSQLStatement::Node *clone() const /Factory/; - public: + protected: }; @@ -1005,7 +1005,7 @@ Constructor Entry function for the visitor pattern %End - public: + protected: QgsSQLStatement( const QString &statement, bool allowFragments ); %Docstring diff --git a/python/core/auto_generated/qgstaskmanager.sip.in b/python/core/auto_generated/qgstaskmanager.sip.in index 64a0391df887..95cc0f62bb9c 100644 --- a/python/core/auto_generated/qgstaskmanager.sip.in +++ b/python/core/auto_generated/qgstaskmanager.sip.in @@ -256,7 +256,7 @@ an internal error). be emitted %End - public: + protected: virtual bool run() = 0; %Docstring diff --git a/python/core/auto_generated/qgstracer.sip.in b/python/core/auto_generated/qgstracer.sip.in index f333c360f013..b3fa710f04c4 100644 --- a/python/core/auto_generated/qgstracer.sip.in +++ b/python/core/auto_generated/qgstracer.sip.in @@ -155,7 +155,7 @@ The optional "error" argument may receive error code (PathError enum) if it is n Find out whether the point is snapped to a vertex or edge (i.e. it can be used for tracing start/stop) %End - public: + protected: virtual void configure(); %Docstring diff --git a/python/core/auto_generated/qgstransaction.sip.in b/python/core/auto_generated/qgstransaction.sip.in index 1b3d0f3e48d0..29d6b6dcbf00 100644 --- a/python/core/auto_generated/qgstransaction.sip.in +++ b/python/core/auto_generated/qgstransaction.sip.in @@ -159,7 +159,7 @@ Emitted after a rollback Emitted if a sql query is executed and the underlying data is modified %End - public: + protected: }; diff --git a/python/core/auto_generated/qgsvectorfilewriter.sip.in b/python/core/auto_generated/qgsvectorfilewriter.sip.in index 1add6a7eba5e..73744e3111a8 100644 --- a/python/core/auto_generated/qgsvectorfilewriter.sip.in +++ b/python/core/auto_generated/qgsvectorfilewriter.sip.in @@ -705,7 +705,7 @@ Returns whether there are among the attributes specified some that do not exist .. versionadded:: 3.0 %End - public: + protected: diff --git a/python/core/auto_generated/qgsvectorfilewritertask.sip.in b/python/core/auto_generated/qgsvectorfilewritertask.sip.in index 8349ee838c0d..7f95fe39f6f6 100644 --- a/python/core/auto_generated/qgsvectorfilewritertask.sip.in +++ b/python/core/auto_generated/qgsvectorfilewritertask.sip.in @@ -58,7 +58,7 @@ Emitted when an error occurs which prevented the file being written (or if the task is canceled). The writing ``error`` and ``errorMessage`` will be reported. %End - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/raster/qgscolorrampshader.sip.in b/python/core/auto_generated/raster/qgscolorrampshader.sip.in index 9fa363c1944f..7437669e14ee 100644 --- a/python/core/auto_generated/raster/qgscolorrampshader.sip.in +++ b/python/core/auto_generated/raster/qgscolorrampshader.sip.in @@ -234,7 +234,7 @@ Ownership of ``settings`` is transferred. .. versionadded:: 3.18 %End - public: + protected: }; diff --git a/python/core/auto_generated/raster/qgscontrastenhancementfunction.sip.in b/python/core/auto_generated/raster/qgscontrastenhancementfunction.sip.in index 8972dc34dff0..c4d996a353ff 100644 --- a/python/core/auto_generated/raster/qgscontrastenhancementfunction.sip.in +++ b/python/core/auto_generated/raster/qgscontrastenhancementfunction.sip.in @@ -76,7 +76,7 @@ Returns the minimum value. .. versionadded:: 3.2 %End - public: + protected: diff --git a/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in b/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in index 7e91f0326117..20f0c41a14b2 100644 --- a/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in +++ b/python/core/auto_generated/raster/qgsrasterdataprovider.sip.in @@ -706,7 +706,7 @@ Emit a message to be displayed on status bar, usually used by network providers .. versionadded:: 2.14 %End - public: + protected: diff --git a/python/core/auto_generated/raster/qgsrasterdrawer.sip.in b/python/core/auto_generated/raster/qgsrasterdrawer.sip.in index d3450a8867c0..2469adc97c7c 100644 --- a/python/core/auto_generated/raster/qgsrasterdrawer.sip.in +++ b/python/core/auto_generated/raster/qgsrasterdrawer.sip.in @@ -39,7 +39,7 @@ Draws raster data. :param feedback: optional raster feedback object for cancellation/preview. Added in QGIS 3.0. %End - public: + protected: }; diff --git a/python/core/auto_generated/raster/qgsrasterfilewritertask.sip.in b/python/core/auto_generated/raster/qgsrasterfilewritertask.sip.in index 94c9186ccf99..2aa2fbbf4ca0 100644 --- a/python/core/auto_generated/raster/qgsrasterfilewritertask.sip.in +++ b/python/core/auto_generated/raster/qgsrasterfilewritertask.sip.in @@ -89,7 +89,7 @@ the task is canceled). The writing ``error`` will be reported and a .. versionadded:: 3.10 %End - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/raster/qgsrasterinterface.sip.in b/python/core/auto_generated/raster/qgsrasterinterface.sip.in index f9a49ab6a3c6..259f013a3c81 100644 --- a/python/core/auto_generated/raster/qgsrasterinterface.sip.in +++ b/python/core/auto_generated/raster/qgsrasterinterface.sip.in @@ -443,7 +443,7 @@ Write base class members to xml. Sets base class members from xml. Usually called from :py:func:`~QgsRasterInterface.create` methods of subclasses %End - public: + protected: @@ -492,11 +492,13 @@ Fill in histogram defaults if not specified maximum = PyFloat_AsDouble( a4 ); } +#if defined(SIP_PROTECTED_IS_PUBLIC) || (SIP_VERSION >= 0x050000 && !defined(_MSC_VER)) sipCpp->initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 ); +#else + sipCpp->sipProtect_initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 ); +#endif %End - - void initStatistics( QgsRasterBandStats &statistics, int bandNo, int stats = QgsRasterBandStats::All, const QgsRectangle &boundingBox = QgsRectangle(), diff --git a/python/core/auto_generated/raster/qgsrasterlayer.sip.in b/python/core/auto_generated/raster/qgsrasterlayer.sip.in index ef5b2aa8eea7..e0338306453a 100644 --- a/python/core/auto_generated/raster/qgsrasterlayer.sip.in +++ b/python/core/auto_generated/raster/qgsrasterlayer.sip.in @@ -440,7 +440,7 @@ Emitted when the layer's subset string has changed. %End - public: + protected: virtual bool readSymbology( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, QgsMapLayer::StyleCategories categories = QgsMapLayer::AllStyleCategories ); virtual bool readStyle( const QDomNode &node, QString &errorMessage, QgsReadWriteContext &context, QgsMapLayer::StyleCategories categories = QgsMapLayer::AllStyleCategories ); diff --git a/python/core/auto_generated/raster/qgsrasterrenderer.sip.in b/python/core/auto_generated/raster/qgsrasterrenderer.sip.in index 7ede37210f7d..2e731063afa6 100644 --- a/python/core/auto_generated/raster/qgsrasterrenderer.sip.in +++ b/python/core/auto_generated/raster/qgsrasterrenderer.sip.in @@ -171,7 +171,7 @@ should be canceled. .. versionadded:: 3.10 %End - public: + protected: void _writeXml( QDomDocument &doc, QDomElement &rasterRendererElem ) const; %Docstring diff --git a/python/core/auto_generated/raster/qgsrasterresamplefilter.sip.in b/python/core/auto_generated/raster/qgsrasterresamplefilter.sip.in index c0d0e87d33f8..5ccd912a0db6 100644 --- a/python/core/auto_generated/raster/qgsrasterresamplefilter.sip.in +++ b/python/core/auto_generated/raster/qgsrasterresamplefilter.sip.in @@ -61,7 +61,7 @@ Sets resampler for zoomed out scales. Takes ownership of the object Sets base class members from xml. Usually called from :py:func:`~QgsRasterResampleFilter.create` methods of subclasses %End - public: + protected: }; diff --git a/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in b/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in index 2202f5d49be6..cd65a3e8fd30 100644 --- a/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in +++ b/python/core/auto_generated/raster/qgsrastershaderfunction.sip.in @@ -129,7 +129,7 @@ Sets label precision to ``labelPrecision`` .. versionadded:: 3.16 %End - public: + protected: diff --git a/python/core/auto_generated/scalebar/qgsscalebarrenderer.sip.in b/python/core/auto_generated/scalebar/qgsscalebarrenderer.sip.in index 5f195c9b5061..38c737439aef 100644 --- a/python/core/auto_generated/scalebar/qgsscalebarrenderer.sip.in +++ b/python/core/auto_generated/scalebar/qgsscalebarrenderer.sip.in @@ -140,7 +140,7 @@ Returns ``True`` if settings were applied. .. versionadded:: 3.14 %End - public: + protected: void drawDefaultLabels( QgsRenderContext &context, const QgsScaleBarSettings &settings, diff --git a/python/core/auto_generated/settings/qgssettingsregistry.sip.in b/python/core/auto_generated/settings/qgssettingsregistry.sip.in index afa6440afddc..8a9098dc134b 100644 --- a/python/core/auto_generated/settings/qgssettingsregistry.sip.in +++ b/python/core/auto_generated/settings/qgssettingsregistry.sip.in @@ -58,7 +58,7 @@ Remove a child ``settingsRegistry`` from the register. Returns the list of registered child QgsSettingsRegistry. %End - public: + protected: void addSettingsEntry( const QgsSettingsEntryBase *settingsEntry ); %Docstring diff --git a/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in index b36ecbcb95a4..96ec7583b8cb 100644 --- a/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgscategorizedsymbolrenderer.sip.in @@ -123,7 +123,7 @@ Returns a string representing the categories settings, used for debugging purpos Converts the category to a matching SLD rule, within the specified DOM document and ``element``. %End - public: + protected: void swap( QgsRendererCategory &other ); }; @@ -456,7 +456,7 @@ configuration. .. versionadded:: 3.6 %End - public: + protected: diff --git a/python/core/auto_generated/symbology/qgscptcityarchive.sip.in b/python/core/auto_generated/symbology/qgscptcityarchive.sip.in index 008479ffe02c..f94f58676b1e 100644 --- a/python/core/auto_generated/symbology/qgscptcityarchive.sip.in +++ b/python/core/auto_generated/symbology/qgscptcityarchive.sip.in @@ -121,7 +121,7 @@ Base class for all items in the model bool isValid(); - public: + protected: signals: @@ -162,7 +162,7 @@ Item that represents a layer that can be opened with one of the providers void init(); - public: + protected: }; @@ -185,7 +185,7 @@ A Collection: logical collection of subcollections and color ramps void addChild( QgsCptCityDataItem *item /Transfer/ ); QVector childrenRamps( bool recursive ); - public: + protected: }; class QgsCptCityDirectoryItem : QgsCptCityCollectionItem @@ -210,7 +210,7 @@ A directory: contains subdirectories and color ramps static QgsCptCityDataItem *dataItem( QgsCptCityDataItem *parent, const QString &name, const QString &path ); - public: + protected: QMap< QString, QStringList > rampsMap(); QStringList dirEntries() const; }; @@ -235,7 +235,7 @@ A selection: contains subdirectories and color ramps QStringList selectionsList() const; - public: + protected: void parseXml(); }; @@ -255,7 +255,7 @@ An "All ramps item", which contains all items in a flat hierarchy virtual QVector createChildren(); - public: + protected: }; class QgsCptCityBrowserModel : QAbstractItemModel @@ -334,7 +334,7 @@ Returns index of a path void beginRemoveItems( QgsCptCityDataItem *parent, int first, int last ); void endRemoveItems(); - public: + protected: void addRootItems(); void removeRootItems(); diff --git a/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in b/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in index 716c9b743701..55f039782803 100644 --- a/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in +++ b/python/core/auto_generated/symbology/qgsfillsymbollayer.sip.in @@ -187,7 +187,7 @@ Returns the map unit scale for the fill's offset. virtual Qt::BrushStyle dxfBrushStyle() const; - public: + protected: }; @@ -409,7 +409,7 @@ Returns the map unit scale for the fill's offset. virtual QgsMapUnitScale mapUnitScale() const; - public: + protected: @@ -835,7 +835,7 @@ Returns the stroke width map unit scale. virtual bool hasDataDefinedProperties() const; - public: + protected: @@ -1131,7 +1131,7 @@ Returns the map unit scale for the image's width. .. seealso:: :py:func:`widthUnit` %End - public: + protected: virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context ); @@ -1430,7 +1430,7 @@ Sets the dynamic SVG parameters .. versionadded:: 3.18 %End - public: + protected: virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context ); @@ -1699,7 +1699,7 @@ Returns the map unit scale for the pattern's line offset. virtual bool hasDataDefinedProperties() const; - public: + protected: virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context ); @@ -2022,7 +2022,7 @@ Returns the unit scale for the vertical offset between rows in the pattern. virtual QColor color() const; - public: + protected: virtual void applyDataDefinedSettings( QgsSymbolRenderContext &context ); @@ -2358,7 +2358,7 @@ Sets whether point markers should be ``clipped`` to the current part boundary on virtual void stopFeatureRender( const QgsFeature &feature, QgsRenderContext &context ); - public: + protected: diff --git a/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in index a458b329a947..9ac8d10c5da9 100644 --- a/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsgraduatedsymbolrenderer.sip.in @@ -506,7 +506,7 @@ range matches the value. .. versionadded:: 3.10.1 %End - public: + protected: diff --git a/python/core/auto_generated/symbology/qgslinesymbollayer.sip.in b/python/core/auto_generated/symbology/qgslinesymbollayer.sip.in index 4ddf426197ef..2fdc0032f4ec 100644 --- a/python/core/auto_generated/symbology/qgslinesymbollayer.sip.in +++ b/python/core/auto_generated/symbology/qgslinesymbollayer.sip.in @@ -861,7 +861,7 @@ calculating individual symbol angles. virtual bool canCauseArtifactsBetweenAdjacentTiles() const; - public: + protected: virtual void setSymbolLineAngle( double angle ) = 0; %Docstring @@ -1004,7 +1004,7 @@ Shall the marker be rotated. virtual void renderPolyline( const QPolygonF &points, QgsSymbolRenderContext &context ); - public: + protected: virtual void setSymbolLineAngle( double angle ); @@ -1166,7 +1166,7 @@ Returns the map unit scale for the hash length. virtual void renderPolyline( const QPolygonF &points, QgsSymbolRenderContext &context ); - public: + protected: virtual void setSymbolLineAngle( double angle ); diff --git a/python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in b/python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in index ce11814a923f..e80ea0db7a6c 100644 --- a/python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in +++ b/python/core/auto_generated/symbology/qgsmarkersymbollayer.sip.in @@ -136,7 +136,7 @@ Encodes a shape to its string representation. virtual QRectF bounds( QPointF point, QgsSymbolRenderContext &context ); - public: + protected: bool prepareMarkerShape( Shape shape ); %Docstring @@ -469,7 +469,7 @@ Returns the map scale for the width of the marker's stroke. .. seealso:: :py:func:`strokeWidthUnit` %End - public: + protected: void drawMarker( QPainter *p, QgsSymbolRenderContext &context ); %Docstring @@ -760,7 +760,7 @@ Returns the units for the stroke width. virtual QSet usedAttributes( const QgsRenderContext &context ) const; - public: + protected: double calculateAspectRatio( QgsSymbolRenderContext &context, double scaledSize, bool &hasDataDefinedAspectRatio ) const; %Docstring @@ -935,7 +935,7 @@ if the value set is lower or equal to 0 the aspect ratio will be preserved in re virtual QRectF bounds( QPointF point, QgsSymbolRenderContext &context ); - public: + protected: }; diff --git a/python/core/auto_generated/symbology/qgsmergedfeaturerenderer.sip.in b/python/core/auto_generated/symbology/qgsmergedfeaturerenderer.sip.in index c7b8cc0a9f3b..8c7fa3149c70 100644 --- a/python/core/auto_generated/symbology/qgsmergedfeaturerenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsmergedfeaturerenderer.sip.in @@ -115,7 +115,7 @@ Creates a QgsMergedFeatureRenderer by a conversion from an existing renderer. :return: a new renderer if the conversion was possible, otherwise ``None``. %End - public: + protected: QgsMergedFeatureRenderer( const QString &type, QgsFeatureRenderer *embeddedRenderer /Transfer/ ); %Docstring @@ -125,14 +125,13 @@ Constructor for QgsMergedFeatureRenderer. :param embeddedRenderer: optional embeddedRenderer. Ownership will be transferred. %End -protected: enum GeometryOperation { Merge, InvertOnly, MergeAndInvert, }; -protected slots: + }; diff --git a/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in b/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in index 6a32556eefae..441166d6aba4 100644 --- a/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in +++ b/python/core/auto_generated/symbology/qgspointdistancerenderer.sip.in @@ -276,7 +276,7 @@ Returns the map unit scale object for the distance tolerance. This is only used .. seealso:: :py:func:`toleranceUnit` %End - public: + protected: diff --git a/python/core/auto_generated/symbology/qgsrenderer.sip.in b/python/core/auto_generated/symbology/qgsrenderer.sip.in index afc7bf462ba6..f5f987c6b392 100644 --- a/python/core/auto_generated/symbology/qgsrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsrenderer.sip.in @@ -36,7 +36,7 @@ The symbol of this symbol level The layer of this symbol level %End - public: + protected: }; typedef QList< QgsSymbolLevelItem > QgsSymbolLevel; @@ -557,7 +557,7 @@ Currently clones .. versionadded:: 3.22 %End - public: + protected: QgsFeatureRenderer( const QString &type ); void renderFeatureWithSymbol( const QgsFeature &feature, QgsSymbol *symbol, QgsRenderContext &context, int layer, bool selected, bool drawVertexMarker ) throw( QgsCsException ); diff --git a/python/core/auto_generated/symbology/qgsrendererrange.sip.in b/python/core/auto_generated/symbology/qgsrendererrange.sip.in index 0c23324f434b..7450c44e4e1c 100644 --- a/python/core/auto_generated/symbology/qgsrendererrange.sip.in +++ b/python/core/auto_generated/symbology/qgsrendererrange.sip.in @@ -67,7 +67,7 @@ Creates a DOM element representing the range in SLD format. rather than a < test. %End - public: + protected: void swap( QgsRendererRange &other ); }; @@ -120,7 +120,7 @@ class QgsRendererRangeLabelFormat /Deprecated/ static const int MAX_PRECISION; static const int MIN_PRECISION; - public: + protected: }; diff --git a/python/core/auto_generated/symbology/qgsrendererregistry.sip.in b/python/core/auto_generated/symbology/qgsrendererregistry.sip.in index 21ef1aa2b180..2f9011bd6641 100644 --- a/python/core/auto_generated/symbology/qgsrendererregistry.sip.in +++ b/python/core/auto_generated/symbology/qgsrendererregistry.sip.in @@ -98,7 +98,7 @@ The old renderer does not have to be of the same type as returned by :py:func:`~ virtual QgsFeatureRenderer *createRendererFromSld( QDomElement &elem, QgsWkbTypes::GeometryType geomType ) /Factory/; - public: + protected: }; @@ -128,7 +128,7 @@ Convenience metadata class that uses static functions to create renderer and its virtual QgsRendererAbstractMetadata::LayerTypes compatibleLayerTypes() const; - public: + protected: private: QgsRendererMetadata(); diff --git a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in index 59c1bec9d4b3..d8ebfd1212ae 100644 --- a/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgsrulebasedrenderer.sip.in @@ -444,7 +444,7 @@ should be canceled. .. versionadded:: 3.10 %End - public: + protected: void initFilter(); private: @@ -563,7 +563,7 @@ Since QGIS 3.20, the optional ``layer`` parameter is required for conversions of helper function to convert the size scale and rotation fields present in some other renderers to data defined symbology %End - public: + protected: diff --git a/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in b/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in index 9417cc9da0c6..311d68a4c3dd 100644 --- a/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in +++ b/python/core/auto_generated/symbology/qgssinglesymbolrenderer.sip.in @@ -121,7 +121,7 @@ Will return ``None`` if the functionality is disabled. .. versionadded:: 3.0 %End - public: + protected: private: QgsSingleSymbolRenderer( const QgsSingleSymbolRenderer & ); diff --git a/python/core/auto_generated/symbology/qgssvgcache.sip.in b/python/core/auto_generated/symbology/qgssvgcache.sip.in index ddc7216e5796..d5a0d59971a5 100644 --- a/python/core/auto_generated/symbology/qgssvgcache.sip.in +++ b/python/core/auto_generated/symbology/qgssvgcache.sip.in @@ -231,7 +231,7 @@ Emitted when the cache has finished retrieving an SVG file from a remote ``url`` .. versionadded:: 3.2 %End - public: + protected: virtual bool checkReply( QNetworkReply *reply, const QString &path ) const; diff --git a/python/core/auto_generated/symbology/qgssymbol.sip.in b/python/core/auto_generated/symbology/qgssymbol.sip.in index cf47257b5e8c..0c27b9033a6f 100644 --- a/python/core/auto_generated/symbology/qgssymbol.sip.in +++ b/python/core/auto_generated/symbology/qgssymbol.sip.in @@ -641,7 +641,7 @@ Internally, this notifies all symbol layers which were used via a call to .. versionadded:: 3.20 %End - public: + protected: QgsSymbol( Qgis::SymbolType type, const QgsSymbolLayerList &layers /Transfer/ ); // can't be instantiated diff --git a/python/core/auto_generated/symbology/qgssymbollayer.sip.in b/python/core/auto_generated/symbology/qgssymbollayer.sip.in index 1adf85a1af36..76949b483317 100644 --- a/python/core/auto_generated/symbology/qgssymbollayer.sip.in +++ b/python/core/auto_generated/symbology/qgssymbollayer.sip.in @@ -573,7 +573,7 @@ This is a list of symbol layers of other layers that should be occluded. .. versionadded:: 3.12 %End - public: + protected: QgsSymbolLayer( Qgis::SymbolType type, bool locked = false ); %Docstring @@ -935,7 +935,7 @@ any data defined overrides and offsets which are set for the marker layer. .. versionadded:: 2.14 %End - public: + protected: QgsMarkerSymbolLayer( bool locked = false ); %Docstring @@ -1205,7 +1205,7 @@ for a polygon. .. versionadded:: 3.6 %End - public: + protected: QgsLineSymbolLayer( bool locked = false ); @@ -1237,7 +1237,7 @@ The ``rings`` argument optionally specifies a list of polygon rings to render as void setAngle( double angle ); double angle() const; - public: + protected: QgsFillSymbolLayer( bool locked = false ); void _renderPolygon( QPainter *p, const QPolygonF &points, const QVector *rings, QgsSymbolRenderContext &context ); %Docstring diff --git a/python/core/auto_generated/symbology/qgssymbollayerregistry.sip.in b/python/core/auto_generated/symbology/qgssymbollayerregistry.sip.in index cb1739848b4b..e629baa76bed 100644 --- a/python/core/auto_generated/symbology/qgssymbollayerregistry.sip.in +++ b/python/core/auto_generated/symbology/qgssymbollayerregistry.sip.in @@ -75,7 +75,7 @@ warnings in the ``context`` if not. .. versionadded:: 3.20 %End - public: + protected: }; @@ -99,7 +99,7 @@ Convenience metadata class that uses static functions to create symbol layer and virtual void resolveFonts( const QVariantMap &properties, const QgsReadWriteContext &context ); - public: + protected: private: diff --git a/python/core/auto_generated/vector/qgsvectordataprovider.sip.in b/python/core/auto_generated/vector/qgsvectordataprovider.sip.in index c2f1b6aab3a5..41afebaaa93e 100644 --- a/python/core/auto_generated/vector/qgsvectordataprovider.sip.in +++ b/python/core/auto_generated/vector/qgsvectordataprovider.sip.in @@ -638,7 +638,7 @@ Signals an error in this provider .. versionadded:: 3.0 %End - public: + protected: void clearMinMaxCache(); %Docstring diff --git a/python/core/auto_generated/vector/qgsvectorlayer.sip.in b/python/core/auto_generated/vector/qgsvectorlayer.sip.in index f6a5ef04a782..bdd0a0ed5001 100644 --- a/python/core/auto_generated/vector/qgsvectorlayer.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayer.sip.in @@ -2996,7 +2996,7 @@ Emitted when the feature count for symbols on this layer has been recalculated. .. versionadded:: 3.0 %End - public: + protected: virtual void setExtent( const QgsRectangle &rect ) ${SIP_FINAL}; %Docstring diff --git a/python/core/auto_generated/vector/qgsvectorlayercache.sip.in b/python/core/auto_generated/vector/qgsvectorlayercache.sip.in index 26e6468b7a95..b0cd53725024 100644 --- a/python/core/auto_generated/vector/qgsvectorlayercache.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayercache.sip.in @@ -232,7 +232,7 @@ Returns the number of features contained in the source, or -1 if the feature count is unknown. %End - public: + protected: void requestCompleted( const QgsFeatureRequest &featureRequest, const QgsFeatureIds &fids ); %Docstring diff --git a/python/core/auto_generated/vector/qgsvectorlayereditbuffer.sip.in b/python/core/auto_generated/vector/qgsvectorlayereditbuffer.sip.in index 35568a5a4735..76c689994d75 100644 --- a/python/core/auto_generated/vector/qgsvectorlayereditbuffer.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayereditbuffer.sip.in @@ -270,7 +270,7 @@ Emitted after committing an attribute rename void committedAttributeValuesChanges( const QString &layerId, const QgsChangedAttributesMap &changedAttributesValues ); void committedGeometriesChanges( const QString &layerId, const QgsGeometryMap &changedGeometries ); - public: + protected: QgsVectorLayerEditBuffer(); %Docstring @@ -304,7 +304,7 @@ Updates an index in an attribute map to a new value (for updates of changed attr void updateLayerFields(); - public: + protected: diff --git a/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in b/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in index 9a551f9b8158..58cf7bb2f894 100644 --- a/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayerexporter.sip.in @@ -182,7 +182,7 @@ Emitted when an error occurs which prevented the layer being exported (or if the task is canceled). The export ``error`` and ``errorMessage`` will be reported. %End - public: + protected: virtual bool run(); diff --git a/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in b/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in index 53ce323f41fe..d8430e87c427 100644 --- a/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayerfeatureiterator.sip.in @@ -62,7 +62,7 @@ Returns the layer id of the source layer. .. versionadded:: 3.4 %End - public: + protected: @@ -122,7 +122,7 @@ end of iterating: free the resources / lock virtual bool isValid() const; - public: + protected: virtual bool fetchFeature( QgsFeature &feature ); %Docstring diff --git a/python/core/auto_generated/vector/qgsvectorlayerjoininfo.sip.in b/python/core/auto_generated/vector/qgsvectorlayerjoininfo.sip.in index 845b4f635382..9816268011cc 100644 --- a/python/core/auto_generated/vector/qgsvectorlayerjoininfo.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayerjoininfo.sip.in @@ -244,7 +244,7 @@ All fields will be used if ``None`` is returned. .. versionadded:: 2.6 %End - public: + protected: diff --git a/python/core/auto_generated/vector/qgsvectorlayerundocommand.sip.in b/python/core/auto_generated/vector/qgsvectorlayerundocommand.sip.in index 1e890049a9a6..1bdd0bb536ec 100644 --- a/python/core/auto_generated/vector/qgsvectorlayerundocommand.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayerundocommand.sip.in @@ -39,7 +39,7 @@ Returns the layer associated with the undo command virtual int id() const; virtual bool mergeWith( const QUndoCommand * ); - public: + protected: }; diff --git a/python/core/auto_generated/vector/qgsvectorlayerundopassthroughcommand.sip.in b/python/core/auto_generated/vector/qgsvectorlayerundopassthroughcommand.sip.in index 67a8db8e8426..b22e81e11759 100644 --- a/python/core/auto_generated/vector/qgsvectorlayerundopassthroughcommand.sip.in +++ b/python/core/auto_generated/vector/qgsvectorlayerundopassthroughcommand.sip.in @@ -39,7 +39,7 @@ Constructor for QgsVectorLayerUndoPassthroughCommand Returns error status %End - public: + protected: bool rollBackToSavePoint(); %Docstring diff --git a/python/core/auto_generated/vectortile/qgsmapboxglstyleconverter.sip.in b/python/core/auto_generated/vectortile/qgsmapboxglstyleconverter.sip.in index e4b43ca58c5c..89a37f1f103a 100644 --- a/python/core/auto_generated/vectortile/qgsmapboxglstyleconverter.sip.in +++ b/python/core/auto_generated/vectortile/qgsmapboxglstyleconverter.sip.in @@ -224,9 +224,8 @@ Returns a new instance of a vector tile labeling representing the converted styl or ``None`` if the style could not be converted successfully. %End - public: + protected: -protected: enum PropertyType { Color, @@ -234,7 +233,7 @@ protected: Opacity, Point, }; -protected slots: + void parseLayers( const QVariantList &layers, QgsMapBoxGlStyleConversionContext *context = 0 ); %Docstring Parse list of ``layers`` from JSON. diff --git a/python/gui/auto_generated/annotations/qgsannotationitemwidget.sip.in b/python/gui/auto_generated/annotations/qgsannotationitemwidget.sip.in index b1ff76db6a20..c73e5ddb2468 100644 --- a/python/gui/auto_generated/annotations/qgsannotationitemwidget.sip.in +++ b/python/gui/auto_generated/annotations/qgsannotationitemwidget.sip.in @@ -77,7 +77,7 @@ Focuses the default widget for the page. Emitted when the annotation item definition in the widget is changed by the user. %End - public: + protected: virtual bool setNewItem( QgsAnnotationItem *item ); %Docstring diff --git a/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in b/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in index e1e25233c6ba..6f3b68ad1fb2 100644 --- a/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in +++ b/python/gui/auto_generated/attributetable/qgsattributetablefiltermodel.sip.in @@ -247,7 +247,7 @@ Emitted when an error occurred while filtering features .. versionadded:: 3.18 %End - public: + protected: virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; diff --git a/python/gui/auto_generated/attributetable/qgsattributetableview.sip.in b/python/gui/auto_generated/attributetable/qgsattributetableview.sip.in index 72c4882d68ee..2d698180b964 100644 --- a/python/gui/auto_generated/attributetable/qgsattributetableview.sip.in +++ b/python/gui/auto_generated/attributetable/qgsattributetableview.sip.in @@ -78,7 +78,7 @@ Optionally a ``column`` can be specified, which will also bring that column into .. versionadded:: 3.16 %End - public: + protected: virtual void mousePressEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/attributetable/qgsdualview.sip.in b/python/gui/auto_generated/attributetable/qgsdualview.sip.in index 3bb3da35e8cf..a1051b2850e9 100644 --- a/python/gui/auto_generated/attributetable/qgsdualview.sip.in +++ b/python/gui/auto_generated/attributetable/qgsdualview.sip.in @@ -295,7 +295,7 @@ Emitted when selecting context menu on the feature list to create the context me :param fid: feature id of the selected feature %End - public: + protected: virtual void hideEvent( QHideEvent *event ); diff --git a/python/gui/auto_generated/attributetable/qgsfeaturelistview.sip.in b/python/gui/auto_generated/attributetable/qgsfeaturelistview.sip.in index 0870e438c470..8b9a8e51d8ba 100644 --- a/python/gui/auto_generated/attributetable/qgsfeaturelistview.sip.in +++ b/python/gui/auto_generated/attributetable/qgsfeaturelistview.sip.in @@ -100,7 +100,7 @@ setFeatureSelectionManager :param featureSelectionManager: %End - public: + protected: virtual void mouseMoveEvent( QMouseEvent *event ); virtual void mousePressEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/attributetable/qgsfeaturelistviewdelegate.sip.in b/python/gui/auto_generated/attributetable/qgsfeaturelistviewdelegate.sip.in index fc8148c9c1ec..c6280e4f1577 100644 --- a/python/gui/auto_generated/attributetable/qgsfeaturelistviewdelegate.sip.in +++ b/python/gui/auto_generated/attributetable/qgsfeaturelistviewdelegate.sip.in @@ -36,7 +36,7 @@ class QgsFeatureListViewDelegate : QItemDelegate signals: void editButtonClicked( QModelIndex &index ); - public: + protected: virtual QSize sizeHint( const QStyleOptionViewItem &option, const QModelIndex &index ) const; virtual void paint( QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index ) const; diff --git a/python/gui/auto_generated/auth/qgsauthauthoritieseditor.sip.in b/python/gui/auto_generated/auth/qgsauthauthoritieseditor.sip.in index 6ca5cb046a65..53adbbad19fa 100644 --- a/python/gui/auto_generated/auth/qgsauthauthoritieseditor.sip.in +++ b/python/gui/auto_generated/auth/qgsauthauthoritieseditor.sip.in @@ -28,7 +28,7 @@ Widget for viewing and editing certificate authorities directly in database :param parent: Parent widget %End - public: + protected: virtual void showEvent( QShowEvent *e ); %Docstring diff --git a/python/gui/auto_generated/auth/qgsauthidentitieseditor.sip.in b/python/gui/auto_generated/auth/qgsauthidentitieseditor.sip.in index b049fc75f687..40a7e68c43d4 100644 --- a/python/gui/auto_generated/auth/qgsauthidentitieseditor.sip.in +++ b/python/gui/auto_generated/auth/qgsauthidentitieseditor.sip.in @@ -28,7 +28,7 @@ Widget for editing authentication configurations directly in database :param parent: Parent widget %End - public: + protected: virtual void showEvent( QShowEvent *e ); %Docstring diff --git a/python/gui/auto_generated/auth/qgsauthmethodedit.sip.in b/python/gui/auto_generated/auth/qgsauthmethodedit.sip.in index 4c309aab9e30..5a4247676855 100644 --- a/python/gui/auto_generated/auth/qgsauthmethodedit.sip.in +++ b/python/gui/auto_generated/auth/qgsauthmethodedit.sip.in @@ -54,7 +54,7 @@ Clear GUI controls in subclassed widget, optionally reloading any previously loa Clear GUI controls in subclassed widget %End - public: + protected: explicit QgsAuthMethodEdit( QWidget *parent = 0 ); %Docstring diff --git a/python/gui/auto_generated/auth/qgsauthserverseditor.sip.in b/python/gui/auto_generated/auth/qgsauthserverseditor.sip.in index f309df2c0683..e44862320460 100644 --- a/python/gui/auto_generated/auth/qgsauthserverseditor.sip.in +++ b/python/gui/auto_generated/auth/qgsauthserverseditor.sip.in @@ -28,7 +28,7 @@ Widget for editing authentication configurations directly in database :param parent: Parent Widget %End - public: + protected: virtual void showEvent( QShowEvent *e ); diff --git a/python/gui/auto_generated/auth/qgsauthtrustedcasdialog.sip.in b/python/gui/auto_generated/auth/qgsauthtrustedcasdialog.sip.in index 76c24d37b835..f2e8a3849d68 100644 --- a/python/gui/auto_generated/auth/qgsauthtrustedcasdialog.sip.in +++ b/python/gui/auto_generated/auth/qgsauthtrustedcasdialog.sip.in @@ -31,7 +31,7 @@ Construct a dialog that will list the trusted Certificate Authorities :param trustedCAs: List of trusted Certificate Authorities objects %End - public: + protected: virtual void showEvent( QShowEvent *e ); diff --git a/python/gui/auto_generated/callouts/qgscalloutwidget.sip.in b/python/gui/auto_generated/callouts/qgscalloutwidget.sip.in index bb8bcb1b6fa1..0872c076c84c 100644 --- a/python/gui/auto_generated/callouts/qgscalloutwidget.sip.in +++ b/python/gui/auto_generated/callouts/qgscalloutwidget.sip.in @@ -70,7 +70,7 @@ Returns the vector layer associated with the widget. Sets the geometry ``type`` of the features to customize the widget accordingly. %End - public: + protected: void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsCallout::Property key ); %Docstring diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in index 52b1d84d7bf9..72e25f13683c 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditor.sip.in @@ -181,7 +181,7 @@ Clears all warning messages from the editor. .. versionadded:: 3.16 %End - public: + protected: bool isFixedPitch( const QFont &font ); diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorcss.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorcss.sip.in index fa3cfaefc507..0135fccd1bd0 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorcss.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorcss.sip.in @@ -31,7 +31,7 @@ code autocompletion. Constructor for QgsCodeEditorCSS %End - public: + protected: virtual void initializeLexer(); }; diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorexpression.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorexpression.sip.in index 59ec388be258..f1dfad103da6 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorexpression.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorexpression.sip.in @@ -41,7 +41,7 @@ Will also reload all globally registered functions. Field names will be added to the API. %End - public: + protected: virtual void initializeLexer(); diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorhtml.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorhtml.sip.in index 073cc9fc9e48..3043ad7fbbe9 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorhtml.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorhtml.sip.in @@ -32,7 +32,7 @@ code autocompletion. Constructor for QgsCodeEditorHTML %End - public: + protected: virtual void initializeLexer(); }; diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorjs.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorjs.sip.in index aa2bb926a914..aeeda92c88fc 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorjs.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorjs.sip.in @@ -29,7 +29,7 @@ code autocompletion. Constructor for QgsCodeEditorJavascript %End - public: + protected: virtual void initializeLexer(); }; diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorjson.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorjson.sip.in index da63b39ddb9d..d47156bf094f 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorjson.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorjson.sip.in @@ -29,7 +29,7 @@ code autocompletion. Constructor for QgsCodeEditorJson %End - public: + protected: virtual void initializeLexer(); diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorpython.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorpython.sip.in index 5b9df88218e8..6516a3f24426 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorpython.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorpython.sip.in @@ -61,7 +61,7 @@ Searches the selected text in the official PyQGIS online documentation. .. versionadded:: 3.16 %End - public: + protected: virtual void initializeLexer(); diff --git a/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in b/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in index 351b9634f102..a055fb1d7e02 100644 --- a/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in +++ b/python/gui/auto_generated/codeeditors/qgscodeeditorsql.sip.in @@ -77,7 +77,7 @@ keywords. .. versionadded:: 3.22 %End - public: + protected: virtual void initializeLexer(); diff --git a/python/gui/auto_generated/editorwidgets/core/qgseditorconfigwidget.sip.in b/python/gui/auto_generated/editorwidgets/core/qgseditorconfigwidget.sip.in index 7ac876ab13a5..0232e6c02d23 100644 --- a/python/gui/auto_generated/editorwidgets/core/qgseditorconfigwidget.sip.in +++ b/python/gui/auto_generated/editorwidgets/core/qgseditorconfigwidget.sip.in @@ -75,7 +75,7 @@ Emitted when the configuration of the widget is changed. .. versionadded:: 3.0 %End - public: + protected: void initializeDataDefinedButton( QgsPropertyOverrideButton *button, QgsWidgetWrapper::Property key ); %Docstring diff --git a/python/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in index 7cb341fb146d..bd89941bb0ac 100644 --- a/python/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/core/qgseditorwidgetwrapper.sip.in @@ -327,7 +327,7 @@ depend on the parent form scope. .. versionadded:: 3.14 %End - public: + protected: virtual void updateConstraintWidgetStatus(); %Docstring diff --git a/python/gui/auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip.in index 83fe17fec725..acdfe23dac6a 100644 --- a/python/gui/auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/core/qgssearchwidgetwrapper.sip.in @@ -256,7 +256,7 @@ Set the ``expression`` which is currently used as filter for this widget. virtual void setFeature( const QgsFeature &feature ); - public: + protected: void clearExpression(); %Docstring clears the expression to search for all features diff --git a/python/gui/auto_generated/editorwidgets/core/qgswidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/core/qgswidgetwrapper.sip.in index d7d19bf5617e..820910e56ccf 100644 --- a/python/gui/auto_generated/editorwidgets/core/qgswidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/core/qgswidgetwrapper.sip.in @@ -184,7 +184,7 @@ Signal when :py:class:`QgsAttributeEditorContext` mContext changed .. versionadded:: 3.4 %End - public: + protected: virtual QWidget *createWidget( QWidget *parent ) = 0; %Docstring diff --git a/python/gui/auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip.in index ed10c4a5d2fd..dbf3cbca8c15 100644 --- a/python/gui/auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgscheckboxsearchwidgetwrapper.sip.in @@ -64,7 +64,7 @@ Returns a variant representing the current state of the widget. virtual void setEnabled( bool enabled ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsdatetimeedit.sip.in b/python/gui/auto_generated/editorwidgets/qgsdatetimeedit.sip.in index 04385413515b..cddd97d26b0a 100644 --- a/python/gui/auto_generated/editorwidgets/qgsdatetimeedit.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsdatetimeedit.sip.in @@ -134,7 +134,7 @@ Signal emitted whenever the value changes. :param date: The new date/time value. %End - public: + protected: virtual void mousePressEvent( QMouseEvent *event ); virtual void focusOutEvent( QFocusEvent *event ); @@ -221,7 +221,7 @@ Sets the ``time`` for the widget and handles null times. Signal emitted whenever the time changes. %End - public: + protected: virtual void emitValueChanged( const QVariant &value ); @@ -276,7 +276,7 @@ Sets the ``date`` for the widget and handles null dates. Signal emitted whenever the date changes. %End - public: + protected: virtual void emitValueChanged( const QVariant &value ); diff --git a/python/gui/auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip.in index 7ba6d0af0bad..8f846547bad3 100644 --- a/python/gui/auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsdatetimesearchwidgetwrapper.sip.in @@ -59,7 +59,7 @@ the editor widget's configured field format for date/time values. virtual void setEnabled( bool enabled ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip.in index 135b1d8735f2..261c3eeb228f 100644 --- a/python/gui/auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsdefaultsearchwidgetwrapper.sip.in @@ -50,7 +50,7 @@ Constructor for QgsDefaultSearchWidgetWrapper virtual void setExpression( const QString &exp ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsdoublespinbox.sip.in b/python/gui/auto_generated/editorwidgets/qgsdoublespinbox.sip.in index e713722b133a..96fe77bb3d32 100644 --- a/python/gui/auto_generated/editorwidgets/qgsdoublespinbox.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsdoublespinbox.sip.in @@ -140,7 +140,7 @@ is equal to :py:func:`~QgsDoubleSpinBox.minimum`. Typical use is to indicate tha virtual void paintEvent( QPaintEvent *e ); - public: + protected: virtual void changeEvent( QEvent *event ); virtual void wheelEvent( QWheelEvent *event ); diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip.in index 1f1f116d69c7..8dc9071cb8c1 100644 --- a/python/gui/auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsrelationreferencesearchwidgetwrapper.sip.in @@ -64,7 +64,7 @@ Returns the default flags (equalTo) virtual void setEnabled( bool enabled ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidget.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidget.sip.in index 4f4420609236..68e8a9415abc 100644 --- a/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidget.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidget.sip.in @@ -261,7 +261,7 @@ activate the map tool to select a new related feature on the map unset the currently related feature %End - public: + protected: virtual void showEvent( QShowEvent *e ); diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip.in index 2102b3552269..a14e902e955b 100644 --- a/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsrelationreferencewidgetwrapper.sip.in @@ -60,7 +60,7 @@ Constructor for QgsRelationReferenceWidgetWrapper virtual void setEnabled( bool enabled ); - public: + protected: virtual void updateConstraintWidgetStatus(); diff --git a/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in index 89a317af2a1b..2de5874ef382 100644 --- a/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsrelationwidgetwrapper.sip.in @@ -234,7 +234,7 @@ Forward the signal to the embedded form %End - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsspinbox.sip.in b/python/gui/auto_generated/editorwidgets/qgsspinbox.sip.in index 2571bd4e4f4e..28d06a2cae7f 100644 --- a/python/gui/auto_generated/editorwidgets/qgsspinbox.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsspinbox.sip.in @@ -138,7 +138,7 @@ is equal to :py:func:`~QgsSpinBox.minimum`. Typical use is to indicate that this virtual QValidator::State validate( QString &input, int &pos ) const; - public: + protected: virtual void changeEvent( QEvent *event ); diff --git a/python/gui/auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip.in index cbefd117959f..f087e92580f4 100644 --- a/python/gui/auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsvaluemapsearchwidgetwrapper.sip.in @@ -46,7 +46,7 @@ Constructor for QgsValueMapSearchWidgetWrapper virtual void setEnabled( bool enabled ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip.in b/python/gui/auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip.in index 4f62a1cf033b..5ca80cdbc5e9 100644 --- a/python/gui/auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip.in +++ b/python/gui/auto_generated/editorwidgets/qgsvaluerelationsearchwidgetwrapper.sip.in @@ -48,7 +48,7 @@ Constructor for QgsValueRelationSearchWidgetWrapper virtual void setEnabled( bool enabled ); - public: + protected: virtual QWidget *createWidget( QWidget *parent ); virtual void initWidget( QWidget *editor ); diff --git a/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in b/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in index 97eb73534960..c863b896f5b8 100644 --- a/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in +++ b/python/gui/auto_generated/effects/qgseffectstackpropertieswidget.sip.in @@ -94,7 +94,7 @@ Updates the effect stack when the currently selected effect changes properties. :param newEffect: new effect to replace existing effect at selected position within the stack. %End - public: + protected: void loadStack(); @@ -172,7 +172,7 @@ Sets the picture to use for effect previews for the dialog :param picture: preview picture %End - public: + protected: }; diff --git a/python/gui/auto_generated/labeling/qgslabelsettingswidgetbase.sip.in b/python/gui/auto_generated/labeling/qgslabelsettingswidgetbase.sip.in index bb3d64fd52cf..69d07a31fe90 100644 --- a/python/gui/auto_generated/labeling/qgslabelsettingswidgetbase.sip.in +++ b/python/gui/auto_generated/labeling/qgslabelsettingswidgetbase.sip.in @@ -88,7 +88,7 @@ Emitted when any of the settings described by the widget are changed. Emitted when an auxiliary field is created in the widget. %End - public: + protected: virtual QgsExpressionContext createExpressionContext() const; diff --git a/python/gui/auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip.in b/python/gui/auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip.in index 35258f98f6c2..8bd050d377a2 100644 --- a/python/gui/auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip.in +++ b/python/gui/auto_generated/layertree/qgslayertreeembeddedwidgetregistry.sip.in @@ -103,7 +103,7 @@ Unregister a provider, the provider object is deleted. Returns ``True`` on success, ``False`` if the provider was not registered. %End - public: + protected: private: diff --git a/python/gui/auto_generated/layertree/qgslayertreeview.sip.in b/python/gui/auto_generated/layertree/qgslayertreeview.sip.in index b89e1352818d..c0df77b63d3a 100644 --- a/python/gui/auto_generated/layertree/qgslayertreeview.sip.in +++ b/python/gui/auto_generated/layertree/qgslayertreeview.sip.in @@ -46,7 +46,7 @@ Returns if private layers are shown. Determines if private layers are shown. %End - public: + protected: virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const; @@ -353,7 +353,7 @@ Returns the show private layers status Emitted when a current layer is changed %End - public: + protected: virtual void contextMenuEvent( QContextMenuEvent *event ); @@ -383,7 +383,7 @@ Emitted when a current layer is changed void onExpandedChanged( QgsLayerTreeNode *node, bool expanded ); void onModelReset(); - public: + protected: }; diff --git a/python/gui/auto_generated/layertree/qgslayertreeviewdefaultactions.sip.in b/python/gui/auto_generated/layertree/qgslayertreeviewdefaultactions.sip.in index 9054f02d5965..6b3a1964b218 100644 --- a/python/gui/auto_generated/layertree/qgslayertreeviewdefaultactions.sip.in +++ b/python/gui/auto_generated/layertree/qgslayertreeviewdefaultactions.sip.in @@ -207,12 +207,12 @@ Slot to enable/disable mutually exclusive group flag .. versionadded:: 2.12 %End - public: + protected: void zoomToLayers( QgsMapCanvas *canvas, const QList &layers ); QString uniqueGroupName( QgsLayerTreeGroup *parentGroup ); - public: + protected: }; diff --git a/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in b/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in index cd430b42f084..b29c32bc9a52 100644 --- a/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutitemwidget.sip.in @@ -115,7 +115,7 @@ Sets the master layout associated with the item. .. versionadded:: 3.10 %End - public: + protected: void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsLayoutObject::DataDefinedProperty property ); %Docstring diff --git a/python/gui/auto_generated/layout/qgslayoutruler.sip.in b/python/gui/auto_generated/layout/qgslayoutruler.sip.in index 1f1517342400..75aff671556b 100644 --- a/python/gui/auto_generated/layout/qgslayoutruler.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutruler.sip.in @@ -79,7 +79,7 @@ the view. Emitted when mouse cursor coordinates change %End - public: + protected: virtual void paintEvent( QPaintEvent *event ); virtual void mouseMoveEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/layout/qgslayoutview.sip.in b/python/gui/auto_generated/layout/qgslayoutview.sip.in index 10554077e90b..f9bd0093bf9e 100644 --- a/python/gui/auto_generated/layout/qgslayoutview.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutview.sip.in @@ -556,7 +556,7 @@ Emitted in the destructor when the view is about to be deleted, but is still in a perfectly valid state. %End - public: + protected: virtual void mousePressEvent( QMouseEvent *event ); virtual void mouseReleaseEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in b/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in index 217a08bbf734..2f7ccb15b53c 100644 --- a/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutviewrubberband.sip.in @@ -120,7 +120,7 @@ with a format which differs per subclass (e.g. rectangles may describe a size using width and height, while circles may describe a size by radius). %End - public: + protected: QRectF updateRect( QPointF start, QPointF position, bool constrainSquare, bool fromCenter ); %Docstring diff --git a/python/gui/auto_generated/layout/qgslayoutviewtool.sip.in b/python/gui/auto_generated/layout/qgslayoutviewtool.sip.in index c3d8bf9e1eec..31bb4151ea76 100644 --- a/python/gui/auto_generated/layout/qgslayoutviewtool.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutviewtool.sip.in @@ -170,7 +170,7 @@ Emitted when an ``item`` is "focused" by the tool, i.e. it should become the act item and should have its properties displayed in any designer windows. %End - public: + protected: void setFlags( QgsLayoutViewTool::Flags flags ); %Docstring diff --git a/python/gui/auto_generated/layout/qgslayoutviewtoolzoom.sip.in b/python/gui/auto_generated/layout/qgslayoutviewtoolzoom.sip.in index 8b4b780e21a5..64a24efaee36 100644 --- a/python/gui/auto_generated/layout/qgslayoutviewtoolzoom.sip.in +++ b/python/gui/auto_generated/layout/qgslayoutviewtoolzoom.sip.in @@ -39,7 +39,7 @@ Constructor for QgsLayoutViewToolZoom. virtual void deactivate(); - public: + protected: }; diff --git a/python/gui/auto_generated/locator/qgslocatorwidget.sip.in b/python/gui/auto_generated/locator/qgslocatorwidget.sip.in index 75a19e8cd36e..bb872ddece47 100644 --- a/python/gui/auto_generated/locator/qgslocatorwidget.sip.in +++ b/python/gui/auto_generated/locator/qgslocatorwidget.sip.in @@ -64,7 +64,7 @@ filter settings. Emitted when the configure option is triggered in the widget. %End - public: + protected: virtual bool eventFilter( QObject *obj, QEvent *event ); diff --git a/python/gui/auto_generated/pointcloud/qgspointcloudrendererwidget.sip.in b/python/gui/auto_generated/pointcloud/qgspointcloudrendererwidget.sip.in index ce20fe2cffde..bb25fb6d9797 100644 --- a/python/gui/auto_generated/pointcloud/qgspointcloudrendererwidget.sip.in +++ b/python/gui/auto_generated/pointcloud/qgspointcloudrendererwidget.sip.in @@ -55,7 +55,7 @@ Returns the point cloud layer associated with the widget. signals: - public: + protected: }; diff --git a/python/gui/auto_generated/processing/models/qgsmodelcomponentgraphicitem.sip.in b/python/gui/auto_generated/processing/models/qgsmodelcomponentgraphicitem.sip.in index de4a1fe90643..05e916d948da 100644 --- a/python/gui/auto_generated/processing/models/qgsmodelcomponentgraphicitem.sip.in +++ b/python/gui/auto_generated/processing/models/qgsmodelcomponentgraphicitem.sip.in @@ -250,7 +250,7 @@ Called when the component should be edited. The default implementation does nothing. %End - public: + protected: QString truncatedTextForItem( const QString &text ) const; %Docstring @@ -341,7 +341,7 @@ Ownership of ``parameter`` is transferred to the item. virtual bool canDeleteComponent(); - public: + protected: virtual QColor fillColor( State state ) const; @@ -404,7 +404,7 @@ Sets the results obtained for this child algorithm for the last model execution Sets the inputs used for this child algorithm for the last model execution through the dialog. %End - public: + protected: virtual QColor fillColor( State state ) const; @@ -464,7 +464,7 @@ Ownership of ``output`` is transferred to the item. virtual bool canDeleteComponent(); - public: + protected: virtual QColor fillColor( State state ) const; @@ -526,7 +526,7 @@ Ownership of ``output`` is transferred to the item. Returns the parent model component item. %End - public: + protected: virtual QColor fillColor( State state ) const; @@ -581,7 +581,7 @@ Ownership of ``output`` is transferred to the item. virtual bool canDeleteComponent(); - public: + protected: virtual QColor fillColor( State state ) const; diff --git a/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in b/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in index b5decb184b3b..71abe534483e 100644 --- a/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in +++ b/python/gui/auto_generated/processing/models/qgsmodeldesignerdialog.sip.in @@ -67,7 +67,7 @@ Loads a model into the designer from the specified file ``path``. Sets the related ``scene``. %End - public: + protected: virtual void repaintModel( bool showControls = true ) = 0; virtual void addAlgorithm( const QString &algorithmId, const QPointF &pos ) = 0; diff --git a/python/gui/auto_generated/processing/models/qgsmodelgraphicitem.sip.in b/python/gui/auto_generated/processing/models/qgsmodelgraphicitem.sip.in index 5a28e50bbf64..1e93149993ea 100644 --- a/python/gui/auto_generated/processing/models/qgsmodelgraphicitem.sip.in +++ b/python/gui/auto_generated/processing/models/qgsmodelgraphicitem.sip.in @@ -66,7 +66,7 @@ Returns the associated model view. Emitted when the button is clicked. %End - public: + protected: void setPicture( const QPicture &picture ); %Docstring diff --git a/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in b/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in index 096ec2e67187..f625089a41f1 100644 --- a/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in +++ b/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in @@ -179,7 +179,7 @@ Emitted whenever the selected item changes. If ``None``, no item is selected. %End - public: + protected: virtual QgsModelComponentGraphicItem *createParameterGraphicItem( QgsProcessingModelAlgorithm *model, QgsProcessingModelParameter *param ) const /Factory/; %Docstring diff --git a/python/gui/auto_generated/processing/qgsprocessingalgorithmdialogbase.sip.in b/python/gui/auto_generated/processing/qgsprocessingalgorithmdialogbase.sip.in index 72c8765ba11b..1eb12cbadd86 100644 --- a/python/gui/auto_generated/processing/qgsprocessingalgorithmdialogbase.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingalgorithmdialogbase.sip.in @@ -208,7 +208,7 @@ Switches the dialog to the parameters page. virtual void reject(); - public: + protected: virtual void closeEvent( QCloseEvent *e ); diff --git a/python/gui/auto_generated/processing/qgsprocessingmaplayercombobox.sip.in b/python/gui/auto_generated/processing/qgsprocessingmaplayercombobox.sip.in index 998ad552f70f..afbf816c2b00 100644 --- a/python/gui/auto_generated/processing/qgsprocessingmaplayercombobox.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingmaplayercombobox.sip.in @@ -111,7 +111,7 @@ Returns whether the combo box value can be freely edited. Emitted whenever the value is changed in the widget. %End - public: + protected: virtual void dragEnterEvent( QDragEnterEvent *event ); diff --git a/python/gui/auto_generated/processing/qgsprocessingmultipleselectiondialog.sip.in b/python/gui/auto_generated/processing/qgsprocessingmultipleselectiondialog.sip.in index f48696663a6a..be2ddde04225 100644 --- a/python/gui/auto_generated/processing/qgsprocessingmultipleselectiondialog.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingmultipleselectiondialog.sip.in @@ -91,7 +91,7 @@ Emitted when the accept button is clicked. Emitted when the selection changes in the widget. %End - public: + protected: void addOption( const QVariant &value, const QString &title, bool selected, bool updateExistingTitle = false ); %Docstring diff --git a/python/gui/auto_generated/processing/qgsprocessingoutputdestinationwidget.sip.in b/python/gui/auto_generated/processing/qgsprocessingoutputdestinationwidget.sip.in index ea19b96ce033..bd4834b7d81c 100644 --- a/python/gui/auto_generated/processing/qgsprocessingoutputdestinationwidget.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingoutputdestinationwidget.sip.in @@ -87,7 +87,7 @@ Emitted whenever the "skip output" option is toggled in the widget. %Docstring Emitted whenever the destination value is changed in the widget. %End - public: + protected: virtual void dragEnterEvent( QDragEnterEvent *event ); diff --git a/python/gui/auto_generated/processing/qgsprocessingparameterswidget.sip.in b/python/gui/auto_generated/processing/qgsprocessingparameterswidget.sip.in index a90e49e14cb0..1793d2cb87a2 100644 --- a/python/gui/auto_generated/processing/qgsprocessingparameterswidget.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingparameterswidget.sip.in @@ -34,7 +34,7 @@ Constructor for QgsProcessingParametersWidget, for the specified ``algorithm``. const QgsProcessingAlgorithm *algorithm() const; - public: + protected: virtual void initWidgets(); diff --git a/python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in b/python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in index b4f963d4800f..d2bebf03bf75 100644 --- a/python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingtoolboxtreeview.sip.in @@ -97,7 +97,7 @@ Sets a ``filter`` string, used to filter out the contents of the view to matching algorithms. %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/processing/qgsprocessingwidgetwrapper.sip.in b/python/gui/auto_generated/processing/qgsprocessingwidgetwrapper.sip.in index a265b380fe89..f2a65089575e 100644 --- a/python/gui/auto_generated/processing/qgsprocessingwidgetwrapper.sip.in +++ b/python/gui/auto_generated/processing/qgsprocessingwidgetwrapper.sip.in @@ -382,7 +382,7 @@ Sets the parent ``dialog`` in which the wrapper is shown. Emitted whenever the parameter value (as defined by the wrapped widget) is changed. %End - public: + protected: virtual QWidget *createWidget() = 0 /Factory/; %Docstring @@ -433,7 +433,7 @@ buttons and property override buttons to correctly show the appropriate vector l .. versionadded:: 3.6 %End - public: + protected: }; @@ -525,7 +525,7 @@ type will not be configurable when users add it as an input to their graphical m .. versionadded:: 3.10 %End - public: + protected: virtual QStringList compatibleParameterTypes() const = 0; %Docstring @@ -630,7 +630,7 @@ Constructor for QgsProcessingHiddenWidgetWrapper, for the specified Sets the vector layer linked to the wrapper. %End - public: + protected: virtual QWidget *createWidget(); virtual QLabel *createLabel(); diff --git a/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in b/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in index 9f30752d1c45..e5003e3be200 100644 --- a/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in +++ b/python/gui/auto_generated/qgsabstractdatasourcewidget.sip.in @@ -170,7 +170,7 @@ Emitted when a ``message`` with ``title`` and ``level`` must be shown to the use %End - public: + protected: QgsAbstractDataSourceWidget( QWidget *parent /TransferThis/ = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); %Docstring diff --git a/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in index 50a3c7e1bfb5..e4675b78202e 100644 --- a/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in +++ b/python/gui/auto_generated/qgsabstractrelationeditorwidget.sip.in @@ -212,7 +212,7 @@ Duplicates a feature Duplicates features %End - public: + protected: diff --git a/python/gui/auto_generated/qgsattributeformwidget.sip.in b/python/gui/auto_generated/qgsattributeformwidget.sip.in index 83e720e4c016..df78ca7e3a79 100644 --- a/python/gui/auto_generated/qgsattributeformwidget.sip.in +++ b/python/gui/auto_generated/qgsattributeformwidget.sip.in @@ -134,7 +134,7 @@ The visibility of the search widget tool button, that allows (de)activating this search widgte or defines the comparison operator to use. %End - public: + protected: diff --git a/python/gui/auto_generated/qgsbrowsertreeview.sip.in b/python/gui/auto_generated/qgsbrowsertreeview.sip.in index 00de08c33f38..d1d78dfa7965 100644 --- a/python/gui/auto_generated/qgsbrowsertreeview.sip.in +++ b/python/gui/auto_generated/qgsbrowsertreeview.sip.in @@ -48,7 +48,7 @@ Returns the browser model void setSettingsSection( const QString §ion ); - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/qgsbrowserwidget.sip.in b/python/gui/auto_generated/qgsbrowserwidget.sip.in index 9ebfeac5597a..4c97c0caddce 100644 --- a/python/gui/auto_generated/qgsbrowserwidget.sip.in +++ b/python/gui/auto_generated/qgsbrowserwidget.sip.in @@ -69,7 +69,7 @@ Refreshes the browser model and view. %End - public: + protected: virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/qgscharacterselectordialog.sip.in b/python/gui/auto_generated/qgscharacterselectordialog.sip.in index 87e5aded5f2a..8c6feb799957 100644 --- a/python/gui/auto_generated/qgscharacterselectordialog.sip.in +++ b/python/gui/auto_generated/qgscharacterselectordialog.sip.in @@ -31,7 +31,7 @@ Opens the dialog modally and returns when the user has selected a character. If ``initialSelection`` is specified, then that character will be initially selected in the dialog. %End - public: + protected: }; /************************************************************************ diff --git a/python/gui/auto_generated/qgscheckablecombobox.sip.in b/python/gui/auto_generated/qgscheckablecombobox.sip.in index 1147ea252dab..85f4337e8e15 100644 --- a/python/gui/auto_generated/qgscheckablecombobox.sip.in +++ b/python/gui/auto_generated/qgscheckablecombobox.sip.in @@ -154,7 +154,7 @@ Set items which should be checked/selected. .. seealso:: :py:func:`checkedItems` %End - public: + protected: virtual void resizeEvent( QResizeEvent *event ); @@ -180,7 +180,7 @@ Selects all items. Removes selection from all items. %End - public: + protected: }; diff --git a/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in b/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in index bb51739aedfa..8000d9eb39a6 100644 --- a/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in +++ b/python/gui/auto_generated/qgscollapsiblegroupbox.sip.in @@ -26,7 +26,7 @@ class QgsGroupBoxCollapseButton : QToolButton bool shiftDown() const; void setShiftDown( bool shiftdown ); - public: + protected: virtual void mouseReleaseEvent( QMouseEvent *event ); @@ -104,7 +104,7 @@ Overridden to prepare base call and avoid crash due to specific QT versions .. versionadded:: 3.16 %End - public: + protected: void init(); void collapseExpandFixes(); @@ -203,7 +203,7 @@ The configuration path to which it is saved is defined by - The settingGroup %End - public: + protected: void init(); virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/qgscolorbutton.sip.in b/python/gui/auto_generated/qgscolorbutton.sip.in index e648a172ae95..7ac9864cef5b 100644 --- a/python/gui/auto_generated/qgscolorbutton.sip.in +++ b/python/gui/auto_generated/qgscolorbutton.sip.in @@ -474,7 +474,7 @@ to a project color and is now no longer linked. .. versionadded:: 3.6 %End - public: + protected: virtual bool event( QEvent *e ); diff --git a/python/gui/auto_generated/qgscolordialog.sip.in b/python/gui/auto_generated/qgscolordialog.sip.in index 2439a37dae3d..a0d25418304e 100644 --- a/python/gui/auto_generated/qgscolordialog.sip.in +++ b/python/gui/auto_generated/qgscolordialog.sip.in @@ -89,7 +89,7 @@ Sets the current color for the dialog :param color: desired color %End - public: + protected: virtual void closeEvent( QCloseEvent *e ); diff --git a/python/gui/auto_generated/qgscolorrampbutton.sip.in b/python/gui/auto_generated/qgscolorrampbutton.sip.in index f7351d7535ca..9e2641b82fbf 100644 --- a/python/gui/auto_generated/qgscolorrampbutton.sip.in +++ b/python/gui/auto_generated/qgscolorrampbutton.sip.in @@ -293,7 +293,7 @@ Emitted whenever a new color ramp is set for the button. The color ramp is alway In case the new color ramp is the same, no signal is emitted to avoid infinite loops. %End - public: + protected: virtual bool event( QEvent *e ); diff --git a/python/gui/auto_generated/qgscolorschemelist.sip.in b/python/gui/auto_generated/qgscolorschemelist.sip.in index 315e826fc5ac..1675543ff1ae 100644 --- a/python/gui/auto_generated/qgscolorschemelist.sip.in +++ b/python/gui/auto_generated/qgscolorschemelist.sip.in @@ -276,7 +276,7 @@ Emitted when a color is selected from the list :param color: color selected %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/qgscolorswatchgrid.sip.in b/python/gui/auto_generated/qgscolorswatchgrid.sip.in index e825c906a9a1..249de7a4b9e2 100644 --- a/python/gui/auto_generated/qgscolorswatchgrid.sip.in +++ b/python/gui/auto_generated/qgscolorswatchgrid.sip.in @@ -102,7 +102,7 @@ Emitted when a color has been selected from the widget Emitted when mouse hovers over widget %End - public: + protected: virtual void paintEvent( QPaintEvent *event ); diff --git a/python/gui/auto_generated/qgscolorwidgets.sip.in b/python/gui/auto_generated/qgscolorwidgets.sip.in index 6e478fd1df68..e68c04ec0b52 100644 --- a/python/gui/auto_generated/qgscolorwidgets.sip.in +++ b/python/gui/auto_generated/qgscolorwidgets.sip.in @@ -137,7 +137,7 @@ Emitted when mouse hovers over widget. .. versionadded:: 2.14 %End - public: + protected: @@ -305,7 +305,7 @@ Constructs a new color wheel widget. virtual void setColor( const QColor &color, bool emitSignals = false ); - public: + protected: virtual void resizeEvent( QResizeEvent *event ); @@ -359,7 +359,7 @@ Construct a new color box widget. virtual void setColor( const QColor &color, bool emitSignals = false ); - public: + protected: virtual void resizeEvent( QResizeEvent *event ); @@ -478,7 +478,7 @@ Emitted when the widget's color component value changes :param value: new value of color component %End - public: + protected: virtual void mouseMoveEvent( QMouseEvent *event ); @@ -557,7 +557,7 @@ Construct a new color line edit widget. virtual void setColor( const QColor &color, bool emitSignals = false ); - public: + protected: virtual void resizeEvent( QResizeEvent *event ); @@ -616,7 +616,7 @@ Sets the second color for the widget .. seealso:: :py:func:`color2` %End - public: + protected: virtual void mousePressEvent( QMouseEvent *e ); diff --git a/python/gui/auto_generated/qgscompoundcolorwidget.sip.in b/python/gui/auto_generated/qgscompoundcolorwidget.sip.in index 6d4dd97b7669..72807845b427 100644 --- a/python/gui/auto_generated/qgscompoundcolorwidget.sip.in +++ b/python/gui/auto_generated/qgscompoundcolorwidget.sip.in @@ -131,7 +131,7 @@ Sets the color to show in an optional "previous color" section :param color: previous color %End - public: + protected: virtual void hideEvent( QHideEvent *e ); diff --git a/python/gui/auto_generated/qgsconfigureshortcutsdialog.sip.in b/python/gui/auto_generated/qgsconfigureshortcutsdialog.sip.in index 5f84df28678e..0395dcca8850 100644 --- a/python/gui/auto_generated/qgsconfigureshortcutsdialog.sip.in +++ b/python/gui/auto_generated/qgsconfigureshortcutsdialog.sip.in @@ -33,7 +33,7 @@ Constructor for QgsConfigureShortcutsDialog. singleton :py:class:`QgsShortcutsManager` instance. %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); virtual void keyReleaseEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/qgscredentialdialog.sip.in b/python/gui/auto_generated/qgscredentialdialog.sip.in index f0183effb759..841f777cab93 100644 --- a/python/gui/auto_generated/qgscredentialdialog.sip.in +++ b/python/gui/auto_generated/qgscredentialdialog.sip.in @@ -26,7 +26,7 @@ QgsCredentialDialog constructor %End - public: + protected: virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ); diff --git a/python/gui/auto_generated/qgscurveeditorwidget.sip.in b/python/gui/auto_generated/qgscurveeditorwidget.sip.in index 7d417fdaf323..779abd8e757d 100644 --- a/python/gui/auto_generated/qgscurveeditorwidget.sip.in +++ b/python/gui/auto_generated/qgscurveeditorwidget.sip.in @@ -101,7 +101,7 @@ Sets the maximum expected value for the range of values shown in the histogram. Emitted when the widget curve changes %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/qgsdial.sip.in b/python/gui/auto_generated/qgsdial.sip.in index 5907ed286d9c..ef0becf55d54 100644 --- a/python/gui/auto_generated/qgsdial.sip.in +++ b/python/gui/auto_generated/qgsdial.sip.in @@ -33,7 +33,7 @@ Constructor for QgsDial signals: void valueChanged( const QVariant & ); - public: + protected: virtual void paintEvent( QPaintEvent *event ); diff --git a/python/gui/auto_generated/qgsdialog.sip.in b/python/gui/auto_generated/qgsdialog.sip.in index 587a4870bf2a..fcddea116d72 100644 --- a/python/gui/auto_generated/qgsdialog.sip.in +++ b/python/gui/auto_generated/qgsdialog.sip.in @@ -37,7 +37,7 @@ Returns the central layout. Widgets added to it must have this dialog as parent. Returns the button box. %End - public: + protected: }; /************************************************************************ diff --git a/python/gui/auto_generated/qgsdockwidget.sip.in b/python/gui/auto_generated/qgsdockwidget.sip.in index 9507609a97f7..ed5c5a9ffe78 100644 --- a/python/gui/auto_generated/qgsdockwidget.sip.in +++ b/python/gui/auto_generated/qgsdockwidget.sip.in @@ -103,7 +103,7 @@ and raised. If it is currently user visible it will be closed. .. versionadded:: 3.2 %End - public: + protected: virtual void closeEvent( QCloseEvent * ); diff --git a/python/gui/auto_generated/qgsexpressionbuilderdialog.sip.in b/python/gui/auto_generated/qgsexpressionbuilderdialog.sip.in index 224c3cd0569b..e646601b0150 100644 --- a/python/gui/auto_generated/qgsexpressionbuilderdialog.sip.in +++ b/python/gui/auto_generated/qgsexpressionbuilderdialog.sip.in @@ -105,7 +105,7 @@ provide an expression context of which we are sure it's completely populated. .. versionadded:: 3.0 %End - public: + protected: virtual void done( int r ); diff --git a/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in b/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in index 9fa4a6952a93..0a1b6bae1f9f 100644 --- a/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in +++ b/python/gui/auto_generated/qgsexpressionbuilderwidget.sip.in @@ -405,7 +405,7 @@ with the context. .. versionadded:: 3.0 %End - public: + protected: virtual void showEvent( QShowEvent *e ); diff --git a/python/gui/auto_generated/qgsexpressionhighlighter.sip.in b/python/gui/auto_generated/qgsexpressionhighlighter.sip.in index f7c484d72d68..0096d636de66 100644 --- a/python/gui/auto_generated/qgsexpressionhighlighter.sip.in +++ b/python/gui/auto_generated/qgsexpressionhighlighter.sip.in @@ -20,7 +20,7 @@ class QgsExpressionHighlighter : QSyntaxHighlighter QgsExpressionHighlighter( QTextDocument *parent = 0 ); void addFields( const QStringList &fieldList ); - public: + protected: virtual void highlightBlock( const QString &text ); diff --git a/python/gui/auto_generated/qgsexpressionlineedit.sip.in b/python/gui/auto_generated/qgsexpressionlineedit.sip.in index ee25511a297f..f1e949461182 100644 --- a/python/gui/auto_generated/qgsexpressionlineedit.sip.in +++ b/python/gui/auto_generated/qgsexpressionlineedit.sip.in @@ -147,7 +147,7 @@ Sets the current expression to show in the widget. .. seealso:: :py:func:`expression` %End - public: + protected: virtual void changeEvent( QEvent *event ); diff --git a/python/gui/auto_generated/qgsexpressionselectiondialog.sip.in b/python/gui/auto_generated/qgsexpressionselectiondialog.sip.in index 3db6b05bb030..1f9a739eb17f 100644 --- a/python/gui/auto_generated/qgsexpressionselectiondialog.sip.in +++ b/python/gui/auto_generated/qgsexpressionselectiondialog.sip.in @@ -76,7 +76,7 @@ Sets a map canvas associated with the dialog. .. versionadded:: 3.0 %End - public: + protected: virtual void closeEvent( QCloseEvent *closeEvent ); diff --git a/python/gui/auto_generated/qgsexpressiontreeview.sip.in b/python/gui/auto_generated/qgsexpressiontreeview.sip.in index 2a369371ef22..067ed2b4d8f0 100644 --- a/python/gui/auto_generated/qgsexpressiontreeview.sip.in +++ b/python/gui/auto_generated/qgsexpressiontreeview.sip.in @@ -96,7 +96,7 @@ Sets the search filter ``string``. .. versionadded:: 3.22 %End - public: + protected: virtual bool lessThan( const QModelIndex &left, const QModelIndex &right ) const; diff --git a/python/gui/auto_generated/qgsextentwidget.sip.in b/python/gui/auto_generated/qgsextentwidget.sip.in index a9110e1f7f77..5e11858a2428 100644 --- a/python/gui/auto_generated/qgsextentwidget.sip.in +++ b/python/gui/auto_generated/qgsextentwidget.sip.in @@ -230,7 +230,7 @@ Emitted when the parent dialog visibility must be changed (e.g. to permit access to the map canvas) %End - public: + protected: virtual void dragEnterEvent( QDragEnterEvent *event ); diff --git a/python/gui/auto_generated/qgsexternalstoragefilewidget.sip.in b/python/gui/auto_generated/qgsexternalstoragefilewidget.sip.in index 3c1949125f73..fbc7588a3e30 100644 --- a/python/gui/auto_generated/qgsexternalstoragefilewidget.sip.in +++ b/python/gui/auto_generated/qgsexternalstoragefilewidget.sip.in @@ -158,7 +158,7 @@ It defines the variable containing the user selected file name virtual void setReadOnly( bool readOnly ); - public: + protected: virtual void updateLayout(); diff --git a/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in b/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in index b33c174de2db..8d3ab8945352 100644 --- a/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in +++ b/python/gui/auto_generated/qgsfeatureselectiondlg.sip.in @@ -48,7 +48,7 @@ Set the selected features :param ids: The feature ids to select %End - public: + protected: virtual void keyPressEvent( QKeyEvent *evt ); diff --git a/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in b/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in index 53474913cb98..c1f5f39a3b51 100644 --- a/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in +++ b/python/gui/auto_generated/qgsfieldexpressionwidget.sip.in @@ -245,7 +245,7 @@ updateLineEditStyle will re-style (color/font) the line edit depending on conten bool isExpressionValid( const QString &expressionStr ); - public: + protected: virtual void changeEvent( QEvent *event ); diff --git a/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in b/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in index 0fec056b81ce..b0bf0338ea94 100644 --- a/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in +++ b/python/gui/auto_generated/qgsfilecontentsourcelineedit.sip.in @@ -129,7 +129,7 @@ The default format is SVG. Defines the mode of the source line edit %End - public: + protected: QgsPictureSourceLineEditBase( Format format, QWidget *parent /TransferThis/ = 0 ); %Docstring diff --git a/python/gui/auto_generated/qgsfilewidget.sip.in b/python/gui/auto_generated/qgsfilewidget.sip.in index 7b9b5ee51e73..b030b9d8bb7a 100644 --- a/python/gui/auto_generated/qgsfilewidget.sip.in +++ b/python/gui/auto_generated/qgsfilewidget.sip.in @@ -261,7 +261,7 @@ the appearance and behavior of the line edit portion of the widget. Emitted whenever the current file or directory ``path`` is changed. %End - public: + protected: virtual void updateLayout(); %Docstring diff --git a/python/gui/auto_generated/qgsfilterlineedit.sip.in b/python/gui/auto_generated/qgsfilterlineedit.sip.in index 329e890bde48..7c5f70e9ed48 100644 --- a/python/gui/auto_generated/qgsfilterlineedit.sip.in +++ b/python/gui/auto_generated/qgsfilterlineedit.sip.in @@ -285,7 +285,7 @@ Will select all text when this widget receives the focus. .. versionadded:: 3.0 %End - public: + protected: virtual void focusInEvent( QFocusEvent *e ); virtual void mouseReleaseEvent( QMouseEvent *e ); diff --git a/python/gui/auto_generated/qgsfloatingwidget.sip.in b/python/gui/auto_generated/qgsfloatingwidget.sip.in index ee58b3edc1e8..2ceed722f08b 100644 --- a/python/gui/auto_generated/qgsfloatingwidget.sip.in +++ b/python/gui/auto_generated/qgsfloatingwidget.sip.in @@ -115,7 +115,7 @@ Emitted when the anchor point changes Emitted when the anchor widget point changes %End - public: + protected: virtual void showEvent( QShowEvent *e ); virtual void paintEvent( QPaintEvent *e ); diff --git a/python/gui/auto_generated/qgsfontbutton.sip.in b/python/gui/auto_generated/qgsfontbutton.sip.in index 078ffdfdb941..8c9be0a4a003 100644 --- a/python/gui/auto_generated/qgsfontbutton.sip.in +++ b/python/gui/auto_generated/qgsfontbutton.sip.in @@ -278,7 +278,7 @@ This is only used when :py:func:`~QgsFontButton.mode` is ModeTextRenderer. Emitted when the widget's text format settings are changed. %End - public: + protected: virtual bool event( QEvent *e ); diff --git a/python/gui/auto_generated/qgsformannotation.sip.in b/python/gui/auto_generated/qgsformannotation.sip.in index 6feb865fc3cb..458713dc3e73 100644 --- a/python/gui/auto_generated/qgsformannotation.sip.in +++ b/python/gui/auto_generated/qgsformannotation.sip.in @@ -64,7 +64,7 @@ Returns the path to the Qt Designer UI file to show in the annotation. Returns a new QgsFormAnnotation object. %End - public: + protected: virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const; diff --git a/python/gui/auto_generated/qgsgeometryrubberband.sip.in b/python/gui/auto_generated/qgsgeometryrubberband.sip.in index c5a235ff5eac..61bf153c63d0 100644 --- a/python/gui/auto_generated/qgsgeometryrubberband.sip.in +++ b/python/gui/auto_generated/qgsgeometryrubberband.sip.in @@ -92,7 +92,7 @@ Sets vertex marker icon type Sets whether the vertices are drawn %End - public: + protected: virtual void paint( QPainter *painter ); diff --git a/python/gui/auto_generated/qgsgradientstopeditor.sip.in b/python/gui/auto_generated/qgsgradientstopeditor.sip.in index e673ec64e0c3..f330b54f422a 100644 --- a/python/gui/auto_generated/qgsgradientstopeditor.sip.in +++ b/python/gui/auto_generated/qgsgradientstopeditor.sip.in @@ -152,7 +152,7 @@ Emitted when the current selected stop changes. :param stop: details about newly selected stop %End - public: + protected: virtual void mouseMoveEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/qgshighlight.sip.in b/python/gui/auto_generated/qgshighlight.sip.in index ec1f81f9393d..36eef80b0a33 100644 --- a/python/gui/auto_generated/qgshighlight.sip.in +++ b/python/gui/auto_generated/qgshighlight.sip.in @@ -137,7 +137,7 @@ Returns the layer for which this highlight has been created. virtual void updatePosition(); - public: + protected: virtual void paint( QPainter *p ); diff --git a/python/gui/auto_generated/qgshighlightablelineedit.sip.in b/python/gui/auto_generated/qgshighlightablelineedit.sip.in index 5e2100bd66bd..0d5c8d363c46 100644 --- a/python/gui/auto_generated/qgshighlightablelineedit.sip.in +++ b/python/gui/auto_generated/qgshighlightablelineedit.sip.in @@ -42,7 +42,7 @@ Sets whether the line edit is currently ``highlighted``. .. seealso:: :py:func:`isHighlighted` %End - public: + protected: virtual void paintEvent( QPaintEvent *e ); diff --git a/python/gui/auto_generated/qgshistogramwidget.sip.in b/python/gui/auto_generated/qgshistogramwidget.sip.in index 8bb8bb35e998..8e0b7b2e8386 100644 --- a/python/gui/auto_generated/qgshistogramwidget.sip.in +++ b/python/gui/auto_generated/qgshistogramwidget.sip.in @@ -191,7 +191,7 @@ Sets the source field or expression to use for values in the histogram. .. seealso:: :py:func:`setLayer` %End - public: + protected: virtual void drawHistogram(); %Docstring diff --git a/python/gui/auto_generated/qgsidentifymenu.sip.in b/python/gui/auto_generated/qgsidentifymenu.sip.in index 142ac6e1cb80..c679dbe74d29 100644 --- a/python/gui/auto_generated/qgsidentifymenu.sip.in +++ b/python/gui/auto_generated/qgsidentifymenu.sip.in @@ -155,7 +155,7 @@ Applies style from the settings to the highlight .. versionadded:: 3.8 %End - public: + protected: virtual void closeEvent( QCloseEvent *e ); diff --git a/python/gui/auto_generated/qgslegendpatchshapebutton.sip.in b/python/gui/auto_generated/qgslegendpatchshapebutton.sip.in index 50f2f5f1a469..b46e5f9763b0 100644 --- a/python/gui/auto_generated/qgslegendpatchshapebutton.sip.in +++ b/python/gui/auto_generated/qgslegendpatchshapebutton.sip.in @@ -126,7 +126,7 @@ Emitted when the shape's settings are changed. .. seealso:: :py:func:`setShape` %End - public: + protected: virtual void changeEvent( QEvent *e ); diff --git a/python/gui/auto_generated/qgsmapcanvas.sip.in b/python/gui/auto_generated/qgsmapcanvas.sip.in index 7315f8c4024c..9dc1d1d8c975 100644 --- a/python/gui/auto_generated/qgsmapcanvas.sip.in +++ b/python/gui/auto_generated/qgsmapcanvas.sip.in @@ -1303,7 +1303,7 @@ Can be used to extend the context menu. .. versionadded:: 3.16 %End - public: + protected: virtual bool event( QEvent *e ); diff --git a/python/gui/auto_generated/qgsmapcanvasitem.sip.in b/python/gui/auto_generated/qgsmapcanvasitem.sip.in index 7c04fdfea261..3dec0e3f6c45 100644 --- a/python/gui/auto_generated/qgsmapcanvasitem.sip.in +++ b/python/gui/auto_generated/qgsmapcanvasitem.sip.in @@ -19,7 +19,7 @@ map canvas. %TypeHeaderCode #include "qgsmapcanvasitem.h" %End - public: + protected: QgsMapCanvasItem( QgsMapCanvas *mapCanvas /TransferThis/ ); %Docstring @@ -82,7 +82,7 @@ transformation from screen coordinates to map coordinates transformation from map coordinates to screen coordinates %End - public: + protected: diff --git a/python/gui/auto_generated/qgsmapcanvassnappingutils.sip.in b/python/gui/auto_generated/qgsmapcanvassnappingutils.sip.in index 95f9f74011a0..77cd5114a311 100644 --- a/python/gui/auto_generated/qgsmapcanvassnappingutils.sip.in +++ b/python/gui/auto_generated/qgsmapcanvassnappingutils.sip.in @@ -33,7 +33,7 @@ Construct map canvas snapping utils object if ``False`` it will block until indexing is done %End - public: + protected: virtual void prepareIndexStarting( int count ); virtual void prepareIndexProgress( int index ); diff --git a/python/gui/auto_generated/qgsmapcanvastracer.sip.in b/python/gui/auto_generated/qgsmapcanvastracer.sip.in index 28b770687366..5f32523fc7a5 100644 --- a/python/gui/auto_generated/qgsmapcanvastracer.sip.in +++ b/python/gui/auto_generated/qgsmapcanvastracer.sip.in @@ -73,7 +73,7 @@ instances for easier access to the common tracer by various map tools Report a path finding error to the user %End - public: + protected: virtual void configure(); %Docstring diff --git a/python/gui/auto_generated/qgsmaplayeractionregistry.sip.in b/python/gui/auto_generated/qgsmaplayeractionregistry.sip.in index fec39848b8be..91c5fbe2cbbb 100644 --- a/python/gui/auto_generated/qgsmaplayeractionregistry.sip.in +++ b/python/gui/auto_generated/qgsmaplayeractionregistry.sip.in @@ -172,7 +172,7 @@ Sets the default action for a layer Returns the default action for a layer %End - public: + protected: signals: diff --git a/python/gui/auto_generated/qgsmaplayercombobox.sip.in b/python/gui/auto_generated/qgsmaplayercombobox.sip.in index 3879c5de991d..a4d3a205a333 100644 --- a/python/gui/auto_generated/qgsmaplayercombobox.sip.in +++ b/python/gui/auto_generated/qgsmaplayercombobox.sip.in @@ -177,7 +177,7 @@ setLayer set the current layer selected in the combo Emitted whenever the currently selected layer changes. %End - public: + protected: virtual void dragEnterEvent( QDragEnterEvent *event ); diff --git a/python/gui/auto_generated/qgsmaplayerconfigwidget.sip.in b/python/gui/auto_generated/qgsmaplayerconfigwidget.sip.in index 4ce5c5ac4303..e90c5cc358e5 100644 --- a/python/gui/auto_generated/qgsmaplayerconfigwidget.sip.in +++ b/python/gui/auto_generated/qgsmaplayerconfigwidget.sip.in @@ -139,7 +139,7 @@ Focuses the default widget for the page. signals: - public: + protected: }; diff --git a/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in b/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in index 3d130dcec693..89baf3960650 100644 --- a/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in +++ b/python/gui/auto_generated/qgsmapoverviewcanvas.sip.in @@ -55,7 +55,7 @@ Returns list of layers visible in the overview Triggered when a layer in the overview requests a repaint. %End - public: + protected: void drawExtentRect(); %Docstring diff --git a/python/gui/auto_generated/qgsmaptool.sip.in b/python/gui/auto_generated/qgsmaptool.sip.in index fd0f7681c962..1fb5a68c4f7c 100644 --- a/python/gui/auto_generated/qgsmaptool.sip.in +++ b/python/gui/auto_generated/qgsmaptool.sip.in @@ -284,7 +284,7 @@ signal emitted once the map tool is activated signal emitted once the map tool is deactivated %End - public: + protected: QgsMapTool( QgsMapCanvas *canvas /TransferThis/ ); %Docstring diff --git a/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in b/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in index 6954d842f2ce..308a6e155c4f 100644 --- a/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in +++ b/python/gui/auto_generated/qgsmaptooladvanceddigitizing.sip.in @@ -106,7 +106,7 @@ It is therefore possible to configure the behavior by the map tool. .. versionadded:: 3.0 %End - public: + protected: void setAdvancedDigitizingAllowed( bool allowed ); %Docstring diff --git a/python/gui/auto_generated/qgsmaptoolcapture.sip.in b/python/gui/auto_generated/qgsmaptoolcapture.sip.in index 854218ef09ce..961da197f946 100644 --- a/python/gui/auto_generated/qgsmaptoolcapture.sip.in +++ b/python/gui/auto_generated/qgsmaptoolcapture.sip.in @@ -146,7 +146,7 @@ Toggles the stream digitizing mode. .. versionadded:: 3.20 %End - public: + protected: int nextPoint( const QgsPoint &mapPoint, QgsPoint &layerPoint ); diff --git a/python/gui/auto_generated/qgsmaptooldigitizefeature.sip.in b/python/gui/auto_generated/qgsmaptooldigitizefeature.sip.in index 089d9a0b9ddb..18fc810c3ff2 100644 --- a/python/gui/auto_generated/qgsmaptooldigitizefeature.sip.in +++ b/python/gui/auto_generated/qgsmaptooldigitizefeature.sip.in @@ -67,7 +67,7 @@ Emitted whenever the digitizing has been ended without digitizing any feature %End - public: + protected: bool checkGeometryType() const; %Docstring diff --git a/python/gui/auto_generated/qgsmaptooledit.sip.in b/python/gui/auto_generated/qgsmaptooledit.sip.in index f0d5df1e1af4..873327e644ce 100644 --- a/python/gui/auto_generated/qgsmaptooledit.sip.in +++ b/python/gui/auto_generated/qgsmaptooledit.sip.in @@ -37,7 +37,7 @@ Used for setting M coordinate to new vertex. .. versionadded:: 3.20 %End - public: + protected: static QColor digitizingStrokeColor(); %Docstring @@ -69,14 +69,13 @@ returned object Returns the current vector layer of the map canvas or 0 %End -protected: enum TopologicalResult { Success, InvalidCanvas, InvalidLayer, }; -protected slots: + TopologicalResult addTopologicalPoints( const QVector &vertices ) /Deprecated/; %Docstring Adds a list of ``vertices`` to other features to keep topology up to date, e.g. to neighbouring polygons. diff --git a/python/gui/auto_generated/qgsmaptoolidentify.sip.in b/python/gui/auto_generated/qgsmaptoolidentify.sip.in index 201fd75c5e80..8427dab13834 100644 --- a/python/gui/auto_generated/qgsmaptoolidentify.sip.in +++ b/python/gui/auto_generated/qgsmaptoolidentify.sip.in @@ -139,7 +139,7 @@ this menu can also be customized void identifyMessage( const QString & ); void changedRasterResults( QList & ); - public: + protected: QList identify( int x, int y, IdentifyMode mode, const QList &layerList, LayerType layerType = AllLayers, const QgsIdentifyContext &identifyContext = QgsIdentifyContext() ); %Docstring diff --git a/python/gui/auto_generated/qgsmaptoolidentifyfeature.sip.in b/python/gui/auto_generated/qgsmaptoolidentifyfeature.sip.in index d9eca3744758..f3b265f438cc 100644 --- a/python/gui/auto_generated/qgsmaptoolidentifyfeature.sip.in +++ b/python/gui/auto_generated/qgsmaptoolidentifyfeature.sip.in @@ -41,7 +41,7 @@ change the layer used by the map tool to identify void featureIdentified( const QgsFeature & ); void featureIdentified( QgsFeatureId ); - public: + protected: virtual void keyPressEvent( QKeyEvent *e ); diff --git a/python/gui/auto_generated/qgsmaptoolzoom.sip.in b/python/gui/auto_generated/qgsmaptoolzoom.sip.in index 61c327fa0d0b..ab4d01256313 100644 --- a/python/gui/auto_generated/qgsmaptoolzoom.sip.in +++ b/python/gui/auto_generated/qgsmaptoolzoom.sip.in @@ -42,7 +42,7 @@ constructor virtual void deactivate(); - public: + protected: diff --git a/python/gui/auto_generated/qgsmenuheader.sip.in b/python/gui/auto_generated/qgsmenuheader.sip.in index b3b56e787b38..ecbf6c9d12f3 100644 --- a/python/gui/auto_generated/qgsmenuheader.sip.in +++ b/python/gui/auto_generated/qgsmenuheader.sip.in @@ -33,7 +33,7 @@ Constructor for QgsMenuHeader, showing the specified ``text``. virtual QSize sizeHint() const; - public: + protected: virtual void paintEvent( QPaintEvent *event ); diff --git a/python/gui/auto_generated/qgsmessagebar.sip.in b/python/gui/auto_generated/qgsmessagebar.sip.in index 54d33f012cf8..67b3b9112dd7 100644 --- a/python/gui/auto_generated/qgsmessagebar.sip.in +++ b/python/gui/auto_generated/qgsmessagebar.sip.in @@ -232,7 +232,7 @@ Pushes a critical warning ``message`` that must be manually dismissed by the use .. versionadded:: 2.8 %End - public: + protected: virtual void mousePressEvent( QMouseEvent *e ); diff --git a/python/gui/auto_generated/qgsmessagelogviewer.sip.in b/python/gui/auto_generated/qgsmessagelogviewer.sip.in index 07ce5af32da8..6736db2334e6 100644 --- a/python/gui/auto_generated/qgsmessagelogviewer.sip.in +++ b/python/gui/auto_generated/qgsmessagelogviewer.sip.in @@ -34,7 +34,7 @@ Create a new message log viewer. The viewer will automatically connect to the sy Logs a ``message`` to the viewer. %End - public: + protected: virtual void closeEvent( QCloseEvent *e ); virtual void reject(); diff --git a/python/gui/auto_generated/qgsnewauxiliaryfielddialog.sip.in b/python/gui/auto_generated/qgsnewauxiliaryfielddialog.sip.in index 648558e54257..6c92c618b6fe 100644 --- a/python/gui/auto_generated/qgsnewauxiliaryfielddialog.sip.in +++ b/python/gui/auto_generated/qgsnewauxiliaryfielddialog.sip.in @@ -38,7 +38,7 @@ Constructor. Returns the underlying property definition. %End - public: + protected: virtual void accept(); diff --git a/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in b/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in index a78f775ee622..2b772965d6bd 100644 --- a/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in +++ b/python/gui/auto_generated/qgsnewauxiliarylayerdialog.sip.in @@ -32,7 +32,7 @@ Constructor. :param parent: Parent window %End - public: + protected: virtual void accept(); diff --git a/python/gui/auto_generated/qgsnewhttpconnection.sip.in b/python/gui/auto_generated/qgsnewhttpconnection.sip.in index c502b1cdd077..10b71e559a24 100644 --- a/python/gui/auto_generated/qgsnewhttpconnection.sip.in +++ b/python/gui/auto_generated/qgsnewhttpconnection.sip.in @@ -76,9 +76,8 @@ Returns the current connection url. virtual void accept(); - public: + protected: -protected: enum WfsVersionIndex { WFS_VERSION_MAX, @@ -87,7 +86,7 @@ protected: WFS_VERSION_2_0, WFS_VERSION_API_FEATURES_1_0, }; -protected slots: + virtual bool validate(); %Docstring Returns ``True`` if dialog settings are valid, or ``False`` if current diff --git a/python/gui/auto_generated/qgsnewnamedialog.sip.in b/python/gui/auto_generated/qgsnewnamedialog.sip.in index 31946662197c..e86168cd8965 100644 --- a/python/gui/auto_generated/qgsnewnamedialog.sip.in +++ b/python/gui/auto_generated/qgsnewnamedialog.sip.in @@ -167,7 +167,7 @@ Emitted when the name is changed in the dialog. public slots: void nameChanged(); - public: + protected: QString highlightText( const QString &text ); %Docstring diff --git a/python/gui/auto_generated/qgsnewvectortabledialog.sip.in b/python/gui/auto_generated/qgsnewvectortabledialog.sip.in index 7c15d6d3467c..96e831066931 100644 --- a/python/gui/auto_generated/qgsnewvectortabledialog.sip.in +++ b/python/gui/auto_generated/qgsnewvectortabledialog.sip.in @@ -105,7 +105,7 @@ Returns ``True`` if spatialindex checkbox is cheched Returns the validation errors or an empty list if the dialog is valid %End - public: + protected: virtual void showEvent( QShowEvent *event ); }; diff --git a/python/gui/auto_generated/qgsoptionsdialogbase.sip.in b/python/gui/auto_generated/qgsoptionsdialogbase.sip.in index 7fb9953dd1a4..257e91e53551 100644 --- a/python/gui/auto_generated/qgsoptionsdialogbase.sip.in +++ b/python/gui/auto_generated/qgsoptionsdialogbase.sip.in @@ -158,7 +158,7 @@ Remove tab and unregister widgets on page remove void warnAboutMissingObjects(); - public: + protected: virtual void showEvent( QShowEvent *e ); virtual void paintEvent( QPaintEvent *e ); diff --git a/python/gui/auto_generated/qgsoptionsdialoghighlightwidget.sip.in b/python/gui/auto_generated/qgsoptionsdialoghighlightwidget.sip.in index 057f5b5fb649..36bbfca9ad9a 100644 --- a/python/gui/auto_generated/qgsoptionsdialoghighlightwidget.sip.in +++ b/python/gui/auto_generated/qgsoptionsdialoghighlightwidget.sip.in @@ -56,7 +56,7 @@ Returns the widget - public: + protected: virtual bool searchText( const QString &text ) = 0; %Docstring diff --git a/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in b/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in index d54c789ffccc..d83bbbcdbca4 100644 --- a/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in +++ b/python/gui/auto_generated/qgsoptionsdialoghighlightwidgetsimpl.sip.in @@ -29,7 +29,7 @@ This is used to search and highlight text in :py:class:`QgsOptionsDialogBase` im %Docstring constructs a highlight widget for a label %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); @@ -55,7 +55,7 @@ This is used to search and highlight text in :py:class:`QgsOptionsDialogBase` im %Docstring constructs a highlight widget for a checkbox %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); @@ -81,7 +81,7 @@ This is used to search and highlight text in :py:class:`QgsOptionsDialogBase` im %Docstring constructs a highlight widget for a button. %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); @@ -107,7 +107,7 @@ This is used to search and highlight text in :py:class:`QgsOptionsDialogBase` im %Docstring constructs a highlight widget for a group box. %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); @@ -135,7 +135,7 @@ in any tree view or inherited class. %Docstring constructs a highlight widget for a tree view or widget. %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); @@ -161,7 +161,7 @@ This is used to search and highlight text in :py:class:`QgsOptionsDialogBase` im %Docstring constructs a highlight widget for a table view or widget. %End - public: + protected: virtual bool searchText( const QString &text ); virtual bool highlightText( const QString &text ); diff --git a/python/gui/auto_generated/qgsoptionswidgetfactory.sip.in b/python/gui/auto_generated/qgsoptionswidgetfactory.sip.in index dccf3f92d0c0..ec124fec53c4 100644 --- a/python/gui/auto_generated/qgsoptionswidgetfactory.sip.in +++ b/python/gui/auto_generated/qgsoptionswidgetfactory.sip.in @@ -49,7 +49,7 @@ Called to permanently apply the settings shown in the options page (e.g. save th :py:class:`QgsSettings` objects). This is usually called when the options dialog is accepted. %End - public: + protected: void registerHighlightWidget( QgsOptionsDialogHighlightWidget *highlightWidget ); %Docstring diff --git a/python/gui/auto_generated/qgsorderbydialog.sip.in b/python/gui/auto_generated/qgsorderbydialog.sip.in index 2bf7df52123e..fbc07c335504 100644 --- a/python/gui/auto_generated/qgsorderbydialog.sip.in +++ b/python/gui/auto_generated/qgsorderbydialog.sip.in @@ -42,7 +42,7 @@ Set the order by to manage Gets the order by defined in the dialog %End - public: + protected: virtual bool eventFilter( QObject *obj, QEvent *e ); diff --git a/python/gui/auto_generated/qgsowssourceselect.sip.in b/python/gui/auto_generated/qgsowssourceselect.sip.in index 33861f2945b5..87f009f09252 100644 --- a/python/gui/auto_generated/qgsowssourceselect.sip.in +++ b/python/gui/auto_generated/qgsowssourceselect.sip.in @@ -58,7 +58,7 @@ show whatever error is exposed. Sets status message to theMessage %End - public: + protected: virtual QList providerFormats(); %Docstring diff --git a/python/gui/auto_generated/qgspanelwidget.sip.in b/python/gui/auto_generated/qgspanelwidget.sip.in index 61e0ca2b5727..ebc878f33cf4 100644 --- a/python/gui/auto_generated/qgspanelwidget.sip.in +++ b/python/gui/auto_generated/qgspanelwidget.sip.in @@ -194,7 +194,7 @@ Accept the panel. Causes panelAccepted to be emitted. Widgets are normally removed form the interface using the panel manager or the caller. %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/gui/auto_generated/qgspanelwidgetstack.sip.in b/python/gui/auto_generated/qgspanelwidgetstack.sip.in index 3af69330ed9d..f84face7014a 100644 --- a/python/gui/auto_generated/qgspanelwidgetstack.sip.in +++ b/python/gui/auto_generated/qgspanelwidgetstack.sip.in @@ -132,7 +132,7 @@ This slot is normally auto connected to panelAccepted when a panel is shown. :param panel: The panel to close. %End - public: + protected: virtual void mouseReleaseEvent( QMouseEvent *e ); diff --git a/python/gui/auto_generated/qgsprevieweffect.sip.in b/python/gui/auto_generated/qgsprevieweffect.sip.in index 24cc7e8a186b..7521270e0395 100644 --- a/python/gui/auto_generated/qgsprevieweffect.sip.in +++ b/python/gui/auto_generated/qgsprevieweffect.sip.in @@ -54,7 +54,7 @@ Returns the mode used for the preview effect. .. versionadded:: 2.3 %End - public: + protected: virtual void draw( QPainter *painter ); diff --git a/python/gui/auto_generated/qgsprojectionselectiontreewidget.sip.in b/python/gui/auto_generated/qgsprojectionselectiontreewidget.sip.in index 40a5534ea47f..50bb7cbb579b 100644 --- a/python/gui/auto_generated/qgsprojectionselectiontreewidget.sip.in +++ b/python/gui/auto_generated/qgsprojectionselectiontreewidget.sip.in @@ -183,7 +183,7 @@ Emitted when the selection in the tree is changed from a valid selection to an i .. versionadded:: 3.18 %End - public: + protected: virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in b/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in index 72d1f2d6913d..cd65a0075051 100644 --- a/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in +++ b/python/gui/auto_generated/qgsprojectionselectionwidget.sip.in @@ -163,7 +163,7 @@ to the preset CRSes shown in the widget. Opens the dialog for selecting a new CRS %End - public: + protected: virtual void dragEnterEvent( QDragEnterEvent *event ); diff --git a/python/gui/auto_generated/qgspropertyoverridebutton.sip.in b/python/gui/auto_generated/qgspropertyoverridebutton.sip.in index 283ae677c3d8..aaefd2f09771 100644 --- a/python/gui/auto_generated/qgspropertyoverridebutton.sip.in +++ b/python/gui/auto_generated/qgspropertyoverridebutton.sip.in @@ -245,7 +245,7 @@ Emitted when the activated status of the widget changes Emitted when creating a new auxiliary field %End - public: + protected: virtual void mouseReleaseEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/qgsrasterformatsaveoptionswidget.sip.in b/python/gui/auto_generated/qgsrasterformatsaveoptionswidget.sip.in index 3a91566a66d8..3c0a229fe36e 100644 --- a/python/gui/auto_generated/qgsrasterformatsaveoptionswidget.sip.in +++ b/python/gui/auto_generated/qgsrasterformatsaveoptionswidget.sip.in @@ -116,7 +116,7 @@ Reloads profiles list from QGIS settings void updateOptions(); void swapOptionsUI( int newIndex = -1 ); void updateControls(); - public: + protected: virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/qgsratiolockbutton.sip.in b/python/gui/auto_generated/qgsratiolockbutton.sip.in index 5127484188d3..a213d4872f6d 100644 --- a/python/gui/auto_generated/qgsratiolockbutton.sip.in +++ b/python/gui/auto_generated/qgsratiolockbutton.sip.in @@ -84,7 +84,7 @@ from the current values of the width and height spin boxes. Emitted whenever the lock state changes. %End - public: + protected: virtual void changeEvent( QEvent *e ); diff --git a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in index 2661edd692e9..195229887361 100644 --- a/python/gui/auto_generated/qgsrelationeditorwidget.sip.in +++ b/python/gui/auto_generated/qgsrelationeditorwidget.sip.in @@ -140,7 +140,7 @@ Defines the current configuration virtual void parentFormValueChanged( const QString &attribute, const QVariant &newValue ); - public: + protected: virtual void updateUi(); virtual void beforeSetRelationFeature( const QgsRelation &newRelation, const QgsFeature &newFeature ); diff --git a/python/gui/auto_generated/qgsrichtexteditor.sip.in b/python/gui/auto_generated/qgsrichtexteditor.sip.in index 352e01e6cf61..219d03fe7f7d 100644 --- a/python/gui/auto_generated/qgsrichtexteditor.sip.in +++ b/python/gui/auto_generated/qgsrichtexteditor.sip.in @@ -79,7 +79,7 @@ The ``text`` can either be a plain text string or a HTML document. Clears the current text from the widget. %End - public: + protected: virtual void focusInEvent( QFocusEvent *event ); diff --git a/python/gui/auto_generated/qgsrubberband.sip.in b/python/gui/auto_generated/qgsrubberband.sip.in index f382e9f0016f..36354cebb6a9 100644 --- a/python/gui/auto_generated/qgsrubberband.sip.in +++ b/python/gui/auto_generated/qgsrubberband.sip.in @@ -382,7 +382,7 @@ Ownership of ``symbol`` is transferred to the rubberband. .. versionadded:: 3.20 %End - public: + protected: virtual void paint( QPainter *p ); diff --git a/python/gui/auto_generated/qgsscalecombobox.sip.in b/python/gui/auto_generated/qgsscalecombobox.sip.in index f6d17ddc163b..f376daf4c675 100644 --- a/python/gui/auto_generated/qgsscalecombobox.sip.in +++ b/python/gui/auto_generated/qgsscalecombobox.sip.in @@ -157,7 +157,7 @@ This only has an effect if :py:func:`~QgsScaleComboBox.allowNull` is ``True``. .. versionadded:: 3.8 %End - public: + protected: virtual void showPopup(); diff --git a/python/gui/auto_generated/qgsscrollarea.sip.in b/python/gui/auto_generated/qgsscrollarea.sip.in index 845b16b3c09c..0a1232d1cae1 100644 --- a/python/gui/auto_generated/qgsscrollarea.sip.in +++ b/python/gui/auto_generated/qgsscrollarea.sip.in @@ -57,7 +57,7 @@ the scroll area widget. .. versionadded:: 3.8 %End - public: + protected: virtual void wheelEvent( QWheelEvent *event ); virtual void resizeEvent( QResizeEvent *event ); diff --git a/python/gui/auto_generated/qgsslider.sip.in b/python/gui/auto_generated/qgsslider.sip.in index cafe7abd2faf..aeba2246dd55 100644 --- a/python/gui/auto_generated/qgsslider.sip.in +++ b/python/gui/auto_generated/qgsslider.sip.in @@ -36,7 +36,7 @@ Constructor for QgsSlider signals: void valueChanged( const QVariant & ); - public: + protected: virtual void paintEvent( QPaintEvent *event ); diff --git a/python/gui/auto_generated/qgsstatusbar.sip.in b/python/gui/auto_generated/qgsstatusbar.sip.in index e9faa0e0a796..1c7fcf390166 100644 --- a/python/gui/auto_generated/qgsstatusbar.sip.in +++ b/python/gui/auto_generated/qgsstatusbar.sip.in @@ -98,7 +98,7 @@ and shown on this status bar too. %End - public: + protected: virtual void changeEvent( QEvent *event ); diff --git a/python/gui/auto_generated/qgsstyleitemslistwidget.sip.in b/python/gui/auto_generated/qgsstyleitemslistwidget.sip.in index 8e82e3d5fa47..c902cf7cb1e4 100644 --- a/python/gui/auto_generated/qgsstyleitemslistwidget.sip.in +++ b/python/gui/auto_generated/qgsstyleitemslistwidget.sip.in @@ -81,7 +81,7 @@ Returns the type of the item currently selected in the widget. .. seealso:: :py:func:`currentItemName` %End - public: + protected: virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/qgssublayersdialog.sip.in b/python/gui/auto_generated/qgssublayersdialog.sip.in index f982ed1b218f..b5a2caf549dd 100644 --- a/python/gui/auto_generated/qgssublayersdialog.sip.in +++ b/python/gui/auto_generated/qgssublayersdialog.sip.in @@ -123,7 +123,7 @@ Returns column with count or -1 virtual int exec(); - public: + protected: diff --git a/python/gui/auto_generated/qgssymbolbutton.sip.in b/python/gui/auto_generated/qgssymbolbutton.sip.in index 3cdae001f3f0..6c4e12b81064 100644 --- a/python/gui/auto_generated/qgssymbolbutton.sip.in +++ b/python/gui/auto_generated/qgssymbolbutton.sip.in @@ -192,7 +192,7 @@ Emitted when the symbol's settings are changed. .. seealso:: :py:func:`setSymbol` %End - public: + protected: virtual void changeEvent( QEvent *e ); diff --git a/python/gui/auto_generated/qgstablewidgetbase.sip.in b/python/gui/auto_generated/qgstablewidgetbase.sip.in index 268e6d438753..9eea3189ec15 100644 --- a/python/gui/auto_generated/qgstablewidgetbase.sip.in +++ b/python/gui/auto_generated/qgstablewidgetbase.sip.in @@ -29,7 +29,7 @@ Child classes must call init(QAbstractTableModel*) from their constructor. Constructor. %End - public: + protected: void init( QAbstractTableModel *model ); %Docstring diff --git a/python/gui/auto_generated/qgstemporalcontrollerwidget.sip.in b/python/gui/auto_generated/qgstemporalcontrollerwidget.sip.in index 3bec146cdfa4..29cf97bb570b 100644 --- a/python/gui/auto_generated/qgstemporalcontrollerwidget.sip.in +++ b/python/gui/auto_generated/qgstemporalcontrollerwidget.sip.in @@ -40,7 +40,7 @@ The dock widget retains ownership of the returned object. - public: + protected: virtual void keyPressEvent( QKeyEvent *e ); diff --git a/python/gui/auto_generated/qgstextformatwidget.sip.in b/python/gui/auto_generated/qgstextformatwidget.sip.in index cea9a601b025..1568b8b2894e 100644 --- a/python/gui/auto_generated/qgstextformatwidget.sip.in +++ b/python/gui/auto_generated/qgstextformatwidget.sip.in @@ -113,15 +113,14 @@ Emitted when an auxiliary field is created in the widget. .. versionadded:: 3.10 %End - public: + protected: -protected: enum Mode { Text, Labeling, }; -protected slots: + QgsTextFormatWidget( QgsMapCanvas *mapCanvas, QWidget *parent /TransferThis/, Mode mode, QgsVectorLayer *layer = 0 ); %Docstring Constructor for QgsTextFormatWidget. diff --git a/python/gui/auto_generated/qgsuserinputwidget.sip.in b/python/gui/auto_generated/qgsuserinputwidget.sip.in index 1ee275a54b7f..20c617937c65 100644 --- a/python/gui/auto_generated/qgsuserinputwidget.sip.in +++ b/python/gui/auto_generated/qgsuserinputwidget.sip.in @@ -41,7 +41,7 @@ Add a widget to be displayed in the dock. :param widget: widget to add. Ownership is not transferred. %End - public: + protected: virtual void paintEvent( QPaintEvent *event ); diff --git a/python/gui/auto_generated/qgsvariableeditorwidget.sip.in b/python/gui/auto_generated/qgsvariableeditorwidget.sip.in index c2ddcd839dda..bafa21aea31b 100644 --- a/python/gui/auto_generated/qgsvariableeditorwidget.sip.in +++ b/python/gui/auto_generated/qgsvariableeditorwidget.sip.in @@ -119,7 +119,7 @@ after adding or removing scopes from the attached context. Emitted when the user has modified a scope using the widget. %End - public: + protected: virtual void showEvent( QShowEvent *event ); diff --git a/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in b/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in index 008586185484..d9f48d9b66c7 100644 --- a/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in +++ b/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in @@ -111,7 +111,7 @@ Executes the single band pseudo raster classification Loads min and max values from color ramp tree %End - public: + protected: void populateColormapTreeWidget( const QList &colorRampItems ); %Docstring diff --git a/python/gui/auto_generated/raster/qgsrasterrendererwidget.sip.in b/python/gui/auto_generated/raster/qgsrasterrendererwidget.sip.in index 750b2a98c3cc..d8bd2ed7fac3 100644 --- a/python/gui/auto_generated/raster/qgsrasterrendererwidget.sip.in +++ b/python/gui/auto_generated/raster/qgsrasterrendererwidget.sip.in @@ -73,7 +73,7 @@ Emitted when something on the widget has changed. All widgets will fire this event to notify of an internal change. %End - public: + protected: }; diff --git a/python/gui/auto_generated/raster/qgsrastertransparencywidget.sip.in b/python/gui/auto_generated/raster/qgsrastertransparencywidget.sip.in index 3949ed86a5e8..448f98d5e945 100644 --- a/python/gui/auto_generated/raster/qgsrastertransparencywidget.sip.in +++ b/python/gui/auto_generated/raster/qgsrastertransparencywidget.sip.in @@ -58,7 +58,7 @@ Sync the widget state to the layer set for the widget. Apply any changes on the widget to the set layer. %End - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/characterwidget.sip.in b/python/gui/auto_generated/symbology/characterwidget.sip.in index 1a134cc2ebab..cf991fb28196 100644 --- a/python/gui/auto_generated/symbology/characterwidget.sip.in +++ b/python/gui/auto_generated/symbology/characterwidget.sip.in @@ -119,7 +119,7 @@ Clears the currently selected character in the widget. Emitted when a character is selected in the widget. %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); virtual void mouseMoveEvent( QMouseEvent *event ); diff --git a/python/gui/auto_generated/symbology/qgsbrushstylecombobox.sip.in b/python/gui/auto_generated/symbology/qgsbrushstylecombobox.sip.in index 9584f35bf5c3..8c7c49da1dda 100644 --- a/python/gui/auto_generated/symbology/qgsbrushstylecombobox.sip.in +++ b/python/gui/auto_generated/symbology/qgsbrushstylecombobox.sip.in @@ -21,7 +21,7 @@ class QgsBrushStyleComboBox : QComboBox void setBrushStyle( Qt::BrushStyle style ); - public: + protected: QIcon iconForBrush( Qt::BrushStyle style ); }; diff --git a/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in index ffbcf83006db..0161bf64eafe 100644 --- a/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgscategorizedsymbolrendererwidget.sip.in @@ -88,7 +88,7 @@ from the XML file with a matching name. .. versionadded:: 2.9 %End - public: + protected: virtual void setSymbolLevels( const QgsLegendSymbolList &levels, bool enabled ); @@ -97,7 +97,7 @@ from the XML file with a matching name. virtual void pasteSymbolToSelection(); - public: + protected: void updateUiFromRenderer(); @@ -132,7 +132,7 @@ Applies current symbol to selected categories, or to all categories if none is s virtual void keyPressEvent( QKeyEvent *event ); - public: + protected: diff --git a/python/gui/auto_generated/symbology/qgsellipsesymbollayerwidget.sip.in b/python/gui/auto_generated/symbology/qgsellipsesymbollayerwidget.sip.in index 1f1af38a93f4..eb4f92266185 100644 --- a/python/gui/auto_generated/symbology/qgsellipsesymbollayerwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsellipsesymbollayerwidget.sip.in @@ -36,7 +36,7 @@ Creates a new :py:class:`QgsSymbolLayerWidget`. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgsgraduatedhistogramwidget.sip.in b/python/gui/auto_generated/symbology/qgsgraduatedhistogramwidget.sip.in index ad835b9a2c12..ceeeffa61c9a 100644 --- a/python/gui/auto_generated/symbology/qgsgraduatedhistogramwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsgraduatedhistogramwidget.sip.in @@ -49,7 +49,7 @@ Emitted when the user modifies the graduated ranges using the histogram widget. modified existing range breaks %End - public: + protected: virtual void drawHistogram(); diff --git a/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in index 50b1eaaea141..0d033cc2d56f 100644 --- a/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsgraduatedsymbolrendererwidget.sip.in @@ -71,7 +71,7 @@ Refreshes the ranges for the renderer. The ``reset`` argument is deprecated and has no effect. %End - public: + protected: virtual void setSymbolLevels( const QgsLegendSymbolList &levels, bool enabled ); @@ -80,7 +80,7 @@ The ``reset`` argument is deprecated and has no effect. virtual void pasteSymbolToSelection(); - public: + protected: void updateUiFromRenderer( bool updateCount = true ); void connectUpdateHandlers(); void disconnectUpdateHandlers(); diff --git a/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in index 7e7fc9062f6c..d6255d2aee90 100644 --- a/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsinvertedpolygonrendererwidget.sip.in @@ -49,7 +49,7 @@ Constructor virtual void setDockMode( bool dockMode ); - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgslayerpropertieswidget.sip.in b/python/gui/auto_generated/symbology/qgslayerpropertieswidget.sip.in index bc53b5cbe4f4..49c6bfad9576 100644 --- a/python/gui/auto_generated/symbology/qgslayerpropertieswidget.sip.in +++ b/python/gui/auto_generated/symbology/qgslayerpropertieswidget.sip.in @@ -65,7 +65,7 @@ widgets and not open dialogs void changed(); void changeLayer( QgsSymbolLayer * ); - public: + protected: void populateLayerTypes(); void updateSymbolLayerWidget( QgsSymbolLayer *layer ); @@ -81,7 +81,7 @@ and help text for the associated property. .. versionadded:: 3.0 %End - public: // data + protected: // data }; diff --git a/python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in index 07fe89f163e8..c63c8e1cb596 100644 --- a/python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsnullsymbolrendererwidget.sip.in @@ -40,7 +40,7 @@ Constructor for QgsNullSymbolRendererWidget Returns a pointer to the configured renderer %End - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgspenstylecombobox.sip.in b/python/gui/auto_generated/symbology/qgspenstylecombobox.sip.in index abcd21d5d1f3..bac0c3d8dc0e 100644 --- a/python/gui/auto_generated/symbology/qgspenstylecombobox.sip.in +++ b/python/gui/auto_generated/symbology/qgspenstylecombobox.sip.in @@ -21,7 +21,7 @@ class QgsPenStyleComboBox : QComboBox void setPenStyle( Qt::PenStyle style ); - public: + protected: QIcon iconForPen( Qt::PenStyle style ); }; diff --git a/python/gui/auto_generated/symbology/qgsrendererpropertiesdialog.sip.in b/python/gui/auto_generated/symbology/qgsrendererpropertiesdialog.sip.in index 70d07f8ba28e..dbcab49261cf 100644 --- a/python/gui/auto_generated/symbology/qgsrendererpropertiesdialog.sip.in +++ b/python/gui/auto_generated/symbology/qgsrendererpropertiesdialog.sip.in @@ -113,7 +113,7 @@ and block the user. %End - public: + protected: void connectValueChanged( const QList &widgets, const char *slot ); %Docstring diff --git a/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in index 9ccbd923d0dd..ff3d1e42f0c1 100644 --- a/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsrendererwidget.sip.in @@ -91,7 +91,7 @@ Emitted when the symbol levels settings have been changed. -- no longer emitted. %End - public: + protected: @@ -224,7 +224,7 @@ Returns the vector layer associated with the widget. public slots: void dataDefinedChanged(); - public: + protected: void init( int propertyKey ); // needed in children ctor to call virtual @@ -244,7 +244,7 @@ class QgsDataDefinedSizeDialog : QgsDataDefinedValueDialog public: QgsDataDefinedSizeDialog( const QList &symbolList, QgsVectorLayer *layer ); - public: + protected: virtual QgsProperty symbolDataDefined( const QgsSymbol *symbol ) const; @@ -265,7 +265,7 @@ class QgsDataDefinedRotationDialog : QgsDataDefinedValueDialog public: QgsDataDefinedRotationDialog( const QList &symbolList, QgsVectorLayer *layer ); - public: + protected: virtual QgsProperty symbolDataDefined( const QgsSymbol *symbol ) const; @@ -285,7 +285,7 @@ class QgsDataDefinedWidthDialog : QgsDataDefinedValueDialog public: QgsDataDefinedWidthDialog( const QList &symbolList, QgsVectorLayer *layer ); - public: + protected: virtual QgsProperty symbolDataDefined( const QgsSymbol *symbol ) const; diff --git a/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in index 1ae6f1d74b3a..8a9b518c67d6 100644 --- a/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsrulebasedrendererwidget.sip.in @@ -83,7 +83,7 @@ transferred to the renderer. void clearFeatureCounts(); - public: + protected: }; @@ -128,7 +128,7 @@ class QgsRuleBasedRendererWidget : QgsRendererWidget void saveSectionWidth( int section, int oldSize, int newSize ); void restoreSectionWidths(); - public: + protected: void refineRule( int type ); void refineRuleCategoriesGui(); %Docstring @@ -224,7 +224,7 @@ Set the widget in dock mode. :param dockMode: ``True`` for dock mode. %End - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in b/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in index 053831bd8bf2..4e524a5bfa16 100644 --- a/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgssinglesymbolrendererwidget.sip.in @@ -29,7 +29,7 @@ class QgsSingleSymbolRendererWidget : QgsRendererWidget virtual void setDockMode( bool dockMode ); - public: + protected: virtual void setSymbolLevels( const QList< QgsLegendSymbolItem > &levels, bool enabled ); diff --git a/python/gui/auto_generated/symbology/qgssmartgroupeditordialog.sip.in b/python/gui/auto_generated/symbology/qgssmartgroupeditordialog.sip.in index 3fd53cac0601..989aa68238b4 100644 --- a/python/gui/auto_generated/symbology/qgssmartgroupeditordialog.sip.in +++ b/python/gui/auto_generated/symbology/qgssmartgroupeditordialog.sip.in @@ -48,7 +48,7 @@ sets the remove button hidden state to 'hide' signals: void removed( int ); - public: + protected: }; @@ -99,7 +99,7 @@ function to create a new ConditionBox and update UI slot to remove the condition with id int %End - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in b/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in index 65b1c638597e..c5bf554bb75c 100644 --- a/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in +++ b/python/gui/auto_generated/symbology/qgsstylemanagerdialog.sip.in @@ -256,7 +256,7 @@ Tag selected symbols using menu item selection Remove all tags from selected symbols %End - public: + protected: void populateTypes() /Deprecated/; %Docstring diff --git a/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in b/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in index 9a2165108165..68f61b0acc4c 100644 --- a/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgssvgselectorwidget.sip.in @@ -75,7 +75,7 @@ Constructor for creating a model for SVG files in a specific path. virtual QVariant data( const QModelIndex &index, int role = Qt::DisplayRole ) const; - public: + protected: }; @@ -184,7 +184,7 @@ Emitted when the parameters have changed .. versionadded:: 3.18 %End - public: + protected: void populateList(); }; @@ -210,7 +210,7 @@ Constructor for QgsSvgSelectorDialog. Returns pointer to the embedded SVG selector widget %End - public: + protected: }; /************************************************************************ diff --git a/python/gui/auto_generated/symbology/qgssymbollayerwidget.sip.in b/python/gui/auto_generated/symbology/qgssymbollayerwidget.sip.in index e94fb57f9268..b220f4ef1cff 100644 --- a/python/gui/auto_generated/symbology/qgssymbollayerwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgssymbollayerwidget.sip.in @@ -56,7 +56,7 @@ Returns the vector layer associated with the widget. .. versionadded:: 2.12 %End - public: + protected: void registerDataDefinedButton( QgsPropertyOverrideButton *button, QgsSymbolLayer::Property key ); %Docstring @@ -126,7 +126,7 @@ Creates a new QgsSimpleLineSymbolLayerWidget. virtual void setContext( const QgsSymbolWidgetContext &context ); - public: + protected: void updatePatternIcon(); @@ -172,7 +172,7 @@ Creates a new QgsSimpleMarkerSymbolLayerWidget. void setColorStroke( const QColor &color ); void setColorFill( const QColor &color ); - public: + protected: }; @@ -211,7 +211,7 @@ Creates a new QgsSimpleFillSymbolLayerWidget. void setColor( const QColor &color ); void setStrokeColor( const QColor &color ); - public: + protected: }; @@ -253,7 +253,7 @@ Creates a new QgsFilledMarkerSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; @@ -300,7 +300,7 @@ Applies the color ramp passed on by the color ramp button void setCoordinateMode( int index ); void setGradientSpread( int index ); - public: + protected: }; @@ -339,7 +339,7 @@ Creates a new QgsShapeburstFillSymbolLayerWidget. void setColor( const QColor &color ); void setColor2( const QColor &color ); - public: + protected: }; @@ -381,7 +381,7 @@ Creates a new QgsMarkerLineSymbolLayerWidget. void setInterval( double val ); void setOffsetAlongLine( double val ); - public: + protected: }; @@ -472,7 +472,7 @@ Sets the dynamic SVG parameters %End - public: + protected: void populateList() /Deprecated/; %Docstring @@ -531,7 +531,7 @@ Creates a new QgsRasterMarkerSymbolLayerWidget. virtual void setContext( const QgsSymbolWidgetContext &context ); - public: + protected: }; @@ -567,7 +567,7 @@ Creates a new QgsRasterFillSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; @@ -604,7 +604,7 @@ Creates a new QgsSVGFillSymbolLayerWidget. virtual void setContext( const QgsSymbolWidgetContext &context ); - public: + protected: void updateParamGui( bool resetValues = true ); %Docstring @@ -648,7 +648,7 @@ Creates a new QgsLinePatternFillSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; @@ -683,7 +683,7 @@ Creates a new QgsPointPatternFillSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; @@ -788,7 +788,7 @@ Set the font marker character from a text string. .. versionadded:: 3.8 %End - public: + protected: }; @@ -824,7 +824,7 @@ Creates a new QgsCentroidFillSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; diff --git a/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in b/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in index 32127319b978..6a77ce12b684 100644 --- a/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in +++ b/python/gui/auto_generated/symbology/qgssymbolselectordialog.sip.in @@ -239,7 +239,7 @@ alters tree and sets proper widget when Layer Type is changed \note: The layer is received from the LayerPropertiesWidget %End - public: + protected: virtual void keyPressEvent( QKeyEvent *e ); diff --git a/python/gui/auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip.in b/python/gui/auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip.in index b5b669d4f7af..1df67e6128fd 100644 --- a/python/gui/auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip.in +++ b/python/gui/auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip.in @@ -36,7 +36,7 @@ Creates a new QgsVectorFieldSymbolLayerWidget. virtual QgsSymbolLayer *symbolLayer(); - public: + protected: }; diff --git a/python/gui/auto_generated/tableeditor/qgstableeditordialog.sip.in b/python/gui/auto_generated/tableeditor/qgstableeditordialog.sip.in index 13c71ccfb0ab..be11ac81e541 100644 --- a/python/gui/auto_generated/tableeditor/qgstableeditordialog.sip.in +++ b/python/gui/auto_generated/tableeditor/qgstableeditordialog.sip.in @@ -138,7 +138,7 @@ Emitted whenever the table contents are changed. Emitted whenever the "include table header" setting is changed. %End - public: + protected: virtual void closeEvent( QCloseEvent * ); diff --git a/python/gui/auto_generated/tableeditor/qgstableeditorwidget.sip.in b/python/gui/auto_generated/tableeditor/qgstableeditorwidget.sip.in index 52be7961c13e..f0ddd0fe8f96 100644 --- a/python/gui/auto_generated/tableeditor/qgstableeditorwidget.sip.in +++ b/python/gui/auto_generated/tableeditor/qgstableeditorwidget.sip.in @@ -366,7 +366,7 @@ Sets the table ``headers``. .. seealso:: :py:func:`tableHeaders` %End - public: + protected: virtual void keyPressEvent( QKeyEvent *event ); diff --git a/python/server/auto_generated/qgsserverlogger.sip.in b/python/server/auto_generated/qgsserverlogger.sip.in index d22be6dc7b51..7ea2590ef138 100644 --- a/python/server/auto_generated/qgsserverlogger.sip.in +++ b/python/server/auto_generated/qgsserverlogger.sip.in @@ -71,7 +71,7 @@ Log a message from the server context :param level: log level of the message %End - public: + protected: QgsServerLogger(); }; diff --git a/python/server/auto_generated/qgsserverogcapihandler.sip.in b/python/server/auto_generated/qgsserverogcapihandler.sip.in index 0dcc86040861..c5f760b74b7a 100644 --- a/python/server/auto_generated/qgsserverogcapihandler.sip.in +++ b/python/server/auto_generated/qgsserverogcapihandler.sip.in @@ -255,7 +255,7 @@ Returns a vector layer from the ``collectionId`` in the given ``context``. - public: + protected: void setContentTypesInt( const QList &contentTypes ) /PyName=setContentTypes/; %Docstring diff --git a/python/server/auto_generated/qgsserverparameters.sip.in b/python/server/auto_generated/qgsserverparameters.sip.in index f3e845abdb66..e44ba63834ff 100644 --- a/python/server/auto_generated/qgsserverparameters.sip.in +++ b/python/server/auto_generated/qgsserverparameters.sip.in @@ -356,7 +356,7 @@ defined. :return: version %End - public: + protected: virtual bool loadParameter( const QString &name, const QString &value ); %Docstring diff --git a/python/server/auto_generated/qgsserverrequest.sip.in b/python/server/auto_generated/qgsserverrequest.sip.in index dd12701e0429..a10bcbfb72b6 100644 --- a/python/server/auto_generated/qgsserverrequest.sip.in +++ b/python/server/auto_generated/qgsserverrequest.sip.in @@ -225,7 +225,7 @@ Returns the query string parameter with the given ``name`` from the request URL, .. versionadded:: 3.10 %End - public: + protected: void setOriginalUrl( const QUrl &url ); %Docstring diff --git a/scripts/sipify.pl b/scripts/sipify.pl index 903f5b163589..02adb3a0fa24 100755 --- a/scripts/sipify.pl +++ b/scripts/sipify.pl @@ -1018,9 +1018,6 @@ sub detect_non_method_member{ dbg_info("going protected"); $ACCESS[$#ACCESS] = PROTECTED; $COMMENT = ''; - # make all protected methods slots - # https://github.com/qgis/QGIS/issues/45331 - $LINE =~ s/protected:/public:/; } elsif ( $ACCESS[$#ACCESS] == PRIVATE && $LINE =~ m/SIP_FORCE/){ dbg_info("private with SIP_FORCE"); @@ -1058,7 +1055,6 @@ sub detect_non_method_member{ # Enum declaration # For scoped and type based enum, the type has to be removed - my $enum_is_protected = 0; if ( $LINE =~ m/^\s*Q_DECLARE_FLAGS\s*\(\s*(?\w+)\s*,\s*(?\w+)\s*\)\s*SIP_MONKEYPATCH_FLAGS_UNNEST\s*\(\s*(?\w+)\s*,\s*(?\w+)\s*\)\s*$/ ){ push @OUTPUT_PYTHON, "$+{emkb}.$+{emkf} = $ACTUAL_CLASS.$+{flags_name}\n"; $LINE =~ s/\s*SIP_MONKEYPATCH_FLAGS_UNNEST\(.*?\)//; @@ -1066,11 +1062,6 @@ sub detect_non_method_member{ if ( $LINE =~ m/^(\s*enum(\s+Q_DECL_DEPRECATED)?\s+(?class\s+)?(?\w+))(:?\s+SIP_.*)?(\s*:\s*\w+)?(?.*)$/ ){ my $enum_decl = $1; $enum_decl =~ s/\s*\bQ_DECL_DEPRECATED\b//; - if ($ACCESS[$#ACCESS] == PROTECTED){ - # we are in protected slots we need to create a simple protected section - $enum_is_protected = 1; - write_output("ENU0", "protected:\n"); - } write_output("ENU1", "$enum_decl"); write_output("ENU1", $+{oneliner}) if defined $+{oneliner}; write_output("ENU1", "\n"); @@ -1158,9 +1149,6 @@ sub detect_non_method_member{ push @OUTPUT_PYTHON, "$enum_qualname.__doc__ = '$COMMENT\\n\\n' + " . join(" + '\\n' + ", @enum_members_doc) . "\n# --\n"; } } - if ( $enum_is_protected == 1 ) { - write_output("ENU0", "protected slots:"); - } # enums don't have Docstring apparently $COMMENT = ''; next; diff --git a/src/core/mesh/qgsmesheditor.h b/src/core/mesh/qgsmesheditor.h index 35b2aa438c00..7f162497b63e 100644 --- a/src/core/mesh/qgsmesheditor.h +++ b/src/core/mesh/qgsmesheditor.h @@ -26,9 +26,12 @@ #include "qgstriangularmesh.h" #include "qgstopologicalmesh.h" - class QgsMeshAdvancedEditing; +#if defined(_MSC_VER) +template CORE_EXPORT QVector> SIP_SKIP; +#endif + /** * \ingroup core * diff --git a/src/core/mesh/qgstopologicalmesh.h b/src/core/mesh/qgstopologicalmesh.h index 93b1ab4ebc8b..1cf79eb359ec 100644 --- a/src/core/mesh/qgstopologicalmesh.h +++ b/src/core/mesh/qgstopologicalmesh.h @@ -20,6 +20,12 @@ #include "qgsmeshdataprovider.h" +#if defined(_MSC_VER) +template CORE_EXPORT QVector SIP_SKIP; +template CORE_EXPORT QList SIP_SKIP; +template CORE_EXPORT QVector> SIP_SKIP; +#endif + SIP_NO_FILE class QgsMeshEditingError; diff --git a/src/core/raster/qgsrasterinterface.h b/src/core/raster/qgsrasterinterface.h index f14b4498d6a5..dd9a9c121ff7 100644 --- a/src/core/raster/qgsrasterinterface.h +++ b/src/core/raster/qgsrasterinterface.h @@ -540,12 +540,14 @@ class CORE_EXPORT QgsRasterInterface maximum = PyFloat_AsDouble( a4 ); } +#if defined(SIP_PROTECTED_IS_PUBLIC) || (SIP_VERSION >= 0x050000 && !defined(_MSC_VER)) sipCpp->initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 ); +#else + sipCpp->sipProtect_initHistogram( *a0, a1, a2, minimum, maximum, *a5, a6, a7 ); +#endif % End #endif - - //! Fill in statistics defaults if not specified void initStatistics( QgsRasterBandStats &statistics, int bandNo, int stats = QgsRasterBandStats::All, diff --git a/tests/code_layout/sipifyheader.expected.sip b/tests/code_layout/sipifyheader.expected.sip index ab7d5f2500a4..99e8e686c30b 100644 --- a/tests/code_layout/sipifyheader.expected.sip +++ b/tests/code_layout/sipifyheader.expected.sip @@ -314,7 +314,7 @@ remove argument } %End - public: + protected: bool thisShouldBeListed();