diff options
Diffstat (limited to 'src/plugins')
5 files changed, 10 insertions, 10 deletions
diff --git a/src/plugins/geoservices/nokia/nokia_plugin.json b/src/plugins/geoservices/nokia/nokia_plugin.json index eb6fa68d..1fc2827d 100644 --- a/src/plugins/geoservices/nokia/nokia_plugin.json +++ b/src/plugins/geoservices/nokia/nokia_plugin.json @@ -1,6 +1,6 @@ { - "Keys": ["nokia"], - "Provider": "nokia", + "Keys": ["here"], + "Provider": "here", "Version": 101, "Experimental": false, "Features": [ diff --git a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp index 092f2d86..40bec231 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacedetailsreplyimpl.cpp @@ -329,7 +329,7 @@ void QPlaceDetailsReplyImpl::replyFinished() //} QPlaceAttribute provider; - provider.setText(QLatin1String("nokia")); + provider.setText(QLatin1String("here")); place.setExtendedAttribute(QPlaceAttribute::Provider, provider); place.setVisibility(QLocation::PublicVisibility); diff --git a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp index 0ba1c65d..90308c24 100644 --- a/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp +++ b/src/plugins/geoservices/nokia/placesv2/qplacesearchreplyimpl.cpp @@ -201,7 +201,7 @@ QPlaceResult QPlaceSearchReplyImpl::parsePlaceResult(const QJsonObject &item) co place.setPlaceId(href.path().mid(18, 41)); QPlaceAttribute provider; - provider.setText(QStringLiteral("nokia")); + provider.setText(QStringLiteral("here")); place.setExtendedAttribute(QPlaceAttribute::Provider, provider); place.setVisibility(QLocation::PublicVisibility); diff --git a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp index 15d1bd99..05fb85c5 100644 --- a/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeotiledmappingmanagerengine_nokia.cpp @@ -107,7 +107,7 @@ QGeoTiledMappingManagerEngineNokia::QGeoTiledMappingManagerEngineNokia( } else { // managerName() is not yet set, we have to hardcode the plugin name below cacheDir = QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation) - + QLatin1String("/QtLocation/nokia"); + + QLatin1String("/QtLocation/here"); } QGeoTileCache *tileCache = createTileCacheWithDir(cacheDir); @@ -266,10 +266,10 @@ void QGeoTiledMappingManagerEngineNokia::updateVersion(const QJsonObject &newVer void QGeoTiledMappingManagerEngineNokia::saveMapVersion() { QDir saveDir(tileCache()->directory()); - QFile saveFile(saveDir.filePath(QStringLiteral("nokia_version"))); + QFile saveFile(saveDir.filePath(QStringLiteral("here_version"))); if (!saveFile.open(QIODevice::WriteOnly)) { - qWarning("Failed to write nokia map version."); + qWarning("Failed to write here/nokia map version."); return; } @@ -281,10 +281,10 @@ void QGeoTiledMappingManagerEngineNokia::loadMapVersion() { QDir saveDir(tileCache()->directory()); - QFile loadFile(saveDir.filePath(QStringLiteral("nokia_version"))); + QFile loadFile(saveDir.filePath(QStringLiteral("here_version"))); if (!loadFile.open(QIODevice::ReadOnly)) { - qWarning("Failed to read nokia map version."); + qWarning("Failed to read here/nokia map version."); return; } diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp index 1c63621a..e2e1612c 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokiav2.cpp @@ -212,7 +212,7 @@ QPlaceManagerEngineNokiaV2::QPlaceManagerEngineNokiaV2( if (!dataLocations.isEmpty() && !dataLocations.first().isEmpty()) { m_localDataPath = dataLocations.first() - + QStringLiteral("/nokia/qtlocation/data"); + + QStringLiteral("/here/qtlocation/data"); } } |