summaryrefslogtreecommitdiffstats
path: root/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp
diff options
context:
space:
mode:
authorabcd <qt-info@nokia.com>2010-10-17 21:13:43 +1000
committerabcd <qt-info@nokia.com>2010-10-17 21:13:43 +1000
commitd273acc67dd5bc1a9b223f7458e9171fb9d6d091 (patch)
tree5d2433adf158d3e452980a4ce3d8a2ccc9f08c62 /doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp
parent6da9ff449ba0b3241d46dfda2c03d7e320d5d4c9 (diff)
Slightly update example docs
Diffstat (limited to 'doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp')
-rw-r--r--doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp b/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp
index e6e9de31f1..1884b364bf 100644
--- a/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp
+++ b/doc/src/snippets/qtlandmarksdocsample/qtlandmarksdocsample.cpp
@@ -80,7 +80,7 @@ void RequestExample::categorySaveRequest()
connect(catSaveRequest, SIGNAL(stateChanged(QLandmarkAbstractRequest::State)), this,
SLOT(categorySaveRequestHandler(QLandmarkAbstractRequest::State)));
if (!catSaveRequest->start())
- qDebug() << "Unable to save category error code: " << catSaveRequest->error();
+ qDebug() << "Unable to save category, error code: " << catSaveRequest->error();
else
qDebug() << "Saveing category; awaiting results...";
}
@@ -123,7 +123,7 @@ void RequestExample::landmarkSaveRequest()
connect(lmSaveRequest, SIGNAL(stateChanged(QLandmarkAbstractRequest::State)), this,
SLOT(landmarkSaveRequestHandler(QLandmarkAbstractRequest::State)));
if (!lmSaveRequest->start())
- qDebug() << "Unable to save landmark error code: " << lmSaveRequest->error();
+ qDebug() << "Unable to save landmark, error code: " << lmSaveRequest->error();
else
qDebug() << "Saving landmark; awaiting results...";
}
@@ -184,8 +184,8 @@ void RequestExample::landmarkFetchRequest()
{
//! [Retrieve landmarks asynchronously]
QLandmarkCategoryFilter filter;
- //categoryId is a previously retrieved QLandmarkCategoryId
- filter.setCategoryId(categoryId);
+ //category is a previously retrieved QLandmarkCategory
+ filter.setCategory(category);
QLandmarkNameSort sortOrder(Qt::AscendingOrder);
//lmFetchRequest was previously created with lmFetchRequest = new QLandmarkFetchRequest(lmManager);
@@ -231,7 +231,7 @@ void RequestExample::categoryRemoveRequest()
{
//catRemoveRequest was created previously with catRemoveRequest = new QLandmarkCategoryRemoveRequest(lmManager);
//where lmManager is a QLandmarkManager*
- catRemoveRequest->setCategoryId(category.categoryId()); //category is a previously retrieved QLandmarkCategory
+ catRemoveRequest->setCategory(category); //category is a previously retrieved QLandmarkCategory
connect(catRemoveRequest, SIGNAL(stateChanged(QLandmarkAbstractRequest::State)),
this, SLOT(categoryRemoveRequestHandler(QLandmarkAbstractRequest::State)));
@@ -264,7 +264,7 @@ void RequestExample::landmarkRemoveRequest()
{
//lmRemoveRequest was created previously with lmRemoveRequest = new QLandmarkRemoveRequest(lmManager);
//where lmManager is a QLandmarkManager*
- lmRemoveRequest->setLandmarkId(landmark.landmarkId()); //landmark is a previously retrieved QLandmark
+ lmRemoveRequest->setLandmark(landmark); //landmark is a previously retrieved QLandmark
connect(lmRemoveRequest, SIGNAL(stateChanged(QLandmarkAbstractRequest::State)), this,
SLOT(landmarkRemoveRequestHandler(QLandmarkAbstractRequest::State)));
@@ -289,13 +289,13 @@ void RequestExample::landmarkRemoveRequestHandler(QLandmarkAbstractRequest::Stat
}
//! [Remove landmark asynchronously handler]
-void addLandmarkAndCategory(QLandmarkManager *lm)
+void addLandmarkAndCategory(QLandmarkManager *lmManager)
{
//! [Add category synchronously]
QLandmarkCategory cafes;
cafes.setName("Cafes");
cafes.setIconUrl(QUrl("cafe.png"));
- lm->saveCategory(&cafes); //lm is a QLandmarkManager *
+ lmManager->saveCategory(&cafes); //lmManager is a QLandmarkManager *
//! [Add category synchronously]
//! [Add landmark synchronously]
@@ -314,7 +314,7 @@ void addLandmarkAndCategory(QLandmarkManager *lm)
monks.setDescription("Jerry's favourite diner");
monks.addCategoryId(cafes.categoryId());
- lm->saveLandmark(&monks); //lm is a QLandmarkManager*
+ lmManager->saveLandmark(&monks); //lmManager is a QLandmarkManager*
//! [Add landmark synchronously]
{
@@ -328,17 +328,17 @@ void addLandmarkAndCategory(QLandmarkManager *lm)
}
}
-void categoryFetch(QLandmarkManager *lm)
+void categoryFetch(QLandmarkManager *lmManager)
{
//! [Retrieve categories synchronously by id]
- QList<QLandmarkCategoryId> categoryIds = lm->categoryIds();
+ QList<QLandmarkCategoryId> categoryIds = lmManager->categoryIds();
foreach(QLandmarkCategoryId id, categoryIds) {
- qDebug() << "Found category: " << lm->category(id).name();
+ qDebug() << "Found category: " << lmManager->category(id).name();
}
//! [Retrieve categories synchronously by id]
//! [Retrieve categories synchronously]
- QList<QLandmarkCategory> categories = lm->categories();
+ QList<QLandmarkCategory> categories = lmManager->categories();
foreach(QLandmarkCategory category, categories) {
qDebug() << "Found category: " << category.name();
}
@@ -352,17 +352,17 @@ void categoryFetch(QLandmarkManager *lm)
}
}
-void landmarkFetch(QLandmarkManager *lm)
+void landmarkFetch(QLandmarkManager *lmManager)
{
{
//! [Retrieve landmarks synchronously]
QList<QLandmark> landmarks;
QLandmarkCategoryFilter filter;
- //categoryId is a previously retrieved QLandmarkCategoryId
- filter.setCategoryId(categoryId);
+ //category is a previously retrieved QLandmarkCategory
+ filter.setCategory(category);
QLandmarkNameSort sortOrder(Qt::AscendingOrder);
- landmarks = lm->landmarks(filter, 5, 0, sortOrder);
+ landmarks = lmManager->landmarks(filter, 5, 0, sortOrder);
foreach(const QLandmark &landmark, landmarks) {
qDebug() << "Found landmark:" << landmark.name();
}
@@ -374,12 +374,12 @@ void landmarkFetch(QLandmarkManager *lm)
//retrieval via ids
QList<QLandmarkId> landmarkIds;
QLandmarkCategoryFilter filter;
- //categoryId is a previously retrieved QLandmarkCategoryId
- filter.setCategoryId(categoryId);
+ //category is a previously retrieved QLandmarkCategory
+ filter.setCategory(category);
QLandmarkNameSort sortOrder(Qt::AscendingOrder);
- landmarkIds = lm->landmarkIds(filter, 5, 0, sortOrder);
+ landmarkIds = lmManager->landmarkIds(filter, 5, 0, sortOrder);
foreach(const QLandmarkId &id, landmarkIds) {
- qDebug() << "Found landmark:" << lm->landmark(id).name();
+ qDebug() << "Found landmark:" << lmManager->landmark(id).name();
}
//! [Retrieve landmarks synchronously by id]
}
@@ -448,16 +448,16 @@ void listAllCategories(QLandmarkManager *lm)
}
}
-void deleteLandmarkAndCategory(QLandmarkManager *lm)
+void deleteLandmarkAndCategory(QLandmarkManager *lmManager)
{
//! [Remove category synchronously]
//category is a previously retrieved QLandmarkCategory object
- lm->removeCategory(category.categoryId());
+ lmManager->removeCategory(category);
//! [Remove category synchronously]
//! [Remove landmark synchronously]
//landmark is a previously retrieved QLandmark object
- lm->removeLandmark(landmark.landmarkId());
+ lmManager->removeLandmark(landmark);
//! [Remove landmark synchronously]
{