From 77aeba3c881314ff3c800331a1dc76f7e7f23dfa Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Wed, 13 Dec 2023 21:36:22 +0100 Subject: [PATCH] FileDownloader: Avoid using sender() Change-Id: Ifd943b1c827e30fd72320035d1329b6e47aeee96 Reviewed-by: Qt CI Patch Build Bot Reviewed-by: Tim Jenssen --- .../qmldesigner/utils/filedownloader.cpp | 30 ++++++++----------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/src/plugins/qmldesigner/utils/filedownloader.cpp b/src/plugins/qmldesigner/utils/filedownloader.cpp index 38f0caeeb36..8c85b65a18d 100644 --- a/src/plugins/qmldesigner/utils/filedownloader.cpp +++ b/src/plugins/qmldesigner/utils/filedownloader.cpp @@ -74,7 +74,7 @@ void FileDownloader::start() QNetworkReply *reply = Utils::NetworkAccessManager::instance()->get(request); m_reply = reply; - QNetworkReply::connect(reply, &QNetworkReply::readyRead, this, [this, reply]() { + QNetworkReply::connect(reply, &QNetworkReply::readyRead, this, [this, reply] { bool isDownloadingFile = false; QString contentType; if (!reply->hasRawHeader("Content-Type")) { @@ -115,7 +115,7 @@ void FileDownloader::start() emit reply->redirectAllowed(); }); - QNetworkReply::connect(reply, &QNetworkReply::finished, this, [this, reply]() { + QNetworkReply::connect(reply, &QNetworkReply::finished, this, [this, reply] { if (reply->error()) { if (reply->error() != QNetworkReply::OperationCanceledError) { qWarning() << Q_FUNC_INFO << m_url << reply->errorString(); @@ -282,7 +282,7 @@ void FileDownloader::doProbeUrl() emit reply->redirectAllowed(); }); - QNetworkReply::connect(reply, &QNetworkReply::finished, this, [this, reply]() { + QNetworkReply::connect(reply, &QNetworkReply::finished, this, [this, reply] { if (reply->error()) return; @@ -295,22 +295,18 @@ void FileDownloader::doProbeUrl() reply->deleteLater(); }); - QNetworkReply::connect(reply, - &QNetworkReply::errorOccurred, - this, - [this](QNetworkReply::NetworkError code) { + QNetworkReply::connect(reply, &QNetworkReply::errorOccurred, + this, [this, reply](QNetworkReply::NetworkError code) { + if (QQmlData::wasDeleted(this)) { + qDebug() << Q_FUNC_INFO << "FileDownloader was deleted."; + return; + } - if (QQmlData::wasDeleted(this)) { - qDebug() << Q_FUNC_INFO << "FileDownloader was deleted."; - return; - } + qDebug() << Q_FUNC_INFO << "Network error:" << code << reply->errorString(); - qDebug() << Q_FUNC_INFO << "Network error:" << code - << qobject_cast(sender())->errorString(); - - m_available = false; - emit availableChanged(); - }); + m_available = false; + emit availableChanged(); + }); } void FileDownloader::setTargetFilePath(const QString &path)