FCL/sf/mw/qtextensions: comparison qtmobility/src/versit/qversitcontactexporter

equal deleted inserted replaced

-:2b40d63a9c3d
+:90517678cc4f
 #include <qcontactnickname.h>
 #include <qcontactanniversary.h>
 #include <qcontactonlineaccount.h>
 #include <qcontactfamily.h>
 #include <qcontactdisplaylabel.h>
+#include <qcontactthumbnail.h>
 #include <QUrl>
 #include <QBuffer>
 QTM_USE_NAMESPACE
 /*!
 * Export QT Contact into Versit Document.
 */
-void QVersitContactExporterPrivate::exportContact(
+bool QVersitContactExporterPrivate::exportContact(
 const QContact& contact,
-QVersitDocument& document)
+QVersitDocument& document,
+QVersitContactExporter::Error* error)
 {
 mVersitType = document.type();
 QList<QContactDetail> allDetails = contact.details();
+if (allDetails.isEmpty()) {
+*error = QVersitContactExporter::EmptyContactError;
+return false;
+}
 for (int i = 0; i < allDetails.size(); i++) {
 QContactDetail detail = allDetails.at(i);
 // If the custom detail handler handles it, we don't have to.
 if (mDetailHandler
 } else if (detail.definitionName() == QContactNote::DefinitionName) {
 encodeNote(property, detail);
 } else if (detail.definitionName() == QContactOrganization::DefinitionName) {
 encodeOrganization(document, detail);
 addProperty = false;
+} else if (detail.definitionName() == QContactRingtone::DefinitionName) {
+addProperty = encodeRingtone(property, detail);
+} else if (detail.definitionName() == QContactThumbnail::DefinitionName) {
+addProperty = encodeThumbnail(property, detail);
+if (!addProperty)
+unknown = true;
 } else if (detail.definitionName() == QContactAvatar::DefinitionName){
 addProperty = encodeAvatar(property, detail);
 if (!addProperty)
 unknown = true;
 } else if (detail.definitionName() == QContactAnniversary::DefinitionName) {
 encodeAnniversary(property, detail);
 } else if (detail.definitionName() == QContactNickname::DefinitionName) {
 encodeNickname(document, detail);
+addProperty = false;
+} else if (detail.definitionName() == QContactTag::DefinitionName) {
+encodeTag(document, detail);
 addProperty = false;
 } else if (detail.definitionName() == QContactGender::DefinitionName) {
 encodeGender(property, detail);
 } else if (detail.definitionName() == QContactOnlineAccount::DefinitionName) {
 addProperty = encodeOnlineAccount(property, detail);
 } else {
 addProperty = false;
 unknown = true;
 }
-if (addProperty)
+if (addProperty) {
 document.addProperty(property);
+}
 if (mDetailHandler)
 mDetailHandler->postProcessDetail(contact, detail, !unknown, &document);
 }
+// Search through the document for FN or N properties.  This will find it even if it was added
+// by a detail handler.
+if (!documentContainsName(document)) {
+*error = QVersitContactExporter::NoNameError;
+return false;
+}
+return true;
+}
+/*!
+* Returns true if and only if \a document has a "FN" or "N" property.
+*/
+bool QVersitContactExporterPrivate::documentContainsName(const QVersitDocument &document)
+{
+foreach (const QVersitProperty& property, document.properties()) {
+const QString& name = property.name();
+if (name == QLatin1String("FN") || name == QLatin1String("N"))
+return true;
+}
+return false;
 }
 /*!
 * Encode Contact Name Field Information into the Versit Document
 */
 void QVersitContactExporterPrivate::encodeName(
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactName contactName = static_cast<QContactName>(detail);
-property.setValue(QString::fromAscii("%1;%2;%3;%4;%5").arg(
+property.setValue(QStringList()
-escape(contactName.lastName()),
+<< contactName.lastName()
-escape(contactName.firstName()),
+<< contactName.firstName()
-escape(contactName.middleName()),
+<< contactName.middleName()
-escape(contactName.prefix()),
+<< contactName.prefix()
-escape(contactName.suffix())));
+<< contactName.suffix());
+property.setValueType(QVersitProperty::CompoundType);
 }
 /*!
 * Encode Phone Number Field Information into the Versit Document
 */
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactPhoneNumber phoneNumber = static_cast<QContactPhoneNumber>(detail);
 encodeParameters(property, phoneNumber.contexts(), phoneNumber.subTypes());
-setEscapedValue(property,phoneNumber.number());
+property.setValue(phoneNumber.number());
 }
 /*!
 * Encode Email Field Information into the Versit Document
 */
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactEmailAddress emailAddress = static_cast<QContactEmailAddress>(detail);
 encodeParameters(property, emailAddress.contexts());
-setEscapedValue(property,emailAddress.emailAddress());
+property.setValue(emailAddress.emailAddress());
 }
 /*!
 * Encode Address Field Information into the Versit Document
 */
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactAddress address = static_cast<QContactAddress>(detail);
 encodeParameters(property, address.contexts(), address.subTypes());
-// Leave out the extended address field:
+property.setValue(QStringList()
-property.setValue(QString::fromAscii("%1;;%2;%3;%4;%5;%6").arg(
+<< address.postOfficeBox()
-escape(address.postOfficeBox()),
+<< QString() // Leave out the extended address field
-escape(address.street()),
+<< address.street()
-escape(address.locality()),
+<< address.locality()
-escape(address.region()),
+<< address.region()
-escape(address.postcode()),
+<< address.postcode()
-escape(address.country())));
+<< address.country());
+property.setValueType(QVersitProperty::CompoundType);
 }
 /*!
 * Encode URL Field Information into the Versit Document
 */
 void QVersitContactExporterPrivate::encodeUid(
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactGuid uid = static_cast<QContactGuid>(detail);
-setEscapedValue(property,uid.guid());
+property.setValue(uid.guid());
 }
 /*!
 * Encode REV Field Information into the Versit Document
 */
 void QVersitContactExporterPrivate::encodeNote(
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactNote contactNote = static_cast<QContactNote>(detail);
-setEscapedValue(property,contactNote.note());
+property.setValue(contactNote.note());
 }
 /*!
 * Encode Geo Prpoperties Field Information into the Versit Document
 */
 void QVersitContactExporterPrivate::encodeGeoLocation(
 QVersitProperty& property,
 const QContactDetail& detail)
 {
 QContactGeoLocation geoLocation = static_cast<QContactGeoLocation>(detail);
-QString value =
+property.setValue(QStringList() << QString::number(geoLocation.longitude())
-QString::number(geoLocation.longitude()) + QLatin1Char(',') +
+<< QString::number(geoLocation.latitude()));
-QString::number(geoLocation.latitude());
+property.setValueType(QVersitProperty::CompoundType);
-property.setValue(value);
 }
 /*!
 * Encode organization properties to the versit document
 */
 {
 QContactOrganization organization = static_cast<QContactOrganization>(detail);
 if (organization.title().length() > 0) {
 QVersitProperty property;
 property.setName(QLatin1String("TITLE"));
-setEscapedValue(property,organization.title());
+property.setValue(organization.title());
 document.addProperty(property);
 }
 if (organization.name().length() > 0 || organization.department().size() > 0) {
 QVersitProperty property;
 property.setName(QLatin1String("ORG"));
-QString value = escape(organization.name());
+QStringList values(organization.name());
-QStringList departments(organization.department());
+values.append(organization.department());
-if (departments.count() == 0)
+property.setValue(values);
-value += QLatin1Char(';');
+property.setValueType(QVersitProperty::CompoundType);
-foreach (QString department, departments) {
-value += QLatin1Char(';');
-value += escape(department);
-}
-property.setValue(value);
 document.addProperty(property);
 }
-if (organization.logo().length() > 0) {
+if (organization.logoUrl().isValid()) {
 QVersitProperty property;
-if (encodeContentFromFile(organization.logo(), property)) {
+// XXX TODO: FIXME!
+if (encodeContentFromFile(organization.logoUrl().toString(), property)) {
 property.setName(QLatin1String("LOGO"));
 document.addProperty(property);
 }
 }
 if (organization.assistantName().length() > 0) {
 QVersitProperty property;
 property.setName(QLatin1String("X-ASSISTANT"));
-setEscapedValue(property,organization.assistantName());
+property.setValue(organization.assistantName());
 document.addProperty(property);
 }
 if (organization.role().length() > 0) {
 QVersitProperty property;
 property.setName(QLatin1String("ROLE"));
-setEscapedValue(property,organization.role());
+property.setValue(organization.role());
 document.addProperty(property);
 }
 }
-/*!
+bool QVersitContactExporterPrivate::encodeRingtone(QVersitProperty &property, const QContactDetail &detail)
-* Encode avatar content into the Versit Document
+{
+QContactRingtone ringtone = static_cast<QContactRingtone>(detail);
+Q_ASSERT(property.name() == QLatin1String("SOUND"));
+return encodeContentFromFile(ringtone.audioRingtoneUrl().toLocalFile(), property);
+}
+/*!
+* Encode thumbnail content into the Versit Document
+*/
+bool QVersitContactExporterPrivate::encodeThumbnail(
+QVersitProperty& property,
+const QContactDetail& detail)
+{
+QContactThumbnail contactThumbnail = static_cast<QContactThumbnail>(detail);
+property.setName(QLatin1String("PHOTO"));
+QImage image = contactThumbnail.thumbnail();
+if (image.isNull())
+return false;
+QByteArray imageData;
+QBuffer buffer(&imageData);
+buffer.open(QIODevice::WriteOnly);
+// Always store a pixmap as a PNG.
+if (!image.save(&buffer, "PNG")) {
+return false;
+}
+property.setValue(imageData);
+property.insertParameter(QLatin1String("TYPE"), QLatin1String("PNG"));
+return true;
+}
+/*!
+* Encode avatar URIs into the Versit Document
 */
 bool QVersitContactExporterPrivate::encodeAvatar(
 QVersitProperty& property,
 const QContactDetail& detail)
 {
+property.setName(QLatin1String("PHOTO"));
 QContactAvatar contactAvatar = static_cast<QContactAvatar>(detail);
-bool encoded = false;
+QUrl imageUrl(contactAvatar.imageUrl());
-QString propertyName;
+// XXX: fix up this mess: checking the scheme here and in encodeContentFromFile,
-if (contactAvatar.subType() == QContactAvatar::SubTypeImage) {
+// organisation logo and ringtone are QStrings but avatar is a QUrl
-propertyName = QLatin1String("PHOTO");
+if (!imageUrl.scheme().isEmpty() && !imageUrl.host().isEmpty()) {
-} else if (contactAvatar.subType() == QContactAvatar::SubTypeAudioRingtone) {
+property.insertParameter(QLatin1String("VALUE"), QLatin1String("URL"));
-propertyName = QLatin1String("SOUND");
+property.setValue(imageUrl.toString());
+return true;
 } else {
-// NOP
+return encodeContentFromFile(contactAvatar.imageUrl().toString(), property);
 }
-if (propertyName.length() > 0) {
-encoded = encodeContentFromFile(contactAvatar.avatar(), property);
-if (!encoded)
-encoded = encodeContentFromPixmap(contactAvatar.pixmap(), property);
-if (encoded)
-property.setName(propertyName);
-}
-return encoded;
 }
 /*!
 * Encode gender property information into Versit Document
 */
 void QVersitContactExporterPrivate::encodeGender(
 QVersitProperty& property,const
 QContactDetail& detail)
 {
 QContactGender gender = static_cast<QContactGender>(detail);
-setEscapedValue(property,gender.gender());
+property.setValue(gender.gender());
 }
 /*!
 * Encodes nickname property information into the Versit Document
 */
 QVersitDocument& document,
 const QContactDetail& detail)
 {
 QContactNickname nicknameDetail = static_cast<QContactNickname>(detail);
 QVersitProperty property;
-property.setName(QLatin1String("X-NICKNAME"));
 bool found = false;
-foreach (QVersitProperty currentProperty, document.properties()) {
+// XXX TODO: ensure it works for both X-NICKNAME and NICKNAME
+foreach (const QVersitProperty& currentProperty, document.properties()) {
 if (currentProperty.name() == QLatin1String("X-NICKNAME")) {
 property = currentProperty;
 found = true;
 break;
 }
 }
-QString value(property.value());
+QStringList value(property.variantValue().toStringList());
-if (found)
+if (!found)
-value += QLatin1Char(',');
+property.setName(QLatin1String("X-NICKNAME"));
-QString nickname = escape(nicknameDetail.nickname());
+value.append(nicknameDetail.nickname());
-value.append(nickname);
 property.setValue(value);
+property.setValueType(QVersitProperty::ListType);
 // Replace the current property
 document.removeProperties(QLatin1String("X-NICKNAME"));
+document.addProperty(property);
+}
+/*!
+* Encodes a contact tag into the Versit Document
+*/
+void QVersitContactExporterPrivate::encodeTag(
+QVersitDocument& document,
+const QContactDetail& detail)
+{
+QContactTag tagDetail = static_cast<QContactTag>(detail);
+QVersitProperty property;
+bool found = false;
+foreach (const QVersitProperty& currentProperty, document.properties()) {
+if (currentProperty.name() == QLatin1String("CATEGORIES")) {
+property = currentProperty;
+found = true;
+break;
+}
+}
+QStringList value(property.variantValue().toStringList());
+if (!found)
+property.setName(QLatin1String("CATEGORIES"));
+value.append(tagDetail.tag());
+property.setValue(value);
+property.setValueType(QVersitProperty::ListType);
+// Replace the current property
+document.removeProperties(QLatin1String("CATEGORIES"));
 document.addProperty(property);
 }
 /*!
 * Encode anniversary information into Versit Document
 encodeParameters(property, onlineAccount.contexts(), subTypes);
 QString name(QLatin1String("X-SIP"));
 if (subTypes.contains(QContactOnlineAccount::SubTypeImpp))
 name = QLatin1String("X-IMPP");
 property.setName(name);
-setEscapedValue(property,onlineAccount.accountUri());
+property.setValue(onlineAccount.accountUri());
 }
 return encoded;
 }
 /*!
 QContactFamily family = static_cast<QContactFamily>(detail);
 if (family.spouse().size()) {
 QVersitProperty property;
 property.setName(QLatin1String("X-SPOUSE"));
-setEscapedValue(property,family.spouse());
+property.setValue(family.spouse());
 document.addProperty(property);
 }
 if (family.children().size()) {
 QVersitProperty property;
 property.setName(QLatin1String("X-CHILDREN"));
-QString children = family.children().join(QLatin1String(","));
+property.setValue(family.children());
-setEscapedValue(property,children);
+property.setValueType(QVersitProperty::ListType);
 document.addProperty(property);
 }
 return false;
 }
 {
 bool encoded = false;
 QContactDisplayLabel displayLabel = static_cast<QContactDisplayLabel>(detail);
 if (displayLabel.label().size()) {
 encoded = true;
-setEscapedValue(property,displayLabel.label());
+property.setValue(displayLabel.label());
 } else {
 QContactDetail contactDetail;
 for (int i = 0; i < contact.details().count(); i++) {
 contactDetail = contact.details().at(i);
 if (contactDetail.definitionName() == QContactName::DefinitionName)
 }
 if (name.customLabel().length() ||
 name.firstName().length() ||
 name.lastName().length()) {
 encoded = true;
-property.setValue(escape(value));
+property.setValue(value);
 }
 }
 return encoded;
 }
 // The file doesn't exist. Don't encode the path to a local file.
 }
 property.setValue(value);
 return encodeContent;
 }
-/*!
-* Encode embedded content from the given \a pixmap into \a property.
-*/
-bool QVersitContactExporterPrivate::encodeContentFromPixmap(const QPixmap& pixmap,
-QVersitProperty& property)
-{
-if (pixmap.isNull())
-return false;
-QByteArray imageData;
-QBuffer buffer(&imageData);
-buffer.open(QIODevice::WriteOnly);
-// Always store a pixmap as a PNG.
-if (!pixmap.save(&buffer, "PNG")) {
-return false;
-}
-property.setValue(imageData);
-property.insertParameter(QLatin1String("TYPE"), QLatin1String("PNG"));
-return true;
-}
-/*!
-* Escapes \a value if necessary and sets it to \a property
-*/
-void QVersitContactExporterPrivate::setEscapedValue(
-QVersitProperty& property,
-const QString& value)
-{
-QString escapedValue(escape(value));
-property.setValue(escapedValue);
-}
-/*!
-* Escapes \a value if necessary.
-* For vCard there is no concept of escaping the property values.
-* Starting from 3.0 the property values having certain special
-* characters should be escaped.
-*/
-QString QVersitContactExporterPrivate::escape(const QString& value)
-{
-QString escaped(value);
-if (mVersitType != QVersitDocument::VCard21Type) {
-VersitUtils::backSlashEscape(escaped);
-}
-return escaped;
-}

changeset 4	90517678cc4f
parent 1	2b40d63a9c3d
child 8	71781823f776