-rw-r--r-- | kaddressbook/kaimportoldialog.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/kaddressbook/kaimportoldialog.cpp b/kaddressbook/kaimportoldialog.cpp index 848d8af..7bb8bd8 100644 --- a/kaddressbook/kaimportoldialog.cpp +++ b/kaddressbook/kaimportoldialog.cpp | |||
@@ -292,48 +292,49 @@ void KAImportOLdialog::ol2kapiContact( _ContactItem * aItem ) | |||
292 | addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS ); | 292 | addressee.insertCustom( "KADDRESSBOOK", "X-AssistantsName", tempS ); |
293 | tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer()); | 293 | tempS = QString::fromUcs2(aItem->GetDepartment().GetBuffer()); |
294 | if ( !tempS.isEmpty() ) | 294 | if ( !tempS.isEmpty() ) |
295 | addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS ); | 295 | addressee.insertCustom( "KADDRESSBOOK", "X-Department", tempS ); |
296 | tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), ""); | 296 | tempS = QString::fromUcs2(aItem->GetOfficeLocation().GetBuffer()).replace( QRegExp("\\r"), ""); |
297 | if ( !tempS.isEmpty() ) | 297 | if ( !tempS.isEmpty() ) |
298 | addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS ); | 298 | addressee.insertCustom( "KADDRESSBOOK", "X-Office",tempS ); |
299 | tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer()); | 299 | tempS = QString::fromUcs2(aItem->GetProfession().GetBuffer()); |
300 | if ( !tempS.isEmpty() ) | 300 | if ( !tempS.isEmpty() ) |
301 | addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS ); | 301 | addressee.insertCustom( "KADDRESSBOOK", "X-Profession", tempS ); |
302 | dtb = mDdate2Qdtr(aItem->GetAnniversary()); | 302 | dtb = mDdate2Qdtr(aItem->GetAnniversary()); |
303 | if (dtb.isValid() ) { | 303 | if (dtb.isValid() ) { |
304 | QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); | 304 | QString dt = KGlobal::locale()->formatDate( dtb.date() , true, KLocale::ISODate); |
305 | addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); | 305 | addressee.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt); |
306 | } | 306 | } |
307 | int sec = aItem->GetSensitivity() ; | 307 | int sec = aItem->GetSensitivity() ; |
308 | if ( sec > 1 )// mapping pers -> private | 308 | if ( sec > 1 )// mapping pers -> private |
309 | --sec; | 309 | --sec; |
310 | addressee.setSecrecy( sec ); | 310 | addressee.setSecrecy( sec ); |
311 | //addressee.setLogo( const Picture &logo ); | 311 | //addressee.setLogo( const Picture &logo ); |
312 | //addressee.setPhoto( const Picture &photo ); | 312 | //addressee.setPhoto( const Picture &photo ); |
313 | //addressee.setSound( const Sound &sound ); | 313 | //addressee.setSound( const Sound &sound ); |
314 | //addressee.setAgent( const Agent &agent ); | 314 | //addressee.setAgent( const Agent &agent ); |
315 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); | 315 | QString cat = QString::fromUcs2( aItem->GetCategories().GetBuffer()).replace( QRegExp("\\r"), ""); |
316 | cat = cat.replace( QRegExp("; "), ";"); | ||
316 | addressee.setCategories( QStringList::split( ";", cat )); | 317 | addressee.setCategories( QStringList::split( ";", cat )); |
317 | 318 | ||
318 | QString phoneS; | 319 | QString phoneS; |
319 | 320 | ||
320 | phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); | 321 | phoneS = QString::fromUcs2( aItem->GetAssistantTelephoneNumber().GetBuffer()); |
321 | if ( ! phoneS.isEmpty()) | 322 | if ( ! phoneS.isEmpty()) |
322 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); | 323 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Voice ) ); |
323 | phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); | 324 | phoneS = QString::fromUcs2( aItem->GetBusinessTelephoneNumber().GetBuffer()); |
324 | if ( ! phoneS.isEmpty()) | 325 | if ( ! phoneS.isEmpty()) |
325 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | 326 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); |
326 | phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); | 327 | phoneS = QString::fromUcs2( aItem->GetBusiness2TelephoneNumber().GetBuffer()); |
327 | if ( ! phoneS.isEmpty()) | 328 | if ( ! phoneS.isEmpty()) |
328 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); | 329 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work ) ); |
329 | phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer()); | 330 | phoneS = QString::fromUcs2( aItem->GetBusinessFaxNumber().GetBuffer()); |
330 | if ( ! phoneS.isEmpty()) | 331 | if ( ! phoneS.isEmpty()) |
331 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) ); | 332 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Work + KABC::PhoneNumber::Fax ) ); |
332 | phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer()); | 333 | phoneS = QString::fromUcs2( aItem->GetCarTelephoneNumber().GetBuffer()); |
333 | if ( ! phoneS.isEmpty()) | 334 | if ( ! phoneS.isEmpty()) |
334 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) ); | 335 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Car ) ); |
335 | phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer()); | 336 | phoneS = QString::fromUcs2( aItem->GetHomeTelephoneNumber().GetBuffer()); |
336 | if ( ! phoneS.isEmpty()) | 337 | if ( ! phoneS.isEmpty()) |
337 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); | 338 | addressee.insertPhoneNumber( KABC::PhoneNumber(phoneS ,KABC::PhoneNumber::Home ) ); |
338 | phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer()); | 339 | phoneS = QString::fromUcs2( aItem->GetHome2TelephoneNumber().GetBuffer()); |
339 | if ( ! phoneS.isEmpty()) | 340 | if ( ! phoneS.isEmpty()) |