-rw-r--r-- | kabc/addressbook.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index d03dea3..16e1653 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -437,43 +437,47 @@ Ticket *AddressBook::requestSaveTicket( Resource *resource ) | |||
437 | if ( (*it) == resource ) { | 437 | if ( (*it) == resource ) { |
438 | if ( (*it)->readOnly() || !(*it)->isOpen() ) | 438 | if ( (*it)->readOnly() || !(*it)->isOpen() ) |
439 | return 0; | 439 | return 0; |
440 | else | 440 | else |
441 | return (*it)->requestSaveTicket(); | 441 | return (*it)->requestSaveTicket(); |
442 | } | 442 | } |
443 | } | 443 | } |
444 | 444 | ||
445 | return 0; | 445 | return 0; |
446 | } | 446 | } |
447 | 447 | ||
448 | void AddressBook::insertAddressee( const Addressee &a, bool setRev ) | 448 | void AddressBook::insertAddressee( const Addressee &a, bool setRev ) |
449 | { | 449 | { |
450 | Addressee::List::Iterator it; | 450 | Addressee::List::Iterator it; |
451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { | 451 | for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) { |
452 | if ( a.uid() == (*it).uid() ) { | 452 | if ( a.uid() == (*it).uid() ) { |
453 | if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) { | ||
454 | return; | ||
455 | } | ||
453 | bool changed = false; | 456 | bool changed = false; |
454 | Addressee addr = a; | 457 | Addressee addr = a; |
455 | if ( addr != (*it) ) | 458 | if ( addr != (*it) ) |
456 | changed = true; | 459 | changed = true; |
457 | 460 | ||
458 | (*it) = a; | 461 | (*it) = a; |
459 | if ( (*it).resource() == 0 ) | 462 | if ( (*it).resource() == 0 ) |
460 | (*it).setResource( standardResource() ); | 463 | (*it).setResource( standardResource() ); |
461 | 464 | ||
462 | if ( changed ) { | 465 | if ( changed ) { |
463 | if ( setRev ) { | 466 | if ( setRev ) { |
467 | |||
464 | // get rid of micro seconds | 468 | // get rid of micro seconds |
465 | QDateTime dt = QDateTime::currentDateTime(); | 469 | QDateTime dt = QDateTime::currentDateTime(); |
466 | QTime t = dt.time(); | 470 | QTime t = dt.time(); |
467 | dt.setTime( QTime (t.hour (), t.minute (), t.second () ) ); | 471 | dt.setTime( QTime (t.hour (), t.minute (), t.second () ) ); |
468 | (*it).setRevision( dt ); | 472 | (*it).setRevision( dt ); |
469 | } | 473 | } |
470 | (*it).setChanged( true ); | 474 | (*it).setChanged( true ); |
471 | } | 475 | } |
472 | 476 | ||
473 | return; | 477 | return; |
474 | } | 478 | } |
475 | } | 479 | } |
476 | d->mAddressees.append( a ); | 480 | d->mAddressees.append( a ); |
477 | Addressee& addr = d->mAddressees.last(); | 481 | Addressee& addr = d->mAddressees.last(); |
478 | if ( addr.resource() == 0 ) | 482 | if ( addr.resource() == 0 ) |
479 | addr.setResource( standardResource() ); | 483 | addr.setResource( standardResource() ); |
@@ -512,63 +516,64 @@ AddressBook::Iterator AddressBook::find( const Addressee &a ) | |||
512 | Addressee AddressBook::findByUid( const QString &uid ) | 516 | Addressee AddressBook::findByUid( const QString &uid ) |
513 | { | 517 | { |
514 | Iterator it; | 518 | Iterator it; |
515 | for ( it = begin(); it != end(); ++it ) { | 519 | for ( it = begin(); it != end(); ++it ) { |
516 | if ( uid == (*it).uid() ) { | 520 | if ( uid == (*it).uid() ) { |
517 | return *it; | 521 | return *it; |
518 | } | 522 | } |
519 | } | 523 | } |
520 | return Addressee(); | 524 | return Addressee(); |
521 | } | 525 | } |
522 | Addressee::List AddressBook::getExternLastSyncAddressees() | 526 | Addressee::List AddressBook::getExternLastSyncAddressees() |
523 | { | 527 | { |
524 | Addressee::List results; | 528 | Addressee::List results; |
525 | 529 | ||
526 | Iterator it; | 530 | Iterator it; |
527 | for ( it = begin(); it != end(); ++it ) { | 531 | for ( it = begin(); it != end(); ++it ) { |
528 | if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { | 532 | if ( (*it).uid().left( 19 ) == "last-syncAddressee-" ) { |
529 | if ( (*it).familyName().left(3) == "E: " ) | 533 | if ( (*it).familyName().left(3) == "E: " ) |
530 | results.append( *it ); | 534 | results.append( *it ); |
531 | } | 535 | } |
532 | } | 536 | } |
533 | 537 | ||
534 | return results; | 538 | return results; |
535 | } | 539 | } |
536 | void AddressBook::resetTempSyncStat() | 540 | void AddressBook::resetTempSyncStat() |
537 | { | 541 | { |
538 | Iterator it; | 542 | Iterator it; |
539 | for ( it = begin(); it != end(); ++it ) { | 543 | for ( it = begin(); it != end(); ++it ) { |
540 | (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL ); | 544 | (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL ); |
541 | } | 545 | } |
542 | 546 | ||
543 | } | 547 | } |
544 | 548 | ||
545 | QStringList AddressBook:: uidList() | 549 | QStringList AddressBook:: uidList() |
546 | { | 550 | { |
547 | QStringList results; | 551 | QStringList results; |
548 | Iterator it; | 552 | Iterator it; |
549 | for ( it = begin(); it != end(); ++it ) { | 553 | for ( it = begin(); it != end(); ++it ) { |
550 | results.append( (*it).uid() ); | 554 | results.append( (*it).uid() ); |
551 | } | 555 | } |
552 | return results; | 556 | return results; |
553 | } | 557 | } |
554 | 558 | ||
555 | 559 | ||
556 | Addressee::List AddressBook::allAddressees() | 560 | Addressee::List AddressBook::allAddressees() |
557 | { | 561 | { |
558 | return d->mAddressees; | 562 | return d->mAddressees; |
563 | |||
559 | } | 564 | } |
560 | 565 | ||
561 | Addressee::List AddressBook::findByName( const QString &name ) | 566 | Addressee::List AddressBook::findByName( const QString &name ) |
562 | { | 567 | { |
563 | Addressee::List results; | 568 | Addressee::List results; |
564 | 569 | ||
565 | Iterator it; | 570 | Iterator it; |
566 | for ( it = begin(); it != end(); ++it ) { | 571 | for ( it = begin(); it != end(); ++it ) { |
567 | if ( name == (*it).realName() ) { | 572 | if ( name == (*it).realName() ) { |
568 | results.append( *it ); | 573 | results.append( *it ); |
569 | } | 574 | } |
570 | } | 575 | } |
571 | 576 | ||
572 | return results; | 577 | return results; |
573 | } | 578 | } |
574 | 579 | ||