Skip to content

Commit 1c615c1

Browse files
committed
More documentation compliance
Use Qt style "returns .." tense instead of "return ..", and lock this in with a documentation compliance unit test
1 parent 095a324 commit 1c615c1

File tree

465 files changed

+1515
-1527
lines changed

Some content is hidden

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

465 files changed

+1515
-1527
lines changed

python/analysis/auto_generated/raster/qgsalignraster.sip.in

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -46,36 +46,36 @@ Check whether the given path is a valid raster
4646

4747
QString crs() const;
4848
%Docstring
49-
Return CRS in WKT format
49+
Returns the CRS in WKT format
5050
%End
5151
QSize rasterSize() const;
5252
%Docstring
53-
Return size of the raster grid in pixels
53+
Returns the size of the raster grid in pixels
5454
%End
5555
int bandCount() const;
5656
%Docstring
57-
Return number of raster bands in the file
57+
Returns the number of raster bands in the file
5858
%End
5959
QSizeF cellSize() const;
6060
%Docstring
61-
Return cell size in map units
61+
Returns the cell size in map units
6262
%End
6363
QPointF gridOffset() const;
6464
%Docstring
65-
Return grid offset
65+
Returns the grid offset
6666
%End
6767
QgsRectangle extent() const;
6868
%Docstring
69-
Return extent of the raster
69+
Returns the extent of the raster
7070
%End
7171
QPointF origin() const;
7272
%Docstring
73-
Return origin of the raster
73+
Returns the origin of the raster
7474
%End
7575

7676
void dump() const;
7777
%Docstring
78-
write contents of the object to standard error stream - for debugging
78+
Write contents of the object to standard error stream - for debugging
7979
%End
8080

8181
double identify( double mx, double my );
@@ -146,7 +146,7 @@ Get associated progress handler. May be None (default)
146146

147147
void setRasters( const List &list );
148148
%Docstring
149-
Set list of rasters that will be aligned
149+
Sets list of rasters that will be aligned
150150
%End
151151
List rasters() const;
152152
%Docstring
@@ -158,11 +158,11 @@ Get list of rasters that will be aligned
158158

159159
void setCellSize( double x, double y );
160160
%Docstring
161-
Set output cell size
161+
Sets output cell size
162162
%End
163163
void setCellSize( QSizeF size );
164164
%Docstring
165-
Set output cell size
165+
Sets output cell size
166166
%End
167167
QSizeF cellSize() const;
168168
%Docstring
@@ -171,7 +171,7 @@ Get output cell size
171171

172172
void setDestinationCrs( const QString &crsWkt );
173173
%Docstring
174-
Set the output CRS in WKT format
174+
Sets the output CRS in WKT format
175175
%End
176176
QString destinationCrs() const;
177177
%Docstring
@@ -224,7 +224,7 @@ Determine destination extent from the input rasters and calculate derived values
224224

225225
QSize alignedRasterSize() const;
226226
%Docstring
227-
Return expected size of the resulting aligned raster
227+
Returns the expected size of the resulting aligned raster
228228

229229
.. note::
230230

@@ -233,7 +233,7 @@ Return expected size of the resulting aligned raster
233233

234234
QgsRectangle alignedRasterExtent() const;
235235
%Docstring
236-
Return expected extent of the resulting aligned raster
236+
Returns the expected extent of the resulting aligned raster
237237

238238
.. note::
239239

@@ -249,7 +249,7 @@ Run the alignment process
249249

250250
QString errorMessage() const;
251251
%Docstring
252-
Return error from a previous run() call.
252+
Returns the error from a previous run() call.
253253
Error message is empty if run() succeeded (returned true)
254254
%End
255255

@@ -260,7 +260,7 @@ write contents of the object to standard error stream - for debugging
260260

261261
int suggestedReferenceLayer() const;
262262
%Docstring
263-
Return index of the layer which has smallest cell size (returns -1 on error)
263+
Returns the index of the layer which has smallest cell size (returns -1 on error)
264264
%End
265265

266266
protected:

python/core/auto_generated/auth/qgsauthcertutils.sip.in

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Map SSL custom configs' certificate sha1 to custom config as simple cache
8080

8181
static QByteArray fileData( const QString &path );
8282
%Docstring
83-
Return data from a local file via a read-only operation
83+
Returns data from a local file via a read-only operation
8484

8585
:param path: Path to file to read
8686

@@ -89,17 +89,17 @@ Return data from a local file via a read-only operation
8989

9090
static QList<QSslCertificate> certsFromFile( const QString &certspath );
9191
%Docstring
92-
Return list of concatenated certs from a PEM or DER formatted file
92+
Returns a list of concatenated certs from a PEM or DER formatted file
9393
%End
9494

9595
static QList<QSslCertificate> casFromFile( const QString &certspath );
9696
%Docstring
97-
Return list of concatenated CAs from a PEM or DER formatted file
97+
Returns a list of concatenated CAs from a PEM or DER formatted file
9898
%End
9999

100100
static QSslCertificate certFromFile( const QString &certpath );
101101
%Docstring
102-
Return first cert from a PEM or DER formatted file
102+
Returns the first cert from a PEM or DER formatted file
103103
%End
104104

105105
static QList<QSslCertificate> casMerge( const QList<QSslCertificate> &bundle1,
@@ -118,7 +118,7 @@ from the ``bundle2`` are appended to ``bundle1`` if not already there
118118
const QString &keypass = QString(),
119119
QString *algtype = 0 );
120120
%Docstring
121-
Return non-encrypted key from a PEM or DER formatted file
121+
Returns non-encrypted key from a PEM or DER formatted file
122122

123123
:param keypath: File path to private key
124124
:param keypass: Passphrase for private key
@@ -127,7 +127,7 @@ Return non-encrypted key from a PEM or DER formatted file
127127

128128
static QList<QSslCertificate> certsFromString( const QString &pemtext );
129129
%Docstring
130-
Return list of concatenated certs from a PEM Base64 text block
130+
Returns a list of concatenated certs from a PEM Base64 text block
131131
%End
132132

133133

@@ -145,7 +145,7 @@ Return list of concatenated certs from a PEM Base64 text block
145145
const QString &keypass = QString(),
146146
bool reencrypt = true );
147147
%Docstring
148-
Return list of certificate, private key and algorithm (as PEM text) from file path components
148+
Returns list of certificate, private key and algorithm (as PEM text) from file path components
149149

150150
:param certpath: File path to certificate
151151
:param keypath: File path to private key
@@ -170,7 +170,7 @@ Determine if the PEM-encoded text of a key is PKCS#8 format
170170
const QString &bundlepass = QString(),
171171
bool reencrypt = true );
172172
%Docstring
173-
Return list of certificate, private key and algorithm (as PEM text) for a PKCS#12 bundle
173+
Returns list of certificate, private key and algorithm (as PEM text) for a PKCS#12 bundle
174174

175175
:param bundlepath: File path to the PKCS bundle
176176
:param bundlepass: Passphrase for bundle
@@ -182,7 +182,7 @@ Return list of certificate, private key and algorithm (as PEM text) for a PKCS#1
182182
static QList<QSslCertificate> pkcs12BundleCas( const QString &bundlepath,
183183
const QString &bundlepass = QString() );
184184
%Docstring
185-
Return list of CA certificates (as QSslCertificate) for a PKCS#12 bundle
185+
Returns list of CA certificates (as QSslCertificate) for a PKCS#12 bundle
186186

187187
:param bundlepath: File path to the PKCS bundle
188188
:param bundlepass: Passphrase for bundle

python/core/auto_generated/auth/qgsauthconfig.sip.in

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Get 'authcfg' 7-character alphanumeric ID of the config
4444
%End
4545
void setId( const QString &id );
4646
%Docstring
47-
Set auth config ID
47+
Sets auth config ID
4848
%End
4949

5050
const QString name() const;
@@ -53,7 +53,7 @@ Get name of configuration
5353
%End
5454
void setName( const QString &name );
5555
%Docstring
56-
Set name of configuration
56+
Sets name of configuration
5757
%End
5858

5959
const QString uri() const;
@@ -74,7 +74,7 @@ Get version of the configuration
7474
%End
7575
void setVersion( int version );
7676
%Docstring
77-
Set version of the configuration
77+
Sets version of the configuration
7878
%End
7979

8080
bool isValid( bool validateid = false ) const;
@@ -147,15 +147,15 @@ Remove a config from map
147147

148148
QString config( const QString &key, const QString &defaultvalue = QString() ) const;
149149
%Docstring
150-
Return a config's value
150+
Returns a config's value
151151

152152
:param key: Config key
153153
:param defaultvalue: Default value, if key not found
154154
%End
155155

156156
QStringList configList( const QString &key ) const;
157157
%Docstring
158-
Return a config's list of values
158+
Returns a config's list of values
159159

160160
:param key:
161161
%End
@@ -261,7 +261,7 @@ Client certificate object
261261
%End
262262
void setClientCert( const QSslCertificate &cert );
263263
%Docstring
264-
Set client certificate object
264+
Sets client certificate object
265265
%End
266266

267267
const QSslKey clientKey() const;
@@ -270,7 +270,7 @@ Private key object
270270
%End
271271
void setClientKey( const QSslKey &certkey );
272272
%Docstring
273-
Set private key object
273+
Sets private key object
274274
%End
275275

276276
const QList<QSslCertificate> caChain() const;
@@ -279,7 +279,7 @@ Chain of Certificate Authorities for client certificate
279279
%End
280280
void setCaChain( const QList<QSslCertificate> &cachain );
281281
%Docstring
282-
Set chain of Certificate Authorities for client certificate
282+
Sets chain of Certificate Authorities for client certificate
283283
%End
284284

285285
};
@@ -321,7 +321,7 @@ Authentication method configuration
321321

322322
void setConfig( const QgsAuthMethodConfig &config );
323323
%Docstring
324-
Set authentication method configuration
324+
Sets authentication method configuration
325325
%End
326326

327327
const QSslCertificate clientCert() const;
@@ -331,7 +331,7 @@ Client certificate object
331331

332332
void setClientCert( const QSslCertificate &cert );
333333
%Docstring
334-
Set client certificate object
334+
Sets client certificate object
335335
%End
336336

337337
const QSslKey clientCertKey() const;
@@ -341,7 +341,7 @@ Private key object
341341

342342
void setClientCertKey( const QSslKey &certkey );
343343
%Docstring
344-
Set private key object
344+
Sets private key object
345345
%End
346346

347347
QList<QSslCertificate> caChain() const;
@@ -432,7 +432,7 @@ Server certificate object
432432
%End
433433
void setSslCertificate( const QSslCertificate &cert );
434434
%Docstring
435-
Set server certificate object
435+
Sets server certificate object
436436
%End
437437

438438
const QString sslHostPort() const;
@@ -441,7 +441,7 @@ Server host:port string
441441
%End
442442
void setSslHostPort( const QString &hostport );
443443
%Docstring
444-
Set server host:port string
444+
Sets server host:port string
445445
%End
446446

447447
QSsl::SslProtocol sslProtocol() const;
@@ -450,7 +450,7 @@ SSL server protocol to use in connections
450450
%End
451451
void setSslProtocol( QSsl::SslProtocol protocol );
452452
%Docstring
453-
Set SSL server protocol to use in connections
453+
Sets SSL server protocol to use in connections
454454
%End
455455

456456
const QList<QSslError> sslIgnoredErrors() const;
@@ -463,7 +463,7 @@ SSL server errors (as enum list) to ignore in connections
463463
%End
464464
void setSslIgnoredErrorEnums( const QList<QSslError::SslError> &errors );
465465
%Docstring
466-
Set SSL server errors (as enum list) to ignore in connections
466+
Sets SSL server errors (as enum list) to ignore in connections
467467
%End
468468

469469
QSslSocket::PeerVerifyMode sslPeerVerifyMode() const;
@@ -472,7 +472,7 @@ SSL client's peer verify mode to use in connections
472472
%End
473473
void setSslPeerVerifyMode( QSslSocket::PeerVerifyMode mode );
474474
%Docstring
475-
Set SSL client's peer verify mode to use in connections
475+
Sets SSL client's peer verify mode to use in connections
476476
%End
477477

478478
int sslPeerVerifyDepth() const;
@@ -499,7 +499,7 @@ Version of the configuration (used for future upgrading)
499499
%End
500500
void setVersion( int version );
501501
%Docstring
502-
Set version of the configuration (used for future upgrading)
502+
Sets version of the configuration (used for future upgrading)
503503
%End
504504

505505
int qtVersion() const;
@@ -508,7 +508,7 @@ Qt version when the configuration was made (SSL protocols may differ)
508508
%End
509509
void setQtVersion( int version );
510510
%Docstring
511-
Set Qt version when the configuration was made (SSL protocols may differ)
511+
Sets Qt version when the configuration was made (SSL protocols may differ)
512512
%End
513513

514514
const QString configString() const;

python/core/auto_generated/auth/qgsauthmanager.sip.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ and to utilize configurations through various authentication method plugins
5050

5151
QSqlDatabase authDatabaseConnection() const;
5252
%Docstring
53-
Set up the application instance of the authentication database connection
53+
Sets up the application instance of the authentication database connection
5454
%End
5555

5656
const QString authDatabaseConfigTable() const;
@@ -244,14 +244,14 @@ Verify if provided authentication id is unique
244244

245245
bool hasConfigId( const QString &txt ) const;
246246
%Docstring
247-
Return whether a string includes an authcfg ID token
247+
Returns whether a string includes an authcfg ID token
248248

249249
:param txt: String to check
250250
%End
251251

252252
QString configIdRegex() const;
253253
%Docstring
254-
Return regular expression for authcfg=.{7} key/value token for authentication ids
254+
Returns the regular expression for authcfg=.{7} key/value token for authentication ids
255255
%End
256256

257257
QStringList configIds() const;
@@ -646,7 +646,7 @@ Remove a certificate authority
646646

647647
bool setDefaultCertTrustPolicy( QgsAuthCertUtils::CertTrustPolicy policy );
648648
%Docstring
649-
Set the default certificate trust policy perferred by user
649+
Sets the default certificate trust policy perferred by user
650650
%End
651651

652652
QgsAuthCertUtils::CertTrustPolicy defaultCertTrustPolicy();

0 commit comments

Comments
 (0)