From 4e583416312e4fa6be22158ad63347d4958b1f90 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 20 Apr 2017 16:28:57 -0700
Subject: [PATCH] Remove http proxy

---
 interface/src/Application.cpp                     | 9 ---------
 libraries/networking/src/NetworkAccessManager.cpp | 9 +--------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index 886487603e..f51c3d2b46 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -188,7 +188,6 @@
 #include <src/scripting/LimitlessVoiceRecognitionScriptingInterface.h>
 #include <EntityScriptClient.h>
 #include <ModelScriptingInterface.h>
-#include <QtNetwork/QNetworkProxy>
 
 // On Windows PC, NVidia Optimus laptop, we want to enable NVIDIA GPU
 // FIXME seems to be broken.
@@ -605,7 +604,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     {
         const QString TEST_SCRIPT = "--testScript";
         const QString TRACE_FILE = "--traceFile";
-        const QString HTTP_PROXY = "--httpProxy";
         const QStringList args = arguments();
         for (int i = 0; i < args.size() - 1; ++i) {
             if (args.at(i) == TEST_SCRIPT) {
@@ -617,17 +615,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
                 QString traceFilePath = args.at(i + 1);
                 setProperty(hifi::properties::TRACING, traceFilePath);
                 DependencyManager::get<tracing::Tracer>()->startTracing();
-            } else if (args.at(i) == HTTP_PROXY) {
             }
         }
     }
 
-    QNetworkProxy proxy;
-    proxy.setType(QNetworkProxy::HttpProxy);
-    proxy.setHostName("127.0.0.1");
-    proxy.setPort(8888);
-    QNetworkProxy::setApplicationProxy(proxy);
-
     // make sure the debug draw singleton is initialized on the main thread.
     DebugDraw::getInstance().removeMarker("");
 
diff --git a/libraries/networking/src/NetworkAccessManager.cpp b/libraries/networking/src/NetworkAccessManager.cpp
index 6895118be5..fd356c3e94 100644
--- a/libraries/networking/src/NetworkAccessManager.cpp
+++ b/libraries/networking/src/NetworkAccessManager.cpp
@@ -19,14 +19,7 @@ QThreadStorage<QNetworkAccessManager*> networkAccessManagers;
 
 QNetworkAccessManager& NetworkAccessManager::getInstance() {
     if (!networkAccessManagers.hasLocalData()) {
-        auto nm = new QNetworkAccessManager();
-        networkAccessManagers.setLocalData(nm);
-
-        QNetworkProxy proxy;
-        proxy.setType(QNetworkProxy::HttpProxy);
-        proxy.setHostName("127.0.0.1");
-        proxy.setPort(8888);
-        nm->setProxy(proxy);
+        networkAccessManagers.setLocalData(new QNetworkAccessManager());
     }
     
     return *networkAccessManagers.localData();