From c670c9a0d55af846826eed5017f0699ed75e5c27 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 8 Sep 2015 15:31:37 -0700
Subject: [PATCH] fix for AnimNodeLoader use of Resource loaded

---
 libraries/animation/src/AnimNodeLoader.cpp | 8 ++++----
 libraries/animation/src/AnimNodeLoader.h   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/animation/src/AnimNodeLoader.cpp b/libraries/animation/src/AnimNodeLoader.cpp
index 5f0260db6d..866f443005 100644
--- a/libraries/animation/src/AnimNodeLoader.cpp
+++ b/libraries/animation/src/AnimNodeLoader.cpp
@@ -381,8 +381,8 @@ AnimNodeLoader::AnimNodeLoader(const QUrl& url) :
     _resource(nullptr) {
 
     _resource = new Resource(url);
-    connect(_resource, SIGNAL(loaded(QNetworkReply&)), SLOT(onRequestDone(QNetworkReply&)));
-    connect(_resource, SIGNAL(failed(QNetworkReply::NetworkError)), SLOT(onRequestError(QNetworkReply::NetworkError)));
+    connect(_resource, &Resource::loaded, this, &AnimNodeLoader::onRequestDone);
+    connect(_resource, &Resource::failed, this, &AnimNodeLoader::onRequestError);
 }
 
 AnimNode::Pointer AnimNodeLoader::load(const QByteArray& contents, const QUrl& jsonUrl) {
@@ -420,8 +420,8 @@ AnimNode::Pointer AnimNodeLoader::load(const QByteArray& contents, const QUrl& j
     return loadNode(rootVal.toObject(), jsonUrl);
 }
 
-void AnimNodeLoader::onRequestDone(QNetworkReply& request) {
-    auto node = load(request.readAll(), _url);
+void AnimNodeLoader::onRequestDone(const QByteArray& data) {
+    auto node = load(data, _url);
     if (node) {
         emit success(node);
     } else {
diff --git a/libraries/animation/src/AnimNodeLoader.h b/libraries/animation/src/AnimNodeLoader.h
index 71b5552879..713d980f06 100644
--- a/libraries/animation/src/AnimNodeLoader.h
+++ b/libraries/animation/src/AnimNodeLoader.h
@@ -36,7 +36,7 @@ protected:
     static AnimNode::Pointer load(const QByteArray& contents, const QUrl& jsonUrl);
 
 protected slots:
-    void onRequestDone(QNetworkReply& request);
+    void onRequestDone(const QByteArray& data);
     void onRequestError(QNetworkReply::NetworkError error);
 
 protected: