From 517fc3995047787530ab079fbdcb58abcd1a8ce6 Mon Sep 17 00:00:00 2001
From: Chocobo1 <Chocobo1@users.noreply.github.com>
Date: Sat, 21 Jul 2018 16:35:40 +0800
Subject: [PATCH] Remove unnecessary dynamic allocation

Also remove unneeded `if ()` conditional.
---
 src/base/net/downloadhandler.cpp | 41 +++++++++++---------------------
 src/base/net/downloadhandler.h   |  1 -
 2 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/base/net/downloadhandler.cpp b/src/base/net/downloadhandler.cpp
index 4f04102e6..04b8500c2 100644
--- a/src/base/net/downloadhandler.cpp
+++ b/src/base/net/downloadhandler.cpp
@@ -48,6 +48,20 @@ namespace
 {
     QString tr(const char *message);
     QString errorCodeToString(QNetworkReply::NetworkError status);
+
+    bool saveToFile(const QByteArray &replyData, QString &filePath)
+    {
+        QTemporaryFile tmpfile {Utils::Fs::tempPath() + "XXXXXX"};
+        tmpfile.setAutoRemove(false);
+
+        if (!tmpfile.open())
+            return false;
+
+        filePath = tmpfile.fileName();
+
+        tmpfile.write(replyData);
+        return true;
+    }
 }
 
 Net::DownloadHandler::DownloadHandler(QNetworkReply *reply, DownloadManager *manager, const DownloadRequest &downloadRequest)
@@ -145,33 +159,6 @@ void Net::DownloadHandler::checkDownloadSize(qint64 bytesReceived, qint64 bytesT
     }
 }
 
-bool Net::DownloadHandler::saveToFile(const QByteArray &replyData, QString &filePath)
-{
-    QTemporaryFile *tmpfile = new QTemporaryFile(Utils::Fs::tempPath() + "XXXXXX");
-    if (!tmpfile->open()) {
-        delete tmpfile;
-        return false;
-    }
-
-    tmpfile->setAutoRemove(false);
-    filePath = tmpfile->fileName();
-    qDebug("Temporary filename is: %s", qUtf8Printable(filePath));
-    if (m_reply->isOpen() || m_reply->open(QIODevice::ReadOnly)) {
-        tmpfile->write(replyData);
-        tmpfile->close();
-        // XXX: tmpfile needs to be deleted on Windows before using the file
-        // or it will complain that the file is used by another process.
-        delete tmpfile;
-        return true;
-    }
-    else {
-        delete tmpfile;
-        Utils::Fs::forceRemove(filePath);
-    }
-
-    return false;
-}
-
 void Net::DownloadHandler::handleRedirection(QUrl newUrl)
 {
     // Resolve relative urls
diff --git a/src/base/net/downloadhandler.h b/src/base/net/downloadhandler.h
index ef6dc9553..f750f1657 100644
--- a/src/base/net/downloadhandler.h
+++ b/src/base/net/downloadhandler.h
@@ -66,7 +66,6 @@ namespace Net
 
     private:
         void assignNetworkReply(QNetworkReply *reply);
-        bool saveToFile(const QByteArray &replyData, QString &filePath);
         void handleRedirection(QUrl newUrl);
 
         QNetworkReply *m_reply;