From 3959928bbb7e15003fffa32fd4e2cf37a3a79314 Mon Sep 17 00:00:00 2001 From: Ryan Huffman Date: Tue, 25 Aug 2015 15:20:00 -0700 Subject: [PATCH] Update ResourceRequest::moveData to getData --- libraries/networking/src/ResourceCache.cpp | 2 +- libraries/networking/src/ResourceRequest.h | 2 +- libraries/script-engine/src/BatchLoader.cpp | 2 +- libraries/script-engine/src/ScriptCache.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp index 018f9b1c36..bb4e4aeeb9 100644 --- a/libraries/networking/src/ResourceCache.cpp +++ b/libraries/networking/src/ResourceCache.cpp @@ -464,7 +464,7 @@ void Resource::handleReplyFinished() { auto result = _request->getResult(); if (result == ResourceRequest::SUCCESS) { - _data = _request->moveData(); + _data = _request->getData(); qDebug() << "Reqeust finsihed for " << _url << ", " << _activeUrl; _request->disconnect(this); diff --git a/libraries/networking/src/ResourceRequest.h b/libraries/networking/src/ResourceRequest.h index 3eb975d8d6..458a859d16 100644 --- a/libraries/networking/src/ResourceRequest.h +++ b/libraries/networking/src/ResourceRequest.h @@ -33,7 +33,7 @@ public: }; void send(); - QByteArray moveData() { return _data; } + QByteArray getData() { return _data; } State getState() const { return _state; } Result getResult() const { return _result; } QUrl getUrl() const { return _url; } diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp index 99916310f4..58145c2ef3 100644 --- a/libraries/script-engine/src/BatchLoader.cpp +++ b/libraries/script-engine/src/BatchLoader.cpp @@ -42,7 +42,7 @@ void BatchLoader::start() { } connect(request, &ResourceRequest::finished, [=]() { if (request->getResult() == ResourceRequest::SUCCESS) { - _data.insert(url, request->moveData()); + _data.insert(url, request->getData()); } else { _data.insert(url, QString()); } diff --git a/libraries/script-engine/src/ScriptCache.cpp b/libraries/script-engine/src/ScriptCache.cpp index 94fff89c35..9409c10652 100644 --- a/libraries/script-engine/src/ScriptCache.cpp +++ b/libraries/script-engine/src/ScriptCache.cpp @@ -66,7 +66,7 @@ void ScriptCache::scriptDownloaded() { _scriptUsers.remove(url); if (req->getResult() == ResourceRequest::SUCCESS) { - _scriptCache[url] = req->moveData(); + _scriptCache[url] = req->getData(); qCDebug(scriptengine) << "Done downloading script at:" << url.toString(); foreach(ScriptUser* user, scriptUsers) {