--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp	Fri Jun 11 14:26:25 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformaddress.cpp	Wed Jun 23 19:08:38 2010 +0300
@@ -126,20 +126,6 @@
     return detail;
 }
 
-bool CntTransformAddress::supportsField(TUint32 fieldType) const
-{
-    bool ret = false;
-    if (fieldType == KUidContactFieldCountry.iUid ||
-        fieldType == KUidContactFieldPostcode.iUid ||
-        fieldType == KUidContactFieldAddress.iUid ||
-        fieldType == KUidContactFieldLocality.iUid ||
-        fieldType == KUidContactFieldRegion.iUid ||
-        fieldType == KUidContactFieldPostOffice.iUid) {
-        ret = true;
-    }
-    return ret;
-}
-
 bool CntTransformAddress::supportsDetail(QString detailName) const
 {
     bool ret = false;
@@ -149,6 +135,17 @@
     return ret;
 }
 
+QList<TUid> CntTransformAddress::supportedFields() const
+{
+    return QList<TUid>()
+        << KUidContactFieldAddress
+        << KUidContactFieldLocality
+        << KUidContactFieldRegion
+        << KUidContactFieldPostcode
+        << KUidContactFieldCountry
+        << KUidContactFieldPostOffice;
+}
+
 QList<TUid> CntTransformAddress::supportedSortingFieldTypes(QString detailFieldName) const
 {
     QList<TUid> uids;
@@ -245,8 +242,9 @@
             << QLatin1String(QContactDetail::ContextWork));
         fields[QContactDetail::FieldContext] = f;
 
-        // Sub-types not supported in symbian back-end, remove
+        // Sub-types not supported in symbian back-end
         fields.remove(QContactAddress::FieldSubTypes);
+
         d.setFields(fields);
 
         // Replace original definitions