diff options
author | Richard J. Moore <rich@kde.org> | 2014-02-09 17:52:22 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-12 01:41:34 +0100 |
commit | fd00bfc788f23518ae68293d5b97cf9361a9d2a9 (patch) | |
tree | 9af07f04989cf88b6ad7209c9379290c558223c6 | |
parent | 8f899cd19837e91b52fbeef184a21423bd27815e (diff) |
Correct the documentation of the return types of subjectInfo and issuerInfo.
These functions now return a QStringList to reflect the possibility of
there being more than one entry of a given type, but the documentation
did not reflect this.
Task-Number: QTBUG-36304
Change-Id: Iba2eda5e2c3174c8dcea640b5aed9cdc9a432392
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
-rw-r--r-- | src/network/ssl/qsslcertificate.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp index b4c593fa73..3b7fa4da09 100644 --- a/src/network/ssl/qsslcertificate.cpp +++ b/src/network/ssl/qsslcertificate.cpp @@ -341,8 +341,9 @@ static QByteArray _q_SubjectInfoToString(QSslCertificate::SubjectInfo info) \fn QString QSslCertificate::issuerInfo(SubjectInfo subject) const Returns the issuer information for the \a subject from the - certificate, or an empty string if there is no information for - \a subject in the certificate. + certificate, or an empty list if there is no information for + \a subject in the certificate. There can be more than one entry + of each type. \sa subjectInfo() */ @@ -359,8 +360,8 @@ QStringList QSslCertificate::issuerInfo(SubjectInfo info) const /*! Returns the issuer information for \a attribute from the certificate, - or an empty string if there is no information for \a attribute in the - certificate. + or an empty list if there is no information for \a attribute in the + certificate. There can be more than one entry for an attribute. \sa subjectInfo() */ @@ -379,8 +380,9 @@ QStringList QSslCertificate::issuerInfo(const QByteArray &attribute) const \fn QString QSslCertificate::subjectInfo(SubjectInfo subject) const - Returns the information for the \a subject, or an empty string if - there is no information for \a subject in the certificate. + Returns the information for the \a subject, or an empty list if + there is no information for \a subject in the certificate. There + can be more than one entry of each type. \sa issuerInfo() */ @@ -396,8 +398,9 @@ QStringList QSslCertificate::subjectInfo(SubjectInfo info) const } /*! - Returns the subject information for \a attribute, or an empty string if - there is no information for \a attribute in the certificate. + Returns the subject information for \a attribute, or an empty list if + there is no information for \a attribute in the certificate. There + can be more than one entry for an attribute. \sa issuerInfo() */ |