Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 04:24:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update ResourceRequest::moveData to getData

Browse source
This commit is contained in:
Ryan Huffman 2015-08-25 15:20:00 -07:00
parent 2efba00e3e
commit 3959928bbb
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/networking/src/ResourceCache.cpp
View file

@ -464,7 +464,7 @@ void Resource::handleReplyFinished() {
auto result = _request->getResult(); auto result = _request->getResult();
if (result == ResourceRequest::SUCCESS) { if (result == ResourceRequest::SUCCESS) {
_data = _request->moveData(); _data = _request->getData();
qDebug() << "Reqeust finsihed for " << _url << ", " << _activeUrl; qDebug() << "Reqeust finsihed for " << _url << ", " << _activeUrl;
_request->disconnect(this); _request->disconnect(this);

2
libraries/networking/src/ResourceRequest.h
View file

@ -33,7 +33,7 @@ public:
}; };
void send(); void send();
QByteArray moveData() { return _data; } QByteArray getData() { return _data; }
State getState() const { return _state; } State getState() const { return _state; }
Result getResult() const { return _result; } Result getResult() const { return _result; }
QUrl getUrl() const { return _url; } QUrl getUrl() const { return _url; }

2
libraries/script-engine/src/BatchLoader.cpp
View file

@ -42,7 +42,7 @@ void BatchLoader::start() {
} }
connect(request, &ResourceRequest::finished, [=]() { connect(request, &ResourceRequest::finished, [=]() {
if (request->getResult() == ResourceRequest::SUCCESS) { if (request->getResult() == ResourceRequest::SUCCESS) {
_data.insert(url, request->moveData()); _data.insert(url, request->getData());
} else { } else {
_data.insert(url, QString()); _data.insert(url, QString());
} }

2
libraries/script-engine/src/ScriptCache.cpp
View file

@ -66,7 +66,7 @@ void ScriptCache::scriptDownloaded() {
_scriptUsers.remove(url); _scriptUsers.remove(url);
if (req->getResult() == ResourceRequest::SUCCESS) { if (req->getResult() == ResourceRequest::SUCCESS) {
_scriptCache[url] = req->moveData(); _scriptCache[url] = req->getData();
qCDebug(scriptengine) << "Done downloading script at:" << url.toString(); qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
foreach(ScriptUser* user, scriptUsers) { foreach(ScriptUser* user, scriptUsers) {