170 QList<QContactAddress> addresses = aContact.details<QContactAddress>(); |
170 QList<QContactAddress> addresses = aContact.details<QContactAddress>(); |
171 |
171 |
172 if ( addresses.isEmpty() ) |
172 if ( addresses.isEmpty() ) |
173 { |
173 { |
174 QStringList fieldList; |
174 QStringList fieldList; |
175 fieldList << QContactAddress::FieldStreet << QContactAddress::FieldPostcode << QContactAddress::FieldPostOfficeBox; |
175 fieldList << QContactAddress::FieldStreet << QContactAddress::FieldPostcode; |
176 fieldList << QContactAddress::FieldLocality << QContactAddress::FieldRegion << QContactAddress::FieldCountry; |
176 fieldList << QContactAddress::FieldLocality << QContactAddress::FieldRegion << QContactAddress::FieldCountry; |
177 |
177 |
178 QContactAddress addr; |
178 QContactAddress addr; |
179 CntEditViewDetailItem* detailItem = new CntEditViewDetailItem( |
179 CntEditViewDetailItem* detailItem = new CntEditViewDetailItem( |
180 addr, |
180 addr, |
232 |
232 |
233 QList<CntEditViewItem*> CntEditViewItemBuilder::addressDetails(QContact& aContact) |
233 QList<CntEditViewItem*> CntEditViewItemBuilder::addressDetails(QContact& aContact) |
234 { |
234 { |
235 QList<CntEditViewItem*> list; |
235 QList<CntEditViewItem*> list; |
236 // Address |
236 // Address |
237 foreach( QContactAddress addr, aContact.details<QContactAddress>() ) |
237 foreach( QContactAddress addr, CntDetailOrderingHelper::getOrderedAddresses(aContact) ) |
238 { |
238 { |
239 QStringList fieldList; |
239 QStringList fieldList; |
240 fieldList << QContactAddress::FieldStreet << QContactAddress::FieldPostcode << QContactAddress::FieldPostOfficeBox; |
240 fieldList << QContactAddress::FieldStreet << QContactAddress::FieldPostcode; |
241 fieldList << QContactAddress::FieldLocality << QContactAddress::FieldRegion << QContactAddress::FieldCountry; |
241 fieldList << QContactAddress::FieldLocality << QContactAddress::FieldRegion << QContactAddress::FieldCountry; |
242 |
242 |
243 QStringList valueList; |
243 QStringList valueList; |
244 foreach ( QString str, fieldList ) |
244 foreach ( QString str, fieldList ) |
245 { |
245 { |
246 valueList << addr.value( str ); |
246 QString value = addr.value( str ); |
247 } |
247 if ( !value.isEmpty() ) |
248 |
248 { |
249 QString address = valueList.join(" ").trimmed(); |
249 valueList << addr.value( str ); |
|
250 } |
|
251 } |
|
252 |
|
253 QString address = valueList.join(", ").trimmed(); |
250 if ( !address.isEmpty() ) |
254 if ( !address.isEmpty() ) |
251 { |
255 { |
252 QString context = addr.contexts().isEmpty() ? "" : addr.contexts().first(); |
256 QString context = addr.contexts().isEmpty() ? "" : addr.contexts().first(); |
253 CntEditViewDetailItem* detailItem = new CntEditViewDetailItem( |
257 CntEditViewDetailItem* detailItem = new CntEditViewDetailItem( |
254 addr, |
258 addr, |
273 { |
277 { |
274 QList<CntEditViewItem*> list; |
278 QList<CntEditViewItem*> list; |
275 // Company |
279 // Company |
276 QContactOrganization org = aContact.detail<QContactOrganization>(); |
280 QContactOrganization org = aContact.detail<QContactOrganization>(); |
277 QStringList detailList; |
281 QStringList detailList; |
278 detailList << org.title(); |
282 if ( !org.title().isEmpty()) |
279 detailList << org.name(); |
283 detailList << org.title(); |
280 detailList << org.department().join(" ").trimmed(); |
284 if ( !org.name().isEmpty()) |
281 |
285 detailList << org.name(); |
282 QString company = detailList.join(" ").trimmed(); |
286 if ( !org.department().isEmpty()) |
|
287 detailList << org.department().join(", ").trimmed(); |
|
288 |
|
289 QString company = detailList.join(", ").trimmed(); |
283 if ( !company.isEmpty() ) |
290 if ( !company.isEmpty() ) |
284 { |
291 { |
285 QStringList fields; |
292 QStringList fields; |
286 fields << QContactOrganization::FieldTitle; |
293 fields << QContactOrganization::FieldTitle; |
287 fields << QContactOrganization::FieldName; |
294 fields << QContactOrganization::FieldName; |