summaryrefslogtreecommitdiff
path: root/src/location
diff options
context:
space:
mode:
authorabcd <amos.choy@nokia.com>2012-01-30 11:35:06 +1000
committerQt by Nokia <qt-info@nokia.com>2012-01-30 05:39:18 +0100
commit8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af (patch)
tree44043ae3b0ba63177ad19466320d4c28ece99d57 /src/location
parent074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8 (diff)
downloadqtlocation-8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af.tar.gz
Fix inconsistency, use childCategoryIds over childrenCategoryIds
Change-Id: I37dfa12027bcc5424e65aa515f512b18a94692c4 Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/location')
-rw-r--r--src/location/places/qplacemanager.cpp10
-rw-r--r--src/location/places/qplacemanager.h2
-rw-r--r--src/location/places/qplacemanagerengine.cpp6
-rw-r--r--src/location/places/qplacemanagerengine.h2
4 files changed, 10 insertions, 10 deletions
diff --git a/src/location/places/qplacemanager.cpp b/src/location/places/qplacemanager.cpp
index 49222333..93bffd5b 100644
--- a/src/location/places/qplacemanager.cpp
+++ b/src/location/places/qplacemanager.cpp
@@ -122,7 +122,7 @@ QT_BEGIN_NAMESPACE
\o QPlaceManager::childCategories()
\o QPlaceManager::category()
\o QPlaceManager::parentCategoryId()
- \o QPlaceManager::childrenCategoryIds();
+ \o QPlaceManager::childCategoryIds();
\endlist
If the categories need to be refreshed or reloaded, the initializeCategories() function
@@ -325,12 +325,12 @@ QString QPlaceManager::parentCategoryId(const QString &categoryId) const
}
/*!
- Returns the children category ids of the category corresponding to \a categoryId.
- If \a categoryId is empty then all top level category ids are returned.
+ Returns the child category ids of the category corresponding to \a parentId.
+ If \a parentId is empty then all top level category ids are returned.
*/
-QStringList QPlaceManager::childrenCategoryIds(const QString &categoryId) const
+QStringList QPlaceManager::childCategoryIds(const QString &parentId) const
{
- return d->childrenCategoryIds(categoryId);
+ return d->childCategoryIds(parentId);
}
/*!
diff --git a/src/location/places/qplacemanager.h b/src/location/places/qplacemanager.h
index 7ea3d388..1fe2d553 100644
--- a/src/location/places/qplacemanager.h
+++ b/src/location/places/qplacemanager.h
@@ -112,7 +112,7 @@ public:
QPlaceReply *initializeCategories();
QString parentCategoryId(const QString &categoryId) const;
- QStringList childrenCategoryIds(const QString &categoryId = QString()) const;
+ QStringList childCategoryIds(const QString &parentId = QString()) const;
QPlaceCategory category(const QString &categoryId) const;
QList<QPlaceCategory> childCategories(const QString &parentId = QString()) const;
diff --git a/src/location/places/qplacemanagerengine.cpp b/src/location/places/qplacemanagerengine.cpp
index 524fa89e..dd481f73 100644
--- a/src/location/places/qplacemanagerengine.cpp
+++ b/src/location/places/qplacemanagerengine.cpp
@@ -262,10 +262,10 @@ QPlaceManagerEnginePrivate::~QPlaceManagerEnginePrivate()
*/
/*!
- \fn QStringList QPlaceManagerEngine::childrenCategoryIds(const QString &categoryId) const
+ \fn QStringList QPlaceManagerEngine::childCategoryIds(const QString &parentId) const
- Returns the children category ids of the category corresponding to \a categoryId.
- If \a categoryId is empty then all top level category ids are returned.
+ Returns the child category ids of the category corresponding to \a parentId.
+ If \a parentId is empty then all top level category ids are returned.
*/
/*!
diff --git a/src/location/places/qplacemanagerengine.h b/src/location/places/qplacemanagerengine.h
index 9dc4d089..607c8b96 100644
--- a/src/location/places/qplacemanagerengine.h
+++ b/src/location/places/qplacemanagerengine.h
@@ -80,7 +80,7 @@ public:
virtual QPlaceReply *initializeCategories() = 0;
virtual QString parentCategoryId(const QString &categoryId) const = 0;
- virtual QStringList childrenCategoryIds(const QString &categoryId) const = 0;
+ virtual QStringList childCategoryIds(const QString &categoryId) const = 0;
virtual QPlaceCategory category(const QString &categoryId) const = 0;
virtual QList<QPlaceCategory> childCategories(const QString &parentId) const = 0;