From eabee9857acc38a0879af7daa79172eec1618078 Mon Sep 17 00:00:00 2001
From: Atlante45 <clement.brisset@gmail.com>
Date: Mon, 14 Sep 2015 17:23:53 +0200
Subject: [PATCH] Enum coding standard

---
 interface/src/Application.cpp                     | 2 ++
 libraries/networking/src/AssetClient.cpp          | 8 ++++----
 libraries/networking/src/AssetRequest.cpp         | 3 +--
 libraries/networking/src/AssetResourceRequest.cpp | 4 +---
 libraries/networking/src/HTTPResourceRequest.cpp  | 5 ++---
 libraries/networking/src/NetworkAccessManager.cpp | 1 +
 libraries/networking/src/NetworkAccessManager.h   | 2 +-
 7 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index b6e0a871b3..261cd5f2e0 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -370,6 +370,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) :
         _lastFaceTrackerUpdate(0),
         _applicationOverlay()
 {
+    thread()->setObjectName("Main Thread");
+    
     setInstance(this);
 
     _entityClipboard->createRootElement();
diff --git a/libraries/networking/src/AssetClient.cpp b/libraries/networking/src/AssetClient.cpp
index c13bc07be1..12f974796a 100644
--- a/libraries/networking/src/AssetClient.cpp
+++ b/libraries/networking/src/AssetClient.cpp
@@ -11,16 +11,16 @@
 
 #include "AssetClient.h"
 
-#include <QBuffer>
-#include <QThread>
-
 #include <cstdint>
 
+#include <QtCore/QBuffer>
+#include <QtCore/QThread>
+
 #include "AssetRequest.h"
 #include "AssetUpload.h"
+#include "AssetUtils.h"
 #include "NodeList.h"
 #include "PacketReceiver.h"
-#include "AssetUtils.h"
 
 MessageID AssetClient::_currentID = 0;
 
diff --git a/libraries/networking/src/AssetRequest.cpp b/libraries/networking/src/AssetRequest.cpp
index 45e925389d..7490e2eb27 100644
--- a/libraries/networking/src/AssetRequest.cpp
+++ b/libraries/networking/src/AssetRequest.cpp
@@ -13,7 +13,7 @@
 
 #include <algorithm>
 
-#include <QThread>
+#include <QtCore/QThread>
 
 #include "AssetClient.h"
 #include "NetworkLogging.h"
@@ -59,7 +59,6 @@ void AssetRequest::start() {
 
         if (_error != NoError) {
             qCDebug(networking) << "Got error retrieving asset info for" << _hash;
-
             _state = Finished;
             emit finished(this);
             
diff --git a/libraries/networking/src/AssetResourceRequest.cpp b/libraries/networking/src/AssetResourceRequest.cpp
index 6b419fc293..ecbe80cddb 100644
--- a/libraries/networking/src/AssetResourceRequest.cpp
+++ b/libraries/networking/src/AssetResourceRequest.cpp
@@ -32,7 +32,6 @@ void AssetResourceRequest::doSend() {
         _state = Finished;
 
         emit finished();
-
         return;
     }
 
@@ -43,12 +42,11 @@ void AssetResourceRequest::doSend() {
         _state = Finished;
 
         emit finished();
-
         return;
     }
 
     connect(_assetRequest, &AssetRequest::progress, this, &AssetResourceRequest::progress);
-    QObject::connect(_assetRequest, &AssetRequest::finished, [this](AssetRequest* req) mutable {
+    connect(_assetRequest, &AssetRequest::finished, [this](AssetRequest* req) {
         Q_ASSERT(_state == InProgress);
         Q_ASSERT(req == _assetRequest);
         Q_ASSERT(req->getState() == AssetRequest::Finished);
diff --git a/libraries/networking/src/HTTPResourceRequest.cpp b/libraries/networking/src/HTTPResourceRequest.cpp
index fd650df348..34c9c1dad2 100644
--- a/libraries/networking/src/HTTPResourceRequest.cpp
+++ b/libraries/networking/src/HTTPResourceRequest.cpp
@@ -29,8 +29,7 @@ HTTPResourceRequest::~HTTPResourceRequest() {
 }
 
 void HTTPResourceRequest::doSend() {
-    QNetworkAccessManager& networkAccessManager = NetworkAccessManager::getInstance();
-    QNetworkRequest networkRequest = QNetworkRequest(_url);
+    QNetworkRequest networkRequest(_url);
     networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
 
     if (_cacheEnabled) {
@@ -39,7 +38,7 @@ void HTTPResourceRequest::doSend() {
         networkRequest.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::AlwaysNetwork);
     }
 
-    _reply = networkAccessManager.get(networkRequest);
+    _reply = NetworkAccessManager::getInstance().get(networkRequest);
     
     connect(_reply, &QNetworkReply::finished, this, &HTTPResourceRequest::onRequestFinished);
     connect(_reply, &QNetworkReply::downloadProgress, this, &HTTPResourceRequest::onDownloadProgress);
diff --git a/libraries/networking/src/NetworkAccessManager.cpp b/libraries/networking/src/NetworkAccessManager.cpp
index 841b7491c7..97171d5ad7 100644
--- a/libraries/networking/src/NetworkAccessManager.cpp
+++ b/libraries/networking/src/NetworkAccessManager.cpp
@@ -18,6 +18,7 @@ QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 QNetworkAccessManager& NetworkAccessManager::getInstance() {
     if (!networkAccessManagers.hasLocalData()) {
         networkAccessManagers.setLocalData(new QNetworkAccessManager());
+        
     }
     
     return *networkAccessManagers.localData();
diff --git a/libraries/networking/src/NetworkAccessManager.h b/libraries/networking/src/NetworkAccessManager.h
index 5a64f4ae0a..c4b435adb6 100644
--- a/libraries/networking/src/NetworkAccessManager.h
+++ b/libraries/networking/src/NetworkAccessManager.h
@@ -12,7 +12,7 @@
 #ifndef hifi_NetworkAccessManager_h
 #define hifi_NetworkAccessManager_h
 
-#include <QtNetwork/qnetworkaccessmanager.h>
+#include <QtNetwork/QNetworkAccessManager>
 
 /// Wrapper around QNetworkAccessManager to restrict at one instance by thread
 class NetworkAccessManager : public QObject {