forked from qt-creator/qt-creator
FileDownloader: Avoid using sender()
Change-Id: Ifd943b1c827e30fd72320035d1329b6e47aeee96 Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
@@ -74,7 +74,7 @@ void FileDownloader::start()
|
|||||||
QNetworkReply *reply = Utils::NetworkAccessManager::instance()->get(request);
|
QNetworkReply *reply = Utils::NetworkAccessManager::instance()->get(request);
|
||||||
m_reply = reply;
|
m_reply = reply;
|
||||||
|
|
||||||
QNetworkReply::connect(reply, &QNetworkReply::readyRead, this, [this, reply]() {
|
QNetworkReply::connect(reply, &QNetworkReply::readyRead, this, [this, reply] {
|
||||||
bool isDownloadingFile = false;
|
bool isDownloadingFile = false;
|
||||||
QString contentType;
|
QString contentType;
|
||||||
if (!reply->hasRawHeader("Content-Type")) {
|
if (!reply->hasRawHeader("Content-Type")) {
|
||||||
@@ -115,7 +115,7 @@ void FileDownloader::start()
|
|||||||
emit reply->redirectAllowed();
|
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()) {
|
||||||
if (reply->error() != QNetworkReply::OperationCanceledError) {
|
if (reply->error() != QNetworkReply::OperationCanceledError) {
|
||||||
qWarning() << Q_FUNC_INFO << m_url << reply->errorString();
|
qWarning() << Q_FUNC_INFO << m_url << reply->errorString();
|
||||||
@@ -282,7 +282,7 @@ void FileDownloader::doProbeUrl()
|
|||||||
emit reply->redirectAllowed();
|
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())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
@@ -295,18 +295,14 @@ void FileDownloader::doProbeUrl()
|
|||||||
reply->deleteLater();
|
reply->deleteLater();
|
||||||
});
|
});
|
||||||
|
|
||||||
QNetworkReply::connect(reply,
|
QNetworkReply::connect(reply, &QNetworkReply::errorOccurred,
|
||||||
&QNetworkReply::errorOccurred,
|
this, [this, reply](QNetworkReply::NetworkError code) {
|
||||||
this,
|
|
||||||
[this](QNetworkReply::NetworkError code) {
|
|
||||||
|
|
||||||
if (QQmlData::wasDeleted(this)) {
|
if (QQmlData::wasDeleted(this)) {
|
||||||
qDebug() << Q_FUNC_INFO << "FileDownloader was deleted.";
|
qDebug() << Q_FUNC_INFO << "FileDownloader was deleted.";
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
qDebug() << Q_FUNC_INFO << "Network error:" << code
|
qDebug() << Q_FUNC_INFO << "Network error:" << code << reply->errorString();
|
||||||
<< qobject_cast<QNetworkReply *>(sender())->errorString();
|
|
||||||
|
|
||||||
m_available = false;
|
m_available = false;
|
||||||
emit availableChanged();
|
emit availableChanged();
|
||||||
|
Reference in New Issue
Block a user