QtLocation/Nokia plugin: Print usage terms fixup

Instead of only printing the usage terms when using the tile
mapping service the terms are now printed regardless of the
service used from Nokia's location plugin.

Note that the usage terms are only printed at most once per
plugin initialization.

Change-Id: I665ed97552c811e0f5e2b06a7ff1d522f823601a
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>

1 files changed, 0 insertions, 23 deletions

diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 777548ea..5df43dce 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -128,11 +128,6 @@ bool QGeoTileFetcherNokia::init()
     currentMobileCountryCodeChanged(0, m_networkInfo.currentMobileCountryCode(0));
 #endif
 
-    if (!isValidParameter(m_applicationId) || !isValidParameter(m_token)) {
-        qWarning() << "Qt Location requires usage of app_id and token parameters obtained from:";
-        qWarning() << "https://api.developer.nokia.com/";
-    }
-
     // Temporary testing aid for setting China maptile server
     QFile file("/.enable_china_maptile_server");
     if (file.exists()) {
@@ -300,24 +295,6 @@ void QGeoTileFetcherNokia::currentMobileCountryCodeChanged(int interface, const
 }
 #endif
 
-bool QGeoTileFetcherNokia::isValidParameter(const QString &param)
-{
-    if (param.isEmpty())
-        return false;
-
-    if (param.length() > 512)
-        return false;
-
-    foreach (QChar c, param) {
-        if (!c.isLetterOrNumber() && c.toAscii() != '%' && c.toAscii() != '-' &&
-            c.toAscii() != '+' && c.toAscii() != '_') {
-            return false;
-        }
-    }
-
-    return true;
-}
-
 void QGeoTileFetcherNokia::copyrightsFetched()
 {
     QMetaObject::invokeMethod(m_engineNokia,