diff options
| author | Chris Adams <chris.adams@nokia.com> | 2009-07-10 16:49:25 +1000 |
|---|---|---|
| committer | Chris Adams <chris.adams@nokia.com> | 2009-07-10 16:49:25 +1000 |
| commit | 9f6a84b41f727b481f8456597b92cfe77228ae3e (patch) | |
| tree | 43a7b023cd6f315127f1367dd4d7e97ff9b22e0f /doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | |
| parent | 71c104b6b31a8d6662d42d1869ec955f1454baa7 (diff) | |
Remove special treatment for name in QContact, add DisplayLabel special treatment; fix unit test regressions.
Diffstat (limited to 'doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp')
| -rw-r--r-- | doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp index 49bf77a474..1f010cf080 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -79,7 +79,7 @@ void addContact(QContactManager* cm) alice.saveDetail(&aliceName); QContactDisplayLabel aliceDisplay; - aliceDisplay.setDisplayLabel("Ally Jones"); + aliceDisplay.setLabel("Ally Jones"); alice.saveDetail(&aliceDisplay); /* Add a phone number */ @@ -131,9 +131,9 @@ void matchCall(QContactManager* cm, const QString& incomingCallNbr) QContact match = cm->contact(matchingContacts.at(0)); QContactDisplayLabel cdl = match.detail(QContactDisplayLabel::DefinitionId); if (cdl.isEmpty()) - cdl.setDisplayLabel(cm->synthesiseDisplayLabel(match)); + cdl.setLabel(cm->synthesiseDisplayLabel(match)); qDebug() << "Incoming call from" - << cdl.displayLabel() + << cdl.label() << "(" << incomingCallNbr << ")"; } } @@ -146,8 +146,8 @@ void viewSpecificDetail(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionId); if (cdl.isEmpty()) - cdl.setDisplayLabel(cm->synthesiseDisplayLabel(a)); - qDebug() << "The first phone number of" << cdl.displayLabel() + cdl.setLabel(cm->synthesiseDisplayLabel(a)); + qDebug() << "The first phone number of" << cdl.label() << "is" << a.details("PhoneNumber").first().value("Number"); } //! [Viewing a specific detail of a contact] @@ -159,8 +159,8 @@ void viewDetails(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionId); if (cdl.isEmpty()) - cdl.setDisplayLabel(cm->synthesiseDisplayLabel(a)); - qDebug() << "Viewing the details of" << cdl.displayLabel(); + cdl.setLabel(cm->synthesiseDisplayLabel(a)); + qDebug() << "Viewing the details of" << cdl.label(); QList<QContactDetail> allDetails = a.details(); for (int i = 0; i < allDetails.size(); i++) { @@ -208,8 +208,8 @@ void editView(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionId); if (cdl.isEmpty()) - cdl.setDisplayLabel(cm->synthesiseDisplayLabel(a)); - qDebug() << "Modifying the details of" << cdl.displayLabel(); + cdl.setLabel(cm->synthesiseDisplayLabel(a)); + qDebug() << "Modifying the details of" << cdl.label(); /* Change the first phone number */ QList<QContactDetail> numbers = a.details("PhoneNumber"); @@ -242,8 +242,8 @@ void loadManager() QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionId); if (cdl.isEmpty()) - cdl.setDisplayLabel(cm->synthesiseDisplayLabel(a)); - qDebug() << "This manager contains" << cdl.displayLabel(); + cdl.setLabel(cm->synthesiseDisplayLabel(a)); + qDebug() << "This manager contains" << cdl.label(); } else { qDebug() << "This manager contains no contacts"; } |