1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More qOverload cleanups in qtbase

Browse Source 
Task-number: QTBUG-82605
Change-Id: I1c3c14ed82911ed5483258c11e76f5dd7744fa12
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
This commit is contained in:
Timur Pocheptsov 2020-03-24 10:33:01 +01:00
parent 28a0f1ba79
commit 4561370661
6 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
examples/network/multistreamclient/client.cpp
View File

@ -126,8 +126,7 @@ Client::Client(QWidget *parent)
connect(sctpSocket, &QSctpSocket::connected, this, &Client::connected); connect(sctpSocket, &QSctpSocket::connected, this, &Client::connected);
connect(sctpSocket, &QSctpSocket::disconnected, this, &Client::disconnected); connect(sctpSocket, &QSctpSocket::disconnected, this, &Client::disconnected);
connect(sctpSocket, &QSctpSocket::channelReadyRead, this, &Client::readDatagram); connect(sctpSocket, &QSctpSocket::channelReadyRead, this, &Client::readDatagram);
connect(sctpSocket, QOverload<QAbstractSocket::SocketError>::of(&QSctpSocket::error), connect(sctpSocket, &QSctpSocket::errorOccurred, this, &Client::displayError);
this, &Client::displayError);
connect(consumers[SctpChannels::Time], &Consumer::writeDatagram, this, &Client::writeDatagram); connect(consumers[SctpChannels::Time], &Consumer::writeDatagram, this, &Client::writeDatagram);
connect(consumers[SctpChannels::Chat], &Consumer::writeDatagram, this, &Client::writeDatagram); connect(consumers[SctpChannels::Chat], &Consumer::writeDatagram, this, &Client::writeDatagram);

2
src/network/access/qnetworkreply.cpp
View File

@ -868,7 +868,7 @@ void QNetworkReply::setRequest(const QNetworkRequest &request)
Sets the error condition to be \a errorCode. The human-readable Sets the error condition to be \a errorCode. The human-readable
message is set with \a errorString. message is set with \a errorString.
Calling setError() does not emit the error(QNetworkReply::NetworkError) Calling setError() does not emit the errorOccurred(QNetworkReply::NetworkError)
signal. signal.
\sa error(), errorString() \sa error(), errorString()

2
src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
View File

@ -64,7 +64,7 @@ request.setRawHeader("User-Agent", "MyOwnBrowser 1.0");
QNetworkReply *reply = manager->get(request); QNetworkReply *reply = manager->get(request);
connect(reply, &QIODevice::readyRead, this, &MyClass::slotReadyRead); connect(reply, &QIODevice::readyRead, this, &MyClass::slotReadyRead);
connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error), connect(reply, &QNetworkReply::errorOccurred,
this, &MyClass::slotError); this, &MyClass::slotError);
connect(reply, &QNetworkReply::sslErrors, connect(reply, &QNetworkReply::sslErrors,
this, &MyClass::slotSslErrors); this, &MyClass::slotSslErrors);

4
tests/auto/network/access/http2/tst_http2.cpp
View File

@ -512,9 +512,7 @@ void tst_Http2::goaway()
request.setAttribute(QNetworkRequest::Http2AllowedAttribute, QVariant(true)); request.setAttribute(QNetworkRequest::Http2AllowedAttribute, QVariant(true));
replies[i] = manager->get(request); replies[i] = manager->get(request);
QCOMPARE(replies[i]->error(), QNetworkReply::NoError); QCOMPARE(replies[i]->error(), QNetworkReply::NoError);
void (QNetworkReply::*errorSignal)(QNetworkReply::NetworkError) = connect(replies[i], &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError);
&QNetworkReply::errorOccurred;
connect(replies[i], errorSignal, this, &tst_Http2::replyFinishedWithError);
// Since we're using self-signed certificates, ignore SSL errors: // Since we're using self-signed certificates, ignore SSL errors:
replies[i]->ignoreSslErrors(); replies[i]->ignoreSslErrors();
} }

3
tests/auto/network/ssl/qocsp/tst_qocsp.cpp
View File

@ -410,7 +410,6 @@ private:
static QString certDirPath; static QString certDirPath;
void (QSslSocket::*socketErrorSignal)(QAbstractSocket::SocketError) = &QAbstractSocket::errorOccurred;
void (QSslSocket::*tlsErrorsSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors; void (QSslSocket::*tlsErrorsSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
void (QTestEventLoop::*exitLoopSlot)() = &QTestEventLoop::exitLoop; void (QTestEventLoop::*exitLoopSlot)() = &QTestEventLoop::exitLoop;
@ -764,7 +763,7 @@ void tst_QOcsp::setupOcspClient(QSslSocket &clientSocket, const CertificateChain
clientSocket.setSslConfiguration(clientConfig); clientSocket.setSslConfiguration(clientConfig);
clientSocket.setPeerVerifyName(name); clientSocket.setPeerVerifyName(name);
connect(&clientSocket, socketErrorSignal, &loop, exitLoopSlot); connect(&clientSocket, &QAbstractSocket::errorOccurred, &loop, exitLoopSlot);
connect(&clientSocket, tlsErrorsSignal, &loop, exitLoopSlot); connect(&clientSocket, tlsErrorsSignal, &loop, exitLoopSlot);
connect(&clientSocket, &QSslSocket::encrypted, &loop, exitLoopSlot); connect(&clientSocket, &QSslSocket::encrypted, &loop, exitLoopSlot);
} }

3
tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
View File

@ -2552,8 +2552,7 @@ void tst_QSslSocket::closeWhileEmittingSocketError()
clientSocket.setSslConfiguration(clientConfig); clientSocket.setSslConfiguration(clientConfig);
QSignalSpy socketErrorSpy(&clientSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError))); QSignalSpy socketErrorSpy(&clientSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)));
void (QSslSocket::*errorSignal)(QAbstractSocket::SocketError) = &QSslSocket::errorOccurred; connect(&clientSocket, &QSslSocket::errorOccurred, &handshake, &BrokenPskHandshake::socketError);
connect(&clientSocket, errorSignal, &handshake, &BrokenPskHandshake::socketError);
clientSocket.connectToHostEncrypted(QStringLiteral("127.0.0.1"), handshake.serverPort()); clientSocket.connectToHostEncrypted(QStringLiteral("127.0.0.1"), handshake.serverPort());
// Make sure we have some data buffered so that close will try to flush: // Make sure we have some data buffered so that close will try to flush: