diff options
| author | abcd <amos.choy@nokia.com> | 2012-07-16 14:28:53 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-17 04:04:40 +0200 |
| commit | 88687d73501a962029b8f855cb7fb195195d00e6 (patch) | |
| tree | d696efe152c12df35a40167442e6d3929e1a7e0c /examples/declarative/places | |
| parent | 538a798c4223b447a3825e7e6527345998e9ef8a (diff) | |
| download | qtlocation-88687d73501a962029b8f855cb7fb195195d00e6.tar.gz | |
Rename nokia_places_jsondb to places_jsondb
Change-Id: Id3d5a0dd04d399ccb5252c3820f76102144f2802
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'examples/declarative/places')
4 files changed, 5 insertions, 5 deletions
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 { |