diff -r e4ebb16b39ea -r 603d3f8b6302 plugins/contacts/symbian/plugin/src/cntdisplaylabel.cpp --- a/plugins/contacts/symbian/plugin/src/cntdisplaylabel.cpp Fri Sep 17 08:34:34 2010 +0300 +++ b/plugins/contacts/symbian/plugin/src/cntdisplaylabel.cpp Mon Oct 04 01:37:06 2010 +0300 @@ -46,8 +46,7 @@ * Constructor */ -CntDisplayLabel::CntDisplayLabel() : -m_nameOrder(CntOrderFirstLast) +CntDisplayLabel::CntDisplayLabel() { #ifdef SYMBIAN_BACKEND_USE_SQLITE m_settings = new CntCenrep(KCntNameOrdering, *this); @@ -97,11 +96,6 @@ contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), firstLatin)); contactPrefferedDisplayLabelDetails.append(qMakePair(QLatin1String(QContactName::DefinitionName), secondLatin)); m_contactDisplayLabelDetails.append(contactPrefferedDisplayLabelDetails); - - //if preferred details doesn't exist use these - QList > contactSecondaryDisplayLabelDetails; - contactSecondaryDisplayLabelDetails.append(qMakePair(QLatin1String(QContactOrganization::DefinitionName), QLatin1String(QContactOrganization::FieldName))); - m_contactDisplayLabelDetails.append(contactSecondaryDisplayLabelDetails); //Group QList > preferredGroupDisplayLabelDetails; @@ -175,9 +169,11 @@ if(!label.isEmpty()) { +#ifdef SYMBIAN_BACKEND_USE_SQLITE // Inlcude a comma if needed in the display label if (m_nameOrder == CntOrderLastCommaFirst) displayLabel.append(comma()); +#endif displayLabel.append(delimiter()); displayLabel.append(label); }