From 658201eb9886bf4da81046b2a3ae219adfce7f38 Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Wed, 9 Nov 2011 15:19:05 -0500
Subject: [PATCH] Revert "This function is probably unnecessary now, remove it"

This reverts commit e9ed034dc70051f002a359bf2f9a33e1bd924a6b.
---
 src/libtomahawk/utils/tomahawkutils.cpp | 10 ++++++++++
 src/libtomahawk/utils/tomahawkutils.h   |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/libtomahawk/utils/tomahawkutils.cpp b/src/libtomahawk/utils/tomahawkutils.cpp
index f0056f279a..52f11e5d7e 100644
--- a/src/libtomahawk/utils/tomahawkutils.cpp
+++ b/src/libtomahawk/utils/tomahawkutils.cpp
@@ -478,6 +478,16 @@ NetworkProxyFactory::NetworkProxyFactory( const NetworkProxyFactory& other )
 }
 
 
+QList< QNetworkProxy >
+NetworkProxyFactory::proxyForQuery( const QNetworkProxyQuery& query )
+{
+    Q_UNUSED( query );
+    QList< QNetworkProxy > proxies;
+    proxies << QNetworkProxy( QNetworkProxy::DefaultProxy ) << QNetworkProxy( QNetworkProxy::NoProxy );
+    return proxies;
+}
+
+
 QList< QNetworkProxy >
 NetworkProxyFactory::queryProxy( const QNetworkProxyQuery& query )
 {
diff --git a/src/libtomahawk/utils/tomahawkutils.h b/src/libtomahawk/utils/tomahawkutils.h
index 07869c610b..028e55f27c 100644
--- a/src/libtomahawk/utils/tomahawkutils.h
+++ b/src/libtomahawk/utils/tomahawkutils.h
@@ -59,6 +59,7 @@ namespace TomahawkUtils
         virtual ~NetworkProxyFactory() {}
 
         virtual QList< QNetworkProxy > queryProxy( const QNetworkProxyQuery & query = QNetworkProxyQuery() );
+        static QList< QNetworkProxy > proxyForQuery( const QNetworkProxyQuery & query );
 
         virtual void setNoProxyHosts( const QStringList &hosts );
         virtual QStringList noProxyHosts() const { return m_noProxyHosts; }