From 6d6bfcb9ad2ed2f8613ac3120233b9dbe011c644 Mon Sep 17 00:00:00 2001 From: Timur Pocheptsov Date: Wed, 25 Mar 2020 08:37:16 +0100 Subject: QtNetwork remove deprecated signals MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use 'errorOccurred' instead of 'error' and 'sslHandshakeErrors' instead of 'sslErrors'. Fixes: QTBUG-82605 Change-Id: I19d4845b16c7b636af7b0658d4fbbba4eef9d029 Reviewed-by: Edward Welbourne Reviewed-by: Mårten Nordheim --- src/network/socket/qabstractsocket.cpp | 10 ---------- src/network/socket/qabstractsocket.h | 4 ---- src/network/socket/qlocalsocket.cpp | 10 ---------- src/network/socket/qlocalsocket.h | 4 ---- 4 files changed, 28 deletions(-) (limited to 'src/network/socket') diff --git a/src/network/socket/qabstractsocket.cpp b/src/network/socket/qabstractsocket.cpp index bbaaf5e609..03d69d6204 100644 --- a/src/network/socket/qabstractsocket.cpp +++ b/src/network/socket/qabstractsocket.cpp @@ -201,13 +201,6 @@ \sa connectToHost(), disconnectFromHost(), abort() */ -/*! - \fn void QAbstractSocket::error(QAbstractSocket::SocketError socketError) - \obsolete - - Use errorOccurred() instead. -*/ - /*! \fn void QAbstractSocket::errorOccurred(QAbstractSocket::SocketError socketError) \since 5.15 @@ -1454,9 +1447,6 @@ QAbstractSocket::QAbstractSocket(SocketType socketType, : socketType == SctpSocket ? "Sctp" : "Unknown", &dd, parent); #endif d->socketType = socketType; - - // Support the deprecated error() signal: - connect(this, &QAbstractSocket::errorOccurred, this, QOverload::of(&QAbstractSocket::error)); } /*! diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index f76467b2a6..1b7c578a9d 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -208,10 +208,6 @@ Q_SIGNALS: void connected(); void disconnected(); void stateChanged(QAbstractSocket::SocketState); -#if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_NETWORK_API_5_15_X("Use QAbstractSocket::errorOccurred(QAbstractSocket::SocketError) instead") - void error(QAbstractSocket::SocketError); -#endif void errorOccurred(QAbstractSocket::SocketError); #ifndef QT_NO_NETWORKPROXY void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator); diff --git a/src/network/socket/qlocalsocket.cpp b/src/network/socket/qlocalsocket.cpp index 94bbb17412..60e753e2e2 100644 --- a/src/network/socket/qlocalsocket.cpp +++ b/src/network/socket/qlocalsocket.cpp @@ -329,13 +329,6 @@ QT_BEGIN_NAMESPACE \sa connectToServer(), disconnectFromServer(), abort(), connected() */ -/*! - \fn void QLocalSocket::error(QLocalSocket::LocalSocketError socketError) - \obsolete - - Use errorOccurred() instead. -*/ - /*! \fn void QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError socketError) \since 5.15 @@ -372,9 +365,6 @@ QLocalSocket::QLocalSocket(QObject * parent) { Q_D(QLocalSocket); d->init(); - - // Support the deprecated error() signal: - connect(this, &QLocalSocket::errorOccurred, this, QOverload::of(&QLocalSocket::error)); } /*! diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 200d59a309..d45f8f239d 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -117,10 +117,6 @@ public: Q_SIGNALS: void connected(); void disconnected(); -#if QT_DEPRECATED_SINCE(5,15) - QT_DEPRECATED_NETWORK_API_5_15_X("Use QLocalSocket::errorOccurred(QLocalSocket::LocalSocketError) instead") - void error(QLocalSocket::LocalSocketError socketError); -#endif void errorOccurred(QLocalSocket::LocalSocketError socketError); void stateChanged(QLocalSocket::LocalSocketState socketState); -- cgit v1.2.3