-rw-r--r-- | kabc/addressbook.cpp | 15 | ||||
-rw-r--r-- | kabc/addressbook.h | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp index 9332e21..6e8d027 100644 --- a/kabc/addressbook.cpp +++ b/kabc/addressbook.cpp | |||
@@ -484,105 +484,112 @@ void AddressBook::removeAddressee( const Addressee &a ) | |||
484 | return; | 484 | return; |
485 | } | 485 | } |
486 | } | 486 | } |
487 | } | 487 | } |
488 | 488 | ||
489 | void AddressBook::removeAddressee( const Iterator &it ) | 489 | void AddressBook::removeAddressee( const Iterator &it ) |
490 | { | 490 | { |
491 | d->mRemovedAddressees.append( (*it) ); | 491 | d->mRemovedAddressees.append( (*it) ); |
492 | d->mAddressees.remove( it.d->mIt ); | 492 | d->mAddressees.remove( it.d->mIt ); |
493 | } | 493 | } |
494 | 494 | ||
495 | AddressBook::Iterator AddressBook::find( const Addressee &a ) | 495 | AddressBook::Iterator AddressBook::find( const Addressee &a ) |
496 | { | 496 | { |
497 | Iterator it; | 497 | Iterator it; |
498 | for ( it = begin(); it != end(); ++it ) { | 498 | for ( it = begin(); it != end(); ++it ) { |
499 | if ( a.uid() == (*it).uid() ) { | 499 | if ( a.uid() == (*it).uid() ) { |
500 | return it; | 500 | return it; |
501 | } | 501 | } |
502 | } | 502 | } |
503 | return end(); | 503 | return end(); |
504 | } | 504 | } |
505 | 505 | ||
506 | Addressee AddressBook::findByUid( const QString &uid ) | 506 | Addressee AddressBook::findByUid( const QString &uid ) |
507 | { | 507 | { |
508 | Iterator it; | 508 | Iterator it; |
509 | for ( it = begin(); it != end(); ++it ) { | 509 | for ( it = begin(); it != end(); ++it ) { |
510 | if ( uid == (*it).uid() ) { | 510 | if ( uid == (*it).uid() ) { |
511 | return *it; | 511 | return *it; |
512 | } | 512 | } |
513 | } | 513 | } |
514 | return Addressee(); | 514 | return Addressee(); |
515 | } | 515 | } |
516 | Addressee::List AddressBook::getExternLastSyncAddressees() | 516 | Addressee::List AddressBook::getExternLastSyncAddressees() |
517 | { | 517 | { |
518 | Addressee::List results; | 518 | Addressee::List results; |
519 | 519 | ||
520 | Iterator it; | 520 | Iterator it; |
521 | for ( it = begin(); it != end(); ++it ) { | 521 | for ( it = begin(); it != end(); ++it ) { |
522 | if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { | 522 | if ( (*it).uid().left( 20 ) == "last-syncAddressee-" ) { |
523 | if ( (*it).familyName().left(3) == "E: " ) | 523 | if ( (*it).familyName().left(3) == "E: " ) |
524 | results.append( *it ); | 524 | results.append( *it ); |
525 | } | 525 | } |
526 | } | 526 | } |
527 | 527 | ||
528 | return results; | 528 | return results; |
529 | } | 529 | } |
530 | void AddressBook::resetTempSyncStat() | 530 | void AddressBook::resetTempSyncStat() |
531 | { | 531 | { |
532 | 532 | Iterator it; | |
533 | |||
534 | Iterator it; | ||
535 | for ( it = begin(); it != end(); ++it ) { | 533 | for ( it = begin(); it != end(); ++it ) { |
536 | (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL ); | 534 | (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL ); |
537 | } | 535 | } |
538 | 536 | ||
539 | } | 537 | } |
540 | 538 | ||
539 | QStringList AddressBook:: uidList() | ||
540 | { | ||
541 | QStringList results; | ||
542 | Iterator it; | ||
543 | for ( it = begin(); it != end(); ++it ) { | ||
544 | results.append( (*it).uid() ); | ||
545 | } | ||
546 | return results; | ||
547 | } | ||
541 | 548 | ||
542 | 549 | ||
543 | Addressee::List AddressBook::allAddressees() | 550 | Addressee::List AddressBook::allAddressees() |
544 | { | 551 | { |
545 | return d->mAddressees; | 552 | return d->mAddressees; |
546 | } | 553 | } |
547 | 554 | ||
548 | Addressee::List AddressBook::findByName( const QString &name ) | 555 | Addressee::List AddressBook::findByName( const QString &name ) |
549 | { | 556 | { |
550 | Addressee::List results; | 557 | Addressee::List results; |
551 | 558 | ||
552 | Iterator it; | 559 | Iterator it; |
553 | for ( it = begin(); it != end(); ++it ) { | 560 | for ( it = begin(); it != end(); ++it ) { |
554 | if ( name == (*it).realName() ) { | 561 | if ( name == (*it).realName() ) { |
555 | results.append( *it ); | 562 | results.append( *it ); |
556 | } | 563 | } |
557 | } | 564 | } |
558 | 565 | ||
559 | return results; | 566 | return results; |
560 | } | 567 | } |
561 | 568 | ||
562 | Addressee::List AddressBook::findByEmail( const QString &email ) | 569 | Addressee::List AddressBook::findByEmail( const QString &email ) |
563 | { | 570 | { |
564 | Addressee::List results; | 571 | Addressee::List results; |
565 | QStringList mailList; | 572 | QStringList mailList; |
566 | 573 | ||
567 | Iterator it; | 574 | Iterator it; |
568 | for ( it = begin(); it != end(); ++it ) { | 575 | for ( it = begin(); it != end(); ++it ) { |
569 | mailList = (*it).emails(); | 576 | mailList = (*it).emails(); |
570 | for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) { | 577 | for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) { |
571 | if ( email == (*ite) ) { | 578 | if ( email == (*ite) ) { |
572 | results.append( *it ); | 579 | results.append( *it ); |
573 | } | 580 | } |
574 | } | 581 | } |
575 | } | 582 | } |
576 | 583 | ||
577 | return results; | 584 | return results; |
578 | } | 585 | } |
579 | 586 | ||
580 | Addressee::List AddressBook::findByCategory( const QString &category ) | 587 | Addressee::List AddressBook::findByCategory( const QString &category ) |
581 | { | 588 | { |
582 | Addressee::List results; | 589 | Addressee::List results; |
583 | 590 | ||
584 | Iterator it; | 591 | Iterator it; |
585 | for ( it = begin(); it != end(); ++it ) { | 592 | for ( it = begin(); it != end(); ++it ) { |
586 | if ( (*it).hasCategory( category) ) { | 593 | if ( (*it).hasCategory( category) ) { |
587 | results.append( *it ); | 594 | results.append( *it ); |
588 | } | 595 | } |
diff --git a/kabc/addressbook.h b/kabc/addressbook.h index 05225f9..650a638 100644 --- a/kabc/addressbook.h +++ b/kabc/addressbook.h | |||
@@ -245,89 +245,90 @@ class AddressBook : public QObject | |||
245 | 245 | ||
246 | /** | 246 | /** |
247 | Add custom field to address book. | 247 | Add custom field to address book. |
248 | 248 | ||
249 | @param label User visible label of the field. | 249 | @param label User visible label of the field. |
250 | @param category Ored list of field categories. | 250 | @param category Ored list of field categories. |
251 | @param key Identifier used as key for reading and writing the field. | 251 | @param key Identifier used as key for reading and writing the field. |
252 | @param app String used as application key for reading and writing | 252 | @param app String used as application key for reading and writing |
253 | the field. | 253 | the field. |
254 | */ | 254 | */ |
255 | bool addCustomField( const QString &label, int category = Field::All, | 255 | bool addCustomField( const QString &label, int category = Field::All, |
256 | const QString &key = QString::null, | 256 | const QString &key = QString::null, |
257 | const QString &app = QString::null ); | 257 | const QString &app = QString::null ); |
258 | 258 | ||
259 | 259 | ||
260 | /** | 260 | /** |
261 | Add address book resource. | 261 | Add address book resource. |
262 | */ | 262 | */ |
263 | bool addResource( Resource * ); | 263 | bool addResource( Resource * ); |
264 | 264 | ||
265 | /** | 265 | /** |
266 | Remove address book resource. | 266 | Remove address book resource. |
267 | */ | 267 | */ |
268 | bool removeResource( Resource * ); | 268 | bool removeResource( Resource * ); |
269 | 269 | ||
270 | /** | 270 | /** |
271 | Return pointer list of all resources. | 271 | Return pointer list of all resources. |
272 | */ | 272 | */ |
273 | QPtrList<Resource> resources(); | 273 | QPtrList<Resource> resources(); |
274 | 274 | ||
275 | /** | 275 | /** |
276 | Set the @p ErrorHandler, that is used by @ref error() to | 276 | Set the @p ErrorHandler, that is used by @ref error() to |
277 | provide gui-independend error messages. | 277 | provide gui-independend error messages. |
278 | */ | 278 | */ |
279 | void setErrorHandler( ErrorHandler * ); | 279 | void setErrorHandler( ErrorHandler * ); |
280 | 280 | ||
281 | /** | 281 | /** |
282 | Shows gui independend error messages. | 282 | Shows gui independend error messages. |
283 | */ | 283 | */ |
284 | void error( const QString& ); | 284 | void error( const QString& ); |
285 | 285 | ||
286 | /** | 286 | /** |
287 | Query all resources to clean up their lock files | 287 | Query all resources to clean up their lock files |
288 | */ | 288 | */ |
289 | void cleanUp(); | 289 | void cleanUp(); |
290 | 290 | ||
291 | // sync stuff | 291 | // sync stuff |
292 | Addressee::List getExternLastSyncAddressees(); | 292 | Addressee::List getExternLastSyncAddressees(); |
293 | void resetTempSyncStat(); | 293 | void resetTempSyncStat(); |
294 | QStringList uidList(); | ||
294 | 295 | ||
295 | 296 | ||
296 | signals: | 297 | signals: |
297 | /** | 298 | /** |
298 | Emitted, when the address book has changed on disk. | 299 | Emitted, when the address book has changed on disk. |
299 | */ | 300 | */ |
300 | void addressBookChanged( AddressBook * ); | 301 | void addressBookChanged( AddressBook * ); |
301 | 302 | ||
302 | /** | 303 | /** |
303 | Emitted, when the address book has been locked for writing. | 304 | Emitted, when the address book has been locked for writing. |
304 | */ | 305 | */ |
305 | void addressBookLocked( AddressBook * ); | 306 | void addressBookLocked( AddressBook * ); |
306 | 307 | ||
307 | /** | 308 | /** |
308 | Emitted, when the address book has been unlocked. | 309 | Emitted, when the address book has been unlocked. |
309 | */ | 310 | */ |
310 | void addressBookUnlocked( AddressBook * ); | 311 | void addressBookUnlocked( AddressBook * ); |
311 | 312 | ||
312 | protected: | 313 | protected: |
313 | void deleteRemovedAddressees(); | 314 | void deleteRemovedAddressees(); |
314 | void setStandardResource( Resource * ); | 315 | void setStandardResource( Resource * ); |
315 | Resource *standardResource(); | 316 | Resource *standardResource(); |
316 | KRES::Manager<Resource> *resourceManager(); | 317 | KRES::Manager<Resource> *resourceManager(); |
317 | 318 | ||
318 | void init(const QString &config, const QString &family); | 319 | void init(const QString &config, const QString &family); |
319 | 320 | ||
320 | private: | 321 | private: |
321 | //US QPtrList<Resource> mDummy; // Remove in KDE 4 | 322 | //US QPtrList<Resource> mDummy; // Remove in KDE 4 |
322 | 323 | ||
323 | 324 | ||
324 | struct AddressBookData; | 325 | struct AddressBookData; |
325 | AddressBookData *d; | 326 | AddressBookData *d; |
326 | }; | 327 | }; |
327 | 328 | ||
328 | QDataStream &operator<<( QDataStream &, const AddressBook & ); | 329 | QDataStream &operator<<( QDataStream &, const AddressBook & ); |
329 | QDataStream &operator>>( QDataStream &, AddressBook & ); | 330 | QDataStream &operator>>( QDataStream &, AddressBook & ); |
330 | 331 | ||
331 | } | 332 | } |
332 | 333 | ||
333 | #endif | 334 | #endif |