From 0f4b0b96a1ea36be198e1a5daa145fd50e7c5530 Mon Sep 17 00:00:00 2001
From: Jean Gressmann <jean.gressmann@nokia.com>
Date: Tue, 24 Apr 2012 16:53:30 +0200
Subject: Wrap network access to enable testing in Nokia plugin

This enables subsequent testing of the stack (from C++) without being
connected to the network.

Change-Id: I55ad5ece9c323ec82a493d059f1418f68169c5e6
Task-number: QTBUG-25416
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>
---
 .../geoservices/nokia/qgeotilefetcher_nokia.cpp    | 38 ++++++----------------
 1 file changed, 10 insertions(+), 28 deletions(-)

(limited to 'src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp')

diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 5df43dce..09e72343 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -50,12 +50,11 @@
 #include "qgeomapreply_nokia.h"
 #include "qgeotiledmapdata_nokia.h"
 #include "qgeotiledmappingmanagerengine_nokia.h"
+#include "qgeonetworkaccessmanager.h"
 
 #include <qgeotilespec.h>
 
-#include <QNetworkAccessManager>
-#include <QNetworkProxy>
-#include <QNetworkProxyFactory>
+#include <QDebug>
 #include <QSize>
 #include <QDir>
 #include <QUrl>
@@ -70,13 +69,18 @@ QT_BEGIN_NAMESPACE
 const char* MAPTILES_HOST = "1-4.maptile.lbs.ovi.com";
 const char* MAPTILES_HOST_CN = "a-k.maptile.maps.svc.nokia.com.cn";
 
-QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoTiledMappingManagerEngine *engine)
+QGeoTileFetcherNokia::QGeoTileFetcherNokia(QGeoNetworkAccessManager* networkManager,
+                                           QGeoTiledMappingManagerEngine *engine)
         : QGeoTileFetcher(engine),
           m_engineNokia(static_cast<QGeoTiledMappingManagerEngineNokia*>(engine)),
-          m_networkManager(0),
+          m_networkManager(networkManager),
           m_firstSubdomain(QChar::Null),
           m_copyrightsReply(0),
-          m_maxSubdomains(0) {}
+          m_maxSubdomains(0)
+{
+    Q_ASSERT(networkManager);
+    m_networkManager->setParent(this);
+}
 
 QGeoTileFetcherNokia::~QGeoTileFetcherNokia() {}
 
@@ -86,28 +90,6 @@ bool QGeoTileFetcherNokia::init()
 
     qsrand((uint)QTime::currentTime().msec());
 
-    m_networkManager = new QNetworkAccessManager(this);
-
-    if (m_parameters.contains("proxy") || m_parameters.contains("mapping.proxy")) {
-        QString proxy = m_parameters.value("proxy").toString();
-        if (proxy.isEmpty())
-            proxy = m_parameters.value("mapping.proxy").toString();
-
-        if (!proxy.isEmpty() && proxy.toLower() != QLatin1String("system")) {
-            QUrl proxyUrl(proxy);
-            if (proxyUrl.isValid()) {
-                m_networkManager->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy,
-                    proxyUrl.host(),
-                    proxyUrl.port(8080),
-                    proxyUrl.userName(),
-                    proxyUrl.password()));
-            }
-        } else if (!proxy.isEmpty()) {
-            if (QNetworkProxy::applicationProxy().type() == QNetworkProxy::NoProxy)
-                QNetworkProxyFactory::setUseSystemConfiguration(true);
-        }
-    }
-
     if (m_parameters.contains("mapping.host")) {
         QString host = m_parameters.value("mapping.host").toString();
         if (!host.isEmpty())
-- 
cgit v1.2.1