mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-24 21:44:25 +00:00
Remove unnecessary dynamic allocation
Also remove unneeded `if ()` conditional.
This commit is contained in:
parent
56766dc08b
commit
517fc39950
@ -48,6 +48,20 @@ namespace
|
|||||||
{
|
{
|
||||||
QString tr(const char *message);
|
QString tr(const char *message);
|
||||||
QString errorCodeToString(QNetworkReply::NetworkError status);
|
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)
|
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)
|
void Net::DownloadHandler::handleRedirection(QUrl newUrl)
|
||||||
{
|
{
|
||||||
// Resolve relative urls
|
// Resolve relative urls
|
||||||
|
@ -66,7 +66,6 @@ namespace Net
|
|||||||
|
|
||||||
private:
|
private:
|
||||||
void assignNetworkReply(QNetworkReply *reply);
|
void assignNetworkReply(QNetworkReply *reply);
|
||||||
bool saveToFile(const QByteArray &replyData, QString &filePath);
|
|
||||||
void handleRedirection(QUrl newUrl);
|
void handleRedirection(QUrl newUrl);
|
||||||
|
|
||||||
QNetworkReply *m_reply;
|
QNetworkReply *m_reply;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user