Rename nokia_places_jsondb to places_jsondb

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

26 files changed, 9 insertions, 9 deletions

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