--- a/qtmobility/src/versit/qversitdefs_p.h	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/src/versit/qversitdefs_p.h	Mon May 03 13:18:40 2010 +0300
@@ -75,6 +75,9 @@
 #include <qcontactonlineaccount.h>
 #include <qcontactfamily.h>
 #include <qcontactdisplaylabel.h>
+#include <qcontacttag.h>
+#include <qcontactringtone.h>
+#include <qcontactthumbnail.h>
 
 QTM_BEGIN_NAMESPACE
 
@@ -88,64 +91,66 @@
 //! [Property name mappings]
 // Mappings from versit property names to Qt contact details
 const VersitContactDetailMapping versitContactDetailMappings[] = {
-    {"ADR",           QContactAddress::DefinitionName.str,
+    {"ADR",           QContactAddress::DefinitionName.latin1(),
                       ""},
-    {"BDAY",          QContactBirthday::DefinitionName.str,
-                      QContactBirthday::FieldBirthday.str},
-    {"FN",            QContactDisplayLabel::DefinitionName.str,
+    {"BDAY",          QContactBirthday::DefinitionName.latin1(),
+                      QContactBirthday::FieldBirthday.latin1()},
+    {"CATEGORIES",    QContactTag::DefinitionName.latin1(),
+                      QContactTag::FieldTag.latin1()},
+    {"FN",            QContactDisplayLabel::DefinitionName.latin1(),
                       ""},
-    {"GEO",           QContactGeoLocation::DefinitionName.str,
+    {"GEO",           QContactGeoLocation::DefinitionName.latin1(),
                       ""},
-    {"EMAIL",         QContactEmailAddress::DefinitionName.str,
-                      QContactEmailAddress::FieldEmailAddress.str},
-    {"IMPP",          QContactOnlineAccount::DefinitionName.str,
-                      QContactOnlineAccount::SubTypeImpp.str},
-    {"LOGO",          QContactOrganization::DefinitionName.str,
-                      QContactOrganization::FieldLogo.str},
-    {"N",             QContactName::DefinitionName.str,
+    {"EMAIL",         QContactEmailAddress::DefinitionName.latin1(),
+                      QContactEmailAddress::FieldEmailAddress.latin1()},
+    {"IMPP",          QContactOnlineAccount::DefinitionName.latin1(),
+                      QContactOnlineAccount::SubTypeImpp.latin1()},
+    {"LOGO",          QContactOrganization::DefinitionName.latin1(),
+                      QContactOrganization::FieldLogoUrl.latin1()},
+    {"N",             QContactName::DefinitionName.latin1(),
                       ""},
-    {"NICKNAME",      QContactNickname::DefinitionName.str,
-                      QContactNickname::FieldNickname.str},
-    {"NOTE",          QContactNote::DefinitionName.str,
-                      QContactNote::FieldNote.str},
-    {"ORG",           QContactOrganization::DefinitionName.str,
-                      QContactOrganization::FieldName.str},
-    {"PHOTO",         QContactAvatar::DefinitionName.str,
-                      QContactAvatar::SubTypeImage.str},
-    {"REV",           QContactTimestamp::DefinitionName.str,
+    {"NICKNAME",      QContactNickname::DefinitionName.latin1(),
+                      QContactNickname::FieldNickname.latin1()},
+    {"NOTE",          QContactNote::DefinitionName.latin1(),
+                      QContactNote::FieldNote.latin1()},
+    {"ORG",           QContactOrganization::DefinitionName.latin1(),
+                      QContactOrganization::FieldName.latin1()},
+    {"PHOTO",         QContactThumbnail::DefinitionName.latin1(),
+                      ""},
+    {"REV",           QContactTimestamp::DefinitionName.latin1(),
                       ""},
-    {"ROLE",          QContactOrganization::DefinitionName.str,
-                      QContactOrganization::FieldRole.str},
-    {"SOUND",         QContactAvatar::DefinitionName.str,
-                      QContactAvatar::SubTypeAudioRingtone.str},
-    {"TEL",           QContactPhoneNumber::DefinitionName.str,
-                      QContactPhoneNumber::FieldNumber.str},
-    {"TITLE",         QContactOrganization::DefinitionName.str,
-                      QContactOrganization::FieldTitle.str},
-    {"UID",           QContactGuid::DefinitionName.str,
-                      QContactGuid::FieldGuid.str},
-    {"URL",           QContactUrl::DefinitionName.str,
-                      QContactUrl::FieldUrl.str},
-    {"X-ANNIVERSARY", QContactAnniversary::DefinitionName.str,
+    {"ROLE",          QContactOrganization::DefinitionName.latin1(),
+                      QContactOrganization::FieldRole.latin1()},
+    {"SOUND",         QContactRingtone::DefinitionName.latin1(),
+                      QContactRingtone::FieldAudioRingtoneUrl.latin1()},
+    {"TEL",           QContactPhoneNumber::DefinitionName.latin1(),
+                      QContactPhoneNumber::FieldNumber.latin1()},
+    {"TITLE",         QContactOrganization::DefinitionName.latin1(),
+                      QContactOrganization::FieldTitle.latin1()},
+    {"UID",           QContactGuid::DefinitionName.latin1(),
+                      QContactGuid::FieldGuid.latin1()},
+    {"URL",           QContactUrl::DefinitionName.latin1(),
+                      QContactUrl::FieldUrl.latin1()},
+    {"X-ANNIVERSARY", QContactAnniversary::DefinitionName.latin1(),
                       ""},
-    {"X-ASSISTANT",   QContactOrganization::DefinitionName.str,
-                      QContactOrganization::FieldAssistantName.str},
-    {"X-CHILDREN",    QContactFamily::DefinitionName.str,
-                      QContactFamily::FieldChildren.str},
-    {"X-EPOCSECONDNAME",QContactNickname::DefinitionName.str,
-                      QContactNickname::FieldNickname.str},
-    {"X-GENDER",      QContactGender::DefinitionName.str,
-                      QContactGender::FieldGender.str},
-    {"X-IMPP",        QContactOnlineAccount::DefinitionName.str,
-                      QContactOnlineAccount::SubTypeImpp.str},
-    {"X-JABBER",      QContactOnlineAccount::DefinitionName.str,
-                      QContactOnlineAccount::SubTypeImpp.str},
-    {"X-NICKNAME",    QContactNickname::DefinitionName.str,
-                      QContactNickname::FieldNickname.str},
-    {"X-SIP",         QContactOnlineAccount::DefinitionName.str,
+    {"X-ASSISTANT",   QContactOrganization::DefinitionName.latin1(),
+                      QContactOrganization::FieldAssistantName.latin1()},
+    {"X-CHILDREN",    QContactFamily::DefinitionName.latin1(),
+                      QContactFamily::FieldChildren.latin1()},
+    {"X-EPOCSECONDNAME",QContactNickname::DefinitionName.latin1(),
+                      QContactNickname::FieldNickname.latin1()},
+    {"X-GENDER",      QContactGender::DefinitionName.latin1(),
+                      QContactGender::FieldGender.latin1()},
+    {"X-IMPP",        QContactOnlineAccount::DefinitionName.latin1(),
+                      QContactOnlineAccount::SubTypeImpp.latin1()},
+    {"X-JABBER",      QContactOnlineAccount::DefinitionName.latin1(),
+                      QContactOnlineAccount::SubTypeImpp.latin1()},
+    {"X-NICKNAME",    QContactNickname::DefinitionName.latin1(),
+                      QContactNickname::FieldNickname.latin1()},
+    {"X-SIP",         QContactOnlineAccount::DefinitionName.latin1(),
                       ""},
-    {"X-SPOUSE",      QContactFamily::DefinitionName.str,
-                      QContactFamily::FieldSpouse.str}
+    {"X-SPOUSE",      QContactFamily::DefinitionName.latin1(),
+                      QContactFamily::FieldSpouse.latin1()}
 };
 //! [Property name mappings]
 
@@ -157,27 +162,27 @@
 
 // Mappings from versit TYPE parameters to Qt contact detail contexts
 const VersitMapping versitContextMappings[] = {
-    {"HOME", QContactDetail::ContextHome.str},
-    {"WORK", QContactDetail::ContextWork.str},
+    {"HOME", QContactDetail::ContextHome.latin1()},
+    {"WORK", QContactDetail::ContextWork.latin1()},
 };
 
 //! [Property type parameter mappings]
 // Mappings from versit TYPE parameters to Qt contact detail subtypes
 const VersitMapping versitSubTypeMappings[] = {
-    {"DOM",    QContactAddress::SubTypeDomestic.str},
-    {"INTL",   QContactAddress::SubTypeInternational.str},
-    {"POSTAL", QContactAddress::SubTypePostal.str},
-    {"PARCEL", QContactAddress::SubTypeParcel.str},
-    {"VOICE",  QContactPhoneNumber::SubTypeVoice.str},
-    {"CELL",   QContactPhoneNumber::SubTypeMobile.str},
-    {"MODEM",  QContactPhoneNumber::SubTypeModem.str},
-    {"CAR",    QContactPhoneNumber::SubTypeCar.str},
-    {"VIDEO",  QContactPhoneNumber::SubTypeVideo.str},
-    {"FAX",    QContactPhoneNumber::SubTypeFacsimile.str},
-    {"BBS",    QContactPhoneNumber::SubTypeBulletinBoardSystem.str},
-    {"PAGER",  QContactPhoneNumber::SubTypePager.str},
-    {"SWIS",   QContactOnlineAccount::SubTypeVideoShare.str},
-    {"VOIP",   QContactOnlineAccount::SubTypeSipVoip.str}
+    {"DOM",    QContactAddress::SubTypeDomestic.latin1()},
+    {"INTL",   QContactAddress::SubTypeInternational.latin1()},
+    {"POSTAL", QContactAddress::SubTypePostal.latin1()},
+    {"PARCEL", QContactAddress::SubTypeParcel.latin1()},
+    {"VOICE",  QContactPhoneNumber::SubTypeVoice.latin1()},
+    {"CELL",   QContactPhoneNumber::SubTypeMobile.latin1()},
+    {"MODEM",  QContactPhoneNumber::SubTypeModem.latin1()},
+    {"CAR",    QContactPhoneNumber::SubTypeCar.latin1()},
+    {"VIDEO",  QContactPhoneNumber::SubTypeVideo.latin1()},
+    {"FAX",    QContactPhoneNumber::SubTypeFax.latin1()},
+    {"BBS",    QContactPhoneNumber::SubTypeBulletinBoardSystem.latin1()},
+    {"PAGER",  QContactPhoneNumber::SubTypePager.latin1()},
+    {"SWIS",   QContactOnlineAccount::SubTypeVideoShare.latin1()},
+    {"VOIP",   QContactOnlineAccount::SubTypeSipVoip.latin1()}
 };
 //! [Property type parameter mappings]