summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/network/access/qnetworkreply.cpp9
-rw-r--r--src/network/access/qnetworkreply.h4
-rw-r--r--src/network/access/qnetworkreplywasmimpl.cpp2
-rw-r--r--src/network/socket/qabstractsocket.cpp10
-rw-r--r--src/network/socket/qabstractsocket.h4
-rw-r--r--src/network/socket/qlocalsocket.cpp10
-rw-r--r--src/network/socket/qlocalsocket.h4
-rw-r--r--src/network/ssl/qsslsocket.cpp19
-rw-r--r--src/network/ssl/qsslsocket.h3
-rw-r--r--tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp9
10 files changed, 4 insertions, 70 deletions
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 30e4e290ea..f09d7f9838 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -364,13 +364,6 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
*/
/*!
- \fn void QNetworkReply::error(QNetworkReply::NetworkError code)
- \obsolete
-
- Use errorOccurred() instead.
-*/
-
-/*!
\fn void QNetworkReply::errorOccurred(QNetworkReply::NetworkError code)
\since 5.15
@@ -463,8 +456,6 @@ QNetworkReply::QNetworkReply(QObject *parent)
QNetworkReply::QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent)
: QIODevice(dd, parent)
{
- // Support the deprecated error() signal:
- connect(this, &QNetworkReply::errorOccurred, this, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error));
}
/*!
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index c7d981c97e..2587696715 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -156,10 +156,6 @@ public Q_SLOTS:
Q_SIGNALS:
void metaDataChanged();
void finished();
-#if QT_DEPRECATED_SINCE(5,15)
- QT_DEPRECATED_NETWORK_API_5_15_X("Use QNetworkReply::errorOccurred(QNetworkReply::NetworkError) instead")
- void error(QNetworkReply::NetworkError);
-#endif
void errorOccurred(QNetworkReply::NetworkError);
#if QT_CONFIG(ssl)
void encrypted();
diff --git a/src/network/access/qnetworkreplywasmimpl.cpp b/src/network/access/qnetworkreplywasmimpl.cpp
index 94c2106a15..7cb197c3e5 100644
--- a/src/network/access/qnetworkreplywasmimpl.cpp
+++ b/src/network/access/qnetworkreplywasmimpl.cpp
@@ -281,7 +281,7 @@ void QNetworkReplyWasmImplPrivate::emitReplyError(QNetworkReply::NetworkError er
Q_Q(QNetworkReplyWasmImpl);
q->setError(errorCode, errorString);
- emit q->error(errorCode);
+ emit q->errorOccurred(errorCode);
q->setFinished(true);
emit q->finished();
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
@@ -202,13 +202,6 @@
*/
/*!
- \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<QAbstractSocket::SocketError>::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
@@ -330,13 +330,6 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \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<QLocalSocket::LocalSocketError>::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);
diff --git a/src/network/ssl/qsslsocket.cpp b/src/network/ssl/qsslsocket.cpp
index 4b6d8c21d1..47dc7a9f71 100644
--- a/src/network/ssl/qsslsocket.cpp
+++ b/src/network/ssl/qsslsocket.cpp
@@ -1903,25 +1903,6 @@ bool QSslSocket::waitForDisconnected(int msecs)
return retVal;
}
-#if QT_DEPRECATED_SINCE(5, 15)
-/*!
- \deprecated
-
- Use sslHandshakeErrors() instead.
-
- Returns a list of the last SSL errors that occurred. This is the
- same list as QSslSocket passes via the sslErrors() signal. If the
- connection has been encrypted with no errors, this function will
- return an empty list.
-
- \sa connectToHostEncrypted(), sslHandshakeErrors()
-*/
-QList<QSslError> QSslSocket::sslErrors() const
-{
- return sslHandshakeErrors();
-}
-#endif // QT_DEPRECATED_SINCE(5, 15)
-
/*!
\since 5.15
diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h
index 238928e108..d21e8900d8 100644
--- a/src/network/ssl/qsslsocket.h
+++ b/src/network/ssl/qsslsocket.h
@@ -231,9 +231,6 @@ public:
bool waitForBytesWritten(int msecs = 30000) override;
bool waitForDisconnected(int msecs = 30000) override;
-#if QT_DEPRECATED_SINCE(5, 15)
- QT_DEPRECATED_X("Use sslHandshakeErrors()") QList<QSslError> sslErrors() const;
-#endif // QT_DEPRECATED_SINCE(5, 15)
QList<QSslError> sslHandshakeErrors() const;
static bool supportsSsl();
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 79bd4994db..0ac87a9cb1 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -4450,9 +4450,6 @@ void tst_QSslSocket::oldErrorsOnSocketReuse()
#if QT_CONFIG(openssl)
-void (QSslSocket::*const tlsErrorSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
-void (QAbstractSocket::*const socketErrorSignal)(QAbstractSocket::SocketError) = &QAbstractSocket::error;
-
void tst_QSslSocket::alertMissingCertificate()
{
// In this test we want a server to abort the connection due to the failing
@@ -4474,7 +4471,7 @@ void tst_QSslSocket::alertMissingCertificate()
server.config.setMissingCertificateIsFatal(true);
QSslSocket clientSocket;
- connect(&clientSocket, tlsErrorSignal, [&clientSocket](const QList<QSslError> &errors){
+ connect(&clientSocket, &QSslSocket::sslErrors, [&clientSocket](const QList<QSslError> &errors){
qDebug() << "ERR";
clientSocket.ignoreSslErrors(errors);
});
@@ -4497,7 +4494,7 @@ void tst_QSslSocket::alertMissingCertificate()
// Presumably, RemoteHostClosedError for the client and SslHandshakeError
// for the server:
- connect(&clientSocket, socketErrorSignal, earlyQuitter);
+ connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
connect(&server, &SslServer::socketError, earlyQuitter);
runner.enterLoopMSecs(1000);
@@ -4547,7 +4544,7 @@ void tst_QSslSocket::alertInvalidCertificate()
// Presumably, RemoteHostClosedError for the server and SslHandshakeError
// for the client:
- connect(&clientSocket, socketErrorSignal, earlyQuitter);
+ connect(&clientSocket, &QAbstractSocket::errorOccurred, earlyQuitter);
connect(&server, &SslServer::socketError, earlyQuitter);
runner.enterLoopMSecs(1000);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-06 15:33:07 +0000