Add in missed file changes

forgot to add these changes to 37d300e08960a98f83bb6e9c6e80069c74b851a8

9 files changed, 36 insertions, 28 deletions

diff --git a/src/imports/location/declarativeplaces/qdeclarativelocation_p.h b/src/imports/location/declarativeplaces/qdeclarativelocation_p.h
index bda8f5df..7d8e047a 100644
--- a/src/imports/location/declarativeplaces/qdeclarativelocation_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativelocation_p.h
@@ -6,7 +6,7 @@
 #include <qplacelocation.h>
 #include "qdeclarativecoordinate_p.h"
 #include "qdeclarativegeoboundingbox_p.h"
-#include "qdeclarativeaddress_p.h"
+#include "qdeclarativegeoaddress_p.h"
 #include "qdeclarativealternativevalue_p.h"
 
 QTM_BEGIN_NAMESPACE
@@ -17,7 +17,7 @@ class QDeclarativeLocation : public QObject
 
     Q_PROPERTY(QVariantHash additionalData READ additionalData WRITE setAdditionalData NOTIFY additionalDataChanged);
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeAlternativeValue> alternativeLabels READ alternativeLabels NOTIFY alternativeLabelsChanged)
-    Q_PROPERTY(QDeclarativeAddress* address READ address WRITE setAddress NOTIFY addressChanged);
+    Q_PROPERTY(QDeclarativeGeoAddress* address READ address WRITE setAddress NOTIFY addressChanged);
     Q_PROPERTY(QDeclarativeCoordinate* displayPosition READ displayPosition WRITE setDisplayPosition NOTIFY displayPositionChanged);
     Q_PROPERTY(QDeclarativeListProperty<QDeclarativeCoordinate> navigationPositions READ navigationPositions NOTIFY navigationPositionsChanged)
     Q_PROPERTY(QString label READ label WRITE setLabel NOTIFY labelChanged);
@@ -41,8 +41,8 @@ public:
     static int alternativeValue_count(QDeclarativeListProperty<QDeclarativeAlternativeValue> *prop);
     static QDeclarativeAlternativeValue* alternativeValue_at(QDeclarativeListProperty<QDeclarativeAlternativeValue> *prop, int index);
     static void alternativeValue_clear(QDeclarativeListProperty<QDeclarativeAlternativeValue> *prop);
-    QDeclarativeAddress *address();
-    void setAddress(QDeclarativeAddress *address);
+    QDeclarativeGeoAddress *address();
+    void setAddress(QDeclarativeGeoAddress *address);
     QDeclarativeCoordinate *displayPosition();
     void setDisplayPosition(QDeclarativeCoordinate *position);
     QDeclarativeListProperty<QDeclarativeCoordinate> navigationPositions();
@@ -77,7 +77,7 @@ private:
 
 private:
     QList<QDeclarativeAlternativeValue*> m_alternativeValues;
-    QDeclarativeAddress m_address;
+    QDeclarativeGeoAddress m_address;
     QDeclarativeCoordinate m_displayPosition;
     QDeclarativeGeoBoundingBox m_boundingBox;
     QList<QDeclarativeCoordinate*> m_navigationPositions;
diff --git a/src/imports/location/location.cpp b/src/imports/location/location.cpp
index da24929a..0e37ec59 100644
--- a/src/imports/location/location.cpp
+++ b/src/imports/location/location.cpp
@@ -74,7 +74,6 @@
 #include "qdeclarativegeomaneuver_p.h"
 
 //Place includes
-#include "qdeclarativeaddress_p.h"
 #include "qdeclarativealternativevalue_p.h"
 #include "qdeclarativebusinessfeature_p.h"
 #include "qdeclarativebusinessinformation_p.h"
diff --git a/src/location/places/places.pri b/src/location/places/places.pri
index 2eec0907..052b54a9 100644
--- a/src/location/places/places.pri
+++ b/src/location/places/places.pri
@@ -4,7 +4,6 @@ INCLUDEPATH += places
 PUBLIC_HEADERS += \
 #data classes
     places/qplace.h \
-    places/qplaceaddress.h \
     places/qplacealternativevalue.h \
     places/qplacebusinessfeature.h \
     places/qplacebusinessinformation.h \
@@ -38,7 +37,6 @@ PUBLIC_HEADERS += \
 
 PRIVATE_HEADERS += \
     places/qplace_p.h \
-    places/qplaceaddress_p.h \
     places/qplacealternativevalue_p.h \
     places/qplacebusinessfeature_p.h \
     places/qplacebusinessinformation_p.h \
@@ -59,7 +57,6 @@ PRIVATE_HEADERS += \
 SOURCES += \
 #data classes
     places/qplace.cpp \
-    places/qplaceaddress.cpp \
     places/qplacealternativevalue.cpp \
     places/qplacebusinessfeature.cpp \
     places/qplacebusinessinformation.cpp \
diff --git a/src/location/places/qplacelocation.cpp b/src/location/places/qplacelocation.cpp
index ca6fddb1..b526afa3 100644
--- a/src/location/places/qplacelocation.cpp
+++ b/src/location/places/qplacelocation.cpp
@@ -152,7 +152,7 @@ void QPlaceLocation::setAdditionalData(const QVariantHash &data)
 /*!
     Returns address.
 */
-QPlaceAddress QPlaceLocation::address() const
+QGeoAddress QPlaceLocation::address() const
 {
     return d->address;
 }
@@ -160,7 +160,7 @@ QPlaceAddress QPlaceLocation::address() const
 /*!
     Sets address.
 */
-void QPlaceLocation::setAddress(const QPlaceAddress &address)
+void QPlaceLocation::setAddress(const QGeoAddress &address)
 {
     d->address = address;
 }
diff --git a/src/location/places/qplacelocation.h b/src/location/places/qplacelocation.h
index 7642b3f0..53b500cc 100644
--- a/src/location/places/qplacelocation.h
+++ b/src/location/places/qplacelocation.h
@@ -46,11 +46,11 @@
 #include <QString>
 #include <QVariant>
 #include <QList>
+#include "qgeoaddress.h"
 #include "qgeocoordinate.h"
 #include "qgeoboundingbox.h"
 #include "qmobilityglobal.h"
 #include "qplacealternativevalue.h"
-#include "qplaceaddress.h"
 
 QTM_BEGIN_NAMESPACE
 
@@ -73,8 +73,8 @@ public:
 
     QVariantHash additionalData() const;
     void setAdditionalData(const QVariantHash &data);
-    QPlaceAddress address() const;
-    void setAddress(const QPlaceAddress &address);
+    QGeoAddress address() const;
+    void setAddress(const QGeoAddress &address);
     QList<QPlaceAlternativeValue> alternativeLabels() const;
     void setAlternativeLabels(const QList<QPlaceAlternativeValue> &labels);
     QGeoCoordinate displayPosition() const;
diff --git a/src/location/places/qplacelocation_p.h b/src/location/places/qplacelocation_p.h
index 1fe9b6d5..3f2e5d8c 100644
--- a/src/location/places/qplacelocation_p.h
+++ b/src/location/places/qplacelocation_p.h
@@ -59,7 +59,7 @@ public:
     bool operator==(const QPlaceLocationPrivate &other) const;
 
     QVariantHash additionalData;
-    QPlaceAddress address;
+    QGeoAddress address;
     QList<QPlaceAlternativeValue> alternativeLabels;
     QGeoCoordinate displayPosition;
     QList<QGeoCoordinate> navigationPositions;
diff --git a/src/location/qgeoaddress.h b/src/location/qgeoaddress.h
index 06d411bb..256969d6 100644
--- a/src/location/qgeoaddress.h
+++ b/src/location/qgeoaddress.h
@@ -81,11 +81,21 @@ public:
     QString district() const;
     void setDistrict(const QString &district);
 
+    QString postcode() const;
+    void setPostcode(const QString &postcode);
+
     QString street() const;
     void setStreet(const QString &street);
 
-    QString postcode() const;
-    void setPostcode(const QString &postcode);
+//    QString streetNumber() const;
+//    void setStreetNumber(QString &streetNumber);
+
+//  TODO:
+//    QString floor() const;
+//    void setFloor(const QString &floor);
+
+//    QString suite() const;
+//    void setSuite(const QString &suite);
 
     bool isEmpty() const;
     void clear();
diff --git a/src/plugins/places/nokia/qplacejsondetailsparser.cpp b/src/plugins/places/nokia/qplacejsondetailsparser.cpp
index fb8c0393..b81ca3fa 100644
--- a/src/plugins/places/nokia/qplacejsondetailsparser.cpp
+++ b/src/plugins/places/nokia/qplacejsondetailsparser.cpp
@@ -53,12 +53,12 @@
 #include <QtScript/QScriptValueIterator>
 
 #include <qgeocoordinate.h>
+#include <qgeoaddress.h>
 #include <qplace.h>
 #include <qplacecontact.h>
 #include <qplacecategory.h>
 #include <qplacedescription.h>
 #include <qplacerating.h>
-#include <qplaceaddress.h>
 #include <qplacebusinessinformation.h>
 #include <qplacelocation.h>
 #include <qplacealternativevalue.h>
@@ -380,14 +380,14 @@ QPlaceRating *QPlaceJSonDetailsParser::processRating(const QScriptValue &ratingE
 
 void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QPlaceLocation *location)
 {
-    QPlaceAddress newAddress;
+    QGeoAddress newAddress;
     QScriptValue value = address.property(place_address_street);
     if (value.isValid() && !value.toString().isEmpty()) {
         newAddress.setStreet(value.toString());
     }
     value = address.property(place_address_country);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setCountryName(value.toString());
+        newAddress.setCountry(value.toString());
     }
     value = address.property(place_address_county);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -407,7 +407,7 @@ void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QPlace
     }
     value = address.property(place_address_code);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setPostalCode(value.toString());
+        newAddress.setPostcode(value.toString());
     }
     value = address.property(place_address_district);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -415,7 +415,7 @@ void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QPlace
     }
     value = address.property(place_address_house_number);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setHouseNumber(value.toString());
+        newAddress.setStreet(value.toString() + " " + newAddress.street());
     }
     location->setAddress(newAddress);
 }
diff --git a/src/plugins/places/nokia/qplacejsonsearchparser.cpp b/src/plugins/places/nokia/qplacejsonsearchparser.cpp
index 58f20e35..cbb81cb5 100644
--- a/src/plugins/places/nokia/qplacejsonsearchparser.cpp
+++ b/src/plugins/places/nokia/qplacejsonsearchparser.cpp
@@ -52,11 +52,11 @@
 #include <QtScript/QScriptValue>
 #include <QtScript/QScriptValueIterator>
 
-#include <qplace.h>
 #include <qgeocoordinate.h>
+#include <qgeoaddress.h>
+#include <qplace.h>
 #include <qplacecontact.h>
 #include <qplacelocation.h>
-#include <qplaceaddress.h>
 #include <qplacerating.h>
 #include <qplacecategory.h>
 #include <qplacesupplier.h>
@@ -288,10 +288,10 @@ void QPlaceJSonSearchParser::processRating(const QScriptValue &properties, QPlac
 
 void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QPlaceLocation *location)
 {
-    QPlaceAddress newAddress;
+    QGeoAddress newAddress;
     QScriptValue value = properties.property(search_properties_address_country);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setCountryName(value.toString());
+        newAddress.setCountry(value.toString());
     }
     value = properties.property(search_properties_address_county);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -307,7 +307,7 @@ void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QPla
     }
     value = properties.property(search_properties_address_code);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setPostalCode(value.toString());
+        newAddress.setPostcode(value.toString());
     }
     value = properties.property(search_properties_address_city);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -323,7 +323,9 @@ void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QPla
     }
     value = properties.property(search_properties_address_house_number);
     if (value.isValid() && !value.toString().isEmpty()) {
-        newAddress.setHouseNumber(value.toString());
+        //TODO: need to figure out how to deal with street number
+        //and whether to keep it separate from street.
+        newAddress.setStreet(value.toString() + " " + newAddress.street());
     }
     location->setAddress(newAddress);
 }