summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
authorJean Gressmann <jean.gressmann@nokia.com>2012-04-25 17:56:33 +0200
committerQt by Nokia <qt-info@nokia.com>2012-05-25 09:43:51 +0200
commitc8ba042b5bc353c7bc3140e80287e2d5a79ea2f7 (patch)
treef020950345547391671232056dd635b756a0566c /src/plugins
parentfc4cfe109ea6b558f3722d92939645ddcdc628aa (diff)
downloadqtlocation-c8ba042b5bc353c7bc3140e80287e2d5a79ea2f7.tar.gz
QtLocation/Nokia plugin: Removed service authentication data and refs.
Task-number: QTBUG-25497 Change-Id: I43357def9db11bfbe5f9fe14c963f22f11f05310 Reviewed-by: Jean Gressmann <jean.gressmann@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp6
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp3
-rw-r--r--src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h4
-rw-r--r--src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp6
4 files changed, 0 insertions, 19 deletions
diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
index 7a3faf97..7f783692 100644
--- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp
@@ -100,12 +100,6 @@ QString QGeocodingManagerEngineNokia::getAuthenticationString() const
authenticationString += "&app_id=";
authenticationString += m_applicationId;
- } else {
- authenticationString += "?token=";
- authenticationString += QGeoServiceProviderFactoryNokia::defaultToken;
-
- authenticationString += "&referer=";
- authenticationString += QGeoServiceProviderFactoryNokia::defaultReferer;
}
return authenticationString;
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
index d1ee9344..1b8920b4 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.cpp
@@ -170,7 +170,4 @@ void QGeoServiceProviderFactoryNokia::informOnceAboutUsageTermsIfNecessary(
}
}
-const QString QGeoServiceProviderFactoryNokia::defaultToken("152022572f0e44e07489c35cd46fa246");
-const QString QGeoServiceProviderFactoryNokia::defaultReferer("qtlocationapi");
-
QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
index 4b9816e1..4af3bcb4 100644
--- a/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeoserviceproviderplugin_nokia.h
@@ -79,10 +79,6 @@ public:
QPlaceManagerEngine *createPlaceManagerEngine(const QVariantMap &parameters,
QGeoServiceProvider::Error *error,
QString *errorString) const;
-
- static const QString defaultToken;
- static const QString defaultReferer;
-
private:
void informOnceAboutUsageTermsIfNecessary(const QVariantMap &parameters) const;
diff --git a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
index 3ae481c4..3f407e64 100644
--- a/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qgeotilefetcher_nokia.cpp
@@ -186,12 +186,6 @@ QString QGeoTileFetcherNokia::getRequestString(const QGeoTileSpec &spec)
requestString += "&app_id=";
requestString += m_applicationId;
- } else {
- requestString += "?token=";
- requestString += QGeoServiceProviderFactoryNokia::defaultToken;
-
- requestString += "&referer=";
- requestString += QGeoServiceProviderFactoryNokia::defaultReferer;
}
requestString += "&lg=";