From b8c1c279c62e1e371f519e4b18e8c55b0809de2f Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Mon, 14 Sep 2015 11:22:55 -0700
Subject: [PATCH] Update AssetRequest::State enum to use camelcase

---
 libraries/networking/src/AssetRequest.cpp |  6 +++---
 libraries/networking/src/AssetRequest.h   | 10 +++++-----
 libraries/networking/src/AssetUpload.h    |  1 +
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp
index f9d5c70bf5..c0e5f0b6f2 100644
--- a/libraries/networking/src/AssetRequest.cpp
+++ b/libraries/networking/src/AssetRequest.cpp
@@ -33,12 +33,12 @@ void AssetRequest::start() {
         return;
     }
 
-    if (_state != NOT_STARTED) {
+    if (_state != NotStarted) {
         qCWarning(networking) << "AssetRequest already started.";
         return;
     }
     
-    _state = WAITING_FOR_INFO;
+    _state = WaitingForInfo;
     
     auto assetClient = DependencyManager::get<AssetClient>();
     assetClient->getAssetInfo(_hash, _extension, [this](bool responseReceived, AssetServerError serverError, AssetInfo info) {
@@ -66,7 +66,7 @@ void AssetRequest::start() {
             return;
         }
         
-        _state = WAITING_FOR_DATA;
+        _state = WaitingForData;
         _data.resize(info.size);
         
         qCDebug(networking) << "Got size of " << _hash << " : " << info.size << " bytes";
diff --git a/libraries/networking/src/AssetRequest.h b/libraries/networking/src/AssetRequest.h
index 3748703563..9bd224b35e 100644
--- a/libraries/networking/src/AssetRequest.h
+++ b/libraries/networking/src/AssetRequest.h
@@ -24,10 +24,10 @@ class AssetRequest : public QObject {
    Q_OBJECT
 public:
     enum State {
-        NOT_STARTED = 0,
-        WAITING_FOR_INFO,
-        WAITING_FOR_DATA,
-        FINISHED
+        NotStarted = 0,
+        WaitingForInfo,
+        WaitingForData,
+        Finished
     };
     
     enum Error {
@@ -52,7 +52,7 @@ signals:
     void progress(qint64 totalReceived, qint64 total);
 
 private:
-    State _state = NOT_STARTED;
+    State _state = NotStarted;
     Error _error = NoError;
     AssetInfo _info;
     uint64_t _totalReceived { 0 };
diff --git a/libraries/networking/src/AssetUpload.h b/libraries/networking/src/AssetUpload.h
index 2dfada06f2..80faa8a9c1 100644
--- a/libraries/networking/src/AssetUpload.h
+++ b/libraries/networking/src/AssetUpload.h
@@ -28,6 +28,7 @@ public:
     
     enum Error {
         NoError = 0,
+        NetworkError,
         Timeout,
         TooLarge,
         PermissionDenied,