Rename QGeoPlace to QPlace

This is to be more consistent with the other place classes like QPlaceManager. The alternative would be for everything to have the QGeo prefix e.g QGePlaceManager, QGeoPlaceCategory, the Geo prefix does not help much in avoiding name collisions since 'Place' shouldn't collide with anything anyway. For classes like routing the Geo prefix is necessary to give context for what's being routed. Change-Id: Ibcf6e6909a41ea0ce2c402e24b427496d06bf243 Reviewed-on: http://codereview.qt-project.org/5210 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
author: abcd <qt-info@nokia.com> 2011-09-12 13:35:44 +1000
committer: Qt by Nokia <qt-info@nokia.com> 2011-09-23 05:31:20 +0200
commit: 5841ce6aeff5e01febc0d44b0eea0b371fb19ed8 (patch)
tree: 3098a61397642addbf88792c68fb6789bd35dafb
parent: a758d5641c330504941b531cc62f836ea11919c7 (diff)
download: qtlocation-5841ce6aeff5e01febc0d44b0eea0b371fb19ed8.tar.gz
38 files changed, 365 insertions, 366 deletions
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
index 1a8ebda8..1824872c 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace.cpp
@@ -70,7 +70,7 @@ QDeclarativePlace::QDeclarativePlace(QObject* parent)
 {
 }
 
-QDeclarativePlace::QDeclarativePlace(const QGeoPlace &src, QObject *parent)
+QDeclarativePlace::QDeclarativePlace(const QPlace &src, QObject *parent)
 :   QObject(parent), m_reviewModel(0), m_imageModel(0), m_extendedAttributes(new QDeclarativePropertyMap()),
     m_src(src), m_reply(0), m_plugin(0), m_complete(false),
     m_status(QDeclarativePlace::Ready)
@@ -135,9 +135,9 @@ QDeclarativePlaceImageModel *QDeclarativePlace::imageModel()
     return m_imageModel;
 }
 
-void QDeclarativePlace::setPlace(const QGeoPlace &src)
+void QDeclarativePlace::setPlace(const QPlace &src)
 {
-    QGeoPlace previous = m_src;
+    QPlace previous = m_src;
     m_src = src;
 
     if (previous.additionalData() != m_src.additionalData()) {
@@ -203,7 +203,7 @@ void QDeclarativePlace::setPlace(const QGeoPlace &src)
     }
 }
 
-QGeoPlace QDeclarativePlace::place()
+QPlace QDeclarativePlace::place()
 {
     QList<QPlaceCategory> categories;
     foreach (QDeclarativeCategory *value, m_categories) {
@@ -625,7 +625,7 @@ void QDeclarativePlace::setExtendedAttributes(QDeclarativePropertyMap *attribs)
 
     if (!isSame) {
         m_src.extendedAttributes().clear();
-        QGeoPlace::ExtendedAttributes extendedAttributes;
+        QPlace::ExtendedAttributes extendedAttributes;
         foreach (const QString &key, otherKeys)
             extendedAttributes.insert(key, (qvariant_cast<QDeclarativePlaceAttribute*>(attribs->value(key)))->attribute());
         m_src.setExtendedAttributes(extendedAttributes);
diff --git a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
index 5f9af44a..6c422cb8 100644
--- a/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
+++ b/src/imports/location/declarativeplaces/qdeclarativeplace_p.h
@@ -44,7 +44,7 @@
 
 #include <QObject>
 #include <QDeclarativeListProperty>
-#include <qgeoplace.h>
+#include <qplace.h>
 #include "qdeclarativegeolocation_p.h"
 #include "qdeclarativecategory_p.h"
 #include "qdeclarativesupplier_p.h"
@@ -93,7 +93,7 @@ class QDeclarativePlace : public QObject, public QDeclarativeParserStatus
 
 public:
     explicit QDeclarativePlace(QObject* parent = 0);
-    explicit QDeclarativePlace(const QGeoPlace &src, QObject* parent = 0);
+    explicit QDeclarativePlace(const QPlace &src, QObject* parent = 0);
     ~QDeclarativePlace();
 
     enum Status {Ready, Saving, Fetching, Removing, Error};
@@ -108,8 +108,8 @@ public:
     QDeclarativeReviewModel *reviewModel();
     QDeclarativePlaceImageModel *imageModel();
 
-    QGeoPlace place();
-    void setPlace(const QGeoPlace &src);
+    QPlace place();
+    void setPlace(const QPlace &src);
 
     QVariantHash additionalData() const;
     void setAdditionalData(const QVariantHash &data);
@@ -217,7 +217,7 @@ private:
     QDeclarativePlaceImageModel *m_imageModel;
     QDeclarativePropertyMap *m_extendedAttributes;
 
-    QGeoPlace m_src;
+    QPlace m_src;
 
     QPlaceReply *m_reply;
 
diff --git a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp
index 198638b6..4b92a1eb 100644
--- a/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp
+++ b/src/imports/location/declarativeplaces/qdeclarativerecommendationmodel.cpp
@@ -261,7 +261,7 @@ QVariant QDeclarativeRecommendationModel::data(const QModelIndex& index, int rol
 QPlaceReply *QDeclarativeRecommendationModel::sendQuery(QPlaceManager *manager,
                                                         const QPlaceSearchRequest &request)
 {
-    QGeoPlace target;
+    QPlace target;
     target.setPlaceId(request.searchTerm());
     return manager->recommendations(target, request);
 }
diff --git a/src/location/location.pro b/src/location/location.pro
index 63fd8ce0..9746cec2 100644
--- a/src/location/location.pro
+++ b/src/location/location.pro
@@ -28,7 +28,7 @@ PUBLIC_HEADERS += \
                     qgeoboundingcircle.h \
                     qgeocoordinate.h \
                     qgeolocation.h \
-                    qgeoplace.h \
+                    qplace.h \
                     qgeopositioninfo.h \
                     qgeopositioninfosource.h \
                     qgeosatelliteinfo.h \
@@ -41,7 +41,7 @@ PRIVATE_HEADERS += \
                     qgeoboundingbox_p.h \
                     qgeoboundingcircle_p.h \
                     qgeolocation_p.h \
-                    qgeoplace_p.h \
+                    qplace_p.h \
                     qlocationutils_p.h \
                     qnmeapositioninfosource_p.h \
                     qgeoareamonitor_polling_p.h \
@@ -130,7 +130,7 @@ SOURCES += \
             qgeoboundingcircle.cpp \
             qgeocoordinate.cpp \
             qgeolocation.cpp \
-            qgeoplace.cpp \
+            qplace.cpp \
             qgeopositioninfo.cpp \
             qgeopositioninfosource.cpp \
             qgeosatelliteinfo.cpp \
diff --git a/src/location/places/qplacedetailsreply.cpp b/src/location/places/qplacedetailsreply.cpp
index 042abadc..b8a97d0e 100644
--- a/src/location/places/qplacedetailsreply.cpp
+++ b/src/location/places/qplacedetailsreply.cpp
@@ -48,7 +48,7 @@ class QPlaceDetailsReplyPrivate : public QPlaceReplyPrivate
 public:
     QPlaceDetailsReplyPrivate() {}
     ~QPlaceDetailsReplyPrivate() {}
-    QGeoPlace result;
+    QPlace result;
 };
 
 QT_END_NAMESPACE
@@ -92,7 +92,7 @@ QPlaceReply::Type QPlaceDetailsReply::type() const
  /*!
     Returns a place result
 */
-QGeoPlace QPlaceDetailsReply::result() const
+QPlace QPlaceDetailsReply::result() const
 {
     Q_D(const QPlaceDetailsReply);
     return d->result;
@@ -101,7 +101,7 @@ QGeoPlace QPlaceDetailsReply::result() const
 /*!
     Sets the \a place
 */
-void QPlaceDetailsReply::setResult(const QGeoPlace &place)
+void QPlaceDetailsReply::setResult(const QPlace &place)
 {
     Q_D(QPlaceDetailsReply);
     d->result = place;
diff --git a/src/location/places/qplacedetailsreply.h b/src/location/places/qplacedetailsreply.h
index 1eb3c4f7..dc16618d 100644
--- a/src/location/places/qplacedetailsreply.h
+++ b/src/location/places/qplacedetailsreply.h
@@ -43,7 +43,7 @@
 #define QPLACEDETAILSREPLY_H
 
 #include "qplacereply.h"
-#include "qgeoplace.h"
+#include "qplace.h"
 
 QT_BEGIN_NAMESPACE
 
@@ -57,10 +57,10 @@ public:
 
     QPlaceReply::Type type() const;
 
-    QGeoPlace result() const;
+    QPlace result() const;
 
 protected:
-    void setResult(const QGeoPlace &result);
+    void setResult(const QPlace &result);
 private:
     Q_DISABLE_COPY(QPlaceDetailsReply)
     Q_DECLARE_PRIVATE(QPlaceDetailsReply)
diff --git a/src/location/places/qplaceidreply.h b/src/location/places/qplaceidreply.h
index 7c8fe549..1571f438 100644
--- a/src/location/places/qplaceidreply.h
+++ b/src/location/places/qplaceidreply.h
@@ -43,7 +43,7 @@
 #define QPLACEIDREPLY_H
 
 #include "qplacereply.h"
-#include "qgeoplace.h"
+#include "qplace.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index d2f55e20..e54bd5f2 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -146,7 +146,7 @@ QPlaceDetailsReply *QPlaceManager::getPlaceDetails(const QString &placeId) const
     Retrieves content from a given \a place according to thes parameters specified in
     \a request.
 */
-QPlaceContentReply *QPlaceManager::getContent(const QGeoPlace &place, const QPlaceContentRequest &request) const
+QPlaceContentReply *QPlaceManager::getContent(const QPlace &place, const QPlaceContentRequest &request) const
 {
     return d->engine->getContent(place, request);
 }
@@ -170,7 +170,7 @@ QPlaceSearchReply *QPlaceManager::searchForPlaces(const QPlaceSearchRequest &req
 /*!
     Provides recommendation based on a given \a request.
 */
-QPlaceSearchReply *QPlaceManager::recommendations(const QGeoPlace &place, const QPlaceSearchRequest &request) const
+QPlaceSearchReply *QPlaceManager::recommendations(const QPlace &place, const QPlaceSearchRequest &request) const
 {
     return d->engine->recommendations(place, request);
 }
@@ -210,7 +210,7 @@ QPlaceManager::ConnectivityModes QPlaceManager::supportedConnectivityModes() con
 /*!
     Saves a \a place at the given \a scope.
 */
-QPlaceIdReply *QPlaceManager::savePlace(const QGeoPlace &place, VisibilityScope scope)
+QPlaceIdReply *QPlaceManager::savePlace(const QPlace &place, VisibilityScope scope)
 {
     return d->engine->savePlace(place, scope);
 }
@@ -218,7 +218,7 @@ QPlaceIdReply *QPlaceManager::savePlace(const QGeoPlace &place, VisibilityScope
 /*!
     Removes a \a place from the manager
 */
-QPlaceIdReply *QPlaceManager::removePlace(const QGeoPlace &place)
+QPlaceIdReply *QPlaceManager::removePlace(const QPlace &place)
 {
     return d->engine->removePlace(place);
 }
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 984ecd42..135f740a 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -110,11 +110,11 @@ public:
     QPlaceDetailsReply *getPlaceDetails(const QString &placeId) const;
     QPlaceReply *postRating(const QString &placeId, qreal value);
 
-    QPlaceContentReply *getContent(const QGeoPlace &place, const QPlaceContentRequest &request) const;
+    QPlaceContentReply *getContent(const QPlace &place, const QPlaceContentRequest &request) const;
 
     QPlaceSearchReply *searchForPlaces(const QPlaceSearchRequest &query) const;
 
-    QPlaceSearchReply *recommendations(const QGeoPlace &place, const QPlaceSearchRequest &request) const;
+    QPlaceSearchReply *recommendations(const QPlace &place, const QPlaceSearchRequest &request) const;
 
     QPlaceTextPredictionReply *textPredictions(const QPlaceSearchRequest &request) const;
 
@@ -122,10 +122,10 @@ public:
     void setConnectivityMode(ConnectivityModes connectivityMode);
     ConnectivityModes supportedConnectivityModes() const;
 
-    QPlaceIdReply *savePlace(const QGeoPlace &place, VisibilityScope scope = QPlaceManager::NoScope);
+    QPlaceIdReply *savePlace(const QPlace &place, VisibilityScope scope = QPlaceManager::NoScope);
     VisibilityScopes supportedSaveVisibilityScopes();
 
-    QPlaceIdReply *removePlace(const QGeoPlace &place);
+    QPlaceIdReply *removePlace(const QPlace &place);
 
     QPlaceReply *initializeCategories();
     QList<QPlaceCategory> categories(const QPlaceCategory &parent = QPlaceCategory()) const;
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 6902a151..2bdd74f6 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -61,23 +61,23 @@ public:
 
     virtual QPlaceDetailsReply *getPlaceDetails(const QString &placeId) = 0;
 
-    virtual QPlaceContentReply *getContent(const QGeoPlace &place, const QPlaceContentRequest &request) = 0;
+    virtual QPlaceContentReply *getContent(const QPlace &place, const QPlaceContentRequest &request) = 0;
 
     virtual QPlaceReply *postRating(const QString &placeId, qreal value) = 0;
 
     virtual QPlaceSearchReply *searchForPlaces(const QPlaceSearchRequest &request) = 0;
 
-    virtual QPlaceSearchReply *recommendations(const QGeoPlace &place, const QPlaceSearchRequest &request) = 0;
+    virtual QPlaceSearchReply *recommendations(const QPlace &place, const QPlaceSearchRequest &request) = 0;
     virtual QPlaceTextPredictionReply *textPredictions(const QPlaceSearchRequest &request) = 0;
 
     virtual QPlaceManager::ConnectivityModes connectivityMode() const = 0;
     virtual void setConnectivityMode(QPlaceManager::ConnectivityModes mode) = 0;
     virtual QPlaceManager::ConnectivityModes supportedConnectivityModes() const = 0;
 
-    virtual QPlaceIdReply *savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope) = 0;
+    virtual QPlaceIdReply *savePlace(const QPlace &place, QPlaceManager::VisibilityScope scope) = 0;
     virtual QPlaceManager::VisibilityScopes supportedSaveVisibilityScopes() const = 0;
 
-    virtual QPlaceIdReply *removePlace(const QGeoPlace &place) = 0;
+    virtual QPlaceIdReply *removePlace(const QPlace &place) = 0;
 
     virtual QPlaceReply *initializeCategories() = 0;
     virtual QList<QPlaceCategory> categories(const QPlaceCategory &parent) const = 0;
diff --git a/src/location/places/qplacesearchresult.cpp b/src/location/places/qplacesearchresult.cpp
index 50905886..aa2d2a23 100644
--- a/src/location/places/qplacesearchresult.cpp
+++ b/src/location/places/qplacesearchresult.cpp
@@ -230,7 +230,7 @@ void QPlaceSearchResult::setType(const QPlaceSearchResult::SearchResultType &typ
 /*!
     Returns the place.
 */
-QGeoPlace QPlaceSearchResult::place() const
+QPlace QPlaceSearchResult::place() const
 {
     return d->place;
 }
@@ -238,7 +238,7 @@ QGeoPlace QPlaceSearchResult::place() const
 /*!
     Sets the \a place.
 */
-void QPlaceSearchResult::setPlace(const QGeoPlace &place)
+void QPlaceSearchResult::setPlace(const QPlace &place)
 {
     d->place = place;
 }
diff --git a/src/location/places/qplacesearchresult.h b/src/location/places/qplacesearchresult.h
index 64af99d1..5bc9f8ad 100644
--- a/src/location/places/qplacesearchresult.h
+++ b/src/location/places/qplacesearchresult.h
@@ -47,7 +47,7 @@
 #include <QSharedDataPointer>
 #include <QVariant>
 #include <QString>
-#include "qgeoplace.h"
+#include <QtLocation/QPlace>
 
 QT_BEGIN_NAMESPACE
 
@@ -98,8 +98,8 @@ public:
     SearchResultType type() const;
     void setType(const SearchResultType &type);
 
-    QGeoPlace place() const;
-    void setPlace(const QGeoPlace &place);
+    QPlace place() const;
+    void setPlace(const QPlace &place);
 
     QString didYouMeanSuggestion() const;
     void setDidYouMeanSuggestion(const QString &didYouMeanSuggestion);
diff --git a/src/location/places/qplacesearchresult_p.h b/src/location/places/qplacesearchresult_p.h
index be709cf6..106c2fc7 100644
--- a/src/location/places/qplacesearchresult_p.h
+++ b/src/location/places/qplacesearchresult_p.h
@@ -64,7 +64,7 @@ public:
     QPlaceSearchResult::LocationMatchType matchType;
     QVariantHash additionalData;
     QPlaceSearchResult::SearchResultType type;
-    QGeoPlace place;
+    QPlace place;
     QString dymString;
 };
 
diff --git a/src/location/qgeoplace.cpp b/src/location/qplace.cpp
index 738530e5..c8cef540 100644
--- a/src/location/qgeoplace.cpp
+++ b/src/location/qplace.cpp
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtLocation module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,15 +39,15 @@
 **
 ****************************************************************************/
 
-#include "qgeoplace.h"
-#include "qgeoplace_p.h"
+#include "qplace.h"
+#include "qplace_p.h"
 
-#ifdef QGEOPLACE_DEBUG
+#ifdef QPLACE_DEBUG
 #include <QDebug>
 #endif
 
 #if !defined(Q_CC_MWERKS)
-template<> QT_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QGeoPlacePrivate)>::clone()
+template<> QT_PREPEND_NAMESPACE(QPlacePrivate) *QSharedDataPointer<QT_PREPEND_NAMESPACE(QPlacePrivate)>::clone()
 {
     return d->clone();
 }
@@ -56,8 +56,8 @@ template<> QT_PREPEND_NAMESPACE(QGeoPlacePrivate) *QSharedDataPointer<QT_PREPEND
 QT_BEGIN_NAMESPACE
 
 /*!
-    \class QGeoPlace
-    \brief The QGeoPlace class represents basic information about a place.
+    \class QPlace
+    \brief The QPlace class represents basic information about a place.
 
     \inmodule QtLocation
     \since 1.1
@@ -68,22 +68,22 @@ QT_BEGIN_NAMESPACE
 /*!
     Constructs an empty place object.
 */
-QGeoPlace::QGeoPlace()
-        : d_ptr(new QGeoPlacePrivate())
+QPlace::QPlace()
+        : d_ptr(new QPlacePrivate())
 {
 }
 
 /*!
     \internal
 */
-QGeoPlace::QGeoPlace(QGeoPlacePrivate *dd)
+QPlace::QPlace(QPlacePrivate *dd)
         : d_ptr(dd) {}
 
 /*!
     Constructs a copy of \a other.
     \since 1.1
 */
-QGeoPlace::QGeoPlace(const QGeoPlace &other)
+QPlace::QPlace(const QPlace &other)
         : d_ptr(other.d_ptr)
 {
 }
@@ -91,7 +91,7 @@ QGeoPlace::QGeoPlace(const QGeoPlace &other)
 /*!
     Destroys this place.
 */
-QGeoPlace::~QGeoPlace()
+QPlace::~QPlace()
 {
 }
 
@@ -100,20 +100,20 @@ QGeoPlace::~QGeoPlace()
     to this place.
     \since 1.1
 */
-QGeoPlace &QGeoPlace::operator= (const QGeoPlace & other)
+QPlace &QPlace::operator= (const QPlace & other)
 {
     d_ptr = other.d_ptr;
     return *this;
 }
 
-inline QGeoPlacePrivate* QGeoPlace::d_func()
+inline QPlacePrivate* QPlace::d_func()
 {
-    return reinterpret_cast<QGeoPlacePrivate*>(d_ptr.data());
+    return reinterpret_cast<QPlacePrivate*>(d_ptr.data());
 }
 
-inline const QGeoPlacePrivate* QGeoPlace::d_func() const
+inline const QPlacePrivate* QPlace::d_func() const
 {
-    return reinterpret_cast<const QGeoPlacePrivate*>(d_ptr.constData());
+    return reinterpret_cast<const QPlacePrivate*>(d_ptr.constData());
 }
 
 /*!
@@ -121,7 +121,7 @@ inline const QGeoPlacePrivate* QGeoPlace::d_func() const
     otherwise returns false.
     \since 1.1
 */
-bool QGeoPlace::operator== (const QGeoPlace &other) const
+bool QPlace::operator== (const QPlace &other) const
 {
     return ( *(d_ptr.constData()) == *(other.d_ptr.constData()));
 }
@@ -131,7 +131,7 @@ bool QGeoPlace::operator== (const QGeoPlace &other) const
     otherwise returns false.
     \since 1.1
 */
-bool QGeoPlace::operator!= (const QGeoPlace &other) const
+bool QPlace::operator!= (const QPlace &other) const
 {
     return (!this->operator ==(other));
 }
@@ -139,18 +139,18 @@ bool QGeoPlace::operator!= (const QGeoPlace &other) const
 /*!
     Returns additional data.
 */
-QVariantHash QGeoPlace::additionalData() const
+QVariantHash QPlace::additionalData() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->additionalData;
 }
 
 /*!
     Sets additional data.
 */
-void QGeoPlace::setAdditionalData(const QVariantHash &data)
+void QPlace::setAdditionalData(const QVariantHash &data)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->additionalData = data;
 }
 
@@ -158,108 +158,108 @@ void QGeoPlace::setAdditionalData(const QVariantHash &data)
 /*!
     Returns categories.
 */
-QList<QPlaceCategory> QGeoPlace::categories() const
+QList<QPlaceCategory> QPlace::categories() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->categories;
 }
 
 /*!
     Sets categories.
 */
-void QGeoPlace::setCategories(const QList<QPlaceCategory> &categories)
+void QPlace::setCategories(const QList<QPlaceCategory> &categories)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->categories = categories;
 }
 
 /*!
     Returns descriptions.
 */
-QList<QPlaceDescription> QGeoPlace::descriptions() const
+QList<QPlaceDescription> QPlace::descriptions() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->descriptions;
 }
 
 /*!
     Sets descriptions.
 */
-void QGeoPlace::setDescriptions(const QList<QPlaceDescription> &descriptions)
+void QPlace::setDescriptions(const QList<QPlaceDescription> &descriptions)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->descriptions = descriptions;
 }
 
 /*!
     Returns location.
 */
-QGeoLocation QGeoPlace::location() const
+QGeoLocation QPlace::location() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->location;
 }
 
 /*!
     Sets location.
 */
-void QGeoPlace::setLocation(const QGeoLocation &location)
+void QPlace::setLocation(const QGeoLocation &location)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->location = location;
 }
 
 /*!
     Returns rating.
 */
-QPlaceRating QGeoPlace::rating() const
+QPlaceRating QPlace::rating() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->rating;
 }
 
 /*!
     Sets rating.
 */
-void QGeoPlace::setRating(const QPlaceRating &rating)
+void QPlace::setRating(const QPlaceRating &rating)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->rating = rating;
 }
 
 /*!
     Returns suppliers.
 */
-QList<QPlaceSupplier> QGeoPlace::suppliers() const
+QList<QPlaceSupplier> QPlace::suppliers() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->suppliers;
 }
 
 /*!
     Sets suppliers.
 */
-void QGeoPlace::setSuppliers(const QList<QPlaceSupplier> &data)
+void QPlace::setSuppliers(const QList<QPlaceSupplier> &data)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->suppliers = data;
 }
 
 /*!
     Returns feeds list.
 */
-QStringList QGeoPlace::feeds() const
+QStringList QPlace::feeds() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->feeds;
 }
 
 /*!
     Sets feeds list.
 */
-void QGeoPlace::setFeeds(const QStringList &feeds)
+void QPlace::setFeeds(const QStringList &feeds)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->feeds = feeds;
 }
 
@@ -270,18 +270,18 @@ void QGeoPlace::setFeeds(const QStringList &feeds)
 
     The \a type specifies which kind of content is to be retrieved.
 */
-QPlaceContent::Collection QGeoPlace::content(QPlaceContent::Type type) const
+QPlaceContent::Collection QPlace::content(QPlaceContent::Type type) const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->contentCollections.value(type);
 }
 
 /*!
     Sets a collection of \a content for the given \a type.
 */
-void QGeoPlace::setContent(QPlaceContent::Type type, const QPlaceContent::Collection &content)
+void QPlace::setContent(QPlaceContent::Type type, const QPlaceContent::Collection &content)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->contentCollections.insert(type, content);
 }
 
@@ -289,9 +289,9 @@ void QGeoPlace::setContent(QPlaceContent::Type type, const QPlaceContent::Collec
     Adds a collection of \a content of the given \a type to the place.  Any index in \a content
     that already exists is overwritten.
 */
-void QGeoPlace::addContent(QPlaceContent::Type type, const QPlaceContent::Collection &content)
+void QPlace::addContent(QPlaceContent::Type type, const QPlaceContent::Collection &content)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     QMapIterator<int, QPlaceContent> iter(content);
     while (iter.hasNext()) {
         iter.next();
@@ -305,180 +305,180 @@ void QGeoPlace::addContent(QPlaceContent::Type type, const QPlaceContent::Collec
     (As opposed to how many objects this place instance is currently assigned).
     A negative count indicates that the total number of items is unknown.
 */
-int QGeoPlace::contentCount(QPlaceContent::Type type) const
+int QPlace::contentCount(QPlaceContent::Type type) const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->contentCounts.value(type, 0);
 }
 
 /*!
     Sets the \a totalCount of content objects of the given \a type.
 */
-void QGeoPlace::setContentCount(QPlaceContent::Type type, int totalCount)
+void QPlace::setContentCount(QPlaceContent::Type type, int totalCount)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->contentCounts.insert(type, totalCount);
 }
 
 /*!
     Returns name.
 */
-QString QGeoPlace::name() const
+QString QPlace::name() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->name;
 }
 
 /*!
     Sets name.
 */
-void QGeoPlace::setName(const QString &name)
+void QPlace::setName(const QString &name)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->name = name;
 }
 
 /*!
     Returns placeId.
 */
-QString QGeoPlace::placeId() const
+QString QPlace::placeId() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->placeId;
 }
 
 /*!
     Sets placeId.
 */
-void QGeoPlace::setPlaceId(const QString &placeId)
+void QPlace::setPlaceId(const QString &placeId)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->placeId = placeId;
 }
 
 /*!
     Returns list of tags.
 */
-QStringList QGeoPlace::tags() const
+QStringList QPlace::tags() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->tags;
 }
 
 /*!
     Sets tags.
 */
-void QGeoPlace::setTags(const QStringList &tags)
+void QPlace::setTags(const QStringList &tags)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->tags = tags;
 }
 
 /*!
     Returns the primary phone number for this place.
 */
-QString QGeoPlace::primaryPhone() const
+QString QPlace::primaryPhone() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->primaryPhone;
 }
 
 /*!
     Sets the primary \a phone number of this place.
 */
-void QGeoPlace::setPrimaryPhone(const QString &phone)
+void QPlace::setPrimaryPhone(const QString &phone)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->primaryPhone = phone;
 }
 
 /*!
     Returns the primary fax number for this place.
 */
-QString QGeoPlace::primaryFax() const
+QString QPlace::primaryFax() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->primaryFax;
 }
 
 /*!
     Sets the primary \a fax number for this place
 */
-void QGeoPlace::setPrimaryFax(const QString fax)
+void QPlace::setPrimaryFax(const QString fax)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->primaryFax = fax;
 }
 
 /*!
     Returns the primary email address for this place.
 */
-QString QGeoPlace::primaryEmail() const
+QString QPlace::primaryEmail() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->primaryEmail;
 }
 
 /*!
     Sets the primary \a email address for this place.
 */
-void QGeoPlace::setPrimaryEmail(const QString &email)
+void QPlace::setPrimaryEmail(const QString &email)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->primaryEmail = email;
 }
 
 /*!
     Returns the primary URL of this place.
 */
-QUrl QGeoPlace::primaryUrl() const
+QUrl QPlace::primaryUrl() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->primaryUrl;
 }
 
 /*!
     Sets the primary \a url of this place.
 */
-void QGeoPlace::setPrimaryUrl(const QUrl &url)
+void QPlace::setPrimaryUrl(const QUrl &url)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->primaryUrl = url;
 }
 
 /*!
     Returns whether the details of this place have been fetched or not.
 */
-bool QGeoPlace::detailsFetched() const
+bool QPlace::detailsFetched() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->detailsFetched;
 }
 
 /*!
     Sets whether the details of this place have been \a fetched or not.
 */
-void QGeoPlace::setDetailsFetched(bool fetched)
+void QPlace::setDetailsFetched(bool fetched)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->detailsFetched = fetched;
 }
 
 /*!
     Returns the extended attributes of the place
 */
-QGeoPlace::ExtendedAttributes QGeoPlace::extendedAttributes() const
+QPlace::ExtendedAttributes QPlace::extendedAttributes() const
 {
-    Q_D(const QGeoPlace);
+    Q_D(const QPlace);
     return d->extendedAttributes;
 }
 
 /*!
     Sets the extended attributes of the place.
 */
-void QGeoPlace::setExtendedAttributes(const ExtendedAttributes &attributes)
+void QPlace::setExtendedAttributes(const ExtendedAttributes &attributes)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->extendedAttributes = attributes;
 }
 
@@ -486,22 +486,22 @@ void QGeoPlace::setExtendedAttributes(const ExtendedAttributes &attributes)
     Adds a single attribute to the place.  If the attribute already
     exists then the old value is overwritten.
 */
-void QGeoPlace::insertExtendedAttribute(const QString &key, const QPlaceAttribute &value)
+void QPlace::insertExtendedAttribute(const QString &key, const QPlaceAttribute &value)
 {
-    Q_D(QGeoPlace);
+    Q_D(QPlace);
     d->extendedAttributes.insert(key, value);
 }
 
 /*******************************************************************************
 *******************************************************************************/
 
-QGeoPlacePrivate::QGeoPlacePrivate()
+QPlacePrivate::QPlacePrivate()
         : QSharedData(),
         detailsFetched(false)
 {
 }
 
-QGeoPlacePrivate::QGeoPlacePrivate(const QGeoPlacePrivate &other)
+QPlacePrivate::QPlacePrivate(const QPlacePrivate &other)
         : QSharedData(other),
         additionalData(other.additionalData),
         categories(other.categories),
@@ -524,9 +524,9 @@ QGeoPlacePrivate::QGeoPlacePrivate(const QGeoPlacePrivate &other)
 {
 }
 
-QGeoPlacePrivate::~QGeoPlacePrivate() {}
+QPlacePrivate::~QPlacePrivate() {}
 
-QGeoPlacePrivate& QGeoPlacePrivate::operator= (const QGeoPlacePrivate & other)
+QPlacePrivate& QPlacePrivate::operator= (const QPlacePrivate & other)
 {
     additionalData = other.additionalData;
     categories = other.categories;
@@ -546,9 +546,9 @@ QGeoPlacePrivate& QGeoPlacePrivate::operator= (const QGeoPlacePrivate & other)
     return *this;
 }
 
-bool QGeoPlacePrivate::operator== (const QGeoPlacePrivate &other) const
+bool QPlacePrivate::operator== (const QPlacePrivate &other) const
 {
-#ifdef QGEOPLACE_DEBUG
+#ifdef QPLACE_DEBUG
     qDebug() << "additionalData: " << (additionalData == other.additionalData);
     qDebug() << "categories: " << (categories == other.categories);
     qDebug() << "descriptions: " << (descriptions == other.descriptions);
diff --git a/src/location/qgeoplace.h b/src/location/qplace.h
index b0a849e1..a182a4c4 100644
--- a/src/location/qgeoplace.h
+++ b/src/location/qplace.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtLocation module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOPLACE_H
-#define QGEOPLACE_H
+#ifndef QPLACE_H
+#define QPLACE_H
 
 #include "qmobilityglobal.h"
 #include <QSharedDataPointer>
@@ -60,21 +60,21 @@
 QT_BEGIN_NAMESPACE
 
 class QString;
-class QGeoPlacePrivate;
+class QPlacePrivate;
 
-class Q_LOCATION_EXPORT QGeoPlace
+class Q_LOCATION_EXPORT QPlace
 {
 public:
     typedef QMap<QString, QPlaceAttribute> ExtendedAttributes;
 
-    QGeoPlace();
-    QGeoPlace(const QGeoPlace &other);
-    virtual ~QGeoPlace();
+    QPlace();
+    QPlace(const QPlace &other);
+    ~QPlace();
 
-    QGeoPlace& operator=(const QGeoPlace &other);
+    QPlace& operator=(const QPlace &other);
 
-    bool operator==(const QGeoPlace &other) const;
-    bool operator!=(const QGeoPlace &other) const;
+    bool operator==(const QPlace &other) const;
+    bool operator!=(const QPlace &other) const;
 
     QVariantHash additionalData() const;
     void setAdditionalData(const QVariantHash &data);
@@ -121,17 +121,17 @@ public:
     bool detailsFetched() const;
     void setDetailsFetched(bool fetched);
 
-    QGeoPlace::ExtendedAttributes extendedAttributes() const;
-    void setExtendedAttributes(const QGeoPlace::ExtendedAttributes &attributes);
+    QPlace::ExtendedAttributes extendedAttributes() const;
+    void setExtendedAttributes(const QPlace::ExtendedAttributes &attributes);
     void insertExtendedAttribute(const QString &key, const QPlaceAttribute &);
 
 protected:
-    QGeoPlace(QGeoPlacePrivate *dd);
-    QSharedDataPointer<QGeoPlacePrivate> d_ptr;
+    QPlace(QPlacePrivate *dd);
+    QSharedDataPointer<QPlacePrivate> d_ptr;
 
 private:
-    QGeoPlacePrivate* d_func();
-    const QGeoPlacePrivate* d_func() const;
+    QPlacePrivate* d_func();
+    const QPlacePrivate* d_func() const;
 };
 
 QT_END_NAMESPACE
diff --git a/src/location/qgeoplace_p.h b/src/location/qplace_p.h
index 6b5917df..6a3014ae 100644
--- a/src/location/qgeoplace_p.h
+++ b/src/location/qplace_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 **
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the Qt Mobility Components.
+** This file is part of the QtLocation module of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** GNU Lesser General Public License Usage
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOPLACE_P_H
-#define QGEOPLACE_P_H
+#ifndef QPLACE_P_H
+#define QPLACE_P_H
 
 //
 //  W A R N I N G
@@ -57,25 +57,25 @@
 #include <QSharedData>
 #include <QUrl>
 
-#include "qgeoplace.h"
+#include "qplace.h"
 #include "qgeoaddress.h"
 #include "qgeoboundingbox.h"
 #include "qgeocoordinate.h"
 
 QT_BEGIN_NAMESPACE
 
-class QGeoPlacePrivate : public QSharedData
+class QPlacePrivate : public QSharedData
 {
 public:
-    QGeoPlacePrivate();
-    QGeoPlacePrivate(const QGeoPlacePrivate &other);
-    virtual ~QGeoPlacePrivate();
+    QPlacePrivate();
+    QPlacePrivate(const QPlacePrivate &other);
+    virtual ~QPlacePrivate();
 
-    QGeoPlacePrivate& operator= (const QGeoPlacePrivate &other);
+    QPlacePrivate &operator= (const QPlacePrivate &other);
 
-    virtual bool operator== (const QGeoPlacePrivate &other) const;
+    virtual bool operator== (const QPlacePrivate &other) const;
 
-    virtual QGeoPlacePrivate* clone() const { return new QGeoPlacePrivate(*this); }
+    virtual QPlacePrivate *clone() const { return new QPlacePrivate(*this); }
 
     QVariantHash additionalData;
     QList<QPlaceCategory> categories;
@@ -96,7 +96,7 @@ public:
     QString primaryEmail;
     QUrl primaryUrl;
 
-    QGeoPlace::ExtendedAttributes extendedAttributes;
+    QPlace::ExtendedAttributes extendedAttributes;
 
     bool detailsFetched;
 };
@@ -106,12 +106,12 @@ public:
 // This results in multiple symbol definition errors on all other compilers
 // but not having a definition here results in an attempt to use the unspecialized
 // clone (which fails because of the pure virtuals above)
-template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone()
+template<> QPlacePrivate *QSharedDataPointer<QPlacePrivate>::clone()
 {
     return d->clone();
 }
 #else
-template<> QGeoPlacePrivate *QSharedDataPointer<QGeoPlacePrivate>::clone();
+template<> QPlacePrivate *QSharedDataPointer<QPlacePrivate>::clone();
 #endif
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/places/qplacedetailsreplyimpl.cpp b/src/plugins/geoservices/nokia/places/qplacedetailsreplyimpl.cpp
index 06a6e228..a883efa4 100644
--- a/src/plugins/geoservices/nokia/places/qplacedetailsreplyimpl.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacedetailsreplyimpl.cpp
@@ -104,7 +104,7 @@ void QPlaceDetailsReplyImpl::resultReady(const QPlaceJSonParser::Error &errorId,
                       const QString &errorMessage)
 {
     if (errorId == QPlaceJSonParser::NoError) {
-        QGeoPlace place = parser->result();
+        QPlace place = parser->result();
         place.setDetailsFetched(true);
         setResult(place);
     } else if (errorId == QPlaceJSonParser::ParsingError) {
diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
index eb8259a0..06dc03bc 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.cpp
@@ -56,7 +56,7 @@
 
 #include <qgeoaddress.h>
 #include <qgeocoordinate.h>
-#include <qgeoplace.h>
+#include <qplace.h>
 #include <qplacecategory.h>
 #include <qplacedescription.h>
 #include <qplacerating.h>
@@ -194,16 +194,16 @@ QPlaceJSonDetailsParser::~QPlaceJSonDetailsParser()
 {
 }
 
-QGeoPlace QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue)
+QPlace QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue)
 {
-    QGeoPlace newPlace;
+    QPlace newPlace;
     if (placeValue.isValid()) {
         buildPlace(placeValue, &newPlace);
     }
     return newPlace;
 }
 
-QGeoPlace QPlaceJSonDetailsParser::result()
+QPlace QPlaceJSonDetailsParser::result()
 {
     return place;
 }
@@ -223,7 +223,7 @@ void QPlaceJSonDetailsParser::processJSonData(const QScriptValue &sv)
     }
 }
 
-void QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QPlace *targetPlace)
 {
     if (placeValue.isValid()) {
         QScriptValue value = placeValue.property(place_id_element);
@@ -266,7 +266,7 @@ void QPlaceJSonDetailsParser::buildPlace(const QScriptValue &placeValue, QGeoPla
     }
 }
 
-void QPlaceJSonDetailsParser::processMainProvider(const QScriptValue &placeValue, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processMainProvider(const QScriptValue &placeValue, QPlace *targetPlace)
 {
     QPlaceSupplier sup;
     QScriptValue value = placeValue.property(place_provider);
@@ -285,7 +285,7 @@ void QPlaceJSonDetailsParser::processMainProvider(const QScriptValue &placeValue
     targetPlace->setSuppliers(list);
 }
 
-void QPlaceJSonDetailsParser::processContacts(const QScriptValue &contactsValue, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processContacts(const QScriptValue &contactsValue, QPlace *targetPlace)
 {
     QScriptValueIterator it(contactsValue);
     bool phoneRetrieved = false;
@@ -320,12 +320,12 @@ void QPlaceJSonDetailsParser::processContacts(const QScriptValue &contactsValue,
     }
 }
 
-void QPlaceJSonDetailsParser::processCategories(const QScriptValue &categories, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processCategories(const QScriptValue &categories, QPlace *targetPlace)
 {
     targetPlace->setCategories(QPlaceJSonCategoriesParser::parseFlatCategoryList(categories));
 }
 
-void QPlaceJSonDetailsParser::processRatings(const QScriptValue &ratings, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processRatings(const QScriptValue &ratings, QPlace *targetPlace)
 {
     QPlaceRating *rating = NULL;
     QScriptValue value = ratings.property(place_rating_element);
@@ -422,7 +422,7 @@ void QPlaceJSonDetailsParser::processAddress(const QScriptValue &address, QGeoLo
     location->setAddress(newAddress);
 }
 
-void QPlaceJSonDetailsParser::processLocation(const QScriptValue &location, QGeoPlace *targetPlace)
+void QPlaceJSonDetailsParser::processLocation(const QScriptValue &location, QPlace *targetPlace)
 {
     QGeoLocation newLocation;
     QScriptValue property = location.property(place_geoCoordinates_element);
@@ -453,7 +453,7 @@ void QPlaceJSonDetailsParser::processLocation(const QScriptValue &location, QGeo
     targetPlace->setLocation(newLocation);
 }
 
-void QPlaceJSonDetailsParser::processTags(const QScriptValue &tags, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processTags(const QScriptValue &tags, QPlace *targetPlace)
 {
     QStringList newTags;
     if (tags.isValid()) {
@@ -476,7 +476,7 @@ void QPlaceJSonDetailsParser::processTags(const QScriptValue &tags, QGeoPlace*ta
     targetPlace->setTags(newTags);
 }
 
-void QPlaceJSonDetailsParser::processNames(const QScriptValue &names, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processNames(const QScriptValue &names, QPlace *targetPlace)
 {
     QScriptValue value = names.property(place_alternativenames_element);
     if (value.isValid()) {
@@ -526,7 +526,7 @@ QString QPlaceJSonDetailsParser::processName(const QScriptValue &nameValue)
     return name;
 }
 
-void QPlaceJSonDetailsParser::processPremiumContents(const QScriptValue &premiumContent, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processPremiumContents(const QScriptValue &premiumContent, QPlace *targetPlace)
 {
     QScriptValue value = premiumContent.property(place_premiumcontent_version_element);
     if (value.isValid()) {
@@ -545,7 +545,7 @@ void QPlaceJSonDetailsParser::processPremiumContents(const QScriptValue &premium
     }
 }
 
-void QPlaceJSonDetailsParser::processPremiumVersion(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processPremiumVersion(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_premiumcontent_content_element);
     if (value.isValid()) {
@@ -564,7 +564,7 @@ void QPlaceJSonDetailsParser::processPremiumVersion(const QScriptValue &content,
     }
 }
 
-void QPlaceJSonDetailsParser::processPremiumContent(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processPremiumContent(const QScriptValue &content, QPlace *targetPlace)
 {
     QString name, id, iconUrl;
     QScriptValue value = content.property(place_premiumcontent_content_providername_element);
@@ -592,7 +592,7 @@ void QPlaceJSonDetailsParser::processPremiumContent(const QScriptValue &content,
 
 void QPlaceJSonDetailsParser::processPremiumContentDescription(const QScriptValue &content,
                                                                const QPlaceSupplier &supplier,
-                                                               QGeoPlace*targetPlace)
+                                                               QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_premiumcontent_content_desc_element);
     QPlaceDescription desc;
@@ -628,7 +628,7 @@ void QPlaceJSonDetailsParser::processPremiumContentDescription(const QScriptValu
 
 void QPlaceJSonDetailsParser::processPremiumContentMediaObjects(const QScriptValue &content,
                                                                 const QPlaceSupplier &supplier,
-                                                                QGeoPlace*targetPlace)
+                                                                QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_premiumcontent_content_media_element);
     if (value.isValid()) {
@@ -686,7 +686,7 @@ QPlaceImage *QPlaceJSonDetailsParser::processPremiumContentMediaObject(const QSc
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContent(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContent(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_descriptions_element);
     if (value.isValid()) {
@@ -710,7 +710,7 @@ void QPlaceJSonDetailsParser::processAdContent(const QScriptValue &content, QGeo
     }
 }
 
-void QPlaceJSonDetailsParser::processAdContentPackages(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentPackages(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_package_element);
     if (value.isValid()) {
@@ -728,7 +728,7 @@ void QPlaceJSonDetailsParser::processAdContentPackages(const QScriptValue &conte
     }
 }
 
-void QPlaceJSonDetailsParser::processAdContentDescriptions(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentDescriptions(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_description_element);
     if (value.isValid()) {
@@ -776,7 +776,7 @@ QPlaceDescription *QPlaceJSonDetailsParser::processAdContentDescription(const QS
     return description;
 }
 
-void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentMediaObjects(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_media_element);
     if (value.isValid()) {
@@ -839,7 +839,7 @@ QPlaceImage *QPlaceJSonDetailsParser::processAdContentMediaObject(const QScriptV
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContentPaymentMethods(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentPaymentMethods(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_paymentmethod_element);
     if (value.isValid()) {
@@ -881,7 +881,7 @@ QString QPlaceJSonDetailsParser::processAdContentPaymentMethod(const QScriptValu
     return obj;
 }
 
-void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_hours_annualclosingsnotes_element);
     if (value.isValid()) {
@@ -898,7 +898,7 @@ void QPlaceJSonDetailsParser::processAdContentBusinessHours(const QScriptValue &
 }
 
 void QPlaceJSonDetailsParser::processAdContentClosingsNotes(const QScriptValue &content,
-                                                            QGeoPlace *targetPlace)
+                                                            QPlace *targetPlace)
 {
     Q_UNUSED(targetPlace)
 
@@ -943,7 +943,7 @@ QString QPlaceJSonDetailsParser::processAdContentClosingsNote(const QScriptValue
 }
 
 void QPlaceJSonDetailsParser::processAdContentOpeningHours(const QScriptValue &content,
-                                                           QGeoPlace *targetPlace)
+                                                           QPlace *targetPlace)
 {
     Q_UNUSED(targetPlace)
 
@@ -1003,7 +1003,7 @@ void QPlaceJSonDetailsParser::processAdContentOpeningHoursElement(const QScriptV
     return;
 }
 
-void QPlaceJSonDetailsParser::processAdContentOpeningNotes(const QScriptValue &content, QGeoPlace*targetPlace)
+void QPlaceJSonDetailsParser::processAdContentOpeningNotes(const QScriptValue &content, QPlace *targetPlace)
 {
     QScriptValue value = content.property(place_adcontent_hours_openingnote_element);
     if (value.isValid()) {
diff --git a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
index 42dd4070..7c082a31 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsondetailsparser.h
@@ -52,7 +52,7 @@
 #include <QObject>
 #include <QList>
 
-#include <qgeoplace.h>
+#include <qplace.h>
 #include <qplaceimage.h>
 #include "qplacejsonparser_p.h"
 
@@ -68,51 +68,51 @@ public:
     explicit QPlaceJSonDetailsParser(QObject *parent = 0);
     virtual ~QPlaceJSonDetailsParser();
 
-    static QGeoPlace buildPlace(const QScriptValue &place);
-    QGeoPlace result();
+    static QPlace buildPlace(const QScriptValue &place);
+    QPlace result();
 
 private:
     void processJSonData(const QScriptValue &sv);
-    static void buildPlace(const QScriptValue &place, QGeoPlace *targetPlace);
-    static void processMainProvider(const QScriptValue &place, QGeoPlace *targetPlace);
-    static void processContacts(const QScriptValue &contacts, QGeoPlace *targetPlace);
-    static void processCategories(const QScriptValue &categories, QGeoPlace *targetPlace);
+    static void buildPlace(const QScriptValue &place, QPlace *targetPlace);
+    static void processMainProvider(const QScriptValue &place, QPlace *targetPlace);
+    static void processContacts(const QScriptValue &contacts, QPlace *targetPlace);
+    static void processCategories(const QScriptValue &categories, QPlace *targetPlace);
     static QPlaceCategory processCategory(const QScriptValue &category);
-    static void processRatings(const QScriptValue &ratings, QGeoPlace *targetPlace);
+    static void processRatings(const QScriptValue &ratings, QPlace *targetPlace);
     static QPlaceRating *processRating(const QScriptValue &rating);
     static void processAddress(const QScriptValue &address, QGeoLocation *location);
-    static void processLocation(const QScriptValue &location, QGeoPlace *targetPlace);
-    static void processTags(const QScriptValue &locations, QGeoPlace *targetPlace);
-    static void processNames(const QScriptValue &locations, QGeoPlace *targetPlace);
+    static void processLocation(const QScriptValue &location, QPlace *targetPlace);
+    static void processTags(const QScriptValue &locations, QPlace *targetPlace);
+    static void processNames(const QScriptValue &locations, QPlace *targetPlace);
     static QString processName(const QScriptValue &nameValue);
-    static void processPremiumContents(const QScriptValue &content, QGeoPlace *targetPlace);
-    static void processPremiumVersion(const QScriptValue &content, QGeoPlace *targetPlace);
-    static void processPremiumContent(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processPremiumContents(const QScriptValue &content, QPlace *targetPlace);
+    static void processPremiumVersion(const QScriptValue &content, QPlace *targetPlace);
+    static void processPremiumContent(const QScriptValue &content, QPlace *targetPlace);
     static void processPremiumContentDescription(const QScriptValue &content,
                                                  const QPlaceSupplier &supplier,
-                                                 QGeoPlace *targetPlace);
+                                                 QPlace *targetPlace);
     static void processPremiumContentMediaObjects(const QScriptValue &content,
                                                   const QPlaceSupplier &supplier,
-                                                  QGeoPlace *targetPlace);
+                                                  QPlace *targetPlace);
     static QPlaceImage *processPremiumContentMediaObject(const QScriptValue &content);
-    static void processAdContent(const QScriptValue &content, QGeoPlace *targetPlace);
-    static void processAdContentPackages(const QScriptValue &content, QGeoPlace *targetPlace);
-    static void processAdContentDescriptions(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContent(const QScriptValue &content, QPlace *targetPlace);
+    static void processAdContentPackages(const QScriptValue &content, QPlace *targetPlace);
+    static void processAdContentDescriptions(const QScriptValue &content, QPlace *targetPlace);
     static QPlaceDescription *processAdContentDescription(const QScriptValue &content);
-    static void processAdContentMediaObjects(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContentMediaObjects(const QScriptValue &content, QPlace *targetPlace);
     static QPlaceImage *processAdContentMediaObject(const QScriptValue &content);
-    static void processAdContentPaymentMethods(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContentPaymentMethods(const QScriptValue &content, QPlace *targetPlace);
     static QString processAdContentPaymentMethod(const QScriptValue &content);
-    static void processAdContentBusinessHours(const QScriptValue &content, QGeoPlace *targetPlace);
-    static void processAdContentClosingsNotes(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContentBusinessHours(const QScriptValue &content, QPlace *targetPlace);
+    static void processAdContentClosingsNotes(const QScriptValue &content, QPlace *targetPlace);
     static QString processAdContentClosingsNote(const QScriptValue &content);
-    static void processAdContentOpeningHours(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContentOpeningHours(const QScriptValue &content, QPlace *targetPlace);
     static void processAdContentOpeningHoursElement(const QScriptValue &content);
-    static void processAdContentOpeningNotes(const QScriptValue &content, QGeoPlace *targetPlace);
+    static void processAdContentOpeningNotes(const QScriptValue &content, QPlace *targetPlace);
     static QString processAdContentOpeningNote(const QScriptValue &content);
 
 private:
-    QGeoPlace place;
+    QPlace place;
 };
 
 QT_END_NAMESPACE
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
index c596fe59..7bd15460 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonrecommendationparser.cpp
@@ -53,7 +53,7 @@
 #include <QtScript/QScriptValueIterator>
 
 #include "qplacejsondetailsparser.h"
-#include <qgeoplace.h>
+#include <qplace.h>
 
 #if defined(QT_PLACES_LOGGING)
     #include <QDebug>
@@ -118,7 +118,7 @@ void QPlaceJSonRecommendationParser::processResultElement(const QScriptValue &va
     }
     QScriptValue place = value.property(recommendations_place_element);
     if (place.isValid()) {
-        QGeoPlace newPlace = QPlaceJSonDetailsParser::buildPlace(place);
+        QPlace newPlace = QPlaceJSonDetailsParser::buildPlace(place);
         result.setPlace(newPlace);
         searchResults.append(result);
     }
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
index 23a11983..6f294f66 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
+++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.cpp
@@ -55,7 +55,7 @@
 #include <qgeocoordinate.h>
 #include <qgeoaddress.h>
 #include <qgeolocation.h>
-#include <qgeoplace.h>
+#include <qplace.h>
 #include <qplacerating.h>
 #include <qplacecategory.h>
 #include <qplacesupplier.h>
@@ -174,7 +174,7 @@ QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QScriptValu
 {
     QPlaceSearchResult result;
     result.setType(QPlaceSearchResult::Place);
-    QGeoPlace newPlace;
+    QPlace newPlace;
 
     // Processing properties
     QScriptValue properties = results.property(search_properties_element);
@@ -231,7 +231,7 @@ QPlaceSearchResult QPlaceJSonSearchParser::processPlaceElement(const QScriptValu
     return result;
 }
 
-void QPlaceJSonSearchParser::processContacts(const QScriptValue &properties, QGeoPlace *place)
+void QPlaceJSonSearchParser::processContacts(const QScriptValue &properties, QPlace *place)
 {
     QScriptValue value = properties.property(search_properties_url_value);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -244,7 +244,7 @@ void QPlaceJSonSearchParser::processContacts(const QScriptValue &properties, QGe
 }
 
 
-void QPlaceJSonSearchParser::processCategories(const QScriptValue &categories, QGeoPlace *place)
+void QPlaceJSonSearchParser::processCategories(const QScriptValue &categories, QPlace *place)
 {
     QList<QPlaceCategory> categoriesList;
     QScriptValueIterator it(categories);
@@ -265,7 +265,7 @@ void QPlaceJSonSearchParser::processCategories(const QScriptValue &categories, Q
     place->setCategories(categoriesList);
 }
 
-void QPlaceJSonSearchParser::processRating(const QScriptValue &properties, QGeoPlace *place)
+void QPlaceJSonSearchParser::processRating(const QScriptValue &properties, QPlace *place)
 {
     QScriptValue value = properties.property(search_properties_rating_value);
     if (value.isValid() && !value.toString().isEmpty()) {
@@ -323,7 +323,7 @@ void QPlaceJSonSearchParser::processAddress(const QScriptValue &properties, QGeo
     location->setAddress(newAddress);
 }
 
-void QPlaceJSonSearchParser::processLocation(const QScriptValue &properties, QGeoPlace *place)
+void QPlaceJSonSearchParser::processLocation(const QScriptValue &properties, QPlace *place)
 {
     QGeoLocation location;
 
diff --git a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
index 866c49eb..baadfa5f 100644
--- a/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
+++ b/src/plugins/geoservices/nokia/places/qplacejsonsearchparser.h
@@ -75,11 +75,11 @@ private:
     void processJSonData(const QScriptValue &sv);
     void processResultElement(const QScriptValue &value);
     QPlaceSearchResult processPlaceElement(const QScriptValue &value);
-    void processContacts(const QScriptValue &properties, QGeoPlace *place);
-    void processCategories(const QScriptValue &categories, QGeoPlace *place);
-    void processRating(const QScriptValue &properties, QGeoPlace *place);
+    void processContacts(const QScriptValue &properties, QPlace *place);
+    void processCategories(const QScriptValue &categories, QPlace *place);
+    void processRating(const QScriptValue &properties, QPlace *place);
     void processAddress(const QScriptValue &properties, QGeoLocation *location);
-    void processLocation(const QScriptValue &properties, QGeoPlace *place);
+    void processLocation(const QScriptValue &properties, QPlace *place);
 private:
     QList<QPlaceSearchResult> searchResultsList;
 };
diff --git a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
index 940341e1..b38a99c4 100644
--- a/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
+++ b/src/plugins/geoservices/nokia/qgeocodereply_nokia.h
@@ -46,8 +46,8 @@
 **
 ****************************************************************************/
 
-#ifndef QGEOPLACESREPLY_NOKIA_H
-#define QGEOPLACESREPLY_NOKIA_H
+#ifndef QGEOCODEREPLY_NOKIA_H
+#define QGEOCODEREPLY_NOKIA_H
 
 #include <qgeocodereply.h>
 #include <QNetworkReply>
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp
index 08f30556..b0712e70 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp
@@ -107,7 +107,7 @@ QPlaceDetailsReply *QPlaceManagerEngineNokia::getPlaceDetails(const QString &pla
     return reply;
 }
 
-QPlaceContentReply *QPlaceManagerEngineNokia::getContent(const QGeoPlace &place, const QPlaceContentRequest &request)
+QPlaceContentReply *QPlaceManagerEngineNokia::getContent(const QPlace &place, const QPlaceContentRequest &request)
 {
     QPlaceContentReplyImpl *reply;
     switch (request.contentType()) {
@@ -200,7 +200,7 @@ QPlaceSearchReply *QPlaceManagerEngineNokia::searchForPlaces(const QPlaceSearchR
     return reply;
 }
 
-QPlaceSearchReply *QPlaceManagerEngineNokia::recommendations(const QGeoPlace &place, const QPlaceSearchRequest &query)
+QPlaceSearchReply *QPlaceManagerEngineNokia::recommendations(const QPlace &place, const QPlaceSearchRequest &query)
 {
     QPlaceRecommendationReplyImpl *reply = NULL;
     QPlaceSearchRequest newQuery = query;
@@ -246,8 +246,8 @@ QPlaceManager::ConnectivityModes QPlaceManagerEngineNokia::supportedConnectivity
     return QPlaceManager::OnlineMode;
 }
 
-QPlaceIdReply *QPlaceManagerEngineNokia::savePlace(const QGeoPlace &place,
-                                                     QPlaceManager::VisibilityScope scope)
+QPlaceIdReply *QPlaceManagerEngineNokia::savePlace(const QPlace &place,
+                                                   QPlaceManager::VisibilityScope scope)
 {
     Q_UNUSED(place)
     Q_UNUSED(scope)
@@ -260,7 +260,7 @@ QPlaceManager::VisibilityScopes QPlaceManagerEngineNokia::supportedSaveVisibilit
     return QPlaceManager::NoScope;
 }
 
-QPlaceIdReply *QPlaceManagerEngineNokia::removePlace(const QGeoPlace &place)
+QPlaceIdReply *QPlaceManagerEngineNokia::removePlace(const QPlace &place)
 {
     Q_UNUSED(place)
 
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
index cb2e9a11..8f7d78f8 100644
--- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
+++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h
@@ -68,23 +68,23 @@ public:
 
     QPlaceDetailsReply *getPlaceDetails(const QString &placeId);
 
-    QPlaceContentReply *getContent(const QGeoPlace &place, const QPlaceContentRequest &request);
+    QPlaceContentReply *getContent(const QPlace &place, const QPlaceContentRequest &request);
 
     QPlaceReply *postRating(const QString &placeId, qreal value);
 
     QPlaceSearchReply *searchForPlaces(const QPlaceSearchRequest &query);
 
-    QPlaceSearchReply *recommendations(const QGeoPlace &place, const QPlaceSearchRequest &query);
+    QPlaceSearchReply *recommendations(const QPlace &place, const QPlaceSearchRequest &query);
     QPlaceTextPredictionReply *textPredictions(const QPlaceSearchRequest &query);
 
     QPlaceManager::ConnectivityModes connectivityMode() const;
     void setConnectivityMode(QPlaceManager::ConnectivityModes connectivityMode);
     QPlaceManager::ConnectivityModes supportedConnectivityModes() const;
 
-    QPlaceIdReply *savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope);
+    QPlaceIdReply *savePlace(const QPlace &place, QPlaceManager::VisibilityScope scope);
     QPlaceManager::VisibilityScopes supportedSaveVisibilityScopes() const;
 
-    QPlaceIdReply *removePlace(const QGeoPlace &place);
+    QPlaceIdReply *removePlace(const QPlace &place);
 
     QPlaceReply *initializeCategories();
     QList<QPlaceCategory> categories(const QPlaceCategory &parent) const;
diff --git a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp b/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp
index 91d3cdfd..15573cca 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/detailsreply.cpp
@@ -51,7 +51,7 @@ DetailsReply::~DetailsReply()
 {
 }
 
-void DetailsReply::setResult(const QGeoPlace &place)
+void DetailsReply::setResult(const QPlace &place)
 {
     QPlaceDetailsReply::setResult(place);
 }
diff --git a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h b/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h
index dc2f3f53..44201179 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/detailsreply.h
@@ -54,7 +54,7 @@ class DetailsReply : public QPlaceDetailsReply
 public:
     DetailsReply(QPlaceManagerEngineJsonDb *engine);
     virtual ~DetailsReply();
-    void setResult(const QGeoPlace &place);
+    void setResult(const QPlace &place);
 
     DECLARE_TRIGGER_DONE_FN
 
diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp
index 71eb7a10..fbd8e740 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.cpp
@@ -92,7 +92,7 @@ int JsonDbHandler::remove(const QString &uuid)
     return m_db->remove(jsonMap);
 }
 
-QVariant JsonDbHandler::convertToJsonVariant(const QGeoPlace &place)
+QVariant JsonDbHandler::convertToJsonVariant(const QPlace &place)
 {
     QVariantMap map;
     map.insert("_type", PLACE_TYPE);
@@ -141,21 +141,21 @@ QVariant JsonDbHandler::convertToJsonVariant(const QPlaceSearchRequest &request)
    "offset": <integer>
    }
 */
-QList<QGeoPlace> JsonDbHandler::convertJsonResponseToPlaces(const QVariant &response)
+QList<QPlace> JsonDbHandler::convertJsonResponseToPlaces(const QVariant &response)
 {
     QList<QVariant> data = response.toMap().value("data").toList();
-    QList<QGeoPlace> places;
+    QList<QPlace> places;
     foreach (const QVariant&var, data)
         places.append(JsonDbHandler::convertJsonVariantToPlace(var));
 
     return places;
 }
 
-QGeoPlace JsonDbHandler::convertJsonVariantToPlace(const QVariant &variant)
+QPlace JsonDbHandler::convertJsonVariantToPlace(const QVariant &variant)
 {
     QVariantMap placeJson = variant.toMap();
 
-    QGeoPlace place;
+    QPlace place;
     place.setName(placeJson.value(PLACE_NAME).toString());
     place.setPlaceId(placeJson.value(UUID).toString());
 
diff --git a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h
index e9cf8631..7b3e3f9f 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/jsondbhandler.h
@@ -75,7 +75,7 @@ Q_ADDON_JSONDB_END_NAMESPACE
 Q_USE_JSONDB_NAMESPACE
 
 class QPlaceManagerEngineJsonDb;
-class QGeoPlace;
+class QPlace;
 class QPlaceSearchRequest;
 
 class JsonDbHandler : public QObject
@@ -90,10 +90,10 @@ public:
     int queryPlaceDetails(const QString &placeId);
     int remove(const QString &uuid);
 
-    static QVariant convertToJsonVariant(const QGeoPlace &place);
+    static QVariant convertToJsonVariant(const QPlace &place);
     static QVariant convertToJsonVariant(const QPlaceSearchRequest &query);
-    static QList<QGeoPlace> convertJsonResponseToPlaces(const QVariant &response);
-    static QGeoPlace convertJsonVariantToPlace(const QVariant &variant);
+    static QList<QPlace> convertJsonResponseToPlaces(const QVariant &response);
+    static QPlace convertJsonVariantToPlace(const QVariant &variant);
 
     bool isConnected();
 signals:
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
index 5f963c92..579d54b5 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
+++ b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp
@@ -88,7 +88,7 @@ QPlaceDetailsReply *QPlaceManagerEngineJsonDb::getPlaceDetails(const QString &pl
     return detailsReply;
 }
 
-QPlaceContentReply *QPlaceManagerEngineJsonDb::getContent(const QGeoPlace &place, const QPlaceContentRequest &request)
+QPlaceContentReply *QPlaceManagerEngineJsonDb::getContent(const QPlace &place, const QPlaceContentRequest &request)
 {
     ContentReply *contentReply = new ContentReply(this);
     contentReply->triggerDone(QPlaceReply::UnsupportedError, tr("Fetching content is unsupported"));
@@ -142,7 +142,7 @@ QPlaceSearchReply *QPlaceManagerEngineJsonDb::searchForPlaces(const QPlaceSearch
     return searchReply;
 }
 
-QPlaceSearchReply *QPlaceManagerEngineJsonDb::recommendations(const QGeoPlace &place, const QPlaceSearchRequest &request)
+QPlaceSearchReply *QPlaceManagerEngineJsonDb::recommendations(const QPlace &place, const QPlaceSearchRequest &request)
 {
     SearchReply *searchReply = new SearchReply(this);
     searchReply->triggerDone(QPlaceReply::UnsupportedError, tr("Recommendations is unsupported"));
@@ -171,7 +171,7 @@ QPlaceManager::ConnectivityModes QPlaceManagerEngineJsonDb::supportedConnectivit
     return QPlaceManager::OfflineMode;
 }
 
-QPlaceIdReply *QPlaceManagerEngineJsonDb::savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope)
+QPlaceIdReply *QPlaceManagerEngineJsonDb::savePlace(const QPlace &place, QPlaceManager::VisibilityScope scope)
 {
     IdReply *saveReply = new IdReply(QPlaceIdReply::SavePlace, this);
     if (!m_jsonDbHandler.isConnected()) {
@@ -199,7 +199,7 @@ QPlaceManager::VisibilityScopes QPlaceManagerEngineJsonDb::supportedSaveVisibili
     return QPlaceManager::NoScope | QPlaceManager::PrivateScope;
 }
 
-QPlaceIdReply *QPlaceManagerEngineJsonDb::removePlace(const QGeoPlace &place)
+QPlaceIdReply *QPlaceManagerEngineJsonDb::removePlace(const QPlace &place)
 {
     IdReply *removeReply = new IdReply(QPlaceIdReply::RemovePlace, this);
 
@@ -317,12 +317,12 @@ void QPlaceManagerEngineJsonDb::processJsonDbResponse(int id, const QVariant &da
             }
         case QPlaceReply::PlaceSearchReply: {
                 SearchReply *searchReply = qobject_cast<SearchReply *>(reply);
-                QList<QGeoPlace> places = JsonDbHandler::convertJsonResponseToPlaces(data);
+                QList<QPlace> places = JsonDbHandler::convertJsonResponseToPlaces(data);
                 if (searchReply->request().searchArea() != 0) {
                     QGeoBoundingArea *searchArea = searchReply->request().searchArea();
                     if (searchArea->type() == QGeoBoundingArea::CircleType) {
                         QGeoBoundingCircle *circle = static_cast<QGeoBoundingCircle*>(searchArea);
-                        foreach (const QGeoPlace &place, places) {
+                        foreach (const QPlace &place, places) {
                             double dist = circle->center().distanceTo(place.location().coordinate());
                             if (dist > circle->radius())
                                 places.removeAll(place);
@@ -340,7 +340,7 @@ void QPlaceManagerEngineJsonDb::processJsonDbResponse(int id, const QVariant &da
                         double brx = box->bottomRight().longitude();
 
                         QGeoCoordinate coord;
-                        foreach (const QGeoPlace &place, places) {
+                        foreach (const QPlace &place, places) {
                             coord = place.location().coordinate();
                             if (coord.latitude() > tly)
                                 places.removeAll(place);
@@ -365,7 +365,7 @@ void QPlaceManagerEngineJsonDb::processJsonDbResponse(int id, const QVariant &da
                 QList<QPlaceSearchResult> results;
                 QPlaceSearchResult result;
                 result.setType(QPlaceSearchResult::Place);
-                foreach (const QGeoPlace &place, places) {
+                foreach (const QPlace &place, places) {
                     result.setPlace(place);
                     results.append(result);
                 }
@@ -381,7 +381,7 @@ void QPlaceManagerEngineJsonDb::processJsonDbResponse(int id, const QVariant &da
                     detailsReply->triggerDone(QPlaceReply::PlaceDoesNotExistError,
                                               tr("Specified place does not exist"));
                 } else {
-                    QList<QGeoPlace> places = JsonDbHandler::convertJsonResponseToPlaces(data);
+                    QList<QPlace> places = JsonDbHandler::convertJsonResponseToPlaces(data);
                     Q_ASSERT(!places.isEmpty());
                     detailsReply->setResult(places.first());
                     detailsReply->triggerDone();
diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h
index d6ece1f1..765d8496 100644
--- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h
+++ b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h
@@ -62,21 +62,21 @@ public:
 
     QPlaceReply *postRating(const QString &placeId, qreal value);
 
-    QPlaceContentReply *getContent(const QGeoPlace &place, const QPlaceContentRequest &request);
+    QPlaceContentReply *getContent(const QPlace &place, const QPlaceContentRequest &request);
 
     QPlaceSearchReply *searchForPlaces(const QPlaceSearchRequest &request);
 
-    QPlaceSearchReply *recommendations(const QGeoPlace &place, const QPlaceSearchRequest &request);
+    QPlaceSearchReply *recommendations(const QPlace &place, const QPlaceSearchRequest &request);
     QPlaceTextPredictionReply *textPredictions(const QPlaceSearchRequest &request);
 
     QPlaceManager::ConnectivityModes connectivityMode() const;
     void setConnectivityMode(QPlaceManager::ConnectivityModes connectivityMode);
     QPlaceManager::ConnectivityModes supportedConnectivityModes() const;
 
-    QPlaceIdReply *savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope);
+    QPlaceIdReply *savePlace(const QPlace &place, QPlaceManager::VisibilityScope scope);
     QPlaceManager::VisibilityScopes supportedSaveVisibilityScopes() const;
 
-    QPlaceIdReply *removePlace(const QGeoPlace &place);
+    QPlaceIdReply *removePlace(const QPlace &place);
 
     QPlaceReply *initializeCategories();
     QList<QPlaceCategory> categories(const QPlaceCategory &parent) const;
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro
index 485aeeeb..b135df04 100644
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
@@ -7,7 +7,7 @@ SUBDIRS += geotestplugin \
            qgeoboundingcircle \
            qgeocoordinate \
            qgeolocation \
-           qgeoplace \
+           qplace \
            qgeocodereply \
            qgeocodingmanager \
            qplacecategory \
diff --git a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
index 488fdf47..e1ebd76b 100644
--- a/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
+++ b/tests/auto/geotestplugin/qgeoroutingmanagerengine_test.h
@@ -46,7 +46,6 @@
 #include <qgeoroutingmanagerengine.h>
 #include <QLocale>
 #include <qgeoaddress.h>
-#include <qgeoplace.h>
 #include <qgeoroutereply.h>
 
 #include <QDebug>
diff --git a/tests/auto/geotestplugin/qplacemanagerengine_test.h b/tests/auto/geotestplugin/qplacemanagerengine_test.h
index ea66b581..d7f1266c 100644
--- a/tests/auto/geotestplugin/qplacemanagerengine_test.h
+++ b/tests/auto/geotestplugin/qplacemanagerengine_test.h
@@ -77,7 +77,7 @@ public:
         return 0;
     }
 
-    QPlaceContentReply *getContent(const QGeoPlace &place, const QPlaceContentRequest &query)
+    QPlaceContentReply *getContent(const QPlace &place, const QPlaceContentRequest &query)
     {
         Q_UNUSED(place)
         Q_UNUSED(query)
@@ -100,7 +100,7 @@ public:
         return 0;
     }
 
-    QPlaceSearchReply *recommendations(const QGeoPlace &place, const QPlaceSearchRequest &query)
+    QPlaceSearchReply *recommendations(const QPlace &place, const QPlaceSearchRequest &query)
     {
         Q_UNUSED(place)
         Q_UNUSED(query)
@@ -130,7 +130,7 @@ public:
         return QPlaceManager::OnlineMode;
     }
 
-    QPlaceIdReply *savePlace(const QGeoPlace &place, QPlaceManager::VisibilityScope scope)
+    QPlaceIdReply *savePlace(const QPlace &place, QPlaceManager::VisibilityScope scope)
     {
         Q_UNUSED(place)
         Q_UNUSED(scope)
@@ -143,7 +143,7 @@ public:
         return QPlaceManager::PublicScope;
     }
 
-    QPlaceIdReply *removePlace(const QGeoPlace &place)
+    QPlaceIdReply *removePlace(const QPlace &place)
     {
         Q_UNUSED(place)
 
diff --git a/tests/auto/qgeolocation/tst_qgeolocation.h b/tests/auto/qgeolocation/tst_qgeolocation.h
index eac4bcc1..93e43056 100644
--- a/tests/auto/qgeolocation/tst_qgeolocation.h
+++ b/tests/auto/qgeolocation/tst_qgeolocation.h
@@ -97,5 +97,5 @@ Q_DECLARE_METATYPE( QGeoCoordinate::CoordinateFormat);
 Q_DECLARE_METATYPE( QGeoCoordinate::CoordinateType);
 Q_DECLARE_METATYPE( QList<double>);
 
-#endif // TST_QGEOPLACE_H
+#endif
 
diff --git a/tests/auto/qgeoplace/qgeoplace.pro b/tests/auto/qplace/qplace.pro
index 9bc53fb1..290c8313 100644
--- a/tests/auto/qgeoplace/qgeoplace.pro
+++ b/tests/auto/qplace/qplace.pro
@@ -1,7 +1,7 @@
 TEMPLATE = app
 CONFIG += testcase
-TARGET = tst_qgeoplace
+TARGET = tst_qplace
 
-SOURCES += tst_qgeoplace.cpp
+SOURCES += tst_qplace.cpp
 
 QT += location testlib
diff --git a/tests/auto/qgeoplace/tst_qgeoplace.cpp b/tests/auto/qplace/tst_qplace.cpp
index 6a52e76b..6d63479e 100644
--- a/tests/auto/qgeoplace/tst_qgeoplace.cpp
+++ b/tests/auto/qplace/tst_qplace.cpp
@@ -1,18 +1,18 @@
 #include <QtCore/QString>
 #include <QtTest/QtTest>
 
-#include <qgeoplace.h>
+#include <qplace.h>
 #include <qplaceimage.h>
 #include <qplaceattribute.h>
 
 QT_USE_NAMESPACE
 
-class tst_QGeoPlace : public QObject
+class tst_Place : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QGeoPlace();
+    tst_Place();
 
 private Q_SLOTS:
     void constructorTest();
@@ -38,13 +38,13 @@ private Q_SLOTS:
     void extendedAttributeTest();
 };
 
-tst_QGeoPlace::tst_QGeoPlace()
+tst_Place::tst_Place()
 {
 }
 
-void tst_QGeoPlace::constructorTest()
+void tst_Place::constructorTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     testObj.setPlaceId("testId");
     QPlaceAttribute paymentMethods;
     paymentMethods.setLabel("Payment methods");
@@ -53,7 +53,7 @@ void tst_QGeoPlace::constructorTest()
     QGeoLocation loc;
     loc.setCoordinate(QGeoCoordinate(10,20));
     testObj.setLocation(loc);
-    QGeoPlace *testObjPtr = new QGeoPlace(testObj);
+    QPlace *testObjPtr = new QPlace(testObj);
 
     QVERIFY2(testObjPtr != NULL, "Copy constructor - null");
     QVERIFY2(*testObjPtr == testObj, "Copy constructor - compare");
@@ -61,9 +61,9 @@ void tst_QGeoPlace::constructorTest()
     delete testObjPtr;
 }
 
-void tst_QGeoPlace::additionalDataTest()
+void tst_Place::additionalDataTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.additionalData().count() == 0, "Wrong default value");
     QVariantHash list;
     list.insert("key1", "value1");
@@ -73,25 +73,25 @@ void tst_QGeoPlace::additionalDataTest()
     QVERIFY2(testObj.additionalData()["key1"] == "value1", "Wrong value[1] returned");
 }
 
-void tst_QGeoPlace::nameTest()
+void tst_Place::nameTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.name() == QString(), "Wrong default value");
     testObj.setName("testText");
     QVERIFY2(testObj.name() == "testText", "Wrong value returned");
 }
 
-void tst_QGeoPlace::placeIdTest()
+void tst_Place::placeIdTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.placeId() == QString(), "Wrong default value");
     testObj.setPlaceId("testText");
     QVERIFY2(testObj.placeId() == "testText", "Wrong value returned");
 }
 
-void tst_QGeoPlace::contentCountTest()
+void tst_Place::contentCountTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.contentCount(QPlaceContent::ImageType) == 0, "Wrong default value");
     testObj.setContentCount(QPlaceContent::ImageType, 50);
     QVERIFY2(testObj.contentCount(QPlaceContent::ImageType) == 50, "Wrong value returned");
@@ -100,9 +100,9 @@ void tst_QGeoPlace::contentCountTest()
     QVERIFY2(testObj.contentCount(QPlaceContent::ImageType) == 0, "Wrong value returned");
 }
 
-void tst_QGeoPlace::ratingTest()
+void tst_Place::ratingTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.rating() == QPlaceRating(), "Wrong default value");
     QPlaceRating obj;
     obj.setCount(10);
@@ -110,9 +110,9 @@ void tst_QGeoPlace::ratingTest()
     QVERIFY2(testObj.rating() == obj, "Wrong value returned");
 }
 
-void tst_QGeoPlace::locationTest()
+void tst_Place::locationTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.location() == QGeoLocation(), "Wrong default value");
     QGeoLocation obj;
     obj.setCoordinate(QGeoCoordinate(10,20));
@@ -120,9 +120,9 @@ void tst_QGeoPlace::locationTest()
     QVERIFY2(testObj.location() == obj, "Wrong value returned");
 }
 
-void tst_QGeoPlace::descriptionsTest()
+void tst_Place::descriptionsTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.descriptions().count() == 0, "Wrong default value");
     QPlaceDescription sup;
     sup.setContent("testId");
@@ -134,9 +134,9 @@ void tst_QGeoPlace::descriptionsTest()
     QVERIFY2(testObj.descriptions().count() == 2, "Wrong value returned");
 }
 
-void tst_QGeoPlace::detailsFetchedTest()
+void tst_Place::detailsFetchedTest()
 {
-    QGeoPlace testPlace;
+    QPlace testPlace;
     QVERIFY2(testPlace.detailsFetched() == false, "Wrong default value");
     testPlace.setDetailsFetched(true);
     QVERIFY2(testPlace.detailsFetched() == true, "Wrong value returned");
@@ -144,11 +144,11 @@ void tst_QGeoPlace::detailsFetchedTest()
     QVERIFY2(testPlace.detailsFetched() == false, "Wrong value returned");
 }
 
-void tst_QGeoPlace::imageContentTest()
+void tst_Place::imageContentTest()
 {
     QUrl thumbnailUrl("testId");
 
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.content(QPlaceContent::ImageType).count() ==0,"Wrong default value");
 
     QPlaceImage dummyImage;
@@ -196,9 +196,9 @@ void tst_QGeoPlace::imageContentTest()
     QCOMPARE(QPlaceImage(retrievedCollection.value(5)), dummyImage6);
 }
 
-void tst_QGeoPlace::reviewContentTest()
+void tst_Place::reviewContentTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.content(QPlaceContent::ReviewType).count() ==0,"Wrong default value");
 
     QPlaceReview dummyReview;
@@ -246,9 +246,9 @@ void tst_QGeoPlace::reviewContentTest()
     QCOMPARE(QPlaceReview(retrievedCollection.value(5)), dummyReview6);
 }
 
-void tst_QGeoPlace::categoriesTest()
+void tst_Place::categoriesTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.categories().count() == 0, "Wrong default value");
     QPlaceCategory sup;
     sup.setCategoryId("testId");
@@ -260,9 +260,9 @@ void tst_QGeoPlace::categoriesTest()
     QVERIFY2(testObj.categories().count() == 2, "Wrong value returned");
 }
 
-void tst_QGeoPlace::suppliersTest()
+void tst_Place::suppliersTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.suppliers().count() == 0, "Wrong default value");
     QPlaceSupplier sup;
     sup.setName("testName1");
@@ -275,9 +275,9 @@ void tst_QGeoPlace::suppliersTest()
     QVERIFY2(testObj.suppliers().count() == 2, "Wrong value returned");
 }
 
-void tst_QGeoPlace::feedsTest()
+void tst_Place::feedsTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.feeds().count() == 0, "Wrong default value");
     QStringList list;
     list << "1" << "2" << "3";
@@ -286,9 +286,9 @@ void tst_QGeoPlace::feedsTest()
     QVERIFY2(testObj.feeds()[1] == "2", "Wrong [1] value returned");
 }
 
-void tst_QGeoPlace::tagsTest()
+void tst_Place::tagsTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     QVERIFY2(testObj.tags().count() == 0, "Wrong default value");
     QStringList list;
     list << "1" << "2" << "3";
@@ -297,9 +297,9 @@ void tst_QGeoPlace::tagsTest()
     QVERIFY2(testObj.tags()[1] == "2", "Wrong [1] value returned");
 }
 
-void tst_QGeoPlace::primaryPhoneTest()
+void tst_Place::primaryPhoneTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.primaryPhone().isEmpty(), "Wrong default value");
 
     place.setPrimaryPhone("555-5555");
@@ -309,9 +309,9 @@ void tst_QGeoPlace::primaryPhoneTest()
     QCOMPARE(place.primaryPhone(), QString());
 }
 
-void tst_QGeoPlace::primaryFaxTest()
+void tst_Place::primaryFaxTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.primaryFax().isEmpty(), "Wrong default value");
 
     place.setPrimaryFax("555-5555");
@@ -321,9 +321,9 @@ void tst_QGeoPlace::primaryFaxTest()
     QCOMPARE(place.primaryFax(), QString());
 }
 
-void tst_QGeoPlace::primaryEmailTest()
+void tst_Place::primaryEmailTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.primaryEmail().isEmpty(), "Wrong default value");
 
     place.setPrimaryEmail("test@test.com");
@@ -334,9 +334,9 @@ void tst_QGeoPlace::primaryEmailTest()
     QCOMPARE(place.primaryEmail(), QString());
 }
 
-void tst_QGeoPlace::primaryUrlTest()
+void tst_Place::primaryUrlTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.primaryUrl().isEmpty(), "Wron default value");
 
     place.setPrimaryUrl(QUrl("www.winterfell.com"));
@@ -346,9 +346,9 @@ void tst_QGeoPlace::primaryUrlTest()
     QCOMPARE(place.primaryUrl(), QUrl());
 }
 
-void tst_QGeoPlace::operatorsTest()
+void tst_Place::operatorsTest()
 {
-    QGeoPlace testObj;
+    QPlace testObj;
     testObj.setPlaceId("testId");
     QPlaceAttribute paymentMethods;
     paymentMethods.setLabel("Payment methods");
@@ -361,16 +361,16 @@ void tst_QGeoPlace::operatorsTest()
     loc.setCoordinate(QGeoCoordinate(10,20));
     testObj.setLocation(loc);
 
-    QGeoPlace testObj2;
+    QPlace testObj2;
     testObj2 = testObj;
     QVERIFY2(testObj == testObj2, "Not copied correctly");
     testObj2.setPlaceId("342-456");
     QVERIFY2(testObj != testObj2, "Object should be different");
 }
 
-void tst_QGeoPlace::extendedAttributeTest()
+void tst_Place::extendedAttributeTest()
 {
-    QGeoPlace place;
+    QPlace place;
     QVERIFY2(place.extendedAttributes().isEmpty(), "Invalid default attributes");
     QPlaceAttribute smoking;
     smoking.setLabel("Public Smoking");
@@ -408,7 +408,7 @@ void tst_QGeoPlace::extendedAttributeTest()
     lan.setText("Available");
 
     //test setting a new set of attributes
-    QGeoPlace::ExtendedAttributes attributes;
+    QPlace::ExtendedAttributes attributes;
     attributes.insert("Wireless", wireless);
     attributes.insert("Lan", lan);
 
@@ -426,11 +426,11 @@ void tst_QGeoPlace::extendedAttributeTest()
     QCOMPARE(place.extendedAttributes().count(), 2);
 
     //test clearing of attributes
-    QGeoPlace::ExtendedAttributes noAttributes;
+    QPlace::ExtendedAttributes noAttributes;
     place.setExtendedAttributes(noAttributes);
     QCOMPARE(place.extendedAttributes().count(), 0);
 }
 
-QTEST_APPLESS_MAIN(tst_QGeoPlace);
+QTEST_APPLESS_MAIN(tst_Place);
 
-#include "tst_qgeoplace.moc"
+#include "tst_qplace.moc"
diff --git a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
index 0c3870c5..b8b4fcb0 100644
--- a/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
+++ b/tests/auto/qplacemanager_jsondb/tst_qplacemanager_jsondb.cpp
@@ -67,13 +67,13 @@ private Q_SLOTS:
     void unsupportedFunctions();
 
 private:
-    bool doSavePlace(const QGeoPlace &place,
+    bool doSavePlace(const QPlace &place,
                 QPlaceReply::Error expectedError = QPlaceReply::NoError,
                 QString *placeId = 0,
                 QPlaceManager::VisibilityScope = QPlaceManager::NoScope);
-    void doSavePlaces(QList<QGeoPlace> &places);
+    void doSavePlaces(QList<QPlace> &places);
 
-    bool doRemovePlace(const QGeoPlace &place,
+    bool doRemovePlace(const QPlace &place,
                        QPlaceReply::Error expectedError = QPlaceReply::NoError);
 
     bool doSearch(const QPlaceSearchRequest &request,
@@ -81,17 +81,17 @@ private:
              QPlaceReply::Error expectedError = QPlaceReply::NoError);
 
     bool doSearch(const QPlaceSearchRequest &request,
-                  QList<QGeoPlace> *results,
+                  QList<QPlace> *results,
              QPlaceReply::Error expectedError = QPlaceReply::NoError);
 
     bool doFetchDetails(QString placeId,
-                        QGeoPlace *place,
+                        QPlace *place,
                         QPlaceReply::Error expectedError = QPlaceReply::NoError);
 
     bool checkSignals(QPlaceReply *reply, QPlaceReply::Error expectedError);
 
 
-    bool compareResults(const QList<QPlaceSearchResult> &results, const QList<QGeoPlace> &expectedResults);
+    bool compareResults(const QList<QPlaceSearchResult> &results, const QList<QPlace> &expectedResults);
 
     QGeoServiceProvider *provider;
     QPlaceManager *placeManager;
@@ -130,7 +130,7 @@ void tst_QPlaceManagerJsonDb::initTestCase()
 
 void tst_QPlaceManagerJsonDb::saveAndRemove()
 {
-    QGeoPlace place;
+    QPlace place;
     place.setName("Char");
     QGeoLocation location;
 
@@ -149,7 +149,7 @@ void tst_QPlaceManagerJsonDb::saveAndRemove()
     QVERIFY(doSavePlace(place, QPlaceReply::NoError, &placeId));
 
     //ensure we can retrieve it's details
-    QGeoPlace retrievedPlace;
+    QPlace retrievedPlace;
     QVERIFY(doFetchDetails(placeId, &retrievedPlace));
     place.setPlaceId(placeId);
     QVERIFY(retrievedPlace == place);
@@ -159,7 +159,7 @@ void tst_QPlaceManagerJsonDb::saveAndRemove()
 
     //ensure it is actually deleted
     QVERIFY(doFetchDetails(placeId, &retrievedPlace, QPlaceReply::PlaceDoesNotExistError));
-    QCOMPARE(retrievedPlace, QGeoPlace());
+    QCOMPARE(retrievedPlace, QPlace());
 
     //try removing a place that does not exist;
     QVERIFY(doRemovePlace(place, QPlaceReply::PlaceDoesNotExistError));
@@ -170,7 +170,7 @@ void tst_QPlaceManagerJsonDb::saveAndRemove()
 void tst_QPlaceManagerJsonDb::updatePlace()
 {
     //save a place and check that we can retrieve it
-    QGeoPlace place;
+    QPlace place;
     place.setName("Sydney");
     QGeoAddress address;
     address.setStreet("original street");
@@ -189,7 +189,7 @@ void tst_QPlaceManagerJsonDb::updatePlace()
     location.setAddress(address);
     place.setLocation(location);
 
-    QGeoPlace retrievedPlace;
+    QPlace retrievedPlace;
     QVERIFY(doSavePlace(place, QPlaceReply::NoError));
     QVERIFY(doFetchDetails(place.placeId(), &retrievedPlace));
     QCOMPARE(retrievedPlace.name(), QLatin1String("Brisbane"));
@@ -203,13 +203,13 @@ void tst_QPlaceManagerJsonDb::updatePlace()
 
 void tst_QPlaceManagerJsonDb::searchByName()
 {
-    QGeoPlace adelaide, adel, ad, brisbane;
+    QPlace adelaide, adel, ad, brisbane;
     adelaide.setName("Adelaide");
     adel.setName("adel");
     ad.setName("ad");
     brisbane.setName("brisbane");
 
-    QList<QGeoPlace> places;
+    QList<QPlace> places;
     places << adelaide << adel << ad << brisbane;
     doSavePlaces(places);
 
@@ -342,9 +342,9 @@ void tst_QPlaceManagerJsonDb::searchByBox()
     coords.append(inBox4);
     coords.append(inBox5);
 
-    QList<QGeoPlace> places;
+    QList<QPlace> places;
     for (int i = 0; i < coords.size(); ++i) {
-        QGeoPlace place;
+        QPlace place;
         QGeoLocation location;
         location.setCoordinate(coords.at(i));
         place.setLocation(location);
@@ -357,7 +357,7 @@ void tst_QPlaceManagerJsonDb::searchByBox()
 
     QList<QPlaceSearchResult> results1;
     doSearch(request, &results1);
-    QList<QGeoPlace> places1;
+    QList<QPlace> places1;
     foreach (const QPlaceSearchResult  &result, results1)
         places1.append(result.place());
 
@@ -374,7 +374,7 @@ void tst_QPlaceManagerJsonDb::searchByBox()
     QCOMPARE(testSet1, inBoxSet1);
 
     request.setSearchArea(new QGeoBoundingBox(QGeoCoordinate(5.0, 10.0), QGeoCoordinate(-5.0, 20.0)));
-    QList<QGeoPlace> places2;
+    QList<QPlace> places2;
     doSearch(request, &places2);
     QCOMPARE(places2.size(), inBox2.size());
 
@@ -389,7 +389,7 @@ void tst_QPlaceManagerJsonDb::searchByBox()
     QCOMPARE(testSet2, inBoxSet2);
 
     request.setSearchArea(new QGeoBoundingBox(QGeoCoordinate(20.0, -5.0), QGeoCoordinate(10.0, 5.0)));
-    QList<QGeoPlace> places3;
+    QList<QPlace> places3;
     doSearch(request, &places3);
 
     QCOMPARE(places3.size(), inBox3.size());
@@ -405,7 +405,7 @@ void tst_QPlaceManagerJsonDb::searchByBox()
     QCOMPARE(testSet3, inBoxSet3);
 
     request.setSearchArea(new QGeoBoundingBox(QGeoCoordinate(20.0, 10.0), QGeoCoordinate(10.0, 20.0)));
-    QList<QGeoPlace> places4;
+    QList<QPlace> places4;
     doSearch(request, &places4);
     QCOMPARE(places4.size(), inBox4.size());
 
@@ -420,7 +420,7 @@ void tst_QPlaceManagerJsonDb::searchByBox()
     QCOMPARE(testSet4, inBoxSet4);
 
     request.setSearchArea(new QGeoBoundingBox(QGeoCoordinate(5.0, 175.0), QGeoCoordinate(-5.0, -175.0)));
-    QList<QGeoPlace> places5;
+    QList<QPlace> places5;
     doSearch(request, &places5);
     QCOMPARE(places5.size(), inBox5.size());
 
@@ -542,7 +542,7 @@ void tst_QPlaceManagerJsonDb::searchByCircle()
     for (int i = 0; i < coords.size(); ++i) {
         QList<QGeoCoordinate> c = coords.at(i);
         for (int j = 0; j < c.size(); ++j) {
-            QGeoPlace place;
+            QPlace place;
             QGeoLocation location;
             location.setCoordinate(c.at(j));
             place.setLocation(location);
@@ -564,7 +564,7 @@ void tst_QPlaceManagerJsonDb::searchByCircle()
     qreal dist = QGeoCoordinate(0.0, 0.0).distanceTo(QGeoCoordinate(5.0, 5.0));
 
     QList<QPlaceSearchResult> results;
-    QList<QGeoPlace> places;
+    QList<QPlace> places;
     for (int i = 0; i < testSets.size(); ++i) {
         QList<QGeoCoordinate> filterCoords = testSets.at(i).first;
         QList<QGeoCoordinate> plCoords = testSets.at(i).second;
@@ -623,7 +623,7 @@ void tst_QPlaceManagerJsonDb::searchByCircle()
 
 void tst_QPlaceManagerJsonDb::unsupportedFunctions()
 {
-    QGeoPlace place;
+    QPlace place;
     place.setPlaceId("id");
     QPlaceContentRequest request;
     request.setContentType(QPlaceContent::ImageType);
@@ -649,7 +649,7 @@ void tst_QPlaceManagerJsonDb::cleanup()
     QTRY_VERIFY(cleanSpy.count() == 1);
 }
 
-bool tst_QPlaceManagerJsonDb::doSavePlace(const QGeoPlace &place,
+bool tst_QPlaceManagerJsonDb::doSavePlace(const QPlace &place,
                                           QPlaceReply::Error expectedError,
                                           QString *placeId,
                                           QPlaceManager::VisibilityScope scope)
@@ -668,11 +668,11 @@ bool tst_QPlaceManagerJsonDb::doSavePlace(const QGeoPlace &place,
     return isSuccessful;
 }
 
-void tst_QPlaceManagerJsonDb::doSavePlaces(QList<QGeoPlace> &places)
+void tst_QPlaceManagerJsonDb::doSavePlaces(QList<QPlace> &places)
 {
     QPlaceIdReply *saveReply;
 
-    foreach (QGeoPlace place, places) {
+    foreach (QPlace place, places) {
         saveReply = placeManager->savePlace(place);
         QSignalSpy saveSpy(saveReply, SIGNAL(finished()));
         QTRY_VERIFY(saveSpy.count() == 1);
@@ -681,7 +681,7 @@ void tst_QPlaceManagerJsonDb::doSavePlaces(QList<QGeoPlace> &places)
     }
 }
 
-bool tst_QPlaceManagerJsonDb::doRemovePlace(const QGeoPlace &place,
+bool tst_QPlaceManagerJsonDb::doRemovePlace(const QPlace &place,
                                             QPlaceReply::Error expectedError)
 {
     QPlaceIdReply *removeReply = placeManager->removePlace(place);
@@ -701,7 +701,7 @@ bool tst_QPlaceManagerJsonDb::doSearch(const QPlaceSearchRequest &request,
 }
 
 bool tst_QPlaceManagerJsonDb::doSearch(const QPlaceSearchRequest &request,
-                                       QList<QGeoPlace> *results, QPlaceReply::Error expectedError)
+                                       QList<QPlace> *results, QPlaceReply::Error expectedError)
 {
     bool success = false;
     results->clear();
@@ -712,7 +712,7 @@ bool tst_QPlaceManagerJsonDb::doSearch(const QPlaceSearchRequest &request,
     return success;
 }
 
-bool tst_QPlaceManagerJsonDb::doFetchDetails(QString placeId, QGeoPlace *place, QPlaceReply::Error expectedError)
+bool tst_QPlaceManagerJsonDb::doFetchDetails(QString placeId, QPlace *place, QPlaceReply::Error expectedError)
 {
     QPlaceDetailsReply *detailsReply = placeManager->getPlaceDetails(placeId);
     bool success = checkSignals(detailsReply, expectedError);
@@ -804,13 +804,13 @@ bool tst_QPlaceManagerJsonDb::checkSignals(QPlaceReply *reply, QPlaceReply::Erro
 }
 
 bool tst_QPlaceManagerJsonDb::compareResults(const QList<QPlaceSearchResult> &results,
-                                             const QList<QGeoPlace> &expectedResults)
+                                             const QList<QPlace> &expectedResults)
 {
     QSet<QString> actualPlaceCoords;
     foreach (const QPlaceSearchResult &result, results)
         actualPlaceCoords.insert(result.place().location().coordinate().toString());
     QSet<QString> expectedPlaceCoords;
-    foreach (const QGeoPlace &place, expectedResults) {
+    foreach (const QPlace &place, expectedResults) {
         expectedPlaceCoords.insert(place.location().coordinate().toString());
     }
     return actualPlaceCoords == expectedPlaceCoords;
author	abcd <qt-info@nokia.com>	2011-09-12 13:35:44 +1000
committer	Qt by Nokia <qt-info@nokia.com>	2011-09-23 05:31:20 +0200
commit	5841ce6aeff5e01febc0d44b0eea0b371fb19ed8 (patch)
tree	3098a61397642addbf88792c68fb6789bd35dafb
parent	a758d5641c330504941b531cc62f836ea11919c7 (diff)
download	qtlocation-5841ce6aeff5e01febc0d44b0eea0b371fb19ed8.tar.gz