Browse Source

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.
adaptive-webui-19844
Chocobo1 5 years ago
parent
commit
9630e7b689
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
  1. 6
      src/base/net/private/downloadhandlerimpl.cpp
  2. 1
      src/base/net/private/downloadhandlerimpl.h

6
src/base/net/private/downloadhandlerimpl.cpp

@ -64,11 +64,6 @@ DownloadHandlerImpl::DownloadHandlerImpl(Net::DownloadManager *manager, const Ne
m_result.status = Net::DownloadStatus::Success; m_result.status = Net::DownloadStatus::Success;
} }
DownloadHandlerImpl::~DownloadHandlerImpl()
{
delete m_reply;
}
void DownloadHandlerImpl::cancel() void DownloadHandlerImpl::cancel()
{ {
if (m_reply) { if (m_reply) {
@ -83,6 +78,7 @@ void DownloadHandlerImpl::cancel()
void DownloadHandlerImpl::assignNetworkReply(QNetworkReply *reply) void DownloadHandlerImpl::assignNetworkReply(QNetworkReply *reply)
{ {
Q_ASSERT(reply); Q_ASSERT(reply);
Q_ASSERT(!m_reply);
m_reply = reply; m_reply = reply;
m_reply->setParent(this); m_reply->setParent(this);

1
src/base/net/private/downloadhandlerimpl.h

@ -43,7 +43,6 @@ class DownloadHandlerImpl : public Net::DownloadHandler
public: public:
DownloadHandlerImpl(Net::DownloadManager *manager, const Net::DownloadRequest &downloadRequest); DownloadHandlerImpl(Net::DownloadManager *manager, const Net::DownloadRequest &downloadRequest);
~DownloadHandlerImpl() override;
void cancel() override; void cancel() override;

Loading…
Cancel
Save