From 55d56977bb5428591706caf031f07ec9ce5934cf Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Wed, 4 Dec 2024 09:08:24 +0100 Subject: [PATCH] place SIP_SKIP before definition --- src/3d/qgs3drendercontext.h | 2 +- src/core/auth/qgsauthmanager.h | 6 +- src/core/callouts/qgscalloutsregistry.h | 6 +- src/core/effects/qgspainteffectregistry.h | 10 ++-- src/core/geometry/qgswkbptr.h | 58 +++++++++---------- src/core/labeling/qgspallabeling.h | 10 ++-- .../labeling/rules/qgslabelingenginerule.h | 2 +- src/core/layertree/qgslayertreenode.h | 2 +- src/core/layout/qgslayoutitem.h | 2 +- src/core/layout/qgslayoutobject.h | 2 +- .../qgsmaprenderercustompainterjob.h | 2 +- src/core/maprenderer/qgsmaprendererjob.h | 4 +- src/core/pointcloud/qgspointcloudrenderer.h | 2 +- .../qgspointcloudrendererregistry.h | 6 +- src/core/processing/qgsprocessingcontext.h | 2 +- src/core/qgsdiagramrenderer.h | 6 +- src/core/qgsfeaturerequest.h | 4 +- src/core/qgslegendsettings.h | 2 +- src/core/qgsrendercontext.h | 10 ++-- src/core/qgsvectorfilewriter.h | 2 +- src/core/raster/qgsrastershader.h | 2 +- src/core/symbology/qgsrenderer.h | 2 +- src/core/symbology/qgsrendererregistry.h | 8 +-- src/core/symbology/qgssymbol.h | 2 +- src/core/symbology/qgssymbollayer.h | 2 +- src/core/symbology/qgssymbollayerregistry.h | 10 ++-- src/core/symbology/qgssymbolrendercontext.h | 2 +- src/core/tiledscene/qgstiledscenerenderer.h | 2 +- .../qgstiledscenerendererregistry.h | 6 +- .../core/qgseditorwidgetfactory.h | 2 +- src/gui/editorwidgets/core/qgswidgetwrapper.h | 2 +- .../processing/qgsprocessingtoolboxmodel.h | 2 +- src/gui/qgsexpressionstoredialog.h | 2 +- src/gui/qgsmapcanvas.h | 2 +- src/gui/qgsmapcanvasannotationitem.h | 2 +- src/gui/qgsoptionswidgetfactory.h | 2 +- src/gui/qgspropertyassistantwidget.h | 2 +- src/gui/qgspropertyoverridebutton.h | 2 +- 38 files changed, 97 insertions(+), 97 deletions(-) diff --git a/src/3d/qgs3drendercontext.h b/src/3d/qgs3drendercontext.h index c289c19b3ec4..a67439f07c56 100644 --- a/src/3d/qgs3drendercontext.h +++ b/src/3d/qgs3drendercontext.h @@ -149,7 +149,7 @@ class _3D_EXPORT Qgs3DRenderContext * \see setExpressionContext() * \note not available in Python bindings */ - const QgsExpressionContext &expressionContext() const { return mExpressionContext; } SIP_SKIP + const QgsExpressionContext &expressionContext() const SIP_SKIP { return mExpressionContext; } private: QgsCoordinateReferenceSystem mCrs; //!< Destination coordinate system of the world diff --git a/src/core/auth/qgsauthmanager.h b/src/core/auth/qgsauthmanager.h index cd8cd3553365..908ab353d825 100644 --- a/src/core/auth/qgsauthmanager.h +++ b/src/core/auth/qgsauthmanager.h @@ -240,7 +240,7 @@ class CORE_EXPORT QgsAuthManager : public QObject * Whether there is a scheduled opitonal erase of authentication database. * \note not available in Python bindings */ - bool scheduledAuthDatabaseErase() { return mScheduledDbErase; } SIP_SKIP + bool scheduledAuthDatabaseErase() SIP_SKIP { return mScheduledDbErase; } /** * Schedule an optional erase of authentication database, starting when mutex is lockable. @@ -573,7 +573,7 @@ class CORE_EXPORT QgsAuthManager : public QObject * \return hash keyed with cert/connection's sha:host:port. * \note not available in Python bindings */ - QHash > ignoredSslErrorCache() { return mIgnoredSslErrorsCache; } SIP_SKIP + QHash > ignoredSslErrorCache() SIP_SKIP { return mIgnoredSslErrorsCache; } //! Utility function to dump the cache for debug purposes void dumpIgnoredSslErrorsCache_(); @@ -718,7 +718,7 @@ class CORE_EXPORT QgsAuthManager : public QObject * Error message getter * \note not available in Python bindings */ - const QString passwordHelperErrorMessage() { return mPasswordHelperErrorMessage; } SIP_SKIP + const QString passwordHelperErrorMessage() SIP_SKIP { return mPasswordHelperErrorMessage; } /** * Delete master password from wallet diff --git a/src/core/callouts/qgscalloutsregistry.h b/src/core/callouts/qgscalloutsregistry.h index 9ae3a56938b1..d6538e34c260 100644 --- a/src/core/callouts/qgscalloutsregistry.h +++ b/src/core/callouts/qgscalloutsregistry.h @@ -122,12 +122,12 @@ class CORE_EXPORT QgsCalloutMetadata : public QgsCalloutAbstractMetadata {} //! \note not available in Python bindings - QgsCalloutCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsCalloutCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } //! \note not available in Python bindings - QgsCalloutWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsCalloutWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } //! \note not available in Python bindings - void setWidgetFunction( QgsCalloutWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsCalloutWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } QgsCallout *createCallout( const QVariantMap &properties, const QgsReadWriteContext &context ) override SIP_FACTORY; QgsCalloutWidget *createCalloutWidget( QgsMapLayer *vl ) override SIP_FACTORY; diff --git a/src/core/effects/qgspainteffectregistry.h b/src/core/effects/qgspainteffectregistry.h index 919f70a34b4f..b977c68fb8fc 100644 --- a/src/core/effects/qgspainteffectregistry.h +++ b/src/core/effects/qgspainteffectregistry.h @@ -119,7 +119,7 @@ class CORE_EXPORT QgsPaintEffectMetadata : public QgsPaintEffectAbstractMetadata * \returns creation function * \note not available in Python bindings */ - QgsPaintEffectCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsPaintEffectCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } /** * Returns the paint effect properties widget creation function for the paint effect class @@ -127,7 +127,7 @@ class CORE_EXPORT QgsPaintEffectMetadata : public QgsPaintEffectAbstractMetadata * \note not available in Python bindings * \see setWidgetFunction */ - QgsPaintEffectWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsPaintEffectWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } /** * Sets the paint effect properties widget creation function for the paint effect class @@ -135,7 +135,7 @@ class CORE_EXPORT QgsPaintEffectMetadata : public QgsPaintEffectAbstractMetadata * \note not available in Python bindings * \see widgetFunction */ - void setWidgetFunction( QgsPaintEffectWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsPaintEffectWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } /** * Creates a new paint effect of the metadata's effect class @@ -144,7 +144,7 @@ class CORE_EXPORT QgsPaintEffectMetadata : public QgsPaintEffectAbstractMetadata * \note not available in Python bindings * \see createWidget */ - QgsPaintEffect *createPaintEffect( const QVariantMap &map ) override { return mCreateFunc ? mCreateFunc( map ) : nullptr; } SIP_SKIP + QgsPaintEffect *createPaintEffect( const QVariantMap &map ) override SIP_SKIP { return mCreateFunc ? mCreateFunc( map ) : nullptr; } /** * Creates a new paint effect properties widget for the metadata's effect class @@ -152,7 +152,7 @@ class CORE_EXPORT QgsPaintEffectMetadata : public QgsPaintEffectAbstractMetadata * \note not available in Python bindings * \see createWidget */ - QgsPaintEffectWidget *createWidget() override SIP_FACTORY { return mWidgetFunc ? mWidgetFunc() : nullptr; } SIP_SKIP + QgsPaintEffectWidget *createWidget() override SIP_FACTORY SIP_SKIP { return mWidgetFunc ? mWidgetFunc() : nullptr; } protected: QgsPaintEffectCreateFunc mCreateFunc; diff --git a/src/core/geometry/qgswkbptr.h b/src/core/geometry/qgswkbptr.h index 1ee87a2a687d..45752a2f9719 100644 --- a/src/core/geometry/qgswkbptr.h +++ b/src/core/geometry/qgswkbptr.h @@ -75,57 +75,57 @@ class CORE_EXPORT QgsWkbPtr QgsWkbPtr( unsigned char *p SIP_ARRAY, int size SIP_ARRAYSIZE ); - inline const QgsWkbPtr &operator>>( double &v ) const { read( v ); return *this; } SIP_SKIP - inline const QgsWkbPtr &operator>>( float &r ) const { double v; read( v ); r = v; return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( double &v ) const SIP_SKIP { read( v ); return *this; } + inline const QgsWkbPtr &operator>>( float &r ) const SIP_SKIP { double v; read( v ); r = v; return *this; } //! Reads an integer value into a qint32 - inline const QgsWkbPtr &operator>>( qint32 &v ) const { read( v ); return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( qint32 &v ) const SIP_SKIP { read( v ); return *this; } //! Reads an integer value into a longlong - inline const QgsWkbPtr &operator>>( qint64 &r ) const { quint32 v; read( v ); r = v; return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( qint64 &r ) const SIP_SKIP { quint32 v; read( v ); r = v; return *this; } //! Reads an unsigned integer value - inline const QgsWkbPtr &operator>>( quint32 &v ) const { read( v ); return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( quint32 &v ) const SIP_SKIP { read( v ); return *this; } //! Reads an char value - inline const QgsWkbPtr &operator>>( char &v ) const { read( v ); return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( char &v ) const SIP_SKIP { read( v ); return *this; } //! Reads a Qgis::WkbType enum value - inline const QgsWkbPtr &operator>>( Qgis::WkbType &v ) const { read( v ); return *this; } SIP_SKIP + inline const QgsWkbPtr &operator>>( Qgis::WkbType &v ) const SIP_SKIP { read( v ); return *this; } //! Writes a double to the pointer - inline QgsWkbPtr &operator<<( double v ) { write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( double v ) SIP_SKIP { write( v ); return *this; } //! Writes a float to the pointer - inline QgsWkbPtr &operator<<( float r ) { double v = r; write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( float r ) SIP_SKIP { double v = r; write( v ); return *this; } //! Writes an int to the pointer - inline QgsWkbPtr &operator<<( qint32 v ) { write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( qint32 v ) SIP_SKIP { write( v ); return *this; } //! Writes a longlong as int to the pointer - inline QgsWkbPtr &operator<<( qint64 r ) { quint32 v = r; write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( qint64 r ) SIP_SKIP { quint32 v = r; write( v ); return *this; } //! Writes an unsigned int to the pointer - inline QgsWkbPtr &operator<<( quint32 v ) { write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( quint32 v ) SIP_SKIP { write( v ); return *this; } //! Writes a char to the pointer - inline QgsWkbPtr &operator<<( char v ) { write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( char v ) SIP_SKIP { write( v ); return *this; } //! Writes a WKB type value to the pointer - inline QgsWkbPtr &operator<<( Qgis::WkbType v ) { write( v ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( Qgis::WkbType v ) SIP_SKIP { write( v ); return *this; } //! Append data from a byte array - inline QgsWkbPtr &operator<<( const QByteArray &data ) { write( data ); return *this; } SIP_SKIP + inline QgsWkbPtr &operator<<( const QByteArray &data ) SIP_SKIP { write( data ); return *this; } - inline void operator+=( int n ) const { verifyBound( n ); mP += n; } SIP_SKIP + inline void operator+=( int n ) const SIP_SKIP { verifyBound( n ); mP += n; } - inline operator unsigned char *() const { return mP; } SIP_SKIP + inline operator unsigned char *() const SIP_SKIP { return mP; } /** * \brief size * \note not available in Python bindings */ - inline int size() const { return mEnd - mStart; } SIP_SKIP + inline int size() const SIP_SKIP { return mEnd - mStart; } /** * \brief remaining * \note not available in Python bindings */ - inline int remaining() const { return mEnd - mP; } SIP_SKIP + inline int remaining() const SIP_SKIP { return mEnd - mP; } /** * \brief writtenSize * \note not available in Python bindings */ - inline int writtenSize() const { return mP - mStart; } SIP_SKIP + inline int writtenSize() const SIP_SKIP { return mP - mStart; } }; /** @@ -172,27 +172,27 @@ class CORE_EXPORT QgsConstWkbPtr */ Qgis::WkbType readHeader() const SIP_SKIP; - inline const QgsConstWkbPtr &operator>>( double &v ) const { read( v ); return *this; } SIP_SKIP - inline const QgsConstWkbPtr &operator>>( float &r ) const { double v; read( v ); r = v; return *this; } SIP_SKIP - inline const QgsConstWkbPtr &operator>>( int &v ) const { read( v ); return *this; } SIP_SKIP - inline const QgsConstWkbPtr &operator>>( unsigned int &v ) const { read( v ); return *this; } SIP_SKIP - inline const QgsConstWkbPtr &operator>>( char &v ) const { read( v ); return *this; } SIP_SKIP + inline const QgsConstWkbPtr &operator>>( double &v ) const SIP_SKIP { read( v ); return *this; } + inline const QgsConstWkbPtr &operator>>( float &r ) const SIP_SKIP { double v; read( v ); r = v; return *this; } + inline const QgsConstWkbPtr &operator>>( int &v ) const SIP_SKIP { read( v ); return *this; } + inline const QgsConstWkbPtr &operator>>( unsigned int &v ) const SIP_SKIP { read( v ); return *this; } + inline const QgsConstWkbPtr &operator>>( char &v ) const SIP_SKIP { read( v ); return *this; } //! Read a point const QgsConstWkbPtr &operator>>( QPointF &point ) const; SIP_SKIP //! Read a point array const QgsConstWkbPtr &operator>>( QPolygonF &points ) const; SIP_SKIP - inline void operator+=( int n ) const { verifyBound( n ); mP += n; } SIP_SKIP - inline void operator-=( int n ) const { mP -= n; } SIP_SKIP + inline void operator+=( int n ) const SIP_SKIP { verifyBound( n ); mP += n; } + inline void operator-=( int n ) const SIP_SKIP { mP -= n; } - inline operator const unsigned char *() const { return mP; } SIP_SKIP + inline operator const unsigned char *() const SIP_SKIP { return mP; } /** * \brief remaining * \note not available in Python bindings */ - inline int remaining() const { return mEnd - mP; } SIP_SKIP + inline int remaining() const SIP_SKIP { return mEnd - mP; } private: template void endian_swap( T &value ) const SIP_SKIP diff --git a/src/core/labeling/qgspallabeling.h b/src/core/labeling/qgspallabeling.h index 5c214a5ed5a1..3378349eec37 100644 --- a/src/core/labeling/qgspallabeling.h +++ b/src/core/labeling/qgspallabeling.h @@ -751,7 +751,7 @@ class CORE_EXPORT QgsPalLayerSettings * \note Not available in Python bindings * \since QGIS 3.16 */ - const QgsLabelLineSettings &lineSettings() const { return mLineSettings; } SIP_SKIP + const QgsLabelLineSettings &lineSettings() const SIP_SKIP { return mLineSettings; } /** * Returns the label line settings, which contain settings related to how the label @@ -780,7 +780,7 @@ class CORE_EXPORT QgsPalLayerSettings * \note Not available in Python bindings * \since QGIS 3.38 */ - const QgsLabelPointSettings &pointSettings() const { return mPointSettings; } SIP_SKIP + const QgsLabelPointSettings &pointSettings() const SIP_SKIP { return mPointSettings; } /** * Returns the label point settings, which contain settings related to how the label @@ -808,7 +808,7 @@ class CORE_EXPORT QgsPalLayerSettings * \note Not available in Python bindings * \since QGIS 3.10.2 */ - const QgsLabelObstacleSettings &obstacleSettings() const { return mObstacleSettings; } SIP_SKIP + const QgsLabelObstacleSettings &obstacleSettings() const SIP_SKIP { return mObstacleSettings; } /** * Returns the label obstacle settings. @@ -830,7 +830,7 @@ class CORE_EXPORT QgsPalLayerSettings * \note Not available in Python bindings * \since QGIS 3.12 */ - const QgsLabelThinningSettings &thinningSettings() const { return mThinningSettings; } SIP_SKIP + const QgsLabelThinningSettings &thinningSettings() const SIP_SKIP { return mThinningSettings; } /** * Returns the label thinning settings. @@ -852,7 +852,7 @@ class CORE_EXPORT QgsPalLayerSettings * \note Not available in Python bindings * \since QGIS 3.26 */ - const QgsLabelPlacementSettings &placementSettings() const { return mPlacementSettings; } SIP_SKIP + const QgsLabelPlacementSettings &placementSettings() const SIP_SKIP { return mPlacementSettings; } /** * Returns the label placement settings. diff --git a/src/core/labeling/rules/qgslabelingenginerule.h b/src/core/labeling/rules/qgslabelingenginerule.h index 8e498019a801..40d9f64da83e 100644 --- a/src/core/labeling/rules/qgslabelingenginerule.h +++ b/src/core/labeling/rules/qgslabelingenginerule.h @@ -60,7 +60,7 @@ class CORE_EXPORT QgsLabelingEngineContext * Returns a reference to the context's render context. * \note Not available in Python bindings. */ - const QgsRenderContext &renderContext() const { return mRenderContext; } SIP_SKIP + const QgsRenderContext &renderContext() const SIP_SKIP { return mRenderContext; } /** * Returns the map extent defining the limits for labeling. diff --git a/src/core/layertree/qgslayertreenode.h b/src/core/layertree/qgslayertreenode.h index 0883bebb4103..25cabafa5a5b 100644 --- a/src/core/layertree/qgslayertreenode.h +++ b/src/core/layertree/qgslayertreenode.h @@ -121,7 +121,7 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject //! Gets list of children of the node. Children are owned by the parent QList children() { return mChildren; } //! Gets list of children of the node. Children are owned by the parent - QList children() const { return mChildren; } SIP_SKIP + QList children() const SIP_SKIP { return mChildren; } /** * Removes the children, disconnect all the forwarded and external signals and sets their parent to NULLPTR diff --git a/src/core/layout/qgslayoutitem.h b/src/core/layout/qgslayoutitem.h index 6f62e660aa42..4c1e516d0661 100644 --- a/src/core/layout/qgslayoutitem.h +++ b/src/core/layout/qgslayoutitem.h @@ -74,7 +74,7 @@ class CORE_EXPORT QgsLayoutItemRenderContext * * \note Not available in Python bindings. */ - const QgsRenderContext &renderContext() const { return mRenderContext; } SIP_SKIP + const QgsRenderContext &renderContext() const SIP_SKIP { return mRenderContext; } /** * Returns the current view zoom (scale factor). It can be diff --git a/src/core/layout/qgslayoutobject.h b/src/core/layout/qgslayoutobject.h index 509a14495a27..eb323742e12f 100644 --- a/src/core/layout/qgslayoutobject.h +++ b/src/core/layout/qgslayoutobject.h @@ -299,7 +299,7 @@ class CORE_EXPORT QgsLayoutObject: public QObject, public QgsExpressionContextGe * \see setDataDefinedProperties() * \see DataDefinedProperty */ - const QgsPropertyCollection &dataDefinedProperties() const { return mDataDefinedProperties; } SIP_SKIP + const QgsPropertyCollection &dataDefinedProperties() const SIP_SKIP { return mDataDefinedProperties; } /** * Sets the objects's property collection, used for data defined overrides. diff --git a/src/core/maprenderer/qgsmaprenderercustompainterjob.h b/src/core/maprenderer/qgsmaprenderercustompainterjob.h index c60c069d5b1f..b29163feb837 100644 --- a/src/core/maprenderer/qgsmaprenderercustompainterjob.h +++ b/src/core/maprenderer/qgsmaprenderercustompainterjob.h @@ -74,7 +74,7 @@ class CORE_EXPORT QgsMapRendererCustomPainterJob : public QgsMapRendererAbstract QgsLabelingResults *takeLabelingResults() SIP_TRANSFER override; //! \note not available in Python bindings - const std::vector< LayerRenderJob > &jobs() const { return mLayerJobs; } SIP_SKIP + const std::vector< LayerRenderJob > &jobs() const SIP_SKIP { return mLayerJobs; } /** * Wait for the job to be finished - and keep the thread's event loop running while waiting. diff --git a/src/core/maprenderer/qgsmaprendererjob.h b/src/core/maprenderer/qgsmaprendererjob.h index 5709cb746c27..7f7f8d069b6d 100644 --- a/src/core/maprenderer/qgsmaprendererjob.h +++ b/src/core/maprenderer/qgsmaprendererjob.h @@ -403,7 +403,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject SIP_ABSTRACT * \note Not available in Python bindings. * \since QGIS 3.24 */ - QgsLabelSink *labelSink() const { return mLabelSink; } SIP_SKIP + QgsLabelSink *labelSink() const SIP_SKIP { return mLabelSink; } /** * Assigns the label sink which will take over responsibility for handling labels @@ -412,7 +412,7 @@ class CORE_EXPORT QgsMapRendererJob : public QObject SIP_ABSTRACT * \note Not available in Python bindings. * \since QGIS 3.24 */ - void setLabelSink( QgsLabelSink *sink ) { mLabelSink = sink; } SIP_SKIP + void setLabelSink( QgsLabelSink *sink ) SIP_SKIP { mLabelSink = sink; } /** * Returns the associated labeling engine feedback object. diff --git a/src/core/pointcloud/qgspointcloudrenderer.h b/src/core/pointcloud/qgspointcloudrenderer.h index eba93fc79688..53861e6a6932 100644 --- a/src/core/pointcloud/qgspointcloudrenderer.h +++ b/src/core/pointcloud/qgspointcloudrenderer.h @@ -70,7 +70,7 @@ class CORE_EXPORT QgsPointCloudRenderContext * Returns a reference to the context's render context. * \note Not available in Python bindings. */ - const QgsRenderContext &renderContext() const { return mRenderContext; } SIP_SKIP + const QgsRenderContext &renderContext() const SIP_SKIP { return mRenderContext; } /** * Returns the scale of the layer's int32 coordinates compared to CRS coords. diff --git a/src/core/pointcloud/qgspointcloudrendererregistry.h b/src/core/pointcloud/qgspointcloudrendererregistry.h index 21a86d31d049..f69e8de7b350 100644 --- a/src/core/pointcloud/qgspointcloudrendererregistry.h +++ b/src/core/pointcloud/qgspointcloudrendererregistry.h @@ -150,12 +150,12 @@ class CORE_EXPORT QgsPointCloudRendererMetadata : public QgsPointCloudRendererAb #endif //! \note not available in Python bindings - QgsPointCloudRendererCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsPointCloudRendererCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } //! \note not available in Python bindings - QgsPointCloudRendererWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsPointCloudRendererWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } //! \note not available in Python bindings - void setWidgetFunction( QgsPointCloudRendererWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsPointCloudRendererWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } protected: //! pointer to function that creates an instance of the renderer when loading project / style diff --git a/src/core/processing/qgsprocessingcontext.h b/src/core/processing/qgsprocessingcontext.h index c8f516d832db..33beda889663 100644 --- a/src/core/processing/qgsprocessingcontext.h +++ b/src/core/processing/qgsprocessingcontext.h @@ -483,7 +483,7 @@ class CORE_EXPORT QgsProcessingContext * \note not available in Python bindings * \see setTransformErrorCallback() */ - std::function< void( const QgsFeature & ) > transformErrorCallback() const { return mTransformErrorCallback; } SIP_SKIP + std::function< void( const QgsFeature & ) > transformErrorCallback() const SIP_SKIP { return mTransformErrorCallback; } /** * Returns the default encoding to use for newly created files. diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h index 058032b663f4..5bcb57893f5c 100644 --- a/src/core/qgsdiagramrenderer.h +++ b/src/core/qgsdiagramrenderer.h @@ -45,7 +45,7 @@ class QgsPaintEffect; class QgsDataDefinedSizeLegend; class QgsLineSymbol; -namespace pal { class Layer; } SIP_SKIP +namespace pal SIP_SKIP { class Layer; } /** * \ingroup core @@ -224,7 +224,7 @@ class CORE_EXPORT QgsDiagramLayerSettings * \see setRenderer() * \note not available in Python bindings */ - const QgsDiagramRenderer *renderer() const { return mRenderer; } SIP_SKIP + const QgsDiagramRenderer *renderer() const SIP_SKIP { return mRenderer; } /** * Sets the diagram renderer associated with the layer. @@ -297,7 +297,7 @@ class CORE_EXPORT QgsDiagramLayerSettings * \see Property * \note not available in Python bindings */ - const QgsPropertyCollection &dataDefinedProperties() const { return mDataDefinedProperties; } SIP_SKIP + const QgsPropertyCollection &dataDefinedProperties() const SIP_SKIP { return mDataDefinedProperties; } /** * Sets the diagram's property collection, used for data defined overrides. diff --git a/src/core/qgsfeaturerequest.h b/src/core/qgsfeaturerequest.h index eb1b32d2aa85..94103afb6601 100644 --- a/src/core/qgsfeaturerequest.h +++ b/src/core/qgsfeaturerequest.h @@ -510,7 +510,7 @@ class CORE_EXPORT QgsFeatureRequest * \note not available in Python bindings * \see setInvalidGeometryCallback() */ - std::function< void( const QgsFeature & ) > invalidGeometryCallback() const { return mInvalidGeometryCallback; } SIP_SKIP + std::function< void( const QgsFeature & ) > invalidGeometryCallback() const SIP_SKIP { return mInvalidGeometryCallback; } /** * Set the filter \a expression. {\see QgsExpression} @@ -863,7 +863,7 @@ class CORE_EXPORT QgsFeatureRequest * \see setTransformErrorCallback() * \see destinationCrs() */ - std::function< void( const QgsFeature & ) > transformErrorCallback() const { return mTransformErrorCallback; } SIP_SKIP + std::function< void( const QgsFeature & ) > transformErrorCallback() const SIP_SKIP { return mTransformErrorCallback; } /** diff --git a/src/core/qgslegendsettings.h b/src/core/qgslegendsettings.h index 6da4dda84bff..dec88dfe08eb 100644 --- a/src/core/qgslegendsettings.h +++ b/src/core/qgslegendsettings.h @@ -70,7 +70,7 @@ class CORE_EXPORT QgsLegendSettings * * \note Not available in Python bindings. */ - SIP_SKIP QgsLegendStyle &rstyle( QgsLegendStyle::Style s ) { return mStyleMap[s]; } SIP_SKIP + SIP_SKIP QgsLegendStyle &rstyle( QgsLegendStyle::Style s ) SIP_SKIP { return mStyleMap[s]; } /** * Returns the style for a legend component. diff --git a/src/core/qgsrendercontext.h b/src/core/qgsrendercontext.h index c7ff2b0f649d..6efbe711abbe 100644 --- a/src/core/qgsrendercontext.h +++ b/src/core/qgsrendercontext.h @@ -416,14 +416,14 @@ class CORE_EXPORT QgsRenderContext : public QgsTemporalRangeObject * Gets access to new labeling engine (may be NULLPTR). * \note Not available in Python bindings. */ - QgsLabelingEngine *labelingEngine() const { return mLabelingEngine; } SIP_SKIP + QgsLabelingEngine *labelingEngine() const SIP_SKIP { return mLabelingEngine; } /** * Returns the associated label sink, or NULLPTR if not set. * \note Not available in Python bindings. * \since QGIS 3.24 */ - QgsLabelSink *labelSink() const { return mLabelSink; } SIP_SKIP + QgsLabelSink *labelSink() const SIP_SKIP { return mLabelSink; } /** * Returns the color to use when rendering selected features. @@ -594,7 +594,7 @@ class CORE_EXPORT QgsRenderContext : public QgsTemporalRangeObject * Assigns the labeling engine * \note Not available in Python bindings. */ - void setLabelingEngine( QgsLabelingEngine *engine ) { mLabelingEngine = engine; } SIP_SKIP + void setLabelingEngine( QgsLabelingEngine *engine ) SIP_SKIP { mLabelingEngine = engine; } /** * Assigns the label sink which will take over responsibility for handling labels. @@ -602,7 +602,7 @@ class CORE_EXPORT QgsRenderContext : public QgsTemporalRangeObject * \note Not available in Python bindings. * \since QGIS 3.24 */ - void setLabelSink( QgsLabelSink *sink ) { mLabelSink = sink; } SIP_SKIP + void setLabelSink( QgsLabelSink *sink ) SIP_SKIP { mLabelSink = sink; } /** * Sets the \a color to use when rendering selected features. @@ -686,7 +686,7 @@ class CORE_EXPORT QgsRenderContext : public QgsTemporalRangeObject * \see setExpressionContext() * \note not available in Python bindings */ - const QgsExpressionContext &expressionContext() const { return mExpressionContext; } SIP_SKIP + const QgsExpressionContext &expressionContext() const SIP_SKIP { return mExpressionContext; } //! Returns pointer to the unsegmentized geometry const QgsAbstractGeometry *geometry() const { return mGeometry; } diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h index ae21bf4b336c..dc20f9d00a82 100644 --- a/src/core/qgsvectorfilewriter.h +++ b/src/core/qgsvectorfilewriter.h @@ -871,7 +871,7 @@ class CORE_EXPORT QgsVectorFileWriter : public QgsFeatureSink bool addFeatureWithStyle( QgsFeature &feature, QgsFeatureRenderer *renderer, Qgis::DistanceUnit outputUnit = Qgis::DistanceUnit::Meters ); //! \note not available in Python bindings - QMap attrIdxToOgrIdx() const { return mAttrIdxToOgrIdx; } SIP_SKIP + QMap attrIdxToOgrIdx() const SIP_SKIP { return mAttrIdxToOgrIdx; } //! Close opened shapefile for writing ~QgsVectorFileWriter() override; diff --git a/src/core/raster/qgsrastershader.h b/src/core/raster/qgsrastershader.h index 3f513a89d392..d4b1a6a69fda 100644 --- a/src/core/raster/qgsrastershader.h +++ b/src/core/raster/qgsrastershader.h @@ -62,7 +62,7 @@ class CORE_EXPORT QgsRasterShader double minimumValue() const { return mMinimumValue; } QgsRasterShaderFunction *rasterShaderFunction() { return mRasterShaderFunction.get(); } - const QgsRasterShaderFunction *rasterShaderFunction() const { return mRasterShaderFunction.get(); } SIP_SKIP + const QgsRasterShaderFunction *rasterShaderFunction() const SIP_SKIP { return mRasterShaderFunction.get(); } /* * diff --git a/src/core/symbology/qgsrenderer.h b/src/core/symbology/qgsrenderer.h index 7adc935214bd..801b51136f0a 100644 --- a/src/core/symbology/qgsrenderer.h +++ b/src/core/symbology/qgsrenderer.h @@ -536,7 +536,7 @@ class CORE_EXPORT QgsFeatureRenderer * * \since QGIS 3.38 */ - const QgsPropertyCollection &dataDefinedProperties() const { return mDataDefinedProperties; } SIP_SKIP + const QgsPropertyCollection &dataDefinedProperties() const SIP_SKIP { return mDataDefinedProperties; } /** * Sets the renderer's property collection, used for data defined overrides. diff --git a/src/core/symbology/qgsrendererregistry.h b/src/core/symbology/qgsrendererregistry.h index 1fcaa3349baa..56a902de944e 100644 --- a/src/core/symbology/qgsrendererregistry.h +++ b/src/core/symbology/qgsrendererregistry.h @@ -184,14 +184,14 @@ class CORE_EXPORT QgsRendererMetadata : public QgsRendererAbstractMetadata { return mCreateFromSldFunc ? mCreateFromSldFunc( elem, geomType ) : nullptr; } //! \note not available in Python bindings - QgsRendererCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsRendererCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } //! \note not available in Python bindings - QgsRendererWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsRendererWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } //! \note not available in Python bindings - QgsRendererCreateFromSldFunc createFromSldFunction() const { return mCreateFromSldFunc; } SIP_SKIP + QgsRendererCreateFromSldFunc createFromSldFunction() const SIP_SKIP { return mCreateFromSldFunc; } //! \note not available in Python bindings - void setWidgetFunction( QgsRendererWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsRendererWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } QgsRendererAbstractMetadata::LayerTypes compatibleLayerTypes() const override { return mLayerTypes; } diff --git a/src/core/symbology/qgssymbol.h b/src/core/symbology/qgssymbol.h index 8007a43876c9..3b49f486455b 100644 --- a/src/core/symbology/qgssymbol.h +++ b/src/core/symbology/qgssymbol.h @@ -791,7 +791,7 @@ class CORE_EXPORT QgsSymbol * \see setDataDefinedProperties() * \since QGIS 3.18 */ - const QgsPropertyCollection &dataDefinedProperties() const { return mDataDefinedProperties; } SIP_SKIP + const QgsPropertyCollection &dataDefinedProperties() const SIP_SKIP { return mDataDefinedProperties; } /** * Sets the symbol's property collection, used for data defined overrides. diff --git a/src/core/symbology/qgssymbollayer.h b/src/core/symbology/qgssymbollayer.h index 2b15966b4faa..b6fdf4f1ed52 100644 --- a/src/core/symbology/qgssymbollayer.h +++ b/src/core/symbology/qgssymbollayer.h @@ -610,7 +610,7 @@ class CORE_EXPORT QgsSymbolLayer * Returns a reference to the symbol layer's property collection, used for data defined overrides. * \see setDataDefinedProperties() */ - const QgsPropertyCollection &dataDefinedProperties() const { return mDataDefinedProperties; } SIP_SKIP + const QgsPropertyCollection &dataDefinedProperties() const SIP_SKIP { return mDataDefinedProperties; } /** * Sets the symbol layer's property collection, used for data defined overrides. diff --git a/src/core/symbology/qgssymbollayerregistry.h b/src/core/symbology/qgssymbollayerregistry.h index ac9bb12b9ecd..b3b5f1fd6d6b 100644 --- a/src/core/symbology/qgssymbollayerregistry.h +++ b/src/core/symbology/qgssymbollayerregistry.h @@ -126,16 +126,16 @@ class CORE_EXPORT QgsSymbolLayerMetadata : public QgsSymbolLayerAbstractMetadata {} //! \note not available in Python bindings - QgsSymbolLayerCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsSymbolLayerCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } //! \note not available in Python bindings - QgsSymbolLayerWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsSymbolLayerWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } //! \note not available in Python bindings - QgsSymbolLayerCreateFromSldFunc createFromSldFunction() const { return mCreateFromSldFunc; } SIP_SKIP + QgsSymbolLayerCreateFromSldFunc createFromSldFunction() const SIP_SKIP { return mCreateFromSldFunc; } //! \note not available in Python bindings - QgsSymbolLayerPathResolverFunc pathResolverFunction() const { return mPathResolverFunc; } SIP_SKIP + QgsSymbolLayerPathResolverFunc pathResolverFunction() const SIP_SKIP { return mPathResolverFunc; } //! \note not available in Python bindings - void setWidgetFunction( QgsSymbolLayerWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsSymbolLayerWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } QgsSymbolLayer *createSymbolLayer( const QVariantMap &map ) override SIP_FACTORY { return mCreateFunc ? mCreateFunc( map ) : nullptr; } QgsSymbolLayerWidget *createSymbolLayerWidget( QgsVectorLayer *vl ) override SIP_FACTORY { return mWidgetFunc ? mWidgetFunc( vl ) : nullptr; } diff --git a/src/core/symbology/qgssymbolrendercontext.h b/src/core/symbology/qgssymbolrendercontext.h index a7f73a298f60..cf6504c60005 100644 --- a/src/core/symbology/qgssymbolrendercontext.h +++ b/src/core/symbology/qgssymbolrendercontext.h @@ -62,7 +62,7 @@ class CORE_EXPORT QgsSymbolRenderContext * Returns a reference to the context's render context. * \note Not available in Python bindings. */ - const QgsRenderContext &renderContext() const { return mRenderContext; } SIP_SKIP + const QgsRenderContext &renderContext() const SIP_SKIP { return mRenderContext; } /** * Sets the original value variable value for data defined symbology diff --git a/src/core/tiledscene/qgstiledscenerenderer.h b/src/core/tiledscene/qgstiledscenerenderer.h index cddb714c9e84..9fa776dff8f7 100644 --- a/src/core/tiledscene/qgstiledscenerenderer.h +++ b/src/core/tiledscene/qgstiledscenerenderer.h @@ -55,7 +55,7 @@ class CORE_EXPORT QgsTiledSceneRenderContext * Returns a reference to the context's render context. * \note Not available in Python bindings. */ - const QgsRenderContext &renderContext() const { return mRenderContext; } SIP_SKIP + const QgsRenderContext &renderContext() const SIP_SKIP { return mRenderContext; } /** * Returns the feedback object used to cancel rendering diff --git a/src/core/tiledscene/qgstiledscenerendererregistry.h b/src/core/tiledscene/qgstiledscenerendererregistry.h index d55de314b49b..382fb5a53503 100644 --- a/src/core/tiledscene/qgstiledscenerendererregistry.h +++ b/src/core/tiledscene/qgstiledscenerendererregistry.h @@ -147,12 +147,12 @@ class CORE_EXPORT QgsTiledSceneRendererMetadata : public QgsTiledSceneRendererAb #endif //! \note not available in Python bindings - QgsTiledSceneRendererCreateFunc createFunction() const { return mCreateFunc; } SIP_SKIP + QgsTiledSceneRendererCreateFunc createFunction() const SIP_SKIP { return mCreateFunc; } //! \note not available in Python bindings - QgsTiledSceneRendererWidgetFunc widgetFunction() const { return mWidgetFunc; } SIP_SKIP + QgsTiledSceneRendererWidgetFunc widgetFunction() const SIP_SKIP { return mWidgetFunc; } //! \note not available in Python bindings - void setWidgetFunction( QgsTiledSceneRendererWidgetFunc f ) { mWidgetFunc = f; } SIP_SKIP + void setWidgetFunction( QgsTiledSceneRendererWidgetFunc f ) SIP_SKIP { mWidgetFunc = f; } protected: //! pointer to function that creates an instance of the renderer when loading project / style diff --git a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h index ad58f193abbe..d650efbe84bf 100644 --- a/src/gui/editorwidgets/core/qgseditorwidgetfactory.h +++ b/src/gui/editorwidgets/core/qgseditorwidgetfactory.h @@ -106,7 +106,7 @@ class GUI_EXPORT QgsEditorWidgetFactory * \returns A map of widget type names and weight values * \note not available in Python bindings */ - virtual QHash supportedWidgetTypes() { return QHash(); } SIP_SKIP + virtual QHash supportedWidgetTypes() SIP_SKIP { return QHash(); } /** * This method allows disabling this editor widget type for a certain field. diff --git a/src/gui/editorwidgets/core/qgswidgetwrapper.h b/src/gui/editorwidgets/core/qgswidgetwrapper.h index fa868f9a09c5..d80f09ed0cc8 100644 --- a/src/gui/editorwidgets/core/qgswidgetwrapper.h +++ b/src/gui/editorwidgets/core/qgswidgetwrapper.h @@ -183,7 +183,7 @@ class GUI_EXPORT QgsWidgetWrapper : public QObject * * \note not available in Python bindings */ - QgsPropertyCollection &dataDefinedProperties() { return mPropertyCollection; } SIP_SKIP + QgsPropertyCollection &dataDefinedProperties() SIP_SKIP { return mPropertyCollection; } /** * Returns a reference to the editor widget's property collection, used for data defined overrides. diff --git a/src/gui/processing/qgsprocessingtoolboxmodel.h b/src/gui/processing/qgsprocessingtoolboxmodel.h index 60cb1b15ece5..11948fe423a3 100644 --- a/src/gui/processing/qgsprocessingtoolboxmodel.h +++ b/src/gui/processing/qgsprocessingtoolboxmodel.h @@ -101,7 +101,7 @@ class GUI_EXPORT QgsProcessingToolboxModelNode : public QObject * Returns a list of children belonging to the node. * \note Not available in Python bindings */ - QList children() const { return mChildren; } SIP_SKIP + QList children() const SIP_SKIP { return mChildren; } /** * Removes the specified \a node from this node's children, and gives diff --git a/src/gui/qgsexpressionstoredialog.h b/src/gui/qgsexpressionstoredialog.h index 13852aecf58c..6f016d8f690f 100644 --- a/src/gui/qgsexpressionstoredialog.h +++ b/src/gui/qgsexpressionstoredialog.h @@ -62,7 +62,7 @@ class GUI_EXPORT QgsExpressionStoreDialog : public QDialog, private Ui::QgsExpre * Returns whether the label text was modified either manually by the user, * or automatically because it contained slashes or leading/trailing whitespace characters */ - bool isLabelModified() const { return mLabel->text() != mOriginalLabel; } SIP_SKIP + bool isLabelModified() const SIP_SKIP { return mLabel->text() != mOriginalLabel; } private: diff --git a/src/gui/qgsmapcanvas.h b/src/gui/qgsmapcanvas.h index d31cce06d9a9..1358c4d9b36c 100644 --- a/src/gui/qgsmapcanvas.h +++ b/src/gui/qgsmapcanvas.h @@ -766,7 +766,7 @@ class GUI_EXPORT QgsMapCanvas : public QGraphicsView, public QgsExpressionContex * \see defaultExpressionContextScope() * \note not available in Python bindings */ - const QgsExpressionContextScope &expressionContextScope() const { return mExpressionContextScope; } SIP_SKIP + const QgsExpressionContextScope &expressionContextScope() const SIP_SKIP { return mExpressionContextScope; } /** * Creates a new scope which contains default variables and functions relating to the map canvas. diff --git a/src/gui/qgsmapcanvasannotationitem.h b/src/gui/qgsmapcanvasannotationitem.h index a652130a27bd..98faeddbd3bc 100644 --- a/src/gui/qgsmapcanvasannotationitem.h +++ b/src/gui/qgsmapcanvasannotationitem.h @@ -78,7 +78,7 @@ class GUI_EXPORT QgsMapCanvasAnnotationItem: public QObject, public QgsMapCanvas * Returns the item's annotation. * \note not available in Python bindings */ - const QgsAnnotation *annotation() const { return mAnnotation; } SIP_SKIP + const QgsAnnotation *annotation() const SIP_SKIP { return mAnnotation; } /** * Returns the item's annotation. diff --git a/src/gui/qgsoptionswidgetfactory.h b/src/gui/qgsoptionswidgetfactory.h index d9bc053aad38..d2cfd9b4b841 100644 --- a/src/gui/qgsoptionswidgetfactory.h +++ b/src/gui/qgsoptionswidgetfactory.h @@ -55,7 +55,7 @@ class GUI_EXPORT QgsOptionsPageWidget : public QWidget * Returns the registered highlight widgets used to search and highlight text in * options dialogs. */ - QHash registeredHighlightWidgets() {return mHighlightWidgets;} SIP_SKIP + QHash registeredHighlightWidgets() SIP_SKIP {return mHighlightWidgets;} /** * Validates the current state of the widget. diff --git a/src/gui/qgspropertyassistantwidget.h b/src/gui/qgspropertyassistantwidget.h index a022bfdcc00e..84b257c8a5c0 100644 --- a/src/gui/qgspropertyassistantwidget.h +++ b/src/gui/qgspropertyassistantwidget.h @@ -145,7 +145,7 @@ class GUI_EXPORT QgsPropertyAssistantWidget : public QgsPanelWidget, private Ui: * created symbols will be used instead. * \note not available in Python bindings */ - void setSymbol( std::shared_ptr< QgsSymbol > symbol ) { mSymbol = symbol; updatePreview(); } SIP_SKIP + void setSymbol( std::shared_ptr< QgsSymbol > symbol ) SIP_SKIP { mSymbol = symbol; updatePreview(); } void setDockMode( bool dockMode ) override; diff --git a/src/gui/qgspropertyoverridebutton.h b/src/gui/qgspropertyoverridebutton.h index 3ef21f18ec32..4e17b846691e 100644 --- a/src/gui/qgspropertyoverridebutton.h +++ b/src/gui/qgspropertyoverridebutton.h @@ -219,7 +219,7 @@ class GUI_EXPORT QgsPropertyOverrideButton: public QToolButton * by the widget. If not specified, a default created symbol will be used instead. * \note not available in Python bindings */ - void setSymbol( std::shared_ptr< QgsSymbol > symbol ) { mSymbol = symbol; } SIP_SKIP + void setSymbol( std::shared_ptr< QgsSymbol > symbol ) SIP_SKIP { mSymbol = symbol; } public slots: