tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Qt] Call QNetworkReply::readAll() only once

Browse Source
This commit is contained in:
Bruno de Oliveira Abinader
2017-11-08 17:18:57 +02:00
parent 7936c138fe
commit 12f69ae14a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/qt/src/http_file_source.cpp
View File

@@ -80,9 +80,10 @@ void HTTPFileSource::Impl::onReplyFinished()
return;
}
QByteArray data = reply->readAll();
QVector<HTTPRequest*>& requestsVector = it.value().second;
for (auto req : requestsVector) {
req->handleNetworkReply(reply);
req->handleNetworkReply(reply, data);
}
m_pending.erase(it);

7
platform/qt/src/http_request.cpp
View File

@@ -52,7 +52,7 @@ QNetworkRequest HTTPRequest::networkRequest() const
return req;
}
void HTTPRequest::handleNetworkReply(QNetworkReply *reply)
void HTTPRequest::handleNetworkReply(QNetworkReply *reply, const QByteArray& data)
{
m_handled = true;
@@ -98,11 +98,10 @@ void HTTPRequest::handleNetworkReply(QNetworkReply *reply)
switch(responseCode) {
case 200: {
QByteArray bytes = reply->readAll();
if (bytes.isEmpty()) {
if (data.isEmpty()) {
response.data = std::make_shared<std::string>();
} else {
response.data = std::make_shared<std::string>(bytes.constData(), bytes.size());
response.data = std::make_shared<std::string>(data.constData(), data.size());
}
break;
}

2
platform/qt/src/http_request.hpp
View File

@@ -20,7 +20,7 @@ public:
QUrl requestUrl() const;
QNetworkRequest networkRequest() const;
void handleNetworkReply(QNetworkReply *);
void handleNetworkReply(QNetworkReply *, const QByteArray& data);
private:
HTTPFileSource::Impl* m_context;