equal
deleted
inserted
replaced
74 else |
74 else |
75 { |
75 { |
76 dateString = dateTime.toString(DATE_FORMAT); |
76 dateString = dateTime.toString(DATE_FORMAT); |
77 } |
77 } |
78 //display name |
78 //display name |
79 QString contactName = item->data(NickName).toString(); |
79 QString contactName = item->data(DisplayName).toString(); |
80 if (contactName.isEmpty()) { |
80 if (contactName.isEmpty()) { |
81 contactName = tr("(no recipient)"); |
81 contactName = tr("(no recipient)"); |
82 } |
82 } |
83 //description |
83 //description |
84 QString description = item->data(Subject).toString(); |
84 QString description = item->data(Subject).toString(); |
129 case Subject: |
129 case Subject: |
130 { |
130 { |
131 value = item->data(Subject); |
131 value = item->data(Subject); |
132 break; |
132 break; |
133 } |
133 } |
134 case NickName: |
134 case DisplayName: |
135 { |
135 { |
136 value = item->data(NickName); |
136 value = item->data(DisplayName); |
137 break; |
137 break; |
138 } |
138 } |
139 case MessageProperty: |
139 case MessageProperty: |
140 { |
140 { |
141 value = item->data(MessageProperty); |
141 value = item->data(MessageProperty); |
233 timeStamp.SecondsFrom(unixEpoch, seconds); |
233 timeStamp.SecondsFrom(unixEpoch, seconds); |
234 item.setData(seconds.Int(), TimeStamp); |
234 item.setData(seconds.Int(), TimeStamp); |
235 |
235 |
236 // contact details |
236 // contact details |
237 QString contact(S60QConversions::s60DescToQString(entry.iDetails)); |
237 QString contact(S60QConversions::s60DescToQString(entry.iDetails)); |
238 item.setData(contact, NickName); |
238 item.setData(contact, DisplayName); |
239 |
239 |
240 // Attachments |
240 // Attachments |
241 if (entry.Attachment()) { |
241 if (entry.Attachment()) { |
242 item.setData(ConvergedMessage::Attachment, MessageProperty); |
242 item.setData(ConvergedMessage::Attachment, MessageProperty); |
243 } |
243 } |