From b88160faeb3ba50bf6dbaba42243feca1d0ba7b3 Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Mon, 19 Oct 2009 14:32:52 +1000 Subject: Americanize the spelling of synthesise to synthesize --- doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 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 f403eea31c..2bf55cf918 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -155,7 +155,7 @@ void matchCall(QContactManager* cm, const QString& incomingCallNbr) QContact match = cm->contact(matchingContacts.at(0)); QContactDisplayLabel cdl = match.detail(QContactDisplayLabel::DefinitionName); if (cdl.isEmpty()) - cdl.setLabel(cm->synthesiseDisplayLabel(match)); + cdl.setLabel(cm->synthesizeDisplayLabel(match)); qDebug() << "Incoming call from" << cdl.label() << "(" << incomingCallNbr << ")"; @@ -170,7 +170,7 @@ void viewSpecificDetail(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName); if (cdl.isEmpty()) - cdl.setLabel(cm->synthesiseDisplayLabel(a)); + cdl.setLabel(cm->synthesizeDisplayLabel(a)); qDebug() << "The first phone number of" << cdl.label() << "is" << a.detail(QContactPhoneNumber::DefinitionName).value(QContactPhoneNumber::FieldNumber); } @@ -183,7 +183,7 @@ void viewDetails(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName); if (cdl.isEmpty()) - cdl.setLabel(cm->synthesiseDisplayLabel(a)); + cdl.setLabel(cm->synthesizeDisplayLabel(a)); qDebug() << "Viewing the details of" << cdl.label(); QList allDetails = a.details(); @@ -232,7 +232,7 @@ void editView(QContactManager* cm) QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName); if (cdl.isEmpty()) - cdl.setLabel(cm->synthesiseDisplayLabel(a)); + cdl.setLabel(cm->synthesizeDisplayLabel(a)); qDebug() << "Modifying the details of" << cdl.label(); /* Change the first phone number */ @@ -306,7 +306,7 @@ void loadManager() QContact a = cm->contact(contactIds.first()); QContactDisplayLabel cdl = a.detail(QContactDisplayLabel::DefinitionName); if (cdl.isEmpty()) - cdl.setLabel(cm->synthesiseDisplayLabel(a)); + cdl.setLabel(cm->synthesizeDisplayLabel(a)); qDebug() << "This manager contains" << cdl.label(); } else { qDebug() << "This manager contains no contacts"; -- cgit v1.2.3 From e39b1fc604bb288fd5d3e91ca041670ff3eb4f79 Mon Sep 17 00:00:00 2001 From: Michael Goddard Date: Fri, 16 Oct 2009 17:09:13 +1000 Subject: Move match flags to QContactFilter. Since we have some special matching behaviour, use a different match flags enum (QContactFilter::MatchFlags vs Qt::MatchFlags). --- doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 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 2bf55cf918..6dcd2e79f2 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -146,7 +146,7 @@ void matchCall(QContactManager* cm, const QString& incomingCallNbr) QContactDetailFilter phoneFilter; phoneFilter.setDetailDefinitionName(QContactPhoneNumber::DefinitionName, QContactPhoneNumber::FieldNumber); phoneFilter.setValue(incomingCallNbr); - phoneFilter.setMatchFlags(Qt::MatchExactly); + phoneFilter.setMatchFlags(QContactFilter::MatchExactly); QList matchingContacts = cm->contacts(phoneFilter); if (matchingContacts.size() == 0) { @@ -263,7 +263,7 @@ void RequestExample::performRequest() QContactDetailFilter dfil; dfil.setDetailDefinitionName(QContactName::DefinitionName, QContactName::FieldFirst); dfil.setValue("Alice"); - dfil.setMatchFlags(Qt::MatchExactly); + dfil.setMatchFlags(QContactFilter::MatchExactly); m_fetchRequest->setFilter(dfil); connect(m_fetchRequest, SIGNAL(progress(QContactFetchRequest*,bool)), this, SLOT(printContacts(QContactFetchRequest*,bool))); -- cgit v1.2.3 From 373fe8b775a32060c8789afaf094a2aa3479419a Mon Sep 17 00:00:00 2001 From: Chris Adams Date: Fri, 30 Oct 2009 14:01:03 +1000 Subject: Make QCDD::Field a public, real class; allow field level constraints --- .../snippets/qtcontactsdocsample/qtcontactsdocsample.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 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 6dcd2e79f2..f75d6d2495 100644 --- a/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp +++ b/doc/src/snippets/qtcontactsdocsample/qtcontactsdocsample.cpp @@ -190,11 +190,11 @@ void viewDetails(QContactManager* cm) for (int i = 0; i < allDetails.size(); i++) { QContactDetail detail = allDetails.at(i); QContactDetailDefinition currentDefinition = cm->detailDefinition(detail.definitionName()); - QMap fields = currentDefinition.fields(); + QMap fields = currentDefinition.fields(); qDebug("\tDetail #%d (%s):", i, detail.definitionName().toAscii().constData()); foreach (const QString& fieldKey, fields.keys()) { - qDebug() << "\t\t" << fieldKey << "(" << fields.value(fieldKey).dataType << ") =" << detail.value(fieldKey); + qDebug() << "\t\t" << fieldKey << "(" << fields.value(fieldKey).dataType() << ") =" << detail.value(fieldKey); } qDebug(); } @@ -209,9 +209,9 @@ void addPlugin(QContactManager* cm) QContactDetailDefinition modified = definitions.value(QContactEmailAddress::DefinitionName); /* Make our modifications: we add a "Label" field to email addresses */ - QContactDetailDefinition::Field newField; - newField.dataType = QVariant::String; - QMap fields = modified.fields(); + QContactDetailDefinitionField newField; + newField.setDataType(QVariant::String); + QMap fields = modified.fields(); fields.insert("Label", newField); /* Update the definition with the new field included */ @@ -327,10 +327,10 @@ void loadManagerWithParameters() qDebug() << "This backend currently supports the following detail definitions:"; QList allDefinitions = definitions.values(); foreach (const QContactDetailDefinition& defn, allDefinitions) { - QMap fields = defn.fields(); + QMap fields = defn.fields(); foreach (const QString& fieldKey, fields.keys()) { - QList allowableValues = fields.value(fieldKey).allowableValues; - qDebug() << "\t" << fieldKey << "(" << fields.value(fieldKey).dataType << "):"; + QList allowableValues = fields.value(fieldKey).allowableValues(); + qDebug() << "\t" << fieldKey << "(" << fields.value(fieldKey).dataType() << "):"; if (allowableValues.isEmpty()) { qDebug() << "\t\tAny Value Permitted"; } else { -- cgit v1.2.3