summaryrefslogtreecommitdiff
path: root/src/location
diff options
context:
space:
mode:
Diffstat (limited to 'src/location')
-rw-r--r--src/location/location.pro6
-rw-r--r--src/location/places/qplacedetailsreply.cpp6
-rw-r--r--src/location/places/qplacedetailsreply.h6
-rw-r--r--src/location/places/qplaceidreply.h2
-rw-r--r--src/location/places/qplacemanager.cpp8
-rw-r--r--src/location/places/qplacemanager.h8
-rw-r--r--src/location/places/qplacemanagerengine.h8
-rw-r--r--src/location/places/qplacesearchresult.cpp4
-rw-r--r--src/location/places/qplacesearchresult.h6
-rw-r--r--src/location/places/qplacesearchresult_p.h2
-rw-r--r--src/location/qplace.cpp (renamed from src/location/qgeoplace.cpp)204
-rw-r--r--src/location/qplace.h (renamed from src/location/qgeoplace.h)36
-rw-r--r--src/location/qplace_p.h (renamed from src/location/qgeoplace_p.h)30
13 files changed, 163 insertions, 163 deletions
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
View Lorry Controller Status