diff options
22 files changed, 65 insertions, 65 deletions
diff --git a/doc/src/snippets/declarative/places.qml b/doc/src/snippets/declarative/places.qml index 1208dad2..309f5588 100644 --- a/doc/src/snippets/declarative/places.qml +++ b/doc/src/snippets/declarative/places.qml @@ -205,7 +205,7 @@ Item { address: Address { street: "53 Brandl Street" city: "Eight Mile Plains" - postcode: "4113" + postalCode: "4113" country: "Australia" } coordinate: Coordinate { 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()); diff --git a/src/imports/location/qdeclarativegeoaddress.cpp b/src/imports/location/qdeclarativegeoaddress.cpp index 828a53fe..98e3b310 100644 --- a/src/imports/location/qdeclarativegeoaddress.cpp +++ b/src/imports/location/qdeclarativegeoaddress.cpp @@ -96,7 +96,7 @@ void QDeclarativeGeoAddress::setAddress(const QGeoAddress& address) setCity(address.city()); setDistrict(address.district()); setStreet(address.street()); - setPostcode(address.postcode()); + setPostalCode(address.postalCode()); m_address = address; } @@ -240,24 +240,23 @@ void QDeclarativeGeoAddress::setStreet(const QString& street) emit streetChanged(); } -QString QDeclarativeGeoAddress::postcode() const +QString QDeclarativeGeoAddress::postalCode() const { - return m_address.postcode(); + return m_address.postalCode(); } /*! - \qmlproperty string QtLocation5::Address::postcode + \qmlproperty string QtLocation5::Address::postalCode - This property holds the post code of the address. + This property holds the postal code of the address. - */ - -void QDeclarativeGeoAddress::setPostcode(const QString& postcode) +*/ +void QDeclarativeGeoAddress::setPostalCode(const QString& postalCode) { - if (m_address.postcode() == postcode) + if (m_address.postalCode() == postalCode) return; - m_address.setPostcode(postcode); - emit postcodeChanged(); + m_address.setPostalCode(postalCode); + emit postalCodeChanged(); } #include "moc_qdeclarativegeoaddress_p.cpp" diff --git a/src/imports/location/qdeclarativegeoaddress_p.h b/src/imports/location/qdeclarativegeoaddress_p.h index c9888a70..e7f3c5fe 100644 --- a/src/imports/location/qdeclarativegeoaddress_p.h +++ b/src/imports/location/qdeclarativegeoaddress_p.h @@ -60,7 +60,7 @@ class QDeclarativeGeoAddress : public QObject Q_PROPERTY(QString city READ city WRITE setCity NOTIFY cityChanged) Q_PROPERTY(QString district READ district WRITE setDistrict NOTIFY districtChanged) Q_PROPERTY(QString street READ street WRITE setStreet NOTIFY streetChanged) - Q_PROPERTY(QString postcode READ postcode WRITE setPostcode NOTIFY postcodeChanged) + Q_PROPERTY(QString postalCode READ postalCode WRITE setPostalCode NOTIFY postalCodeChanged) public: explicit QDeclarativeGeoAddress(QObject* parent = 0); @@ -82,8 +82,8 @@ public: void setDistrict(const QString& district); QString street() const; void setStreet(const QString& street); - QString postcode() const; - void setPostcode(const QString& postcode); + QString postalCode() const; + void setPostalCode(const QString& postalCode); signals: void countryChanged(); @@ -93,7 +93,7 @@ signals: void cityChanged(); void districtChanged(); void streetChanged(); - void postcodeChanged(); + void postalCodeChanged(); private: QGeoAddress m_address; diff --git a/src/imports/location/qdeclarativegeocodemodel.cpp b/src/imports/location/qdeclarativegeocodemodel.cpp index 44c5bd88..f9068cc8 100644 --- a/src/imports/location/qdeclarativegeocodemodel.cpp +++ b/src/imports/location/qdeclarativegeocodemodel.cpp @@ -568,7 +568,7 @@ void QDeclarativeGeocodeModel::setQuery(const QVariant& query) connect(address_, SIGNAL(cityChanged()), this, SLOT(queryContentChanged())); connect(address_, SIGNAL(districtChanged()), this, SLOT(queryContentChanged())); connect(address_, SIGNAL(streetChanged()), this, SLOT(queryContentChanged())); - connect(address_, SIGNAL(postcodeChanged()), this, SLOT(queryContentChanged())); + connect(address_, SIGNAL(postalCodeChanged()), this, SLOT(queryContentChanged())); coordinate_ = 0; searchString_.clear(); } else if (query.type() == QVariant::String) { diff --git a/src/location/qgeoaddress.cpp b/src/location/qgeoaddress.cpp index 6d0e5e77..e299dd85 100644 --- a/src/location/qgeoaddress.cpp +++ b/src/location/qgeoaddress.cpp @@ -63,7 +63,7 @@ QGeoAddressPrivate::QGeoAddressPrivate(const QGeoAddressPrivate &other) sCity(other.sCity), sDistrict(other.sDistrict), sStreet(other.sStreet), - sPostCode(other.sPostCode) + sPostalCode(other.sPostalCode) { } @@ -131,7 +131,7 @@ bool QGeoAddress::operator==(const QGeoAddress &other) const qDebug() << "city:" << (d->sCity == other.city()); qDebug() << "district:" << (d->sDistrict == other.district()); qDebug() << "street:" << (d->sStreet == other.street()); - qDebug() << "postcode:" << (d->sPostCode == other.postcode()); + qDebug() << "postalCode:" << (d->sPostalCode == other.postalCode()); #endif return d->sCountry == other.country() && @@ -141,7 +141,7 @@ bool QGeoAddress::operator==(const QGeoAddress &other) const d->sCity == other.city() && d->sDistrict == other.district() && d->sStreet == other.street() && - d->sPostCode == other.postcode(); + d->sPostalCode == other.postalCode(); } /*! @@ -274,19 +274,19 @@ void QGeoAddress::setStreet(const QString &street) } /*! - Returns the post code. + Returns the postal code. */ -QString QGeoAddress::postcode() const +QString QGeoAddress::postalCode() const { - return d->sPostCode; + return d->sPostalCode; } /*! - Sets the \a postcode. + Sets the \a postalCode. */ -void QGeoAddress::setPostcode(const QString &postcode) +void QGeoAddress::setPostalCode(const QString &postalCode) { - d->sPostCode = postcode; + d->sPostalCode = postalCode; } /*! @@ -302,8 +302,10 @@ bool QGeoAddress::isEmpty() const d->sCity.isEmpty() && d->sDistrict.isEmpty() && d->sStreet.isEmpty() && - d->sPostCode.isEmpty(); + d->sPostalCode.isEmpty(); + } + /*! Clears the all the address' data fields. */ @@ -316,7 +318,7 @@ void QGeoAddress::clear() d->sCity.clear(); d->sDistrict.clear(); d->sStreet.clear(); - d->sPostCode.clear(); + d->sPostalCode.clear(); } QT_END_NAMESPACE diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h index 69bb91d6..8b607b18 100644 --- a/src/location/qgeoaddress.h +++ b/src/location/qgeoaddress.h @@ -85,8 +85,8 @@ public: QString district() const; void setDistrict(const QString &district); - QString postcode() const; - void setPostcode(const QString &postcode); + QString postalCode() const; + void setPostalCode(const QString &postalCode); QString street() const; void setStreet(const QString &street); diff --git a/src/location/qgeoaddress_p.h b/src/location/qgeoaddress_p.h index 56f9bd81..dd079fe0 100644 --- a/src/location/qgeoaddress_p.h +++ b/src/location/qgeoaddress_p.h @@ -72,7 +72,7 @@ public: QString sCity; //!< city field QString sDistrict; //!< district field QString sStreet; //!< street name field - QString sPostCode; //!< post code field + QString sPostalCode; //!< postal code field }; QT_END_NAMESPACE diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp index 03d54a14..46224496 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp @@ -412,7 +412,7 @@ void QPlaceJSonDetailsParser::processAddress(const QJSValue &address, QGeoLocati } value = address.property(place_address_code); if (value.isValid() && !value.toString().isEmpty()) { - newAddress.setPostcode(value.toString()); + newAddress.setPostalCode(value.toString()); } value = address.property(place_address_district); if (value.isValid() && !value.toString().isEmpty()) { diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp index c499daf7..5d0dc717 100644 --- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp +++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp @@ -297,7 +297,7 @@ void QPlaceJSonSearchParser::processAddress(const QJSValue &properties, QGeoLoca } value = properties.property(search_properties_address_code); if (value.isValid() && !value.toString().isEmpty()) { - newAddress.setPostcode(value.toString()); + newAddress.setPostalCode(value.toString()); } value = properties.property(search_properties_address_city); if (value.isValid() && !value.toString().isEmpty()) { diff --git a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp index f62f035d..de66554d 100644 --- a/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp +++ b/src/plugins/geoservices/nokia/qgeocodexmlparser.cpp @@ -435,7 +435,7 @@ bool QGeoCodeXmlParser::parseAddress(QGeoAddress *address) } if (m_reader->name() == "postCode") { - address->setPostcode(m_reader->readElementText()); + address->setPostalCode(m_reader->readElementText()); if (!m_reader->readNextStartElement()) return true; } diff --git a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp index c2d8a9c9..8a7ebb05 100644 --- a/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qgeocodingmanagerengine_nokia.cpp @@ -71,7 +71,7 @@ QGeocodingManagerEngineNokia::QGeocodingManagerEngineNokia(const QMap<QString, Q if (!proxy.isEmpty()) { QUrl proxyUrl(proxy); if (proxyUrl.isValid()) { - m_networkManager->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, + m_networkManager->setProxy(QNetworkProxy(QNetworkProxy::HttpProxy, proxyUrl.host(), proxyUrl.port(8080), @@ -143,9 +143,9 @@ QGeocodeReply* QGeocodingManagerEngineNokia::geocode(const QGeoAddress &address, requestString += address.city(); } - if (!address.postcode().isEmpty()) { + if (!address.postalCode().isEmpty()) { requestString += "&zip="; - requestString += address.postcode(); + requestString += address.postalCode(); } if (!address.street().isEmpty()) { diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp index 9cfe502e..8c0d623a 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp +++ b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp @@ -136,7 +136,7 @@ QVariant JsonDbHandler::convertToJsonVariant(const QPlace &place) addressMap.insert(COUNTY, place.location().address().county()); addressMap.insert(STATE, place.location().address().state()); addressMap.insert(COUNTRY, place.location().address().country()); - addressMap.insert(POSTCODE, place.location().address().postcode()); + addressMap.insert(POSTALCODE, place.location().address().postalCode()); QVariantMap locationMap; locationMap.insert(COORDINATE, coordMap); @@ -275,9 +275,9 @@ QPlace JsonDbHandler::convertJsonVariantToPlace(const QVariant &variant) address.setCounty(addressMap.value(COUNTY).toString()); address.setState(addressMap.value(STATE).toString()); address.setCountry(addressMap.value(COUNTRY).toString()); - address.setPostcode(addressMap.value(POSTCODE).toString()); - location.setAddress(address); + address.setPostalCode(addressMap.value(POSTALCODE).toString()); + location.setAddress(address); place.setLocation(location); QVariantList phonesJson = placeJson.value(PHONES).toList(); diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h index b4055b02..aa889d1e 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h +++ b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h @@ -69,7 +69,7 @@ #define COUNTY QLatin1String("county") #define STATE QLatin1String("state") #define COUNTRY QLatin1String("country") -#define POSTCODE QLatin1String("postalCode") +#define POSTALCODE QLatin1String("postalCode") #define LOCATION QLatin1String("location") diff --git a/tests/auto/declarative/tst_place.qml b/tests/auto/declarative/tst_place.qml index 56b87c5b..206bbb5e 100644 --- a/tests/auto/declarative/tst_place.qml +++ b/tests/auto/declarative/tst_place.qml @@ -75,7 +75,7 @@ TestCase { city: "city" district: "district" street: "123 Fake Street" - postcode: "1234" + postalCode: "1234" } coordinate: Coordinate { @@ -224,7 +224,7 @@ TestCase { return false; if (place1.location.address.street !== place2.location.address.street) return false; - if (place1.location.address.postcode !== place2.location.address.postcode) + if (place1.location.address.postalCode !== place2.location.address.postalCode) return false; /* diff --git a/tests/auto/qgeoaddress/tst_qgeoaddress.cpp b/tests/auto/qgeoaddress/tst_qgeoaddress.cpp index aad88bc8..747c57f8 100644 --- a/tests/auto/qgeoaddress/tst_qgeoaddress.cpp +++ b/tests/auto/qgeoaddress/tst_qgeoaddress.cpp @@ -67,7 +67,7 @@ private Q_SLOTS: // void floorTest(); // void houseNumberTest(); // void labelTest(); - void postcodeTest(); + void postalCodeTest(); void stateTest(); void streetTest(); // void suiteTest(); @@ -156,12 +156,12 @@ void tst_QGeoAddress::districtTest() // QVERIFY2(testObj.label() == "testText", "Wrong value returned"); //} -void tst_QGeoAddress::postcodeTest() +void tst_QGeoAddress::postalCodeTest() { QGeoAddress testObj; - QVERIFY2(testObj.postcode() == QString(), "Wrong default value"); - testObj.setPostcode("testText"); - QVERIFY2(testObj.postcode() == "testText", "Wrong value returned"); + QVERIFY2(testObj.postalCode() == QString(), "Wrong default value"); + testObj.setPostalCode("testText"); + QVERIFY2(testObj.postalCode() == "testText", "Wrong value returned"); } void tst_QGeoAddress::stateTest() @@ -230,7 +230,7 @@ void tst_QGeoAddress::emptyClearTest() QVERIFY(!testObj.isEmpty()); testObj.clear(); - testObj.setPostcode(QLatin1String("postcode")); + testObj.setPostalCode(QLatin1String("postalCode")); QVERIFY(!testObj.isEmpty()); testObj.clear(); diff --git a/tests/auto/qgeolocation/tst_qgeolocation.cpp b/tests/auto/qgeolocation/tst_qgeolocation.cpp index e9388938..bf646441 100644 --- a/tests/auto/qgeolocation/tst_qgeolocation.cpp +++ b/tests/auto/qgeolocation/tst_qgeolocation.cpp @@ -96,14 +96,14 @@ void tst_QGeoLocation::address() m_address.setCountry("Germany"); m_address.setCountryCode("DEU"); m_address.setDistrict("Mitte"); - m_address.setPostcode("10115"); + m_address.setPostalCode("10115"); m_address.setStreet("Invalidenstrasse"); m_location.setAddress(m_address); QCOMPARE(m_location.address(),m_address); - m_address.setPostcode("10125"); + m_address.setPostalCode("10125"); QVERIFY(m_location.address() != m_address); } diff --git a/tests/auto/qmlinterface/data/TestAddress.qml b/tests/auto/qmlinterface/data/TestAddress.qml index 518e09b5..899bb850 100644 --- a/tests/auto/qmlinterface/data/TestAddress.qml +++ b/tests/auto/qmlinterface/data/TestAddress.qml @@ -45,7 +45,7 @@ Address { city: "Brisbane" country: "Australia" countryCode: "AU" - postcode: "4000" + postalCode: "4000" state: "Queensland" street: "123 Fake Street" } diff --git a/tests/auto/qmlinterface/tst_qmlinterface.cpp b/tests/auto/qmlinterface/tst_qmlinterface.cpp index 467a485a..afbc7958 100644 --- a/tests/auto/qmlinterface/tst_qmlinterface.cpp +++ b/tests/auto/qmlinterface/tst_qmlinterface.cpp @@ -104,7 +104,7 @@ tst_qmlinterface::tst_qmlinterface() m_address.setCity(QLatin1String("Brisbane")); m_address.setCountry(QLatin1String("Australia")); m_address.setCountryCode(QLatin1String("AU")); - m_address.setPostcode(QLatin1String("4000")); + m_address.setPostalCode(QLatin1String("4000")); m_address.setState(QLatin1String("Queensland")); m_address.setStreet(QLatin1String("123 Fake Street")); diff --git a/tests/system/sys_location.qtt b/tests/system/sys_location.qtt index d13c4c0a..c93ba31a 100644 --- a/tests/system/sys_location.qtt +++ b/tests/system/sys_location.qtt @@ -1130,7 +1130,7 @@ testcase = { | Fill in *-27.575* in Latitude filed | | | Fill in *153.088* in Longitude field | | | Press Go! button | | - | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *230 Padstow Rd*, City: *Eight Mile Plains*, State: *AUS-QLD*, Country code: *AUS*, Country: *AUSTRALIA*, Postcode: *4113*) |" + | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *230 Padstow Rd*, City: *Eight Mile Plains*, State: *AUS-QLD*, Country code: *AUS*, Country: *AUSTRALIA*, Postal code: *4113*) |" )); }, @@ -1159,7 +1159,7 @@ testcase = { | Fill in *56.3264* in Latitude filed | | | Fill in *44.0048* in Longitude field | | | Press Go! button | | - | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *Minina I Pozharskogo Ploshchad\'*, district: *Nizhegorodskiy Rayon*, City: *Nizhniy Novgorod*, Country code: *RUS*, Country: *Russian Federation*, Postcode: *603005*) |" + | Wait for message appears on the screen | Verify that reverse geocode issuccessful (street: *Minina I Pozharskogo Ploshchad\'*, district: *Nizhegorodskiy Rayon*, City: *Nizhniy Novgorod*, Country code: *RUS*, Country: *Russian Federation*, Postal code: *603005*) |" )); }, |