From 9630e7b6897df7d9c20fa7ae06a6a9fa712e9d54 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Wed, 25 Mar 2020 11:56:07 +0800 Subject: [PATCH] Rely on Qt ownership to free resources The m_reply has already changed parent in DownloadHandlerImpl::assignNetworkReply() and thus we can rely on Qt ownership to delete the object. --- src/base/net/private/downloadhandlerimpl.cpp | 6 +----- src/base/net/private/downloadhandlerimpl.h | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/base/net/private/downloadhandlerimpl.cpp b/src/base/net/private/downloadhandlerimpl.cpp index faf88363a..699392381 100644 --- a/src/base/net/private/downloadhandlerimpl.cpp +++ b/src/base/net/private/downloadhandlerimpl.cpp @@ -64,11 +64,6 @@ DownloadHandlerImpl::DownloadHandlerImpl(Net::DownloadManager *manager, const Ne m_result.status = Net::DownloadStatus::Success; } -DownloadHandlerImpl::~DownloadHandlerImpl() -{ - delete m_reply; -} - void DownloadHandlerImpl::cancel() { if (m_reply) { @@ -83,6 +78,7 @@ void DownloadHandlerImpl::cancel() void DownloadHandlerImpl::assignNetworkReply(QNetworkReply *reply) { Q_ASSERT(reply); + Q_ASSERT(!m_reply); m_reply = reply; m_reply->setParent(this); diff --git a/src/base/net/private/downloadhandlerimpl.h b/src/base/net/private/downloadhandlerimpl.h index 05c5c10ea..9e8b36565 100644 --- a/src/base/net/private/downloadhandlerimpl.h +++ b/src/base/net/private/downloadhandlerimpl.h @@ -43,7 +43,6 @@ class DownloadHandlerImpl : public Net::DownloadHandler public: DownloadHandlerImpl(Net::DownloadManager *manager, const Net::DownloadRequest &downloadRequest); - ~DownloadHandlerImpl() override; void cancel() override;