From 81f5ec999d5a8ccd8b124d4252eff9242c7a5d0c Mon Sep 17 00:00:00 2001
From: Lucian Varlan <lucian.i.varlan@nokia.com>
Date: Fri, 16 Oct 2009 09:25:32 +0300
Subject: Merged master branch to qtsw/versit.

---
 doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')

diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
index 53044dea28..c688a5b30d 100644
--- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
+++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp
@@ -116,7 +116,7 @@ void addContact(QContactManager* cm)
 //! [Calling an existing contact]
 void callContact(QContactManager* cm)
 {
-    QList<QUniqueId> contactIds = cm->contacts();
+    QList<QContactLocalId> contactIds = cm->contacts();
     QContact a = cm->contact(contactIds.first());
 
     /* Get this contact's first phone number */
@@ -140,7 +140,7 @@ void matchCall(QContactManager* cm, const QString& incomingCallNbr)
     phoneFilter.setValue(incomingCallNbr);
     phoneFilter.setMatchFlags(Qt::MatchExactly);
 
-    QList<QUniqueId> matchingContacts = cm->contacts(phoneFilter);
+    QList<QContactLocalId> matchingContacts = cm->contacts(phoneFilter);
     if (matchingContacts.size() == 0) {
         qDebug() << "Incoming call from unknown contact (" << incomingCallNbr << ")";
     } else {
@@ -158,7 +158,7 @@ void matchCall(QContactManager* cm, const QString& incomingCallNbr)
 //! [Viewing a specific detail of a contact]
 void viewSpecificDetail(QContactManager* cm)
 {
-    QList<QUniqueId> contactIds = cm->contacts();
+    QList<QContactLocalId> contactIds = cm->contacts();
     QContact a = cm->contact(contactIds.first());
     QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName);
     if (cdl.isEmpty())
@@ -171,7 +171,7 @@ void viewSpecificDetail(QContactManager* cm)
 //! [Viewing the details of a contact]
 void viewDetails(QContactManager* cm)
 {
-    QList<QUniqueId> contactIds = cm->contacts();
+    QList<QContactLocalId> contactIds = cm->contacts();
     QContact a = cm->contact(contactIds.first());
     QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName);
     if (cdl.isEmpty())
@@ -220,7 +220,7 @@ void addPlugin(QContactManager* cm)
 //! [Modifying an existing contact]
 void editView(QContactManager* cm)
 {
-    QList<QUniqueId> contactIds = cm->contacts();
+    QList<QContactLocalId> contactIds = cm->contacts();
     QContact a = cm->contact(contactIds.first());
     QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName);
     if (cdl.isEmpty())
@@ -293,7 +293,7 @@ void RequestExample::printContacts(QContactFetchRequest* request, bool appendOnl
 void loadManager()
 {
     QContactManager* cm = new QContactManager("KABC");
-    QList<QUniqueId> contactIds = cm->contacts();
+    QList<QContactLocalId> contactIds = cm->contacts();
     if (!contactIds.isEmpty()) {
         QContact a = cm->contact(contactIds.first());
         QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName);
-- 
cgit v1.2.3