From a441c5fb166ed3902dd17080b073204a9db59d83 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Mon, 6 Oct 2014 09:42:47 -0700
Subject: [PATCH] don't use an unecessary subclass of QNetworkAccessManager

---
 libraries/networking/src/NetworkAccessManager.cpp | 10 +++-------
 libraries/networking/src/NetworkAccessManager.h   |  7 ++-----
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/libraries/networking/src/NetworkAccessManager.cpp b/libraries/networking/src/NetworkAccessManager.cpp
index 6e2580f51e..161170a87d 100644
--- a/libraries/networking/src/NetworkAccessManager.cpp
+++ b/libraries/networking/src/NetworkAccessManager.cpp
@@ -13,16 +13,12 @@
 
 #include "NetworkAccessManager.h"
 
-QThreadStorage<NetworkAccessManager*> networkAccessManagers;
+QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 
-NetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) {
+QNetworkAccessManager& NetworkAccessManager::getInstance(bool forceReset) {
     if (!networkAccessManagers.hasLocalData() || forceReset) {
-            networkAccessManagers.setLocalData(new NetworkAccessManager());
+            networkAccessManagers.setLocalData(new QNetworkAccessManager());
     }
     
     return *networkAccessManagers.localData();
 }
-
-NetworkAccessManager::NetworkAccessManager() {
-    
-}
diff --git a/libraries/networking/src/NetworkAccessManager.h b/libraries/networking/src/NetworkAccessManager.h
index 6636a0eae6..3a236f7041 100644
--- a/libraries/networking/src/NetworkAccessManager.h
+++ b/libraries/networking/src/NetworkAccessManager.h
@@ -15,13 +15,10 @@
 #include <QNetworkAccessManager>
 
 /// Wrapper around QNetworkAccessManager to restrict at one instance by thread
-class NetworkAccessManager : public QNetworkAccessManager {
+class NetworkAccessManager : public QObject {
     Q_OBJECT
 public:
-    static NetworkAccessManager& getInstance(bool forceReset = false);
-    
-private:
-    NetworkAccessManager();
+    static QNetworkAccessManager& getInstance(bool forceReset = false);
 };
 
 #endif // hifi_NetworkAccessManager_h
\ No newline at end of file