Skip to content

Commit 1ff02de

Browse files
dakcartodakcarto
committedSep 22, 2015
[auth system] Fix doc string warnings and comments in PR 2330
·
ltr-3_40archive/master_2
1 parent 16ac248 commit 1ff02de

34 files changed

+436
-212
lines changed
 

‎python/core/auth/qgsauthcertutils.sip

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -43,85 +43,85 @@ class QgsAuthCertUtils
4343

4444

4545

46-
static const QString getSslProtocolName( QSsl::SslProtocol protocol );
46+
static QString getSslProtocolName( QSsl::SslProtocol protocol );
4747

4848

49-
static const QMap< QString, QSslCertificate> mapDigestToCerts( QList<QSslCertificate> certs );
49+
static QMap< QString, QSslCertificate> mapDigestToCerts( QList<QSslCertificate> certs );
5050

5151

52-
// static const QMap< QString, QList<QSslCertificate> > certsGroupedByOrg( QList<QSslCertificate> certs );
52+
// static QMap< QString, QList<QSslCertificate> > certsGroupedByOrg( QList<QSslCertificate> certs );
5353

5454

55-
static const QMap< QString, QgsAuthConfigSslServer> mapDigestToSslConfigs( QList<QgsAuthConfigSslServer> configs );
55+
static QMap< QString, QgsAuthConfigSslServer> mapDigestToSslConfigs( QList<QgsAuthConfigSslServer> configs );
5656

5757

58-
// static const QMap< QString, QList<QgsAuthConfigSslServer> > sslConfigsGroupedByOrg( QList<QgsAuthConfigSslServer> configs );
58+
// static QMap< QString, QList<QgsAuthConfigSslServer> > sslConfigsGroupedByOrg( QList<QgsAuthConfigSslServer> configs );
5959

6060

61-
static const QList<QSslCertificate> certsFromFile( const QString &certspath );
61+
static QList<QSslCertificate> certsFromFile( const QString &certspath );
6262

6363

64-
static const QSslCertificate certFromFile( const QString &certpath );
64+
static QSslCertificate certFromFile( const QString &certpath );
6565

6666

67-
static const QSslKey keyFromFile( const QString &keypath,
68-
const QString &keypass = QString(),
69-
QString *algtype = 0 );
67+
static QSslKey keyFromFile( const QString &keypath,
68+
const QString &keypass = QString(),
69+
QString *algtype = 0 );
7070

7171

72-
static const QList<QSslCertificate> certsFromString( const QString &pemtext );
72+
static QList<QSslCertificate> certsFromString( const QString &pemtext );
7373

7474

75-
static const QStringList certKeyBundleToPem( const QString &certpath,
76-
const QString &keypath,
77-
const QString &keypass = QString(),
78-
bool reencrypt = true );
75+
static QStringList certKeyBundleToPem( const QString &certpath,
76+
const QString &keypath,
77+
const QString &keypass = QString(),
78+
bool reencrypt = true );
7979

8080

81-
static const QStringList pkcs12BundleToPem( const QString &bundlepath,
82-
const QString &bundlepass = QString(),
83-
bool reencrypt = true );
81+
static QStringList pkcs12BundleToPem( const QString &bundlepath,
82+
const QString &bundlepass = QString(),
83+
bool reencrypt = true );
8484

8585

86-
static const QString getCaSourceName( QgsAuthCertUtils::CaCertSource source , bool single = false );
86+
static QString getCaSourceName( QgsAuthCertUtils::CaCertSource source , bool single = false );
8787

8888

89-
static const QString resolvedCertName( const QSslCertificate& cert, bool issuer = false );
89+
static QString resolvedCertName( const QSslCertificate& cert, bool issuer = false );
9090

9191

92-
// static const QString getCertDistinguishedName( const QSslCertificate& qcert,
92+
// static QString getCertDistinguishedName( const QSslCertificate& qcert,
9393
// const QCA::Certificate& acert = QCA::Certificate(),
9494
// bool issuer = false );
9595

9696

97-
static const QString getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust );
97+
static QString getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust );
9898

9999

100-
static const QString getColonDelimited( const QString& txt );
100+
static QString getColonDelimited( const QString& txt );
101101

102102

103-
static const QString shaHexForCert( const QSslCertificate &cert , bool formatted = false );
103+
static QString shaHexForCert( const QSslCertificate &cert , bool formatted = false );
104104

105105

106-
// static const QCA::Certificate qtCertToQcaCert( const QSslCertificate& cert );
106+
// static QCA::Certificate qtCertToQcaCert( const QSslCertificate& cert );
107107

108108

109-
// static const QCA::CertificateCollection qtCertsToQcaCollection( const QList<QSslCertificate>& certs );
109+
// static QCA::CertificateCollection qtCertsToQcaCollection( const QList<QSslCertificate>& certs );
110110

111111

112-
// static const QCA::KeyBundle qcaKeyBundle( const QString &path, const QString &pass );
112+
// static QCA::KeyBundle qcaKeyBundle( const QString &path, const QString &pass );
113113

114114

115-
// static const QString qcaValidityMessage( QCA::Validity validity );
115+
// static QString qcaValidityMessage( QCA::Validity validity );
116116

117117

118-
// static const QString qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm );
118+
// static QString qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm );
119119

120120

121-
// static const QString qcaKnownConstraint( QCA::ConstraintTypeKnown constraint );
121+
// static QString qcaKnownConstraint( QCA::ConstraintTypeKnown constraint );
122122

123123

124-
static const QString certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype );
124+
static QString certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype );
125125

126126

127127
static QList<QgsAuthCertUtils::CertUsageType> certificateUsageTypes( const QSslCertificate& cert );
@@ -141,7 +141,7 @@ class QgsAuthCertUtils
141141

142142
static bool certificateIsSslClient( const QSslCertificate& cert );
143143

144-
static const QString sslErrorEnumString( QSslError::SslError errenum );
144+
static QString sslErrorEnumString( QSslError::SslError errenum );
145145

146-
// static const QList<QPair<QSslError::SslError, QString> > sslErrorEnumStrings();
146+
// static QList<QPair<QSslError::SslError, QString> > sslErrorEnumStrings();
147147
};

‎src/core/auth/qgsauthcertutils.cpp

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
#include "qgslogger.h"
2626

2727

28-
const QString QgsAuthCertUtils::getSslProtocolName( QSsl::SslProtocol protocol )
28+
QString QgsAuthCertUtils::getSslProtocolName( QSsl::SslProtocol protocol )
2929
{
3030
switch ( protocol )
3131
{
@@ -46,7 +46,7 @@ const QString QgsAuthCertUtils::getSslProtocolName( QSsl::SslProtocol protocol )
4646
}
4747
}
4848

49-
const QMap<QString, QSslCertificate> QgsAuthCertUtils::mapDigestToCerts( QList<QSslCertificate> certs )
49+
QMap<QString, QSslCertificate> QgsAuthCertUtils::mapDigestToCerts( QList<QSslCertificate> certs )
5050
{
5151
QMap<QString, QSslCertificate> digestmap;
5252
Q_FOREACH ( QSslCertificate cert, certs )
@@ -56,7 +56,7 @@ const QMap<QString, QSslCertificate> QgsAuthCertUtils::mapDigestToCerts( QList<Q
5656
return digestmap;
5757
}
5858

59-
const QMap<QString, QList<QSslCertificate> > QgsAuthCertUtils::certsGroupedByOrg( QList<QSslCertificate> certs )
59+
QMap<QString, QList<QSslCertificate> > QgsAuthCertUtils::certsGroupedByOrg( QList<QSslCertificate> certs )
6060
{
6161
QMap< QString, QList<QSslCertificate> > orgcerts;
6262
Q_FOREACH ( QSslCertificate cert, certs )
@@ -70,7 +70,7 @@ const QMap<QString, QList<QSslCertificate> > QgsAuthCertUtils::certsGroupedByOrg
7070
return orgcerts;
7171
}
7272

73-
const QMap<QString, QgsAuthConfigSslServer> QgsAuthCertUtils::mapDigestToSslConfigs( QList<QgsAuthConfigSslServer> configs )
73+
QMap<QString, QgsAuthConfigSslServer> QgsAuthCertUtils::mapDigestToSslConfigs( QList<QgsAuthConfigSslServer> configs )
7474
{
7575
QMap<QString, QgsAuthConfigSslServer> digestmap;
7676
Q_FOREACH ( QgsAuthConfigSslServer config, configs )
@@ -80,7 +80,7 @@ const QMap<QString, QgsAuthConfigSslServer> QgsAuthCertUtils::mapDigestToSslConf
8080
return digestmap;
8181
}
8282

83-
const QMap<QString, QList<QgsAuthConfigSslServer> > QgsAuthCertUtils::sslConfigsGroupedByOrg( QList<QgsAuthConfigSslServer> configs )
83+
QMap<QString, QList<QgsAuthConfigSslServer> > QgsAuthCertUtils::sslConfigsGroupedByOrg( QList<QgsAuthConfigSslServer> configs )
8484
{
8585
QMap< QString, QList<QgsAuthConfigSslServer> > orgconfigs;
8686
Q_FOREACH ( QgsAuthConfigSslServer config, configs )
@@ -113,7 +113,7 @@ static QByteArray fileData_( const QString& path, bool astext = false )
113113
return data;
114114
}
115115

116-
const QList<QSslCertificate> QgsAuthCertUtils::certsFromFile( const QString &certspath )
116+
QList<QSslCertificate> QgsAuthCertUtils::certsFromFile( const QString &certspath )
117117
{
118118
QList<QSslCertificate> certs;
119119
bool pem = certspath.endsWith( ".pem", Qt::CaseInsensitive );
@@ -125,7 +125,7 @@ const QList<QSslCertificate> QgsAuthCertUtils::certsFromFile( const QString &cer
125125
return certs;
126126
}
127127

128-
const QSslCertificate QgsAuthCertUtils::certFromFile( const QString &certpath )
128+
QSslCertificate QgsAuthCertUtils::certFromFile( const QString &certpath )
129129
{
130130
QSslCertificate cert;
131131
QList<QSslCertificate> certs( QgsAuthCertUtils::certsFromFile( certpath ) );
@@ -140,9 +140,9 @@ const QSslCertificate QgsAuthCertUtils::certFromFile( const QString &certpath )
140140
return cert;
141141
}
142142

143-
const QSslKey QgsAuthCertUtils::keyFromFile( const QString &keypath,
144-
const QString &keypass,
145-
QString *algtype )
143+
QSslKey QgsAuthCertUtils::keyFromFile( const QString &keypath,
144+
const QString &keypass,
145+
QString *algtype )
146146
{
147147
bool pem = keypath.endsWith( ".pem", Qt::CaseInsensitive );
148148
QByteArray keydata( fileData_( keypath, pem ) );
@@ -177,7 +177,7 @@ const QSslKey QgsAuthCertUtils::keyFromFile( const QString &keypath,
177177
return clientkey;
178178
}
179179

180-
const QList<QSslCertificate> QgsAuthCertUtils::certsFromString( const QString &pemtext )
180+
QList<QSslCertificate> QgsAuthCertUtils::certsFromString( const QString &pemtext )
181181
{
182182
QList<QSslCertificate> certs;
183183
certs = QSslCertificate::fromData( pemtext.toAscii(), QSsl::Pem );
@@ -188,7 +188,7 @@ const QList<QSslCertificate> QgsAuthCertUtils::certsFromString( const QString &p
188188
return certs;
189189
}
190190

191-
const QStringList QgsAuthCertUtils::certKeyBundleToPem( const QString &certpath,
191+
QStringList QgsAuthCertUtils::certKeyBundleToPem( const QString &certpath,
192192
const QString &keypath,
193193
const QString &keypass,
194194
bool reencrypt )
@@ -213,7 +213,7 @@ const QStringList QgsAuthCertUtils::certKeyBundleToPem( const QString &certpath,
213213
return QStringList() << certpem << keypem << algtype;
214214
}
215215

216-
const QStringList QgsAuthCertUtils::pkcs12BundleToPem( const QString &bundlepath,
216+
QStringList QgsAuthCertUtils::pkcs12BundleToPem( const QString &bundlepath,
217217
const QString &bundlepass,
218218
bool reencrypt )
219219
{
@@ -246,7 +246,7 @@ const QStringList QgsAuthCertUtils::pkcs12BundleToPem( const QString &bundlepath
246246
return QStringList() << bundle.certificateChain().primary().toPEM() << bundle.privateKey().toPEM( passarray ) << algtype;
247247
}
248248

249-
const QString QgsAuthCertUtils::getCaSourceName( QgsAuthCertUtils::CaCertSource source, bool single )
249+
QString QgsAuthCertUtils::getCaSourceName( QgsAuthCertUtils::CaCertSource source, bool single )
250250
{
251251
switch ( source )
252252
{
@@ -263,7 +263,7 @@ const QString QgsAuthCertUtils::getCaSourceName( QgsAuthCertUtils::CaCertSource
263263
}
264264
}
265265

266-
const QString QgsAuthCertUtils::resolvedCertName( const QSslCertificate &cert, bool issuer )
266+
QString QgsAuthCertUtils::resolvedCertName( const QSslCertificate &cert, bool issuer )
267267
{
268268
QString name( issuer ? cert.issuerInfo( QSslCertificate::CommonName )
269269
: cert.subjectInfo( QSslCertificate::CommonName ) );
@@ -301,7 +301,7 @@ void QgsAuthCertUtils::appendDirSegment_( QStringList &dirname,
301301
}
302302
}
303303

304-
const QString QgsAuthCertUtils::getCertDistinguishedName( const QSslCertificate &qcert ,
304+
QString QgsAuthCertUtils::getCertDistinguishedName( const QSslCertificate &qcert ,
305305
const QCA::Certificate &acert ,
306306
bool issuer )
307307
{
@@ -351,7 +351,7 @@ const QString QgsAuthCertUtils::getCertDistinguishedName( const QSslCertificate
351351
return dirname.join( "," );
352352
}
353353

354-
const QString QgsAuthCertUtils::getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust )
354+
QString QgsAuthCertUtils::getCertTrustName( QgsAuthCertUtils::CertTrustPolicy trust )
355355
{
356356
switch ( trust )
357357
{
@@ -366,7 +366,7 @@ const QString QgsAuthCertUtils::getCertTrustName( QgsAuthCertUtils::CertTrustPol
366366
}
367367
}
368368

369-
const QString QgsAuthCertUtils::getColonDelimited( const QString &txt )
369+
QString QgsAuthCertUtils::getColonDelimited( const QString &txt )
370370
{
371371
// 64321c05b0ebab8e2b67ec0d7d9e2b6d4bc3c303
372372
// -> 64:32:1c:05:b0:eb:ab:8e:2b:67:ec:0d:7d:9e:2b:6d:4b:c3:c3:03
@@ -378,7 +378,7 @@ const QString QgsAuthCertUtils::getColonDelimited( const QString &txt )
378378
return sl.join( ":" );
379379
}
380380

381-
const QString QgsAuthCertUtils::shaHexForCert( const QSslCertificate& cert, bool formatted )
381+
QString QgsAuthCertUtils::shaHexForCert( const QSslCertificate& cert, bool formatted )
382382
{
383383
QString sha( cert.digest( QCryptographicHash::Sha1 ).toHex() );
384384
if ( formatted )
@@ -388,7 +388,7 @@ const QString QgsAuthCertUtils::shaHexForCert( const QSslCertificate& cert, bool
388388
return sha;
389389
}
390390

391-
const QCA::Certificate QgsAuthCertUtils::qtCertToQcaCert( const QSslCertificate &cert )
391+
QCA::Certificate QgsAuthCertUtils::qtCertToQcaCert( const QSslCertificate &cert )
392392
{
393393
if ( QgsAuthManager::instance()->isDisabled() )
394394
return QCA::Certificate();
@@ -403,7 +403,7 @@ const QCA::Certificate QgsAuthCertUtils::qtCertToQcaCert( const QSslCertificate
403403
return qcacert;
404404
}
405405

406-
const QCA::CertificateCollection QgsAuthCertUtils::qtCertsToQcaCollection( const QList<QSslCertificate> &certs )
406+
QCA::CertificateCollection QgsAuthCertUtils::qtCertsToQcaCollection( const QList<QSslCertificate> &certs )
407407
{
408408
QCA::CertificateCollection qcacoll;
409409
if ( QgsAuthManager::instance()->isDisabled() )
@@ -420,7 +420,7 @@ const QCA::CertificateCollection QgsAuthCertUtils::qtCertsToQcaCollection( const
420420
return qcacoll;
421421
}
422422

423-
const QCA::KeyBundle QgsAuthCertUtils::qcaKeyBundle( const QString &path, const QString &pass )
423+
QCA::KeyBundle QgsAuthCertUtils::qcaKeyBundle( const QString &path, const QString &pass )
424424
{
425425
QCA::SecureArray passarray;
426426
if ( !pass.isEmpty() )
@@ -432,7 +432,7 @@ const QCA::KeyBundle QgsAuthCertUtils::qcaKeyBundle( const QString &path, const
432432
return ( res == QCA::ConvertGood ? bundle : QCA::KeyBundle() );
433433
}
434434

435-
const QString QgsAuthCertUtils::qcaValidityMessage( QCA::Validity validity )
435+
QString QgsAuthCertUtils::qcaValidityMessage( QCA::Validity validity )
436436
{
437437
switch ( validity )
438438
{
@@ -465,7 +465,7 @@ const QString QgsAuthCertUtils::qcaValidityMessage( QCA::Validity validity )
465465
}
466466
}
467467

468-
const QString QgsAuthCertUtils::qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm )
468+
QString QgsAuthCertUtils::qcaSignatureAlgorithm( QCA::SignatureAlgorithm algorithm )
469469
{
470470
switch ( algorithm )
471471
{
@@ -496,7 +496,7 @@ const QString QgsAuthCertUtils::qcaSignatureAlgorithm( QCA::SignatureAlgorithm a
496496
}
497497
}
498498

499-
const QString QgsAuthCertUtils::qcaKnownConstraint( QCA::ConstraintTypeKnown constraint )
499+
QString QgsAuthCertUtils::qcaKnownConstraint( QCA::ConstraintTypeKnown constraint )
500500
{
501501
switch ( constraint )
502502
{
@@ -541,7 +541,7 @@ const QString QgsAuthCertUtils::qcaKnownConstraint( QCA::ConstraintTypeKnown con
541541
}
542542
}
543543

544-
const QString QgsAuthCertUtils::certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype )
544+
QString QgsAuthCertUtils::certificateUsageTypeString( QgsAuthCertUtils::CertUsageType usagetype )
545545
{
546546
switch ( usagetype )
547547
{
@@ -788,7 +788,7 @@ bool QgsAuthCertUtils::certificateIsSslClient( const QSslCertificate &cert )
788788
return QgsAuthCertUtils::certificateUsageTypes( cert ).contains( QgsAuthCertUtils::TlsClientUsage );
789789
}
790790

791-
const QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
791+
QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum )
792792
{
793793
switch ( errenum )
794794
{
@@ -849,7 +849,7 @@ const QString QgsAuthCertUtils::sslErrorEnumString( QSslError::SslError errenum
849849
}
850850
}
851851

852-
const QList<QPair<QSslError::SslError, QString> > QgsAuthCertUtils::sslErrorEnumStrings()
852+
QList<QPair<QSslError::SslError, QString> > QgsAuthCertUtils::sslErrorEnumStrings()
853853
{
854854
QList<QPair<QSslError::SslError, QString> > errenums;
855855
errenums << qMakePair( QSslError::UnableToGetIssuerCertificate,

0 commit comments

Comments
 (0)
Please sign in to comment.