summaryrefslogtreecommitdiff
path: root/src/location/places
diff options
context:
space:
mode:
authorSze Howe Koh <szehowe.koh@gmail.com>2013-01-28 12:46:18 +0800
committerLaszlo Papp <lpapp@kde.org>2013-02-05 20:40:27 +0100
commitd5466f28cb921929268bbcab335f0edaabbbfdd3 (patch)
tree1b81913d351415c89bd9a30ccf1f568bb3bbda30 /src/location/places
parent3a598fcfa09551f3476b19549f02251aa44fefb7 (diff)
downloadqtlocation-d5466f28cb921929268bbcab335f0edaabbbfdd3.tar.gz
Rename namespace QtLocation -> QLocation
Main code, tests and docs updated. For consistency (with minimal disruption to the Qt 5.0.0 release), namespaces with a "Qt" prefix were renamed. Part of the Header Consistency Project (http://lists.qt-project.org/pipermail/development/2012-October/007570.html) Change-Id: Ic728cbbe39e0140dca1cdee24257dda095c9a478 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
Diffstat (limited to 'src/location/places')
-rw-r--r--src/location/places/qplace.cpp8
-rw-r--r--src/location/places/qplace.h4
-rw-r--r--src/location/places/qplace_p.h2
-rw-r--r--src/location/places/qplacecategory.cpp8
-rw-r--r--src/location/places/qplacecategory.h4
-rw-r--r--src/location/places/qplacecategory_p.h2
-rw-r--r--src/location/places/qplacesearchrequest.cpp12
-rw-r--r--src/location/places/qplacesearchrequest.h4
8 files changed, 22 insertions, 22 deletions
diff --git a/src/location/places/qplace.cpp b/src/location/places/qplace.cpp
index 0f084d79..8e0e117d 100644
--- a/src/location/places/qplace.cpp
+++ b/src/location/places/qplace.cpp
@@ -590,7 +590,7 @@ void QPlace::removeContactDetails(const QString &contactType)
/*!
Sets the visibility of the place to \a visibility.
*/
-void QPlace::setVisibility(QtLocation::Visibility visibility)
+void QPlace::setVisibility(QLocation::Visibility visibility)
{
Q_D(QPlace);
d->visibility = visibility;
@@ -603,7 +603,7 @@ void QPlace::setVisibility(QtLocation::Visibility visibility)
If a place is saved with unspecified visibility the backend chooses an appropriate
default visibility to use when saving.
*/
-QtLocation::Visibility QPlace::visibility() const
+QLocation::Visibility QPlace::visibility() const
{
Q_D(const QPlace);
return d->visibility;
@@ -622,7 +622,7 @@ bool QPlace::isEmpty() const
*******************************************************************************/
QPlacePrivate::QPlacePrivate()
-: QSharedData(), visibility(QtLocation::UnspecifiedVisibility), detailsFetched(false)
+: QSharedData(), visibility(QLocation::UnspecifiedVisibility), detailsFetched(false)
{
}
@@ -718,7 +718,7 @@ bool QPlacePrivate::isEmpty() const
&& attribution.isEmpty()
&& contacts.isEmpty()
&& extendedAttributes.isEmpty()
- && QtLocation::UnspecifiedVisibility == visibility
+ && QLocation::UnspecifiedVisibility == visibility
&& icon.isEmpty()
);
}
diff --git a/src/location/places/qplace.h b/src/location/places/qplace.h
index 54e73a9e..b6eee885 100644
--- a/src/location/places/qplace.h
+++ b/src/location/places/qplace.h
@@ -119,8 +119,8 @@ public:
void appendContactDetail(const QString &contactType, const QPlaceContactDetail &detail);
void removeContactDetails(const QString &contactType);
- QtLocation::Visibility visibility() const;
- void setVisibility(QtLocation::Visibility visibility);
+ QLocation::Visibility visibility() const;
+ void setVisibility(QLocation::Visibility visibility);
bool isEmpty() const;
diff --git a/src/location/places/qplace_p.h b/src/location/places/qplace_p.h
index b466df63..a4a4e1d6 100644
--- a/src/location/places/qplace_p.h
+++ b/src/location/places/qplace_p.h
@@ -92,7 +92,7 @@ public:
QMap<QString, QPlaceAttribute> extendedAttributes;
QMap<QString, QList<QPlaceContactDetail> > contacts;
- QtLocation::Visibility visibility;
+ QLocation::Visibility visibility;
QPlaceIcon icon;
bool detailsFetched;
};
diff --git a/src/location/places/qplacecategory.cpp b/src/location/places/qplacecategory.cpp
index aa33db8e..b894994c 100644
--- a/src/location/places/qplacecategory.cpp
+++ b/src/location/places/qplacecategory.cpp
@@ -45,7 +45,7 @@
QT_BEGIN_NAMESPACE
QPlaceCategoryPrivate::QPlaceCategoryPrivate()
-: visibility(QtLocation::UnspecifiedVisibility)
+: visibility(QLocation::UnspecifiedVisibility)
{
}
@@ -75,7 +75,7 @@ bool QPlaceCategoryPrivate::isEmpty() const
return categoryId.isEmpty()
&& name.isEmpty()
&& icon.isEmpty()
- && QtLocation::UnspecifiedVisibility == visibility;
+ && QLocation::UnspecifiedVisibility == visibility;
}
/*!
@@ -185,7 +185,7 @@ void QPlaceCategory::setName(const QString &name)
/*!
Sets the \a visibility of the category.
*/
-void QPlaceCategory::setVisibility(QtLocation::Visibility visibility)
+void QPlaceCategory::setVisibility(QLocation::Visibility visibility)
{
d->visibility = visibility;
}
@@ -193,7 +193,7 @@ void QPlaceCategory::setVisibility(QtLocation::Visibility visibility)
/*!
Returns the visibility of the category.
*/
-QtLocation::Visibility QPlaceCategory::visibility() const
+QLocation::Visibility QPlaceCategory::visibility() const
{
return d->visibility;
}
diff --git a/src/location/places/qplacecategory.h b/src/location/places/qplacecategory.h
index 62c2d9c0..c2c97d8c 100644
--- a/src/location/places/qplacecategory.h
+++ b/src/location/places/qplacecategory.h
@@ -75,8 +75,8 @@ public:
QString name() const;
void setName(const QString &name);
- QtLocation::Visibility visibility() const;
- void setVisibility(QtLocation::Visibility visibility);
+ QLocation::Visibility visibility() const;
+ void setVisibility(QLocation::Visibility visibility);
QPlaceIcon icon() const;
void setIcon(const QPlaceIcon &icon);
diff --git a/src/location/places/qplacecategory_p.h b/src/location/places/qplacecategory_p.h
index 9c31455b..6b13ce30 100644
--- a/src/location/places/qplacecategory_p.h
+++ b/src/location/places/qplacecategory_p.h
@@ -63,7 +63,7 @@ public:
QString categoryId;
QString name;
- QtLocation::Visibility visibility;
+ QLocation::Visibility visibility;
QPlaceIcon icon;
};
diff --git a/src/location/places/qplacesearchrequest.cpp b/src/location/places/qplacesearchrequest.cpp
index ad3dd720..045d5d43 100644
--- a/src/location/places/qplacesearchrequest.cpp
+++ b/src/location/places/qplacesearchrequest.cpp
@@ -64,7 +64,7 @@ public:
QList<QPlaceCategory> categories;
QGeoShape searchArea;
QString recommendationId;
- QtLocation::VisibilityScope visibilityScope;
+ QLocation::VisibilityScope visibilityScope;
QPlaceSearchRequest::RelevanceHint relevanceHint;
int limit;
int offset;
@@ -72,7 +72,7 @@ public:
QPlaceSearchRequestPrivate::QPlaceSearchRequestPrivate()
: QSharedData(),
- visibilityScope(QtLocation::UnspecifiedVisibility),
+ visibilityScope(QLocation::UnspecifiedVisibility),
relevanceHint(QPlaceSearchRequest::UnspecifiedHint),
limit(-1), offset(0)
{
@@ -131,7 +131,7 @@ void QPlaceSearchRequestPrivate::clear()
categories.clear();
searchArea = QGeoShape();
recommendationId.clear();
- visibilityScope = QtLocation::UnspecifiedVisibility;
+ visibilityScope = QLocation::UnspecifiedVisibility;
relevanceHint = QPlaceSearchRequest::UnspecifiedHint;
}
@@ -330,10 +330,10 @@ void QPlaceSearchRequest::setRecommendationId(const QString &placeId)
/*!
Returns the visibility scope used when searching for places. The default value is
- QtLocation::UnspecifiedVisibility meaning that no explicit scope has been assigned.
+ QLocation::UnspecifiedVisibility meaning that no explicit scope has been assigned.
Places of any scope may be returned during the search.
*/
-QtLocation::VisibilityScope QPlaceSearchRequest::visibilityScope() const
+QLocation::VisibilityScope QPlaceSearchRequest::visibilityScope() const
{
Q_D(const QPlaceSearchRequest);
return d->visibilityScope;
@@ -342,7 +342,7 @@ QtLocation::VisibilityScope QPlaceSearchRequest::visibilityScope() const
/*!
Sets the visibility \a scope used when searching for places.
*/
-void QPlaceSearchRequest::setVisibilityScope(QtLocation::VisibilityScope scope)
+void QPlaceSearchRequest::setVisibilityScope(QLocation::VisibilityScope scope)
{
Q_D(QPlaceSearchRequest);
d->visibilityScope = scope;
diff --git a/src/location/places/qplacesearchrequest.h b/src/location/places/qplacesearchrequest.h
index dea85112..c7c5c22b 100644
--- a/src/location/places/qplacesearchrequest.h
+++ b/src/location/places/qplacesearchrequest.h
@@ -85,8 +85,8 @@ public:
QString recommendationId() const;
void setRecommendationId(const QString &recommendationId);
- QtLocation::VisibilityScope visibilityScope() const;
- void setVisibilityScope(QtLocation::VisibilityScope visibilityScopes);
+ QLocation::VisibilityScope visibilityScope() const;
+ void setVisibilityScope(QLocation::VisibilityScope visibilityScopes);
RelevanceHint relevanceHint() const;
void setRelevanceHint(RelevanceHint hint);