summaryrefslogtreecommitdiffstats
path: root/src/webenginewidgets
diff options
context:
space:
mode:
authorKirill Burtsev <kirill.burtsev@qt.io>2019-10-04 16:57:18 +0200
committerKirill Burtsev <kirill.burtsev@qt.io>2019-10-17 19:59:21 +0200
commit0ce522cb43813a2a557c4197e0bc672596080a10 (patch)
tree0df48375044b5601ef8d3f0ea19cb627c3ddb878 /src/webenginewidgets
parent615ea60ac76a8db78f1473a6970e3dc3bfdb9cc9 (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/webenginewidgets')
-rw-r--r--src/webenginewidgets/api/qwebenginecertificateerror.cpp8
-rw-r--r--src/webenginewidgets/api/qwebenginecertificateerror.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.cpp b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
index 45277e19d..3f20b6483 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.cpp
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.cpp
@@ -79,7 +79,7 @@ public:
QUrl url;
bool overridable;
QString errorDescription;
- QList<QSslCertificate> chain;
+ QList<QSslCertificate> certificateChain;
bool answered = false, deferred = false;
QWeakPointer<CertificateErrorController> controller;
@@ -107,7 +107,7 @@ QWebEngineCertificateError::QWebEngineCertificateError(const QSharedPointer<Cert
controller->overridable(), controller->errorString()))
{
d->controller = controller;
- d->chain = controller->chain();
+ d->certificateChain = controller->certificateChain();
}
QWebEngineCertificateError::QWebEngineCertificateError(const QWebEngineCertificateError &) = default;
@@ -255,9 +255,9 @@ bool QWebEngineCertificateError::answered() const
Chain starts with the peer's immediate certificate and ending with the CA's certificate.
*/
-QList<QSslCertificate> QWebEngineCertificateError::chain() const
+QList<QSslCertificate> QWebEngineCertificateError::certificateChain() const
{
- return d->chain;
+ return d->certificateChain;
}
QT_END_NAMESPACE
diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h
index b2dd65a9f..d3a19edfc 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.h
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.h
@@ -90,7 +90,7 @@ public:
void ignoreCertificateError();
bool answered() const;
- QList<QSslCertificate> chain() const;
+ QList<QSslCertificate> certificateChain() const;
private:
friend class QWebEnginePagePrivate;