--- a/qtmobility/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp	Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/transform/cnttransformonlineaccount.cpp	Mon May 03 13:18:40 2010 +0300
@@ -42,6 +42,7 @@
 
 #include "cnttransformonlineaccount.h"
 #include "cntmodelextuids.h"
+#include "qcontactpresence.h"
 
 QList<CContactItemField *> CntTransformOnlineAccount::transformDetailL(const QContactDetail &detail)
 {
@@ -120,27 +121,28 @@
 	             CleanupStack::Pop(serviceProviderField);
 	         }
 	         
-	     // Transform presence informaiton
-        TPtrC presenceText(reinterpret_cast<const TUint16*>(onlineAccount.presence().utf16()));
-            if(presenceText.Length()) {
-                QString presence = QString::number(encodePresence(onlineAccount.presence()));
-                CContactItemField* presenceField = CContactItemField::NewLC(KStorageTypeText);
-                TPtrC presenceEncodedText(reinterpret_cast<const TUint16*>(presence.utf16()));
-                presenceField->TextStorage()->SetTextL(presenceEncodedText);
-                presenceField->AddFieldTypeL(KUidContactFieldPresence);
-                fieldList.append(presenceField);
-                CleanupStack::Pop(presenceField);
-            }
+                 //FIXME:no presence in onlineaccount anymore..
+//	     // Transform presence informaiton
+//        TPtrC presenceText(reinterpret_cast<const TUint16*>(onlineAccount.presence().utf16()));
+//            if(presenceText.Length()) {
+//                QString presence = QString::number(encodePresence(onlineAccount.presence()));
+//                CContactItemField* presenceField = CContactItemField::NewLC(KStorageTypeText);
+//                TPtrC presenceEncodedText(reinterpret_cast<const TUint16*>(presence.utf16()));
+//                presenceField->TextStorage()->SetTextL(presenceEncodedText);
+//                presenceField->AddFieldTypeL(KUidContactFieldPresence);
+//                fieldList.append(presenceField);
+//                CleanupStack::Pop(presenceField);
+//            }
 	         
-	     // Transform statusMessage
-	     TPtrC statusMsgText(reinterpret_cast<const TUint16*>(onlineAccount.statusMessage().utf16()));
-	         if(statusMsgText.Length()) {
-	             CContactItemField* statusMsgField = CContactItemField::NewLC(KStorageTypeText);
-	             statusMsgField->TextStorage()->SetTextL(statusMsgText);
-	             statusMsgField->AddFieldTypeL(KUidContactFieldStatusMsg);
-	             fieldList.append(statusMsgField);
-	             CleanupStack::Pop(statusMsgField);
-	         }
+//	     // Transform statusMessage
+//	     TPtrC statusMsgText(reinterpret_cast<const TUint16*>(onlineAccount.statusMessage().utf16()));
+//	         if(statusMsgText.Length()) {
+//	             CContactItemField* statusMsgField = CContactItemField::NewLC(KStorageTypeText);
+//	             statusMsgField->TextStorage()->SetTextL(statusMsgText);
+//	             statusMsgField->AddFieldTypeL(KUidContactFieldStatusMsg);
+//	             fieldList.append(statusMsgField);
+//	             CleanupStack::Pop(statusMsgField);
+//	         }
 	}
 
 	return fieldList;
@@ -148,7 +150,9 @@
 
 QContactDetail *CntTransformOnlineAccount::transformItemField(const CContactItemField& field, const QContact &contact)
 {
-    QContactOnlineAccount *onlineAccount = new QContactOnlineAccount(contact.detail<QContactOnlineAccount>());
+    Q_UNUSED(contact);
+
+    QContactOnlineAccount *onlineAccount = new QContactOnlineAccount();
 	CContactTextField* storage = field.TextStorage();
 	QString onlineAccountString = QString::fromUtf16(storage->Text().Ptr(), storage->Text().Length());
 
@@ -179,11 +183,11 @@
         //Presence
         else if (field.ContentType().FieldType(i) == KUidContactFieldPresence) {
             QString presenceInfo = decodePresence(onlineAccountString.toInt());
-            onlineAccount->setPresence(presenceInfo);
+//            onlineAccount->setPresence(presenceInfo);
         }
         //Status Message
         else if (field.ContentType().FieldType(i) == KUidContactFieldStatusMsg) {
-            onlineAccount->setStatusMessage(onlineAccountString);
+//            onlineAccount->setStatusMessage(onlineAccountString);
         }
     }
 
@@ -302,19 +306,20 @@
  */
 quint32 CntTransformOnlineAccount::encodePresence(QString aPresence)
 {
-    if (QContactOnlineAccount::PresenceAvailable  == aPresence)
-        return CntTransformOnlineAccount::EPresenceAvailable;
-    else if (QContactOnlineAccount::PresenceHidden == aPresence)
-        return CntTransformOnlineAccount::EPresenceHidden;
-    else if (QContactOnlineAccount::PresenceBusy == aPresence)
-        return CntTransformOnlineAccount::EPresenceBusy;
-    else if (QContactOnlineAccount::PresenceAway == aPresence)
-        return CntTransformOnlineAccount::EPresenceAway;
-    else if (QContactOnlineAccount::PresenceExtendedAway == aPresence)
-        return CntTransformOnlineAccount::EPresenceExtendedAway;
-    else if (QContactOnlineAccount::PresenceUnknown == aPresence)
-        return CntTransformOnlineAccount::EPresenceUnknown;
-    else
+    //FIXME:presence
+//    if (QContactPresence::PresenceAvailable  == aPresence)
+//        return CntTransformOnlineAccount::EPresenceAvailable;
+//    else if (QContactPresence::PresenceHidden == aPresence)
+//        return CntTransformOnlineAccount::EPresenceHidden;
+//    else if (QContactPresence::PresenceBusy == aPresence)
+//        return CntTransformOnlineAccount::EPresenceBusy;
+//    else if (QContactPresence::PresenceAway == aPresence)
+//        return CntTransformOnlineAccount::EPresenceAway;
+//    else if (QContactPresence::PresenceExtendedAway == aPresence)
+//        return CntTransformOnlineAccount::EPresenceExtendedAway;
+//    else if (QContactPresence::PresenceUnknown == aPresence)
+//        return CntTransformOnlineAccount::EPresenceUnknown;
+//    else
         return CntTransformOnlineAccount::EPresenceOffline;
 }
 
@@ -326,20 +331,22 @@
  */
 QString CntTransformOnlineAccount::decodePresence(quint32 aPresence)
 {
-    if (CntTransformOnlineAccount::EPresenceAvailable  == aPresence)
-        return QContactOnlineAccount::PresenceAvailable;
-    else if (CntTransformOnlineAccount::EPresenceHidden == aPresence)
-        return QContactOnlineAccount::PresenceHidden;
-    else if (CntTransformOnlineAccount::EPresenceBusy == aPresence)
-        return QContactOnlineAccount::PresenceBusy;
-    else if ( CntTransformOnlineAccount::EPresenceAway == aPresence)
-        return QContactOnlineAccount::PresenceAway;
-    else if ( CntTransformOnlineAccount::EPresenceExtendedAway == aPresence)
-        return QContactOnlineAccount::PresenceExtendedAway;
-    else if ( CntTransformOnlineAccount::EPresenceUnknown == aPresence)
-        return QContactOnlineAccount::PresenceUnknown;
-    else
-        return QContactOnlineAccount::PresenceOffline;
+    //FIXME:presence
+//    if (CntTransformOnlineAccount::EPresenceAvailable  == aPresence)
+//        return QContactPresence::PresenceAvailable;
+//    else if (CntTransformOnlineAccount::EPresenceHidden == aPresence)
+//        return QContactPresence::PresenceHidden;
+//    else if (CntTransformOnlineAccount::EPresenceBusy == aPresence)
+//        return QContactPresence::PresenceBusy;
+//    else if ( CntTransformOnlineAccount::EPresenceAway == aPresence)
+//        return QContactPresence::PresenceAway;
+//    else if ( CntTransformOnlineAccount::EPresenceExtendedAway == aPresence)
+//        return QContactPresence::PresenceExtendedAway;
+//    else if ( CntTransformOnlineAccount::EPresenceUnknown == aPresence)
+//        return QContactPresence::PresenceUnknown;
+//    else
+//        return QContactPresence::PresenceOffline;
+    return QString();
 }
 
 #endif // SYMBIAN_BACKEND_USE_SQLITE