-rw-r--r-- | kabc/addressbook.cpp | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 64832f1..86dc7c2 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -597,16 +597,48 @@ Addressee AddressBook::findByUid( const QString &uid ) | |||
597 | Iterator it; | 597 | Iterator it; |
598 | for ( it = begin(); it != end(); ++it ) { | 598 | for ( it = begin(); it != end(); ++it ) { |
599 | if ( uid == (*it).uid() ) { | 599 | if ( uid == (*it).uid() ) { |
600 | return *it; | 600 | return *it; |
601 | } | 601 | } |
602 | } | 602 | } |
603 | return Addressee(); | 603 | return Addressee(); |
604 | } | 604 | } |
605 | void AddressBook::preExternSync( AddressBook* aBook, const QString& csd ) | ||
606 | { | ||
607 | qDebug("AddressBook::preExternSync "); | ||
608 | AddressBook::Iterator it; | ||
609 | for ( it = begin(); it != end(); ++it ) { | ||
610 | (*it).setID( csd, (*it).externalUID() ); | ||
611 | (*it).computeCsum( csd ); | ||
612 | } | ||
613 | mergeAB( aBook ,csd ); | ||
614 | } | ||
615 | void AddressBook::postExternSync( AddressBook* aBook , const QString& csd) | ||
616 | { | ||
617 | qDebug("AddressBook::postExternSync "); | ||
618 | AddressBook::Iterator it; | ||
619 | for ( it = begin(); it != end(); ++it ) { | ||
620 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID || | ||
621 | (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_CSUM ) { | ||
622 | Addressee ad = aBook->findByUid( ( (*it).uid() )); | ||
623 | if ( ad.isEmpty() ) { | ||
624 | qDebug("ERROR ad empty "); | ||
625 | } else { | ||
626 | (*it).computeCsum( csd ); | ||
627 | if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_NEW_ID ) | ||
628 | ad.setID( csd, (*it).externalUID() ); | ||
629 | ad.setCsum( csd, (*it).getCsum( csd ) ); | ||
630 | aBook->insertAddressee( ad ); | ||
631 | } | ||
632 | } | ||
633 | } | ||
634 | } | ||
635 | |||
636 | |||
605 | Addressee AddressBook::findByExternUid( const QString& uid , const QString& profile ) | 637 | Addressee AddressBook::findByExternUid( const QString& uid , const QString& profile ) |
606 | { | 638 | { |
607 | Iterator it; | 639 | Iterator it; |
608 | for ( it = begin(); it != end(); ++it ) { | 640 | for ( it = begin(); it != end(); ++it ) { |
609 | if ( uid == (*it).getID( profile ) ) | 641 | if ( uid == (*it).getID( profile ) ) |
610 | return (*it); | 642 | return (*it); |
611 | } | 643 | } |
612 | return Addressee(); | 644 | return Addressee(); |