Uniform usage of proxy, app_id, and, token for all managers.

There is no reason to have different <service>.proxy, <service.app_id
<service>.token parameters, since they are the same for all services.

Change-Id: Ie17c39ac5fd94027ce477267f9e957d4cc4a5e1b
Reviewed-by: Alex Wilson <alex.wilson@nokia.com>

1 files changed, 7 insertions, 10 deletions

diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index cf081252..86d576cc 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -86,8 +86,11 @@ bool QGeoTileFetcherNokia::init()
 
     m_networkManager = new QNetworkAccessManager(this);
 
-    if (m_parameters.contains("mapping.proxy")) {
-        QString proxy = m_parameters.value("mapping.proxy").toString();
+    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()) {
             QUrl proxyUrl(proxy);
             if (proxyUrl.isValid()) {
@@ -106,17 +109,11 @@ bool QGeoTileFetcherNokia::init()
             setHost(host);
     }
 
-    if (m_parameters.contains("mapping.app_id")) {
-        m_applicationId = m_parameters.value("mapping.app_id").toString();
-    }
-    else if (m_parameters.contains("app_id")) {
+    if (m_parameters.contains("app_id")) {
         m_applicationId = m_parameters.value("app_id").toString();
     }
 
-    if (m_parameters.contains("mapping.token")) {
-        m_token = m_parameters.value("mapping.token").toString();
-    }
-    else if (m_parameters.contains("token")) {
+    if (m_parameters.contains("token")) {
         m_token = m_parameters.value("token").toString();
     }