From 47189b3a6738152aa3bda4f10441985ba96f6743 Mon Sep 17 00:00:00 2001
From: Timur Pocheptsov <timur.pocheptsov@qt.io>
Date: Tue, 11 Feb 2020 11:45:31 +0100
Subject: [PATCH] Cleanup QSsl code a bit
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

to get rid of the remaining deprecated enumerators/related names
and documentation bits.

Fixes: QTBUG-76501
Change-Id: I72aa837daf64d8336c95a4708840e0dec3e82d2b
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
---
 src/network/ssl/qssl.cpp            | 11 -----------
 src/network/ssl/qssl.h              |  4 ----
 src/network/ssl/qsslcertificate.cpp |  9 ---------
 src/network/ssl/qsslcertificate.h   |  4 ----
 4 files changed, 28 deletions(-)

diff --git a/src/network/ssl/qssl.cpp b/src/network/ssl/qssl.cpp
index bfbe8eb90f..87b9a1b038 100644
--- a/src/network/ssl/qssl.cpp
+++ b/src/network/ssl/qssl.cpp
@@ -102,19 +102,9 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
     \value IpAddressEntry An IP address entry; the entry contains an IP address
     entry that the certificate is valid for, introduced in Qt 5.13.
 
-    \note In Qt 4, this enum was called \c {AlternateNameEntryType}. That name
-    is deprecated in Qt 5.
-
     \sa QSslCertificate::subjectAlternativeNames()
 */
 
-/*!
-  \typedef QSsl::AlternateNameEntryType
-  \obsolete
-
-  Use QSsl::AlternativeNameEntryType instead.
-*/
-
 /*!
     \enum QSsl::SslProtocol
 
@@ -122,7 +112,6 @@ Q_LOGGING_CATEGORY(lcSsl, "qt.network.ssl");
 
     \value TlsV1_0 TLSv1.0
     \value TlsV1_0OrLater TLSv1.0 and later versions. This option is not available when using the WinRT backend due to platform limitations.
-    \value TlsV1 Obsolete, means the same as TlsV1_0
     \value TlsV1_1 TLSv1.1. When using the WinRT backend this option will also enable TLSv1.0.
     \value TlsV1_1OrLater TLSv1.1 and later versions. This option is not available when using the WinRT backend due to platform limitations.
     \value TlsV1_2 TLSv1.2. When using the WinRT backend this option will also enable TLSv1.0 and TLSv1.1.
diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h
index 1fd2cf9c6d..d0b417f9ed 100644
--- a/src/network/ssl/qssl.h
+++ b/src/network/ssl/qssl.h
@@ -72,10 +72,6 @@ namespace QSsl {
         IpAddressEntry
     };
 
-#if QT_DEPRECATED_SINCE(5,0)
-    typedef AlternativeNameEntryType AlternateNameEntryType;
-#endif
-
     enum SslProtocol {
         TlsV1_0 = 2,
         TlsV1_1,
diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index c179cf9c4a..da952f6e6b 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -373,15 +373,6 @@ QByteArray QSslCertificate::digest(QCryptographicHash::Algorithm algorithm) cons
     \sa subjectInfo()
 */
 
-#if QT_DEPRECATED_SINCE(5,0)
-/*!
-  \fn QMultiMap<QSsl::AlternateNameEntryType, QString> QSslCertificate::alternateSubjectNames() const
-  \obsolete
-
-  Use QSslCertificate::subjectAlternativeNames();
-*/
-#endif
-
 /*!
   \fn QMultiMap<QSsl::AlternativeNameEntryType, QString> QSslCertificate::subjectAlternativeNames() const
 
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 9993769888..c46065160a 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -130,10 +130,6 @@ public:
 
     QList<QByteArray> subjectInfoAttributes() const;
     QList<QByteArray> issuerInfoAttributes() const;
-#if QT_DEPRECATED_SINCE(5,0)
-    QT_DEPRECATED inline QMultiMap<QSsl::AlternateNameEntryType, QString>
-                  alternateSubjectNames() const { return subjectAlternativeNames(); }
-#endif
     QMultiMap<QSsl::AlternativeNameEntryType, QString> subjectAlternativeNames() const;
     QDateTime effectiveDate() const;
     QDateTime expiryDate() const;