Add in missed file changes

forgot to add these changes to 37d300e08960a98f83bb6e9c6e80069c74b851a8

4 files changed, 6 insertions, 9 deletions

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;