Skip to content

Commit 29dd519

Browse files
committed
introduce SIP_SKIP in headers
based on the docstrings 'not available in Python bindings'
1 parent cc887c6 commit 29dd519

File tree

80 files changed

+311
-232
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

80 files changed

+311
-232
lines changed

src/analysis/interpolation/DualEdgeTriangulation.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define DUALEDGETRIANGULATION_H
1919

2020
#include "Triangulation.h"
21+
#include "qgis_sip.h"
2122
#include "HalfEdge.h"
2223
#include <QVector>
2324
#include <QList>
@@ -60,7 +61,7 @@ class ANALYSIS_EXPORT DualEdgeTriangulation: public Triangulation
6061
int getOppositePoint( int p1, int p2 ) override;
6162
//! Finds out, in which triangle the point with coordinates x and y is and assigns the numbers of the vertices to 'n1', 'n2' and 'n3' and the vertices to 'p1', 'p2' and 'p3'
6263
//! \note not available in Python bindings
63-
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1, Point3D *p2, int *n2, Point3D *p3, int *n3 ) override;
64+
virtual bool getTriangle( double x, double y, Point3D *p1, int *n1, Point3D *p2, int *n2, Point3D *p3, int *n3 ) override SIP_SKIP;
6465
//! Finds out, in which triangle the point with coordinates x and y is and assigns addresses to the points at the vertices to 'p1', 'p2' and 'p3
6566
virtual bool getTriangle( double x, double y, Point3D *p1, Point3D *p2, Point3D *p3 ) override;
6667
//! Returns a pointer to a value list with the information of the triangles surrounding (counterclockwise) a point. Four integer values describe a triangle, the first three are the number of the half edges of the triangle and the fourth is -10, if the third (and most counterclockwise) edge is a breakline, and -20 otherwise. The value list has to be deleted by the code which called the method

src/analysis/interpolation/NormVecDecorator.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define NORMVECDECORATOR_H
1919

2020
#include "TriDecorator.h"
21+
#include "qgis_sip.h"
2122
#include "qgis.h"
2223
#include <TriangleInterpolator.h>
2324
#include <MathUtils.h>
@@ -58,7 +59,7 @@ class ANALYSIS_EXPORT NormVecDecorator: public TriDecorator
5859
/** This function behaves similar to the one above. Additionally, the numbers of the points are returned (ptn1, ptn2, ptn3) as well as the PointStates of the triangle points (state1, state2, state3)
5960
* \note not available in Python bindings
6061
*/
61-
bool getTriangle( double x, double y, Point3D *p1, int *ptn1, Vector3D *v1, PointState *state1, Point3D *p2, int *ptn2, Vector3D *v2, PointState *state2, Point3D *p3, int *ptn3, Vector3D *v3, PointState *state3 );
62+
bool getTriangle( double x, double y, Point3D *p1, int *ptn1, Vector3D *v1, PointState *state1, Point3D *p2, int *ptn2, Vector3D *v2, PointState *state2, Point3D *p3, int *ptn3, Vector3D *v3, PointState *state3 ) SIP_SKIP;
6263
//! Returns the state of the point with the number 'pointno'
6364
PointState getState( int pointno ) const;
6465
//! Sets an interpolator

src/analysis/interpolation/qgsinterpolator.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define QGSINTERPOLATOR_H
2020

2121
#include <QVector>
22+
#include "qgis_sip.h"
2223
#include "qgis_analysis.h"
2324

2425
class QgsVectorLayer;
@@ -67,7 +68,7 @@ class ANALYSIS_EXPORT QgsInterpolator
6768
virtual int interpolatePoint( double x, double y, double &result ) = 0;
6869

6970
//! \note not available in Python bindings
70-
QList<LayerData> layerData() const { return mLayerData; }
71+
QList<LayerData> layerData() const { return mLayerData; } SIP_SKIP
7172

7273
protected:
7374

src/analysis/openstreetmap/qgsosmdatabase.h

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#define OSMDATABASE_H
1818

1919
#include <QString>
20+
#include "qgis_sip.h"
2021
#include <QStringList>
2122

2223
#include "qgsosmbase.h"
@@ -70,10 +71,10 @@ class ANALYSIS_EXPORT QgsOSMDatabase
7071
int countWays() const;
7172

7273
//! \note not available in Python bindings
73-
QgsOSMNodeIterator listNodes() const;
74+
QgsOSMNodeIterator listNodes() const SIP_SKIP;
7475

7576
//! \note not available in Python bindings
76-
QgsOSMWayIterator listWays() const;
77+
QgsOSMWayIterator listWays() const SIP_SKIP;
7778

7879
QgsOSMNode node( QgsOSMId id ) const;
7980
QgsOSMWay way( QgsOSMId id ) const;
@@ -100,7 +101,7 @@ class ANALYSIS_EXPORT QgsOSMDatabase
100101
/**
101102
* \note not available in Python bindings
102103
*/
103-
void deleteStatement( sqlite3_stmt *&stmt );
104+
void deleteStatement( sqlite3_stmt *&stmt ) SIP_SKIP;
104105

105106
void exportSpatiaLiteNodes( const QString &tableName, const QStringList &tagKeys, const QStringList &notNullTagKeys = QStringList() );
106107
void exportSpatiaLiteWays( bool closed, const QString &tableName, const QStringList &tagKeys, const QStringList &notNullTagKeys = QStringList() );
@@ -145,7 +146,7 @@ class ANALYSIS_EXPORT QgsOSMNodeIterator // clazy:exclude=rule-of-three
145146

146147
/** \note not available in Python bindings
147148
*/
148-
QgsOSMNodeIterator( sqlite3 *handle );
149+
QgsOSMNodeIterator( sqlite3 *handle ) SIP_SKIP;
149150

150151
sqlite3_stmt *mStmt = nullptr;
151152

@@ -171,7 +172,7 @@ class ANALYSIS_EXPORT QgsOSMWayIterator // clazy:exclude=rule-of-three
171172

172173
/** \note not available in Python bindings
173174
*/
174-
QgsOSMWayIterator( sqlite3 *handle );
175+
QgsOSMWayIterator( sqlite3 *handle ) SIP_SKIP;
175176

176177
sqlite3_stmt *mStmt = nullptr;
177178

src/analysis/openstreetmap/qgsosmimport.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#define OSMIMPORT_H
1818

1919
#include <QFile>
20+
#include "qgis_sip.h"
2021
#include <QObject>
2122

2223
#include "qgsosmbase.h"
@@ -72,7 +73,7 @@ class ANALYSIS_EXPORT QgsOSMXmlImport : public QObject
7273
bool closeDatabase();
7374

7475
//! \note not available in Python bindings
75-
void deleteStatement( sqlite3_stmt *&stmt );
76+
void deleteStatement( sqlite3_stmt *&stmt ) SIP_SKIP;
7677

7778
bool createIndexes();
7879

src/analysis/raster/qgsrastercalcnode.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
#define QGSRASTERCALCNODE_H
2121

2222
#include <QMap>
23+
#include "qgis_sip.h"
2324
#include "qgis.h"
2425
#include <QString>
2526
#include "qgis_analysis.h"
@@ -97,7 +98,7 @@ class ANALYSIS_EXPORT QgsRasterCalcNode
9798
* \since QGIS 2.10
9899
* \note not available in Python bindings
99100
*/
100-
bool calculate( QMap<QString, QgsRasterBlock * > &rasterData, QgsRasterMatrix &result, int row = -1 ) const;
101+
bool calculate( QMap<QString, QgsRasterBlock * > &rasterData, QgsRasterMatrix &result, int row = -1 ) const SIP_SKIP;
101102

102103
static QgsRasterCalcNode *parseRasterCalcString( const QString &str, QString &parserErrorMsg ) SIP_FACTORY;
103104

src/analysis/raster/qgsrastermatrix.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define QGSRASTERMATRIX_H
2020

2121
#include "qgis_analysis.h"
22+
#include "qgis_sip.h"
2223

2324
/** \ingroup analysis
2425
* \class QgsRasterMatrix
@@ -71,10 +72,10 @@ class ANALYSIS_EXPORT QgsRasterMatrix
7172

7273
//! Returns data array (but not ownership)
7374
//! \note not available in Python bindings
74-
double *data() { return mData; }
75+
double *data() { return mData; } SIP_SKIP
7576
//! Returns data and ownership. Sets data and nrows, ncols of this matrix to 0
7677
//! \note not available in Python bindings
77-
double *takeData();
78+
double *takeData() SIP_SKIP;
7879

7980
void setData( int cols, int rows, double *data, double nodataValue );
8081

src/core/auth/qgsauthcertutils.h

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define QGSAUTHCERTUTILS_H
2020

2121
#include <QFile>
22+
#include "qgis_sip.h"
2223
#include <QtCrypto>
2324
#include <QSslCertificate>
2425
#include <QSslError>
@@ -88,7 +89,7 @@ class CORE_EXPORT QgsAuthCertUtils
8889
/** Map certificates to their oraganization.
8990
* \note not available in Python bindings
9091
*/
91-
static QMap< QString, QList<QSslCertificate> > certsGroupedByOrg( const QList<QSslCertificate> &certs );
92+
static QMap< QString, QList<QSslCertificate> > certsGroupedByOrg( const QList<QSslCertificate> &certs ) SIP_SKIP;
9293

9394
/** Map SSL custom configs' certificate sha1 to custom config as simple cache
9495
*/
@@ -97,7 +98,7 @@ class CORE_EXPORT QgsAuthCertUtils
9798
/** Map SSL custom configs' certificates to their oraganization.
9899
* \note not available in Python bindings
99100
*/
100-
static QMap< QString, QList<QgsAuthConfigSslServer> > sslConfigsGroupedByOrg( const QList<QgsAuthConfigSslServer> &configs );
101+
static QMap< QString, QList<QgsAuthConfigSslServer> > sslConfigsGroupedByOrg( const QList<QgsAuthConfigSslServer> &configs ) SIP_SKIP;
101102

102103
//! Return list of concatenated certs from a PEM or DER formatted file
103104
static QList<QSslCertificate> certsFromFile( const QString &certspath );
@@ -163,7 +164,7 @@ class CORE_EXPORT QgsAuthCertUtils
163164
*/
164165
static QString getCertDistinguishedName( const QSslCertificate &qcert,
165166
const QCA::Certificate &acert = QCA::Certificate(),
166-
bool issuer = false );
167+
bool issuer = false ) SIP_SKIP;
167168

168169
//! Get the general name for certificate trust
169170
static QString getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust );
@@ -180,37 +181,37 @@ class CORE_EXPORT QgsAuthCertUtils
180181
/** Convert a QSslCertificate to a QCA::Certificate.
181182
* \note not available in Python bindings
182183
*/
183-
static QCA::Certificate qtCertToQcaCert( const QSslCertificate &cert );
184+
static QCA::Certificate qtCertToQcaCert( const QSslCertificate &cert ) SIP_SKIP;
184185

185186
/** Convert a QList of QSslCertificate to a QCA::CertificateCollection.
186187
* \note not available in Python bindings
187188
*/
188-
static QCA::CertificateCollection qtCertsToQcaCollection( const QList<QSslCertificate> &certs );
189+
static QCA::CertificateCollection qtCertsToQcaCollection( const QList<QSslCertificate> &certs ) SIP_SKIP;
189190

190191
/** PKI key/cert bundle from file path, e.g. from .p12 or pfx files.
191192
* \note not available in Python bindings
192193
*/
193-
static QCA::KeyBundle qcaKeyBundle( const QString &path, const QString &pass );
194+
static QCA::KeyBundle qcaKeyBundle( const QString &path, const QString &pass ) SIP_SKIP;
194195

195196
/** Certificate validity check messages per enum.
196197
* \note not available in Python bindings
197198
*/
198-
static QString qcaValidityMessage( QCA::Validity validity );
199+
static QString qcaValidityMessage( QCA::Validity validity ) SIP_SKIP;
199200

200201
/** Certificate signature algorithm strings per enum.
201202
* \note not available in Python bindings
202203
*/
203-
static QString qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm );
204+
static QString qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm ) SIP_SKIP;
204205

205206
/** Certificate well-known constraint strings per enum.
206207
* \note not available in Python bindings
207208
*/
208-
static QString qcaKnownConstraint( QCA::ConstraintTypeKnown constraint );
209+
static QString qcaKnownConstraint( QCA::ConstraintTypeKnown constraint ) SIP_SKIP;
209210

210211
/** Certificate usage type strings per enum
211212
* \note not available in Python bindings
212213
*/
213-
static QString certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype );
214+
static QString certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype ) SIP_SKIP;
214215

215216
//! Try to determine the certificates usage types
216217
static QList<QgsAuthCertUtils::CertUsageType> certificateUsageTypes( const QSslCertificate &cert );
@@ -236,7 +237,7 @@ class CORE_EXPORT QgsAuthCertUtils
236237
/** Get short strings describing SSL errors.
237238
* \note not available in Python bindings
238239
*/
239-
static QList<QPair<QSslError::SslError, QString> > sslErrorEnumStrings();
240+
static QList<QPair<QSslError::SslError, QString> > sslErrorEnumStrings() SIP_SKIP;
240241

241242
private:
242243
static void appendDirSegment_( QStringList &dirname, const QString &segment, QString value );

src/core/auth/qgsauthmanager.h

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#define QGSAUTHMANAGER_H
1919

2020
#include "qgis_core.h"
21+
#include "qgis_sip.h"
2122
#include <QObject>
2223
#include <QMutex>
2324
#include <QNetworkReply>
@@ -146,7 +147,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
146147
/** Whether there is a scheduled opitonal erase of authentication database.
147148
* \note not available in Python bindings
148149
*/
149-
bool scheduledAuthDatabaseErase() { return mScheduledDbErase; }
150+
bool scheduledAuthDatabaseErase() { return mScheduledDbErase; } SIP_SKIP
150151

151152
/** Schedule an optional erase of authentication database, starting when mutex is lockable.
152153
* \note When an erase is scheduled, any attempt to set the master password,
@@ -159,7 +160,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
159160
* if no access to user interaction occurs wihtin 90 seconds, it cancels the schedule.
160161
* \note not available in Python bindings
161162
*/
162-
void setScheduledAuthDatabaseErase( bool scheduleErase );
163+
void setScheduledAuthDatabaseErase( bool scheduleErase ) SIP_SKIP;
163164

164165
/** Re-emit a signal to schedule an optional erase of authentication database.
165166
* \note This can be called from the slot connected to a previously emitted scheduling signal,
@@ -210,7 +211,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
210211
* \param dataprovider Provider key filter, returning only methods that support a particular provider
211212
* \note not available in Python bindings
212213
*/
213-
QgsAuthMethodsMap authMethodsMap( const QString &dataprovider = QString() );
214+
QgsAuthMethodsMap authMethodsMap( const QString &dataprovider = QString() ) SIP_SKIP;
214215

215216
/**
216217
* Get authentication method edit widget via its key
@@ -358,7 +359,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
358359
/** Get a certificate identity bundle by id (sha hash).
359360
* \note not available in Python bindings
360361
*/
361-
const QPair<QSslCertificate, QSslKey> getCertIdentityBundle( const QString &id );
362+
const QPair<QSslCertificate, QSslKey> getCertIdentityBundle( const QString &id ) SIP_SKIP;
362363

363364
//! Get a certificate identity bundle by id (sha hash) returned as PEM text
364365
const QStringList getCertIdentityBundleToPem( const QString &id );
@@ -397,7 +398,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
397398
/** Get ignored SSL error cache, keyed with cert/connection's sha:host:port.
398399
* \note not available in Python bindings
399400
*/
400-
QHash<QString, QSet<QSslError::SslError> > getIgnoredSslErrorCache() { return mIgnoredSslErrorsCache; }
401+
QHash<QString, QSet<QSslError::SslError> > getIgnoredSslErrorCache() { return mIgnoredSslErrorsCache; } SIP_SKIP
401402

402403
//! Utility function to dump the cache for debug purposes
403404
void dumpIgnoredSslErrorsCache_();
@@ -442,7 +443,7 @@ class CORE_EXPORT QgsAuthManager : public QObject
442443
/** Get all CA certs mapped to their sha1 from cache.
443444
* \note not available in Python bindings
444445
*/
445-
const QMap<QString, QPair<QgsAuthCertUtils::CaCertSource, QSslCertificate> > getCaCertsCache()
446+
const QMap<QString, QPair<QgsAuthCertUtils::CaCertSource, QSslCertificate> > getCaCertsCache() SIP_SKIP
446447
{
447448
return mCaCertsCache;
448449
}
@@ -501,31 +502,31 @@ class CORE_EXPORT QgsAuthManager : public QObject
501502

502503
//! Error message getter
503504
//! @note not available in Python bindings
504-
const QString passwordHelperErrorMessage() { return mPasswordHelperErrorMessage; }
505+
const QString passwordHelperErrorMessage() { return mPasswordHelperErrorMessage; } SIP_SKIP
505506

506507
//! Delete master password from wallet
507508
//! @note not available in Python bindings
508-
bool passwordHelperDelete();
509+
bool passwordHelperDelete() SIP_SKIP;
509510

510511
//! Password helper enabled getter
511512
//! @note not available in Python bindings
512-
bool passwordHelperEnabled() const;
513+
bool passwordHelperEnabled() const SIP_SKIP;
513514

514515
//! Password helper enabled setter
515516
//! @note not available in Python bindings
516-
void setPasswordHelperEnabled( const bool enabled );
517+
void setPasswordHelperEnabled( const bool enabled ) SIP_SKIP;
517518

518519
//! Password helper logging enabled getter
519520
//! @note not available in Python bindings
520-
bool passwordHelperLoggingEnabled() const;
521+
bool passwordHelperLoggingEnabled() const SIP_SKIP;
521522

522523
//! Password helper logging enabled setter
523524
//! @note not available in Python bindings
524-
void setPasswordHelperLoggingEnabled( const bool enabled );
525+
void setPasswordHelperLoggingEnabled( const bool enabled ) SIP_SKIP;
525526

526527
//! Store the password manager into the wallet
527528
//! @note not available in Python bindings
528-
bool passwordHelperSync( );
529+
bool passwordHelperSync( ) SIP_SKIP;
529530

530531
//! The display name of the password helper (platform dependent)
531532
static const QString AUTH_PASSWORD_HELPER_DISPLAY_NAME;

src/core/composer/qgscomposerattributetablev2.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#define QGSCOMPOSERATTRIBUTETABLEV2_H
2020

2121
#include "qgis_core.h"
22+
#include "qgis_sip.h"
2223
#include "qgis.h"
2324
#include "qgscomposertablev2.h"
2425
#include "qgsvectorlayerref.h"
@@ -273,7 +274,7 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
273274
* if false, the attribute is sorted in descending order.
274275
* \note not available in Python bindings
275276
*/
276-
QList<QPair<int, bool> > sortAttributes() const;
277+
QList<QPair<int, bool> > sortAttributes() const SIP_SKIP;
277278

278279
/** Sets a string to wrap the contents of the table cells by. Occurrences of this string will
279280
* be replaced by a line break.
@@ -296,7 +297,7 @@ class CORE_EXPORT QgsComposerAttributeTableV2: public QgsComposerTableV2
296297
* \returns true if attributes were successfully fetched
297298
* \note not available in Python bindings
298299
*/
299-
bool getTableContents( QgsComposerTableContents &contents ) override;
300+
bool getTableContents( QgsComposerTableContents &contents ) override SIP_SKIP;
300301

301302
virtual QgsExpressionContext createExpressionContext() const override;
302303

0 commit comments

Comments
 (0)