qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp
changeset 4 90517678cc4f
parent 1 2b40d63a9c3d
child 11 06b8e2af4411
--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformname.cpp	Mon May 03 13:18:40 2010 +0300
@@ -131,13 +131,13 @@
     if (detailFieldName == QContactName::FieldPrefix)
         return uids << KUidContactFieldPrefixName;
 
-    if (detailFieldName == QContactName::FieldFirst)
+    if (detailFieldName == QContactName::FieldFirstName)
         return uids << KUidContactFieldGivenName;
 
-    if (detailFieldName == QContactName::FieldMiddle)
+    if (detailFieldName == QContactName::FieldMiddleName)
         return uids << KUidContactFieldAdditionalName;
 
-    if (detailFieldName == QContactName::FieldLast)
+    if (detailFieldName == QContactName::FieldLastName)
         return uids << KUidContactFieldFamilyName;
 
     if (detailFieldName == QContactName::FieldSuffix)
@@ -171,11 +171,11 @@
 {
     if (QContactName::FieldPrefix == fieldName)
         return KUidContactFieldPrefixName.iUid;
-    else if (QContactName::FieldFirst == fieldName)
+    else if (QContactName::FieldFirstName == fieldName)
         return KUidContactFieldGivenName.iUid;
-    else if (QContactName::FieldMiddle == fieldName)
+    else if (QContactName::FieldMiddleName == fieldName)
         return KUidContactFieldAdditionalName.iUid;
-    else if (QContactName::FieldLast == fieldName)
+    else if (QContactName::FieldLastName == fieldName)
         return KUidContactFieldFamilyName.iUid;
     else if (QContactName::FieldSuffix == fieldName)
         return KUidContactFieldSuffixName.iUid;
@@ -202,9 +202,9 @@
         // groups support only custom label
         if(contactType == QContactType::TypeGroup) {
             fields.remove(QContactName::FieldPrefix);
-            fields.remove(QContactName::FieldFirst);
-            fields.remove(QContactName::FieldMiddle);
-            fields.remove(QContactName::FieldLast);
+            fields.remove(QContactName::FieldFirstName);
+            fields.remove(QContactName::FieldMiddleName);
+            fields.remove(QContactName::FieldLastName);
             fields.remove(QContactName::FieldSuffix);
         } else {
             // Note: Custom labels cannot be enabled for a contact in pre-10.1
@@ -212,7 +212,9 @@
             // issues for S60 Phonebook editor. If custom label support is
             // needed in 10.1 or later, it needs to be variated away from
             // pre-10.1 platforms.
+#ifndef SYMBIAN_BACKEND_USE_SQLITE        
             fields.remove(QContactName::FieldCustomLabel);
+#endif            
         }
 
         // Context not supported in symbian back-end, remove