From 92b7122eda835537a6bbafb41beb858f38aed538 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 6 Oct 2020 16:00:14 +0200
Subject: Remove dead code

This code has been deprecated in Qt 5.

Change-Id: Ia8e0bc791ac1f43df7124b4f30db3d0bb9966015
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
---
 src/network/ssl/qsslcertificate.cpp | 19 -------------------
 src/network/ssl/qsslcertificate.h   |  8 --------
 src/network/ssl/qsslellipticcurve.h |  3 ---
 3 files changed, 30 deletions(-)

(limited to 'src/network')

diff --git a/src/network/ssl/qsslcertificate.cpp b/src/network/ssl/qsslcertificate.cpp
index 956a1df29c..5dd3f49524 100644
--- a/src/network/ssl/qsslcertificate.cpp
+++ b/src/network/ssl/qsslcertificate.cpp
@@ -247,25 +247,6 @@ QSslCertificate &QSslCertificate::operator=(const QSslCertificate &other)
     \sa clear()
 */
 
-#if QT_DEPRECATED_SINCE(5,0)
-/*!
-    \fn bool QSslCertificate::isValid() const
-    \obsolete
-
-    To verify a certificate, use verify().
-    To check if a certificate is blacklisted, use isBlacklisted().
-    To check if a certificate has expired or is not yet valid, compare
-    expiryDate() and effectiveDate() with QDateTime::currentDateTime()
-
-    This function checks that the current
-    date-time is within the date-time range during which the
-    certificate is considered valid, and checks that the
-    certificate is not in a blacklist of fraudulent certificates.
-
-    \sa isNull(), verify(), isBlacklisted(), expiryDate(), effectiveDate()
-*/
-#endif
-
 /*!
     Returns \c true if this certificate is blacklisted; otherwise
     returns \c false.
diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h
index 8cfeaeb273..cf97dcbee8 100644
--- a/src/network/ssl/qsslcertificate.h
+++ b/src/network/ssl/qsslcertificate.h
@@ -103,14 +103,6 @@ public:
     inline bool operator!=(const QSslCertificate &other) const { return !operator==(other); }
 
     bool isNull() const;
-#if QT_DEPRECATED_SINCE(5,0)
-    QT_DEPRECATED inline bool isValid() const {
-        const QDateTime currentTime = QDateTime::currentDateTimeUtc();
-        return currentTime >= effectiveDate() &&
-               currentTime <= expiryDate() &&
-               !isBlacklisted();
-    }
-#endif
     bool isBlacklisted() const;
     bool isSelfSigned() const;
     void clear();
diff --git a/src/network/ssl/qsslellipticcurve.h b/src/network/ssl/qsslellipticcurve.h
index 95441e75bf..37f77bde68 100644
--- a/src/network/ssl/qsslellipticcurve.h
+++ b/src/network/ssl/qsslellipticcurve.h
@@ -43,9 +43,6 @@
 #include <QtNetwork/qtnetworkglobal.h>
 #include <QtCore/QString>
 #include <QtCore/QMetaType>
-#if QT_DEPRECATED_SINCE(5, 6)
-#include <QtCore/QHash>
-#endif
 #include <QtCore/qhashfunctions.h>
 
 QT_BEGIN_NAMESPACE
-- 
cgit v1.2.3