Skip to content

Commit

Permalink
place SIP_SKIP before definition
Browse files Browse the repository at this point in the history
  • Loading branch information
3nids authored and github-actions[bot] committed Dec 4, 2024
1 parent 099f82d commit 55d5697
Show file tree
Hide file tree
Showing 38 changed files with 97 additions and 97 deletions.
2 changes: 1 addition & 1 deletion src/3d/qgs3drendercontext.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/core/auth/qgsauthmanager.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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<QString, QSet<QSslError::SslError> > ignoredSslErrorCache() { return mIgnoredSslErrorsCache; } SIP_SKIP
QHash<QString, QSet<QSslError::SslError> > ignoredSslErrorCache() SIP_SKIP { return mIgnoredSslErrorsCache; }

//! Utility function to dump the cache for debug purposes
void dumpIgnoredSslErrorsCache_();
Expand Down Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/core/callouts/qgscalloutsregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
10 changes: 5 additions & 5 deletions src/core/effects/qgspainteffectregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -119,23 +119,23 @@ 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
* \returns widget creation function
* \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
* \param f widget creation function
* \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
Expand All @@ -144,15 +144,15 @@ 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
* \returns effect properties widget
* \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;
Expand Down
58 changes: 29 additions & 29 deletions src/core/geometry/qgswkbptr.h
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
};

/**
Expand Down Expand Up @@ -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<typename T> void endian_swap( T &value ) const SIP_SKIP
Expand Down
10 changes: 5 additions & 5 deletions src/core/labeling/qgspallabeling.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand All @@ -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.
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/labeling/rules/qgslabelingenginerule.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/layertree/qgslayertreenode.h
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ class CORE_EXPORT QgsLayerTreeNode : public QObject
//! Gets list of children of the node. Children are owned by the parent
QList<QgsLayerTreeNode *> children() { return mChildren; }
//! Gets list of children of the node. Children are owned by the parent
QList<QgsLayerTreeNode *> children() const { return mChildren; } SIP_SKIP
QList<QgsLayerTreeNode *> children() const SIP_SKIP { return mChildren; }

/**
* Removes the children, disconnect all the forwarded and external signals and sets their parent to NULLPTR
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutitem.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/layout/qgslayoutobject.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/maprenderer/qgsmaprenderercustompainterjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions src/core/maprenderer/qgsmaprendererjob.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion src/core/pointcloud/qgspointcloudrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/core/pointcloud/qgspointcloudrendererregistry.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/core/processing/qgsprocessingcontext.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions src/core/qgsdiagramrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ class QgsPaintEffect;
class QgsDataDefinedSizeLegend;
class QgsLineSymbol;

namespace pal { class Layer; } SIP_SKIP
namespace pal SIP_SKIP { class Layer; }

/**
* \ingroup core
Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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.
Expand Down
Loading

0 comments on commit 55d5697

Please sign in to comment.