From 45c0f45e04f4c8431c2744dd52d334ee2e127019 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Thu, 25 Jun 2020 10:44:57 +0200 Subject: Move QAlertLevel and QAlertType enums into the namespace QSsl MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Mårten Nordheim --- tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp') 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"); qRegisterMetaType("QAbstractSocket::SocketState"); qRegisterMetaType("QAbstractSocket::SocketError"); - qRegisterMetaType("QAlertLevel"); - qRegisterMetaType("QAlertType"); #ifndef QT_NO_OPENSSL qRegisterMetaType(); @@ -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) -- cgit v1.2.3