Move QAlertLevel and QAlertType enums into the namespace QSsl

Not to pollute the global namespace with rather generic names
(especially in case QT_NAMESPACE is none); also drop the
(now)redundant 'Q' prefix in the names.

Change-Id: I57ea7e3996cced705f7ddbdbc1e0231191b31c43
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

1 files changed, 2 insertions, 45 deletions

diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 9906db54fe..3408e36197 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -61,49 +61,6 @@ class QSslEllipticCurve;
 class QSslPreSharedKeyAuthenticator;
 class QOcspResponse;
 
-enum class QAlertLevel {
-    Warning,
-    Fatal,
-    Unknown
-};
-
-enum class QAlertType {
-    CloseNotify,
-    UnexpectedMessage = 10,
-    BadRecordMac = 20,
-    RecordOverflow = 22,
-    DecompressionFailure = 30, // reserved
-    HandshakeFailure = 40,
-    NoCertificate = 41, // reserved
-    BadCertificate = 42,
-    UnsupportedCertificate = 43,
-    CertificateRevoked = 44,
-    CertificateExpired = 45,
-    CertificateUnknown = 46,
-    IllegalParameter = 47,
-    UnknownCa = 48,
-    AccessDenied = 49,
-    DecodeError = 50,
-    DecryptError = 51,
-    ExportRestriction = 60, // reserved
-    ProtocolVersion = 70,
-    InsufficientSecurity = 71,
-    InternalError = 80,
-    InappropriateFallback = 86,
-    UserCancelled = 90,
-    NoRenegotiation = 100,
-    MissingExtension = 109,
-    UnsupportedExtension = 110,
-    CertificateUnobtainable = 111, // reserved
-    UnrecognizedName = 112,
-    BadCertificateStatusResponse = 113,
-    BadCertificateHashValue = 114, // reserved
-    UnknownPskIdentity = 115,
-    CertificateRequired = 116,
-    NoApplicationProtocol = 120,
-    UnknownAlertMessage = 255
-};
-
 class QSslSocketPrivate;
 class Q_NETWORK_EXPORT QSslSocket : public QTcpSocket
 {
@@ -225,8 +182,8 @@ Q_SIGNALS:
     void encryptedBytesWritten(qint64 totalBytes);
     void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator);
     void newSessionTicketReceived();
-    void alertSent(QAlertLevel level, QAlertType type, const QString &description);
-    void alertReceived(QAlertLevel level, QAlertType type, const QString &description);
+    void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description);
+    void alertReceived(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description);
     void handshakeInterruptedOnError(const QSslError &error);
 
 protected: