Rename postcode to postalCode

Change-Id: I14e4aa9b6b8fd54f19a3c49c118c2083f2578be4
Reviewed-by: abcd <amos.choy@nokia.com>

3 files changed, 9 insertions, 10 deletions

diff --git a/examples/declarative/mapviewer/mapviewer/mapviewer.qml b/examples/declarative/mapviewer/mapviewer/mapviewer.qml
index 47fd7445..d7023937 100644
--- a/examples/declarative/mapviewer/mapviewer/mapviewer.qml
+++ b/examples/declarative/mapviewer/mapviewer/mapviewer.qml
@@ -349,7 +349,7 @@ Item {
         z: backgroundRect.z + 2
 
         Component.onCompleted: {
-            var obj = [["Street", "Brandl St"],["District",""],["City", "Eight Mile Plains"], ["County", ""],["State", ""],["Country code",""],["Country","Australia"], ["Post code", ""]]
+            var obj = [["Street", "Brandl St"],["District",""],["City", "Eight Mile Plains"], ["County", ""],["State", ""],["Country code",""],["Country","Australia"], ["Postal code", ""]]
             setModel(obj)
         }
 
@@ -367,7 +367,7 @@ Item {
             geocodeAddress.state = dialogModel.get(4).inputText
             geocodeAddress.countryCode = dialogModel.get(5).inputText
             geocodeAddress.country = dialogModel.get(6).inputText
-            geocodeAddress.postcode = dialogModel.get(7).inputText
+            geocodeAddress.postalCode = dialogModel.get(7).inputText
             map.geocodeModel.clear()
             map.geocodeModel.query = geocodeAddress
             map.geocodeModel.update();*/
@@ -495,7 +495,7 @@ Item {
     }
 */
     function geocodeMessage(){
-        var street, district, city, county, state, countryCode, country, postcode, latitude, longitude, text
+        var street, district, city, county, state, countryCode, country, postalCode, latitude, longitude, text
         /*        latitude = map.geocodeModel.get(0).coordinate.latitude
         longitude = map.geocodeModel.get(0).coordinate.longitude
         street = map.geocodeModel.get(0).address.street
@@ -505,7 +505,7 @@ Item {
         state = map.geocodeModel.get(0).address.state
         countryCode = map.geocodeModel.get(0).address.countryCode
         country = map.geocodeModel.get(0).address.country
-        postcode = map.geocodeModel.get(0).address.postcode
+        postalCode = map.geocodeModel.get(0).address.postalCode
 
         text = "<b>Latitude:</b> " + latitude + "<br/>"
         text +="<b>Longitude:</b> " + longitude + "<br/>" + "<br/>"
@@ -516,7 +516,7 @@ Item {
         if (state) text +="<b>State: </b>"+ state + " <br/>"
         if (countryCode) text +="<b>Country code: </b>"+ countryCode + " <br/>"
         if (country) text +="<b>Country: </b>"+ country + " <br/>"
-        if (postcode) text +="<b>Postcode: </b>"+ postcode + " <br/>"*/
+        if (postalCode) text +="<b>PostalCode: </b>"+ postalCode + " <br/>"*/
         return text
     }
 
diff --git a/examples/declarative/places/content/places/PlaceDialog.qml b/examples/declarative/places/content/places/PlaceDialog.qml
index c88c366c..13264ffe 100644
--- a/examples/declarative/places/content/places/PlaceDialog.qml
+++ b/examples/declarative/places/content/places/PlaceDialog.qml
@@ -81,7 +81,7 @@ Dialog {
             ["State", place ? place.location.address.state : ""],
             ["Country code", place ? place.location.address.countryCode : ""],
             ["Country", place ? place.location.address.country : ""],
-            ["Post code", place ? place.location.address.postcode : ""],
+            ["Postal code", place ? place.location.address.postalCode : ""],
             ["Latitude", latitude()],
             ["Longitude", longitude()]
         ]);
@@ -99,12 +99,11 @@ Dialog {
         modifiedPlace.location.address.state = dialogModel.get(5).inputText;
         modifiedPlace.location.address.countryCode = dialogModel.get(6).inputText;
         modifiedPlace.location.address.country = dialogModel.get(7).inputText;
-        modifiedPlace.location.address.postcode = dialogModel.get(8).inputText;
+        modifiedPlace.location.address.postalCode = dialogModel.get(8).inputText;
 
         modifiedPlace.location.coordinate.latitude = parseFloat(dialogModel.get(9).inputText);
         modifiedPlace.location.coordinate.longitude = parseFloat(dialogModel.get(10).inputText);
 
-
         place = modifiedPlace;
 
         place.save();
diff --git a/examples/maps/markerdialog.cpp b/examples/maps/markerdialog.cpp
index 1f02521f..6fba77bb 100644
--- a/examples/maps/markerdialog.cpp
+++ b/examples/maps/markerdialog.cpp
@@ -99,12 +99,12 @@ void MarkerDialog::updateMarker()
 
 void MarkerDialog::setAddressLabel(QGeoAddress address)
 {
-    QString addressFormat = tr("$street\n$city, $state $postcode\n$country");
+    QString addressFormat = tr("$street\n$city, $state $postalcode\n$country");
     addressFormat.replace("$street", address.street());
     addressFormat.replace("$city", address.city());
     addressFormat.replace("$county", address.county());
     addressFormat.replace("$state", address.state());
-    addressFormat.replace("$postcode", address.postcode());
+    addressFormat.replace("$postalcode", address.postalCode());
     addressFormat.replace("$district", address.district());
     addressFormat.replace("$country", address.country());