diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2020-08-07 10:49:22 +0200 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2020-08-14 16:34:53 +0200 |
| commit | cf830e3122c94e429321f43ddc81b860bd223a72 (patch) | |
| tree | 0d5718e3367e236754cc8c8e89376fa26a85760a /src/core/api/qwebenginecertificateerror.cpp | |
| parent | c7a10dd8b0426a84205958a3f832a36fd35e24ca (diff) | |
Cleanup namespace issues in core
Change-Id: Ifdffc556278fa5d133da1896600a71248662e9fa
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/api/qwebenginecertificateerror.cpp')
| -rw-r--r-- | src/core/api/qwebenginecertificateerror.cpp | 51 |
1 files changed, 34 insertions, 17 deletions
diff --git a/src/core/api/qwebenginecertificateerror.cpp b/src/core/api/qwebenginecertificateerror.cpp index 2e5768a0c..cf8a20d53 100644 --- a/src/core/api/qwebenginecertificateerror.cpp +++ b/src/core/api/qwebenginecertificateerror.cpp @@ -43,22 +43,38 @@ QT_BEGIN_NAMESPACE -ASSERT_ENUMS_MATCH(CertificateErrorController::SslPinnedKeyNotInCertificateChain, QWebEngineCertificateError::SslPinnedKeyNotInCertificateChain); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateCommonNameInvalid, QWebEngineCertificateError::CertificateCommonNameInvalid); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateCommonNameInvalid, QWebEngineCertificateError::CertificateCommonNameInvalid); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateDateInvalid, QWebEngineCertificateError::CertificateDateInvalid); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateAuthorityInvalid, QWebEngineCertificateError::CertificateAuthorityInvalid); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateContainsErrors, QWebEngineCertificateError::CertificateContainsErrors); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateUnableToCheckRevocation, QWebEngineCertificateError::CertificateUnableToCheckRevocation); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateRevoked, QWebEngineCertificateError::CertificateRevoked); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateInvalid, QWebEngineCertificateError::CertificateInvalid); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateWeakSignatureAlgorithm, QWebEngineCertificateError::CertificateWeakSignatureAlgorithm); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateNonUniqueName, QWebEngineCertificateError::CertificateNonUniqueName); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateWeakKey, QWebEngineCertificateError::CertificateWeakKey); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateNameConstraintViolation, QWebEngineCertificateError::CertificateNameConstraintViolation); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateValidityTooLong, QWebEngineCertificateError::CertificateValidityTooLong); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateTransparencyRequired, QWebEngineCertificateError::CertificateTransparencyRequired); -ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateKnownInterceptionBlocked, QWebEngineCertificateError::CertificateKnownInterceptionBlocked); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::SslPinnedKeyNotInCertificateChain, + QWebEngineCertificateError::SslPinnedKeyNotInCertificateChain); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateCommonNameInvalid, + QWebEngineCertificateError::CertificateCommonNameInvalid); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateCommonNameInvalid, + QWebEngineCertificateError::CertificateCommonNameInvalid); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateDateInvalid, + QWebEngineCertificateError::CertificateDateInvalid); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateAuthorityInvalid, + QWebEngineCertificateError::CertificateAuthorityInvalid); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateContainsErrors, + QWebEngineCertificateError::CertificateContainsErrors); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateUnableToCheckRevocation, + QWebEngineCertificateError::CertificateUnableToCheckRevocation); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateRevoked, + QWebEngineCertificateError::CertificateRevoked); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateInvalid, + QWebEngineCertificateError::CertificateInvalid); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateWeakSignatureAlgorithm, + QWebEngineCertificateError::CertificateWeakSignatureAlgorithm); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateNonUniqueName, + QWebEngineCertificateError::CertificateNonUniqueName); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateWeakKey, + QWebEngineCertificateError::CertificateWeakKey); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateNameConstraintViolation, + QWebEngineCertificateError::CertificateNameConstraintViolation); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateValidityTooLong, + QWebEngineCertificateError::CertificateValidityTooLong); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateTransparencyRequired, + QWebEngineCertificateError::CertificateTransparencyRequired); +ASSERT_ENUMS_MATCH(QtWebEngineCore::CertificateErrorController::CertificateKnownInterceptionBlocked, + QWebEngineCertificateError::CertificateKnownInterceptionBlocked); /*! \class QWebEngineCertificateError @@ -72,7 +88,8 @@ ASSERT_ENUMS_MATCH(CertificateErrorController::CertificateKnownInterceptionBlock /*! \internal */ -QWebEngineCertificateError::QWebEngineCertificateError(const QSharedPointer<CertificateErrorController> &controller) +QWebEngineCertificateError::QWebEngineCertificateError( + const QSharedPointer<QtWebEngineCore::CertificateErrorController> &controller) : d(controller) { } |