-rw-r--r-- | kabc/vcardformatimpl.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp index ec5ed80..26fd4f0 100644 --- a/kabc/vcardformatimpl.cpp +++ b/kabc/vcardformatimpl.cpp | |||
@@ -278,13 +278,13 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v ) | |||
278 | address.setType( type ); | 278 | address.setType( type ); |
279 | 279 | ||
280 | address.setLabel( QString::fromUtf8( cl->value()->asString() ) ); | 280 | address.setLabel( QString::fromUtf8( cl->value()->asString() ) ); |
281 | addressee.insertAddress( address ); | 281 | addressee.insertAddress( address ); |
282 | } | 282 | } |
283 | } | 283 | } |
284 | 284 | addressee.makePhoneNumbersOLcompatible(); | |
285 | return true; | 285 | return true; |
286 | } | 286 | } |
287 | 287 | ||
288 | void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCard *v, bool intern ) | 288 | void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCard *v, bool intern ) |
289 | { | 289 | { |
290 | //US ContentLine cl; | 290 | //US ContentLine cl; |
@@ -592,13 +592,12 @@ void VCardFormatImpl::addTelephoneValue( VCard *v, const PhoneNumber &p ) | |||
592 | if( p.type() & PhoneNumber::Bbs ) params.append( new Param( "TYPE", "bbs" ) ); | 592 | if( p.type() & PhoneNumber::Bbs ) params.append( new Param( "TYPE", "bbs" ) ); |
593 | if( p.type() & PhoneNumber::Modem ) params.append( new Param( "TYPE", "modem" ) ); | 593 | if( p.type() & PhoneNumber::Modem ) params.append( new Param( "TYPE", "modem" ) ); |
594 | if( p.type() & PhoneNumber::Car ) params.append( new Param( "TYPE", "car" ) ); | 594 | if( p.type() & PhoneNumber::Car ) params.append( new Param( "TYPE", "car" ) ); |
595 | if( p.type() & PhoneNumber::Isdn ) params.append( new Param( "TYPE", "isdn" ) ); | 595 | if( p.type() & PhoneNumber::Isdn ) params.append( new Param( "TYPE", "isdn" ) ); |
596 | if( p.type() & PhoneNumber::Pcs ) params.append( new Param( "TYPE", "pcs" ) ); | 596 | if( p.type() & PhoneNumber::Pcs ) params.append( new Param( "TYPE", "pcs" ) ); |
597 | if( p.type() & PhoneNumber::Pager ) params.append( new Param( "TYPE", "pager" ) ); | 597 | if( p.type() & PhoneNumber::Pager ) params.append( new Param( "TYPE", "pager" ) ); |
598 | if( p.type() & PhoneNumber::Sip ) params.append( new Param( "TYPE", "sip" ) ); | ||
599 | cl.setParamList( params ); | 598 | cl.setParamList( params ); |
600 | 599 | ||
601 | v->add(cl); | 600 | v->add(cl); |
602 | } | 601 | } |
603 | 602 | ||
604 | PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl ) | 603 | PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl ) |
@@ -625,13 +624,12 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl ) | |||
625 | else if ( tmpStr == "bbs" ) type |= PhoneNumber::Bbs; | 624 | else if ( tmpStr == "bbs" ) type |= PhoneNumber::Bbs; |
626 | else if ( tmpStr == "modem" ) type |= PhoneNumber::Modem; | 625 | else if ( tmpStr == "modem" ) type |= PhoneNumber::Modem; |
627 | else if ( tmpStr == "car" ) type |= PhoneNumber::Car; | 626 | else if ( tmpStr == "car" ) type |= PhoneNumber::Car; |
628 | else if ( tmpStr == "isdn" ) type |= PhoneNumber::Isdn; | 627 | else if ( tmpStr == "isdn" ) type |= PhoneNumber::Isdn; |
629 | else if ( tmpStr == "pcs" ) type |= PhoneNumber::Pcs; | 628 | else if ( tmpStr == "pcs" ) type |= PhoneNumber::Pcs; |
630 | else if ( tmpStr == "pager" ) type |= PhoneNumber::Pager; | 629 | else if ( tmpStr == "pager" ) type |= PhoneNumber::Pager; |
631 | else if ( tmpStr == "sip" ) type |= PhoneNumber::Sip; | ||
632 | } | 630 | } |
633 | } | 631 | } |
634 | p.setType( type ); | 632 | p.setType( type ); |
635 | 633 | ||
636 | return p; | 634 | return p; |
637 | } | 635 | } |