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, 4 deletions

diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index e6db3a734e..97a01efdd3 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -341,8 +341,6 @@ tst_QSslSocket::tst_QSslSocket()
     qRegisterMetaType<QSslError>("QSslError");
     qRegisterMetaType<QAbstractSocket::SocketState>("QAbstractSocket::SocketState");
     qRegisterMetaType<QAbstractSocket::SocketError>("QAbstractSocket::SocketError");
-    qRegisterMetaType<QAlertLevel>("QAlertLevel");
-    qRegisterMetaType<QAlertType>("QAlertType");
 
 #ifndef QT_NO_OPENSSL
     qRegisterMetaType<QSslPreSharedKeyAuthenticator *>();
@@ -1202,8 +1200,8 @@ public:
 
 signals:
     void socketError(QAbstractSocket::SocketError);
-    void gotAlert(QAlertLevel level, QAlertType type, const QString &message);
-    void alertSent(QAlertLevel level, QAlertType type, const QString &message);
+    void gotAlert(QSsl::AlertLevel level, QSsl::AlertType type, const QString &message);
+    void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &message);
 
 protected:
     void incomingConnection(qintptr socketDescriptor)