From 00afabc99377ef8948721c5d33a387b94d53db95 Mon Sep 17 00:00:00 2001
From: Artem Koshelev <artkoshelev@yandex-team.ru>
Date: Tue, 10 Jun 2014 16:51:43 +0400
Subject: [PATCH] Replace proxy initialization with existing method

Since we have setProxy() method, we can replace the existing code
block in Phantom::init() with simple method call getting rid of
duplicated code.
---
 src/phantom.cpp | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

diff --git a/src/phantom.cpp b/src/phantom.cpp
index 796a77da..79aa2832 100644
--- a/src/phantom.cpp
+++ b/src/phantom.cpp
@@ -103,25 +103,10 @@ void Phantom::init()
     m_page->setCookieJar(m_defaultCookieJar);
     m_pages.append(m_page);
 
+    // Set up proxy if required
     QString proxyType = m_config.proxyType();
     if (proxyType != "none") {
-        if (m_config.proxyHost().isEmpty()) {
-            QNetworkProxyFactory::setUseSystemConfiguration(true);
-        } else {
-            QNetworkProxy::ProxyType networkProxyType = QNetworkProxy::HttpProxy;
-
-            if (proxyType == "socks5") {
-                networkProxyType = QNetworkProxy::Socks5Proxy;
-            }
-
-            if(!m_config.proxyAuthUser().isEmpty() && !m_config.proxyAuthPass().isEmpty()) {
-                QNetworkProxy proxy(networkProxyType, m_config.proxyHost(), m_config.proxyPort(), m_config.proxyAuthUser(), m_config.proxyAuthPass());
-                QNetworkProxy::setApplicationProxy(proxy);
-            } else {
-                QNetworkProxy proxy(networkProxyType, m_config.proxyHost(), m_config.proxyPort());
-                QNetworkProxy::setApplicationProxy(proxy);
-            }
-        }
+        setProxy(m_config.proxyHost(), m_config.proxyPort(), proxyType, m_config.proxyAuthUser(), m_config.proxyAuthPass());
     }
 
     // Set output encoding
@@ -412,8 +397,7 @@ void Phantom::setProxy(const QString &ip, const qint64 &port, const QString &pro
     qDebug() << "Set " << proxyType << " proxy to: " << ip << ":" << port;
     if (ip.isEmpty()) {
         QNetworkProxyFactory::setUseSystemConfiguration(true);
-    }
-    else {
+    } else {
         QNetworkProxy::ProxyType networkProxyType = QNetworkProxy::HttpProxy;
 
         if (proxyType == "socks5") {