--- a/qtmobility/plugins/contacts/symbian/src/cntdisplaylabel.cpp Fri Apr 16 15:51:22 2010 +0300
+++ b/qtmobility/plugins/contacts/symbian/src/cntdisplaylabel.cpp Mon May 03 13:18:40 2010 +0300
@@ -74,8 +74,8 @@
//Contact
//Preferred details
QList<QPair<QLatin1String, QLatin1String> > contactPrefferedDisplayLabelDetails;
- contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), QLatin1String(QContactName::FieldFirst)));
- contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), QLatin1String(QContactName::FieldLast)));
+ contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), QLatin1String(QContactName::FieldFirstName)));
+ contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), QLatin1String(QContactName::FieldLastName)));
m_contactDisplayLabelDetails.append(contactPrefferedDisplayLabelDetails);
//if preferred details doesn't exist use these
@@ -95,10 +95,10 @@
* \a error On return, contains the possible error.
* \return synthesised display label
*/
-QString CntDisplayLabel::synthesizedDisplayLabel(const QContact& contact, QContactManager::Error& error) const
+QString CntDisplayLabel::synthesizedDisplayLabel(const QContact& contact, QContactManager::Error* error) const
{
QString displayLabel;
- error = QContactManager::NoError;
+ *error = QContactManager::NoError;
//contact
if(contact.type() == QContactType::TypeContact) {
@@ -112,7 +112,7 @@
//invalid type
else {
- error = QContactManager::InvalidContactTypeError;
+ *error = QContactManager::InvalidContactTypeError;
}
return displayLabel;