From c2085c26cf868d3dd0deb37cef525d95a0175256 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= Date: Wed, 3 Jun 2020 10:46:53 +0200 Subject: [PATCH] QNetworkReplyHttpImpl: resolve a todo after the bearer removal Not quite "next commit" like I wrote originally, but better late than never. As the comment said (and the code shows) it only returns true now so the extra function and if-check isn't needed anymore. Change-Id: I9e8fb8891a116475ab78c3848d7cfcdb659ac521 Reviewed-by: Edward Welbourne --- src/network/access/qnetworkreplyhttpimpl.cpp | 25 +++----------------- src/network/access/qnetworkreplyhttpimpl_p.h | 2 -- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp index a6688bfd7a9..e5913402579 100644 --- a/src/network/access/qnetworkreplyhttpimpl.cpp +++ b/src/network/access/qnetworkreplyhttpimpl.cpp @@ -1180,8 +1180,8 @@ void QNetworkReplyHttpImplPrivate::followRedirect() if (managerPrivate->thread) managerPrivate->thread->disconnect(); - QMetaObject::invokeMethod(q, "start", Qt::QueuedConnection, - Q_ARG(QNetworkRequest, redirectRequest)); + QMetaObject::invokeMethod( + q, [this]() { postRequest(redirectRequest); }, Qt::QueuedConnection); } void QNetworkReplyHttpImplPrivate::checkForRedirect(const int statusCode) @@ -1731,33 +1731,14 @@ void QNetworkReplyHttpImplPrivate::setResumeOffset(quint64 offset) resumeOffset = offset; } -/*! - Starts the backend. Returns \c true if the backend is started. Returns \c false if the backend - could not be started due to an unopened or roaming session. The caller should recall this - function once the session has been opened or the roaming process has finished. -*/ -bool QNetworkReplyHttpImplPrivate::start(const QNetworkRequest &newHttpRequest) -{ - postRequest(newHttpRequest); - return true; -} - void QNetworkReplyHttpImplPrivate::_q_startOperation() { - Q_Q(QNetworkReplyHttpImpl); if (state == Working) // ensure this function is only being called once return; state = Working; - if (!start(request)) { // @todo next commit: cleanup, start now always returns true - qWarning("Backend start failed"); - QMetaObject::invokeMethod(q, "_q_error", synchronous ? Qt::DirectConnection : Qt::QueuedConnection, - Q_ARG(QNetworkReply::NetworkError, QNetworkReply::UnknownNetworkError), - Q_ARG(QString, QCoreApplication::translate("QNetworkReply", "backend start error."))); - QMetaObject::invokeMethod(q, "_q_finished", synchronous ? Qt::DirectConnection : Qt::QueuedConnection); - return; - } + postRequest(request); setupTransferTimeout(); if (synchronous) { diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 1dded7096d2..2bd6072c215 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -98,7 +98,6 @@ public: Q_DECLARE_PRIVATE(QNetworkReplyHttpImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) - Q_PRIVATE_SLOT(d_func(), bool start(const QNetworkRequest &)) Q_PRIVATE_SLOT(d_func(), void _q_cacheLoadReadyRead()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingData()) Q_PRIVATE_SLOT(d_func(), void _q_bufferOutgoingDataFinished()) @@ -164,7 +163,6 @@ public: QNetworkReplyHttpImplPrivate(); ~QNetworkReplyHttpImplPrivate(); - bool start(const QNetworkRequest &newHttpRequest); void _q_startOperation(); void _q_cacheLoadReadyRead();