diff options
author | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-10-04 16:57:18 +0200 |
---|---|---|
committer | Kirill Burtsev <kirill.burtsev@qt.io> | 2019-10-17 19:59:21 +0200 |
commit | 0ce522cb43813a2a557c4197e0bc672596080a10 (patch) | |
tree | 0df48375044b5601ef8d3f0ea19cb627c3ddb878 /src/core | |
parent | 615ea60ac76a8db78f1473a6970e3dc3bfdb9cc9 (diff) |
Rename certificate error's chain API method
Address API review and make the name to be consistent with other methods
like localCertificateChain and peerCertificateChain of QSslCertificate
Change-Id: I4f115846965d31ea9a20df3b7a27c6c041c52768
Reviewed-by: Michael BrĂ¼ning <michael.bruning@qt.io>
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/certificate_error_controller.cpp | 6 | ||||
-rw-r--r-- | src/core/certificate_error_controller.h | 2 | ||||
-rw-r--r-- | src/core/certificate_error_controller_p.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/core/certificate_error_controller.cpp b/src/core/certificate_error_controller.cpp index bc83ed802..f3b16357b 100644 --- a/src/core/certificate_error_controller.cpp +++ b/src/core/certificate_error_controller.cpp @@ -93,7 +93,7 @@ CertificateErrorControllerPrivate::CertificateErrorControllerPrivate(int cert_er if (auto cert = ssl_info.cert.get()) { validStart = toQt(cert->valid_start()); validExpiry = toQt(cert->valid_expiry()); - chain = toCertificateChain(cert); + certificateChain = toCertificateChain(cert); } } @@ -187,9 +187,9 @@ QString CertificateErrorController::errorString() const return getQStringForMessageId(IDS_CERT_ERROR_UNKNOWN_ERROR_DESCRIPTION); } -QList<QSslCertificate> CertificateErrorController::chain() const +QList<QSslCertificate> CertificateErrorController::certificateChain() const { - return d->chain; + return d->certificateChain; } QT_END_NAMESPACE diff --git a/src/core/certificate_error_controller.h b/src/core/certificate_error_controller.h index 7f5300dc8..d7e057adf 100644 --- a/src/core/certificate_error_controller.h +++ b/src/core/certificate_error_controller.h @@ -96,7 +96,7 @@ public: QString errorString() const; QDateTime validStart() const; QDateTime validExpiry() const; - QList<QSslCertificate> chain() const; + QList<QSslCertificate> certificateChain() const; void accept(bool); diff --git a/src/core/certificate_error_controller_p.h b/src/core/certificate_error_controller_p.h index a11f2b6f0..ceae99853 100644 --- a/src/core/certificate_error_controller_p.h +++ b/src/core/certificate_error_controller_p.h @@ -71,7 +71,7 @@ public: bool fatalError; bool strictEnforcement; const base::Callback<void(content::CertificateRequestResultType)> callback; - QList<QSslCertificate> chain; + QList<QSslCertificate> certificateChain; }; QT_END_NAMESPACE |