Rename nokia_places_jsondb to places_jsondb

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

36 files changed, 29 insertions, 29 deletions

diff --git a/doc/src/place-crossref.qdocinc b/doc/src/place-crossref.qdocinc
index 010154e9..4d9639f1 100644
--- a/doc/src/place-crossref.qdocinc
+++ b/doc/src/place-crossref.qdocinc
@@ -1,5 +1,5 @@
     \code
-    origin R/O manager(nokia)       destination R/W manager (nokia_places_jsondb)
+    origin R/O manager(nokia)       destination R/W manager (places_jsondb)
                             Save
     Place id: ae246         --->    Place id: 0001
     Attribute type: x_provider      Attribute type: x_id_nokia
diff --git a/doc/src/plugins/jsondb.qdoc b/doc/src/plugins/jsondb.qdoc
index 2031c3ea..ab622d80 100644
--- a/doc/src/plugins/jsondb.qdoc
+++ b/doc/src/plugins/jsondb.qdoc
@@ -40,7 +40,7 @@ Included with Qt Location is a plugin which stores places in a Qt Json Database
 (also known as JsonDb).  This plugin is intended to be used as a local store for
 user defined favorite places.
 
-The JsonDb GeoServices plugin can be loaded by using the plugin key "nokia_places_jsondb".
+The JsonDb GeoServices plugin can be loaded by using the plugin key "places_jsondb".
 
 Note that in order to use this plugin, the JsonDb daemon must be running in the
 background.
diff --git a/examples/declarative/places/content/places/OptionsDialog.qml b/examples/declarative/places/content/places/OptionsDialog.qml
index 3291a305..e541f998 100644
--- a/examples/declarative/places/content/places/OptionsDialog.qml
+++ b/examples/declarative/places/content/places/OptionsDialog.qml
@@ -72,10 +72,10 @@ Dialog {
             id: enableFavoritesButton
 
             function resetVisibility() {
-                if (placesPlugin.name !== "nokia_places_jsondb") {
+                if (placesPlugin.name !== "places_jsondb") {
                     var pluginNames = placesPlugin.availableServiceProviders;
                     for (var i = 0; i < pluginNames.length; ++i) {
-                        if (pluginNames[i] === "nokia_places_jsondb") {
+                        if (pluginNames[i] === "places_jsondb") {
                             enableFavoritesButton.visible = true;
                             return;
                         }
diff --git a/examples/declarative/places/content/places/PlaceDelegate.qml b/examples/declarative/places/content/places/PlaceDelegate.qml
index 99cf1461..2bec65da 100644
--- a/examples/declarative/places/content/places/PlaceDelegate.qml
+++ b/examples/declarative/places/content/places/PlaceDelegate.qml
@@ -247,7 +247,7 @@ Item {
 
                         function reset()
                         {
-                            saveButton.visible = (placesPlugin.name !== "nokia_places_jsondb")
+                            saveButton.visible = (placesPlugin.name !== "places_jsondb")
                                                 && (placeSearchModel.favoritesPlugin !== null);
                             saveStatus.visible = false;
                         }
diff --git a/examples/declarative/places/content/places/SearchBox.qml b/examples/declarative/places/content/places/SearchBox.qml
index a1262ff6..bf3e0122 100644
--- a/examples/declarative/places/content/places/SearchBox.qml
+++ b/examples/declarative/places/content/places/SearchBox.qml
@@ -206,7 +206,7 @@ Rectangle {
     PlaceSearchSuggestionModel {
         id: suggestionModel
         plugin: placesPlugin
-        searchArea: plugin.name === "nokia_places_jsondb" ? null : placeSearchModel.searchArea
+        searchArea: plugin.name === "places_jsondb" ? null : placeSearchModel.searchArea
 
         onStatusChanged: {
             if (status == PlaceSearchSuggestionModel.Ready)
diff --git a/examples/declarative/places/places.qml b/examples/declarative/places/places.qml
index cb16fd94..eab92a20 100644
--- a/examples/declarative/places/places.qml
+++ b/examples/declarative/places/places.qml
@@ -329,7 +329,7 @@ Item {
         onGoButtonClicked: {
             if (isFavoritesEnabled) {
                 if (favoritesPlugin == null)
-                    favoritesPlugin = Qt.createQmlObject('import QtLocation 5.0; Plugin { name: "nokia_places_jsondb" }', page);
+                    favoritesPlugin = Qt.createQmlObject('import QtLocation 5.0; Plugin { name: "places_jsondb" }', page);
                 favoritesPlugin.parameters = pluginParametersFromMap(pluginParameters);
                 placeSearchModel.favoritesPlugin = favoritesPlugin;
             } else {
diff --git a/src/plugins/geoservices/geoservices.pro b/src/plugins/geoservices/geoservices.pro
index abf4c44e..c93e578e 100644
--- a/src/plugins/geoservices/geoservices.pro
+++ b/src/plugins/geoservices/geoservices.pro
@@ -2,4 +2,4 @@ TEMPLATE = subdirs
 
 SUBDIRS = nokia
 
-!isEmpty(QT.jsondb.name):SUBDIRS += nokia_places_jsondb
+!isEmpty(QT.jsondb.name):SUBDIRS += places_jsondb
diff --git a/src/plugins/geoservices/nokia_places_jsondb/10-placesIndices.json b/src/plugins/geoservices/places_jsondb/10-placesIndices.json
index f14b0711..f14b0711 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/10-placesIndices.json
+++ b/src/plugins/geoservices/places_jsondb/10-placesIndices.json
diff --git a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp b/src/plugins/geoservices/places_jsondb/detailsreply.cpp
index 763aa3cc..763aa3cc 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp
+++ b/src/plugins/geoservices/places_jsondb/detailsreply.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h b/src/plugins/geoservices/places_jsondb/detailsreply.h
index 06887544..06887544 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h
+++ b/src/plugins/geoservices/places_jsondb/detailsreply.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/icon.cpp b/src/plugins/geoservices/places_jsondb/icon.cpp
index c6d93f38..c6d93f38 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/icon.cpp
+++ b/src/plugins/geoservices/places_jsondb/icon.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/icon.h b/src/plugins/geoservices/places_jsondb/icon.h
index a1ca90ff..a1ca90ff 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/icon.h
+++ b/src/plugins/geoservices/places_jsondb/icon.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp b/src/plugins/geoservices/places_jsondb/iconhandler.cpp
index d3245454..d3245454 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.cpp
+++ b/src/plugins/geoservices/places_jsondb/iconhandler.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h b/src/plugins/geoservices/places_jsondb/iconhandler.h
index f6d7a36d..f6d7a36d 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/iconhandler.h
+++ b/src/plugins/geoservices/places_jsondb/iconhandler.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/idreply.cpp b/src/plugins/geoservices/places_jsondb/idreply.cpp
index f01410e7..f01410e7 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/idreply.cpp
+++ b/src/plugins/geoservices/places_jsondb/idreply.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/idreply.h b/src/plugins/geoservices/places_jsondb/idreply.h
index e141b2dc..e141b2dc 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/idreply.h
+++ b/src/plugins/geoservices/places_jsondb/idreply.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/initreply.cpp b/src/plugins/geoservices/places_jsondb/initreply.cpp
index 515fe414..515fe414 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/initreply.cpp
+++ b/src/plugins/geoservices/places_jsondb/initreply.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/initreply.h b/src/plugins/geoservices/places_jsondb/initreply.h
index bc547aec..bc547aec 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/initreply.h
+++ b/src/plugins/geoservices/places_jsondb/initreply.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp b/src/plugins/geoservices/places_jsondb/jsondb.cpp
index 14875bcc..14875bcc 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/jsondb.cpp
+++ b/src/plugins/geoservices/places_jsondb/jsondb.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondb.h b/src/plugins/geoservices/places_jsondb/jsondb.h
index d7313418..d7313418 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/jsondb.h
+++ b/src/plugins/geoservices/places_jsondb/jsondb.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/macro.h b/src/plugins/geoservices/places_jsondb/macro.h
index d7f6ee3b..d7f6ee3b 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/macro.h
+++ b/src/plugins/geoservices/places_jsondb/macro.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/matchreply.cpp b/src/plugins/geoservices/places_jsondb/matchreply.cpp
index e90e5c38..e90e5c38 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/matchreply.cpp
+++ b/src/plugins/geoservices/places_jsondb/matchreply.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/matchreply.h b/src/plugins/geoservices/places_jsondb/matchreply.h
index 9faa23e4..9faa23e4 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/matchreply.h
+++ b/src/plugins/geoservices/places_jsondb/matchreply.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro b/src/plugins/geoservices/places_jsondb/places_jsondb.pro
index 9f1c19de..2ee5fa0b 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/nokia_places_jsondb.pro
+++ b/src/plugins/geoservices/places_jsondb/places_jsondb.pro
@@ -1,6 +1,6 @@
 load(qt_build_config)
 
-TARGET = qtgeoservices_nokia_places_jsondb
+TARGET = qtgeoservices_places_jsondb
 QT += location gui network
 
 load(qt_plugin)
@@ -41,4 +41,4 @@ target.path += $$[QT_INSTALL_PLUGINS]/geoservices
 INSTALLS += target
 
 OTHER_FILES += \
-    nokia_plugin_jsondb.json
+    places_jsondb_plugin.json
diff --git a/src/plugins/geoservices/nokia_places_jsondb/nokia_plugin_jsondb.json b/src/plugins/geoservices/places_jsondb/places_jsondb_plugin.json
index 90b89076..0c208f1e 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/nokia_plugin_jsondb.json
+++ b/src/plugins/geoservices/places_jsondb/places_jsondb_plugin.json
@@ -1,6 +1,6 @@
 {
-    "Keys": ["nokia_places_jsondb"],
-    "Provider": "nokia_places_jsondb",
+    "Keys": ["places_jsondb"],
+    "Provider": "places_jsondb",
     "Version": 100,
     "Experimental": false,
     "Features": [
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp b/src/plugins/geoservices/places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
index 5eefd26b..5eefd26b 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
+++ b/src/plugins/geoservices/places_jsondb/qgeoserviceproviderplugin_jsondb.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h b/src/plugins/geoservices/places_jsondb/qgeoserviceproviderplugin_jsondb.h
index e3b40284..79ec608a 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qgeoserviceproviderplugin_jsondb.h
+++ b/src/plugins/geoservices/places_jsondb/qgeoserviceproviderplugin_jsondb.h
@@ -52,7 +52,7 @@ class QGeoServiceProviderFactoryJsonDb : public QObject, public QGeoServiceProvi
     Q_OBJECT
     Q_INTERFACES(QGeoServiceProviderFactory)
     Q_PLUGIN_METADATA(IID "org.qt-project.qt.geoservice.serviceproviderfactory/5.0"
-                      FILE "nokia_plugin_jsondb.json")
+                      FILE "places_jsondb_plugin.json")
 
 public:
     QGeoServiceProviderFactoryJsonDb();
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp b/src/plugins/geoservices/places_jsondb/qplacemanagerengine_jsondb.cpp
index f7ea7bcc..548ad93e 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
+++ b/src/plugins/geoservices/places_jsondb/qplacemanagerengine_jsondb.cpp
@@ -306,7 +306,7 @@ QPlace QPlaceManagerEngineJsonDb::compatiblePlace(const QPlace &original) const
                 if (nokiaIconGenerated)
                      parameters.insert(JsonDbIcon::NokiaIconGenerated, nokiaIconGenerated);
             } else if (originalIcon.manager()->managerName()
-                            == QLatin1String("nokia_places_jsondb")) {
+                            == QLatin1String("places_jsondb")) {
                 parameters = originalIcon.parameters();
             } else {
                 if (!originalIcon.url(JsonDbIcon::SmallSize).isEmpty())
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h b/src/plugins/geoservices/places_jsondb/qplacemanagerengine_jsondb.h
index 4fe905b0..d1b4cf53 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h
+++ b/src/plugins/geoservices/places_jsondb/qplacemanagerengine_jsondb.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QPLACEMANAGERENGINE_NOKIA_JSONDB_H
-#define QPLACEMANAGERENGINE_NOKIA_JSONDB_H
+#ifndef QPLACEMANAGERENGINE_JSONDB_H
+#define QPLACEMANAGERENGINE_JSONDB_H
 
 #include "jsondb.h"
 
diff --git a/src/plugins/geoservices/nokia_places_jsondb/searchreply.cpp b/src/plugins/geoservices/places_jsondb/searchreply.cpp
index 4a6ceab7..4a6ceab7 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/searchreply.cpp
+++ b/src/plugins/geoservices/places_jsondb/searchreply.cpp
diff --git a/src/plugins/geoservices/nokia_places_jsondb/searchreply.h b/src/plugins/geoservices/places_jsondb/searchreply.h
index eb0d8115..eb0d8115 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/searchreply.h
+++ b/src/plugins/geoservices/places_jsondb/searchreply.h
diff --git a/src/plugins/geoservices/nokia_places_jsondb/unsupportedreplies.h b/src/plugins/geoservices/places_jsondb/unsupportedreplies.h
index 58f27fc9..58f27fc9 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/unsupportedreplies.h
+++ b/src/plugins/geoservices/places_jsondb/unsupportedreplies.h
diff --git a/tests/auto/qplacemanager_jsondb/qplacemanager_jsondb.pro b/tests/auto/qplacemanager_jsondb/qplacemanager_jsondb.pro
index 09ce7a23..1619cb67 100644
--- a/tests/auto/qplacemanager_jsondb/qplacemanager_jsondb.pro
+++ b/tests/auto/qplacemanager_jsondb/qplacemanager_jsondb.pro
@@ -14,7 +14,7 @@ DEFINES += JSONDB_DAEMON_BASE=\\\"$$QT.jsondb.bins\\\"
 
 RESOURCES += resources.qrc
 
-DEFINES += JSONFILE=\\\"$$PWD/../../../src/plugins/geoservices/nokia_places_jsondb/10-placesIndices.json\\\"
+DEFINES += JSONFILE=\\\"$$PWD/../../../src/plugins/geoservices/places_jsondb/10-placesIndices.json\\\"
 
 #Mark test as insignificant until jsondb is supported
 CONFIG+=insignificant_test
diff --git a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
index 0e61037c..afd75b66 100644
--- a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
+++ b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
@@ -223,7 +223,7 @@ void tst_QPlaceManagerJsonDb::initTestCase()
     qRegisterMetaType<QJsonObject>();
 
     QStringList providers = QGeoServiceProvider::availableServiceProviders();
-    QVERIFY(providers.contains(QLatin1String("nokia_places_jsondb")));
+    QVERIFY(providers.contains(QLatin1String("places_jsondb")));
 
     //create dummy icon file
     QString catIconPath = tempDir.path() + "/icons/categories/";
@@ -245,7 +245,7 @@ void tst_QPlaceManagerJsonDb::initTestCase()
     QFile mappingFile(QStringLiteral(":/resources/offline-mapping.json"));
     mappingFile.copy(offlinePath + QStringLiteral("offline-mapping.json"));
 
-    provider = new QGeoServiceProvider(QLatin1String("nokia_places_jsondb"));
+    provider = new QGeoServiceProvider(QLatin1String("places_jsondb"));
 
     placeManager = provider->placeManager();
     QVERIFY(placeManager);
@@ -3041,7 +3041,7 @@ void tst_QPlaceManagerJsonDb::providerIcons()
     providerParams.insert(CustomIcons, false);
     providerParams.insert(QLatin1String("places.local_data_path"), tempDir.path());
 
-    provider = new QGeoServiceProvider(QLatin1String("nokia_places_jsondb"), providerParams);
+    provider = new QGeoServiceProvider(QLatin1String("places_jsondb"), providerParams);
     placeManager = provider->placeManager();
 
     QPlaceReply * catInitReply = placeManager->initializeCategories();
@@ -3224,7 +3224,7 @@ void tst_QPlaceManagerJsonDb::specifiedPartition()
 
     QVariantMap parameters;
     parameters.insert(QLatin1String("partition"), ArbitraryPartition);
-    provider = new QGeoServiceProvider(QLatin1String("nokia_places_jsondb"), parameters);
+    provider = new QGeoServiceProvider(QLatin1String("places_jsondb"), parameters);
     placeManager = provider->placeManager();
 
     QSignalSpy createPlaceSpy(placeManager, SIGNAL(placeAdded(QString)));
diff --git a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
index c1bf04b0..0dc219df 100644
--- a/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
+++ b/tests/auto/qplacemanager_nokia/tst_qplacemanager_nokia.cpp
@@ -90,7 +90,7 @@ void tst_QPlaceManagerNokia::initTestCase()
     qRegisterMetaType<QPlaceIdReply *>();
 
     QStringList providers = QGeoServiceProvider::availableServiceProviders();
-    providers.contains("nokia_places_jsondb");
+    providers.contains("places_jsondb");
 
     QMap<QString, QVariant> params;
     params.insert("app_id", "stub");
diff --git a/tests/system/places/sys_places.qtt b/tests/system/places/sys_places.qtt
index 4387589e..7b7b894c 100644
--- a/tests/system/places/sys_places.qtt
+++ b/tests/system/places/sys_places.qtt
@@ -464,7 +464,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select Category icon | Verify that there are no categories |
         | Select Category icon | |
         | Select [New] button | |
@@ -505,7 +505,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select [New] button | |
         | Select [Place] button | |
         | Fill in [" + name + "] in Name field | |
@@ -572,7 +572,7 @@ testcase = {
         | Select back button | Verify that [" + place + "] has a star |
         | Hide search results | |
         | Select [Provider] | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Fill in [" + search_string + "] in Search field | |
         | Select Loupe icon | |
         | Expand panel with results | Verify that list contains [" + place + "] |
@@ -665,7 +665,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select [New] button | |
         | Select [Category] button | |
         | Fill in [" + category1 + "] in Name field | |
@@ -740,7 +740,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select [New] button | |
         | Select [Category] button | |
         | Fill in [" + category1 + "] in Name field | |
@@ -846,7 +846,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select [New] button | |
         | Select [Place] button | |
         | Fill in [" + name1 + "] in Name field | |
@@ -897,7 +897,7 @@ testcase = {
         | *Step* | *Verification* |
         | Launch [" + testBinary + "] | App launches normally |
         | Select [Provider] button | |
-        | Select [nokia_places_jsondb] | |
+        | Select [places_jsondb] | |
         | Select [New] button | |
         | Select [Place] button | |
         | Fill in [" + name1 + "] in Name field | |