-rw-r--r-- | kabc/vcardformatimpl.cpp | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp index 3fcaf94..bd9a57b 100644 --- a/kabc/vcardformatimpl.cpp +++ b/kabc/vcardformatimpl.cpp @@ -44,47 +44,49 @@ using namespace VCARD; bool VCardFormatImpl::load( Addressee &addressee, QFile *file ) { kdDebug(5700) << "VCardFormat::load()" << endl; QByteArray fdata = file->readAll(); QCString data(fdata.data(), fdata.size()+1); VCardEntity e( data ); VCardListIterator it( e.cardList() ); if ( it.current() ) { - VCard v(*it.current()); - loadAddressee( addressee, v ); +//US VCard v(*it.current()); +//US loadAddressee( addressee, v ); + loadAddressee( addressee, it.current() ); return true; } return false; } bool VCardFormatImpl::loadAll( AddressBook *addressBook, Resource *resource, QFile *file ) { kdDebug(5700) << "VCardFormat::loadAll()" << endl; QByteArray fdata = file->readAll(); QCString data(fdata.data(), fdata.size()+1); VCardEntity e( data ); VCardListIterator it( e.cardList() ); for (; it.current(); ++it) { - VCard v(*it.current()); +//US VCard v(*it.current()); Addressee addressee; - loadAddressee( addressee, v ); +//US loadAddressee( addressee, v ); + loadAddressee( addressee, it.current() ); addressee.setResource( resource ); addressBook->insertAddressee( addressee ); } return true; } void VCardFormatImpl::save( const Addressee &addressee, QFile *file ) { VCardEntity vcards; VCardList vcardlist; vcardlist.setAutoDelete( true ); @@ -113,27 +115,27 @@ void VCardFormatImpl::saveAll( AddressBook *ab, Resource *resource, QFile *file saveAddressee( (*it), v, false ); (*it).setChanged( false ); vcardlist.append( v ); } } vcards.setCardList( vcardlist ); QCString vcardData = vcards.asString(); file->writeBlock( (const char*)vcardData, vcardData.length() ); } -bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard &v ) +bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v ) { - QPtrList<ContentLine> contentLines = v.contentLineList(); + QPtrList<ContentLine> contentLines = v->contentLineList(); ContentLine *cl; for( cl = contentLines.first(); cl; cl = contentLines.next() ) { QCString n = cl->name(); if ( n.left( 2 ) == "X-" ) { n = n.mid( 2 ); int posDash = n.find( "-" ); addressee.insertCustom( QString::fromUtf8( n.left( posDash ) ), QString::fromUtf8( n.mid( posDash + 1 ) ), QString::fromUtf8( cl->value()->asString() ) ); continue; } @@ -992,26 +994,27 @@ Sound VCardFormatImpl::readSoundValue( VCARD::ContentLine *cl, const Addressee & sound.setUrl( QString::fromUtf8( v->asString() ) ); } return sound; } bool VCardFormatImpl::readFromString( const QString &vcard, Addressee &addressee ) { VCardEntity e( vcard.utf8() ); VCardListIterator it( e.cardList() ); if ( it.current() ) { - VCard v(*it.current()); - loadAddressee( addressee, v ); +//US VCard v(*it.current()); +//US loadAddressee( addressee, v ); + loadAddressee( addressee, it.current() ); return true; } return false; } bool VCardFormatImpl::writeToString( const Addressee &addressee, QString &vcard ) { VCardEntity vcards; VCardList vcardlist; vcardlist.setAutoDelete( true ); |