From 0ce522cb43813a2a557c4197e0bc672596080a10 Mon Sep 17 00:00:00 2001
From: Kirill Burtsev <kirill.burtsev@qt.io>
Date: Fri, 4 Oct 2019 16:57:18 +0200
Subject: Rename certificate error's chain API method
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/core/certificate_error_controller.cpp                    | 6 +++---
 src/core/certificate_error_controller.h                      | 2 +-
 src/core/certificate_error_controller_p.h                    | 2 +-
 src/webenginewidgets/api/qwebenginecertificateerror.cpp      | 8 ++++----
 src/webenginewidgets/api/qwebenginecertificateerror.h        | 2 +-
 tests/auto/widgets/certificateerror/tst_certificateerror.cpp | 2 +-
 6 files changed, 11 insertions(+), 11 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
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;
diff --git a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
index 5fd765ed5..109c69cd7 100644
--- a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
@@ -96,7 +96,7 @@ void tst_CertificateError::handleError()
     page.setUrl(server.url());
     QTRY_VERIFY(page.error);
     QVERIFY(page.error->isOverridable());
-    auto chain = page.error->chain();
+    auto chain = page.error->certificateChain();
     QCOMPARE(chain.size(), 2);
     QCOMPARE(chain[0].serialNumber(), "3b:dd:1a:b7:2f:40:32:3b:c1:bf:37:d4:86:bd:56:c1:d0:6b:2a:43");
     QCOMPARE(chain[1].serialNumber(), "6d:52:fb:b4:57:3b:b2:03:c8:62:7b:7e:44:45:5c:d3:08:87:74:17");
-- 
cgit v1.2.3