From 667db200c032456569cd090cc6155f3413cbb992 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 27 Aug 2015 09:39:12 -0700
Subject: [PATCH] Cleanup BatchLoader

---
 libraries/networking/src/ResourceCache.cpp  |  1 -
 libraries/script-engine/src/BatchLoader.cpp | 41 ++-------------------
 2 files changed, 3 insertions(+), 39 deletions(-)

diff --git a/libraries/networking/src/ResourceCache.cpp b/libraries/networking/src/ResourceCache.cpp
index 71e3de8254..c24c2f5075 100644
--- a/libraries/networking/src/ResourceCache.cpp
+++ b/libraries/networking/src/ResourceCache.cpp
@@ -190,7 +190,6 @@ void ResourceCache::requestCompleted(Resource* resource) {
         i++;
     }
     if (highestIndex >= 0) {
-        qDebug() << "trying to attempt a pending request";
         attemptRequest(sharedItems->_pendingRequests.takeAt(highestIndex));
     }
 }
diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp
index 58145c2ef3..109b715df6 100644
--- a/libraries/script-engine/src/BatchLoader.cpp
+++ b/libraries/script-engine/src/BatchLoader.cpp
@@ -50,47 +50,12 @@ void BatchLoader::start() {
             checkFinished();
         });
 
+        // If we end up being destroyed before the reply finishes, clean it up
+        connect(this, &QObject::destroyed, request, &QObject::deleteLater);
+
         qCDebug(scriptengine) << "Loading script at " << url;
 
         request->send();
-
-//         if (url.scheme() == "http" || url.scheme() == "https" || url.scheme() == "ftp") {
-//             QNetworkRequest request = QNetworkRequest(url);
-//             request.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
-//             QNetworkReply* reply = networkAccessManager.get(request);
-//
-//             qCDebug(scriptengine) << "Downloading file at" << url;
-//
-//             connect(reply, &QNetworkReply::finished, [=]() {
-//                 if (reply->error()) {
-//                     _data.insert(url, QString());
-//                 } else {
-//                     _data.insert(url, reply->readAll());
-//                 }
-//                 reply->deleteLater();
-//                 checkFinished();
-//             });
-//
-//             // If we end up being destroyed before the reply finishes, clean it up
-//             connect(this, &QObject::destroyed, reply, &QObject::deleteLater);
-//
-//         } else {
-// #ifdef _WIN32
-//             QString fileName = url.toString();
-// #else
-//             QString fileName = url.toLocalFile();
-// #endif
-//
-//             qCDebug(scriptengine) << "Reading file at " << fileName;
-//
-//             QFile scriptFile(fileName);
-//             if (scriptFile.open(QFile::ReadOnly | QFile::Text)) {
-//                 QTextStream in(&scriptFile);
-//                 _data.insert(url, in.readAll());
-//             } else {
-//                 _data.insert(url, QString());
-//             }
-//         }
     }
     checkFinished();
 }