diff options
| author | abcd <amos.choy@nokia.com> | 2012-01-30 11:35:06 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-30 05:39:18 +0100 |
| commit | 8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af (patch) | |
| tree | 44043ae3b0ba63177ad19466320d4c28ece99d57 /src/plugins | |
| parent | 074260af5a59c2a6a9d49cf0b4b9e8a5db5b11f8 (diff) | |
| download | qtlocation-8ba3a6ffd2a974c9ea91035ac6c4ccf30a6c74af.tar.gz | |
Fix inconsistency, use childCategoryIds over childrenCategoryIds
Change-Id: I37dfa12027bcc5424e65aa515f512b18a94692c4
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
Diffstat (limited to 'src/plugins')
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp index 8c8831ad..aaf57c1f 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.cpp @@ -283,7 +283,7 @@ QString QPlaceManagerEngineNokia::parentCategoryId(const QString &categoryId) co return tree.value(categoryId).parentId; } -QStringList QPlaceManagerEngineNokia::childrenCategoryIds(const QString &categoryId) const +QStringList QPlaceManagerEngineNokia::childCategoryIds(const QString &categoryId) const { QPlaceCategoryTree tree = QPlaceCategoriesRepository::instance()->categories(); return tree.value(categoryId).childIds; diff --git a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h index 8df05753..fc6e41e0 100644 --- a/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h +++ b/src/plugins/geoservices/nokia/qplacemanagerengine_nokia.h @@ -83,7 +83,7 @@ public: QPlaceReply *initializeCategories(); QString parentCategoryId(const QString &categoryId) const; - QStringList childrenCategoryIds(const QString &categoryId) const; + QStringList childCategoryIds(const QString &categoryId) const; QPlaceCategory category(const QString &categoryId) const; QList<QPlaceCategory> childCategories(const QString &parentId) const; diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp index 9c1a3ec8..853f56f2 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp +++ b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.cpp @@ -188,7 +188,7 @@ QString QPlaceManagerEngineJsonDb::parentCategoryId(const QString &categoryId) c .first().toMap().value(JsonConverter::CategoryParentId).toString(); } -QStringList QPlaceManagerEngineJsonDb::childrenCategoryIds(const QString &categoryId) const +QStringList QPlaceManagerEngineJsonDb::childCategoryIds(const QString &categoryId) const { QStringList result; QList<QPlaceCategory> children = childCategories(categoryId); diff --git a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h index 7eef23f7..faf0a9c9 100644 --- a/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h +++ b/src/plugins/geoservices/nokia_places_jsondb/qplacemanagerengine_jsondb.h @@ -87,7 +87,7 @@ public: QPlaceReply *initializeCategories(); QString parentCategoryId(const QString &categoryId) const; - QStringList childrenCategoryIds(const QString &categoryId) const; + QStringList childCategoryIds(const QString &categoryId) const; QPlaceCategory category(const QString &categoryId) const; QList<QPlaceCategory> childCategories(const QString &parentId) const; |