diff -r 84d9eb65b26f -r 518b245aa84c messagingapp/msgui/appengine/src/conversationsengineutility.cpp --- a/messagingapp/msgui/appengine/src/conversationsengineutility.cpp Mon May 03 12:29:07 2010 +0300 +++ b/messagingapp/msgui/appengine/src/conversationsengineutility.cpp Fri Jun 25 15:47:40 2010 +0530 @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include "conversationsengineutility.h" #include "convergedmessage.h" @@ -47,6 +47,7 @@ case ECsProvisioning: case ECsBioMsg_VCard: case ECsBioMsg_VCal: + case ECsBioMgs_NokiaService: mMessageType = ConvergedMessage::BioMsg; break; case ECsBlueTooth: @@ -112,6 +113,9 @@ case ECsAudio: messageSubType = ConvergedMessage::Audio; break; + case ECsBioMgs_NokiaService: + messageSubType = ConvergedMessage::NokiaService; + break; default: messageSubType = ConvergedMessage::None; break; @@ -119,40 +123,4 @@ return messageSubType; } -//--------------------------------------------------------------- -// ConversationsEngineUtility::getVcardDisplayName -// @see header -//--------------------------------------------------------------- -QString ConversationsEngineUtility::getVcardDisplayName(QString filePath) -{ - QString displayName; - //open file for parsing - QFile file(filePath); - if (!file.open(QIODevice::ReadOnly)) { - return displayName; - } - // parse contents - QVersitReader reader; - reader.setDevice(&file); - if (reader.startReading()) { - if (reader.waitForFinished()) { - QList versitDocuments = reader.results(); - // Use the resulting document - if (versitDocuments.count() > 0) { - QVersitContactImporter importer; - QList contacts = importer.importContacts(versitDocuments); - // get display-name - if (contacts.count() > 0) { - QContactManager* contactManager = new QContactManager("symbian"); - displayName = contactManager->synthesizedDisplayLabel(contacts[0]); - delete contactManager; - } - } - } - } - file.close(); - - return displayName; -} - // End of file