From 22cdf1cb226928fd806ebb415e1b191f3dace368 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 22 Jan 2015 14:24:20 -0800
Subject: [PATCH] Remove BatchLoader::errorLoadingFile and reorder properties

---
 libraries/script-engine/src/BatchLoader.cpp | 4 +---
 libraries/script-engine/src/BatchLoader.h   | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/libraries/script-engine/src/BatchLoader.cpp b/libraries/script-engine/src/BatchLoader.cpp
index ed6591423f..e2c345ce16 100644
--- a/libraries/script-engine/src/BatchLoader.cpp
+++ b/libraries/script-engine/src/BatchLoader.cpp
@@ -18,9 +18,9 @@
 
 BatchLoader::BatchLoader(const QList<QUrl>& urls) 
     : QObject(),
+      _started(false),
       _finished(false),
       _urls(urls.toSet()),
-      _started(false),
       _data() {
 }
 
@@ -39,7 +39,6 @@ void BatchLoader::start() {
 
             connect(reply, &QNetworkReply::finished, [=]() {
                 if (reply->error()) {
-                    emit errorLoadingFile(url);
                     _data.insert(url, QString());
                 } else {
                     _data.insert(url, reply->readAll());
@@ -65,7 +64,6 @@ void BatchLoader::start() {
                 QTextStream in(&scriptFile);
                 _data.insert(url, in.readAll());
             } else {
-                emit errorLoadingFile(url);
                 _data.insert(url, QString());
             }
         }
diff --git a/libraries/script-engine/src/BatchLoader.h b/libraries/script-engine/src/BatchLoader.h
index 6d19b2322f..cda040d219 100644
--- a/libraries/script-engine/src/BatchLoader.h
+++ b/libraries/script-engine/src/BatchLoader.h
@@ -29,13 +29,12 @@ public:
 
 signals:
     void finished(const QMap<QUrl, QString>& data);
-    void errorLoadingFile(QUrl url);
 
 private:
     void checkFinished();
 
-    bool _finished;
     bool _started;
+    bool _finished;
     QSet<QUrl> _urls;
     QMap<QUrl, QString> _data;
 };