author | zautrix <zautrix> | 2004-10-09 17:36:32 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-09 17:36:32 (UTC) |
commit | d68435216e1ebc5a7fed391157197994e13992b3 (patch) (unidiff) | |
tree | 3cb23a2cf1ee55ab881670c2d7bb3b54d60c3b59 /kabc/addressbook.cpp | |
parent | 59ed933d6c43ecb0ddd3dec53cc289ee8aa68482 (diff) | |
download | kdepimpi-d68435216e1ebc5a7fed391157197994e13992b3.zip kdepimpi-d68435216e1ebc5a7fed391157197994e13992b3.tar.gz kdepimpi-d68435216e1ebc5a7fed391157197994e13992b3.tar.bz2 |
sync fix
-rw-r--r-- | kabc/addressbook.cpp | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index ff05f7e..16927e2 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -431,37 +431,45 @@ void AddressBook::importFromFile( QString fileName, bool replaceLabel, bool rem | |||
431 | (*it).setTagged( true ); | 431 | (*it).setTagged( true ); |
432 | insertAddressee( (*it), false, true ); | 432 | insertAddressee( (*it), false, true ); |
433 | } | 433 | } |
434 | if ( removeOld ) | 434 | if ( removeOld ) |
435 | removeUntagged(); | 435 | removeUntagged(); |
436 | } | 436 | } |
437 | void AddressBook::setUntagged() | 437 | void AddressBook::setUntagged() |
438 | { | 438 | { |
439 | Iterator ait; | 439 | Iterator ait; |
440 | for ( ait = begin(); ait != end(); ++ait ) { | 440 | for ( ait = begin(); ait != end(); ++ait ) { |
441 | (*ait).setTagged( false ); | 441 | (*ait).setTagged( false ); |
442 | } | 442 | } |
443 | } | 443 | } |
444 | void AddressBook::removeUntagged() | 444 | void AddressBook::removeUntagged() |
445 | { | 445 | { |
446 | Iterator ait; | 446 | Iterator ait; |
447 | bool todelete = false; | ||
448 | Iterator todel; | ||
447 | for ( ait = begin(); ait != end(); ++ait ) { | 449 | for ( ait = begin(); ait != end(); ++ait ) { |
448 | if (!(*ait).tagged()) | 450 | if ( todelete ) |
449 | removeAddressee( ait ); | 451 | removeAddressee( todel ); |
450 | } | 452 | if (!(*ait).tagged()) { |
451 | 453 | todelete = true; | |
454 | todel = ait; | ||
455 | } else | ||
456 | todelete = false; | ||
457 | } | ||
458 | if ( todelete ) | ||
459 | removeAddressee( todel ); | ||
452 | deleteRemovedAddressees(); | 460 | deleteRemovedAddressees(); |
453 | } | 461 | } |
454 | bool AddressBook::saveAB() | 462 | bool AddressBook::saveAB() |
455 | { | 463 | { |
456 | bool ok = true; | 464 | bool ok = true; |
457 | 465 | ||
458 | deleteRemovedAddressees(); | 466 | deleteRemovedAddressees(); |
459 | Iterator ait; | 467 | Iterator ait; |
460 | for ( ait = begin(); ait != end(); ++ait ) { | 468 | for ( ait = begin(); ait != end(); ++ait ) { |
461 | if ( !(*ait).IDStr().isEmpty() ) { | 469 | if ( !(*ait).IDStr().isEmpty() ) { |
462 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); | 470 | (*ait).insertCustom( "KADDRESSBOOK", "X-ExternalID", (*ait).IDStr() ); |
463 | } | 471 | } |
464 | } | 472 | } |
465 | KRES::Manager<Resource>::ActiveIterator it; | 473 | KRES::Manager<Resource>::ActiveIterator it; |
466 | KRES::Manager<Resource> *manager = d->mManager; | 474 | KRES::Manager<Resource> *manager = d->mManager; |
467 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { | 475 | for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) { |