-rw-r--r-- | kabc/addressee.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kabc/addressee.h b/kabc/addressee.h index aac78dc..0ea1803 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -105,32 +105,33 @@ class Addressee | |||
105 | void setID( const QString &, const QString & ); | 105 | void setID( const QString &, const QString & ); |
106 | const QString getID( const QString & ) const; | 106 | const QString getID( const QString & ) const; |
107 | void setCsum( const QString &, const QString & ); | 107 | void setCsum( const QString &, const QString & ); |
108 | const QString getCsum( const QString & ) const ; | 108 | const QString getCsum( const QString & ) const ; |
109 | void removeID(const QString &); | 109 | void removeID(const QString &); |
110 | void computeCsum(const QString &dev); | 110 | void computeCsum(const QString &dev); |
111 | ulong getCsum4List( const QStringList & attList); | 111 | ulong getCsum4List( const QStringList & attList); |
112 | /** | 112 | /** |
113 | Return, if the address book entry is empty. | 113 | Return, if the address book entry is empty. |
114 | */ | 114 | */ |
115 | bool isEmpty() const; | 115 | bool isEmpty() const; |
116 | void setExternalUID( const QString &id ); | 116 | void setExternalUID( const QString &id ); |
117 | const QString externalUID() const; | 117 | const QString externalUID() const; |
118 | void setOriginalExternalUID( const QString &id ); | 118 | void setOriginalExternalUID( const QString &id ); |
119 | QString originalExternalUID() const; | 119 | QString originalExternalUID() const; |
120 | void mergeContact( const Addressee& ad, bool isSubSet ); | 120 | void mergeContact( const Addressee& ad, bool isSubSet ); |
121 | void mergeOLContact( const Addressee& ad ); | ||
121 | void simplifyEmails(); | 122 | void simplifyEmails(); |
122 | void simplifyAddresses(); | 123 | void simplifyAddresses(); |
123 | void simplifyPhoneNumbers(); | 124 | void simplifyPhoneNumbers(); |
124 | void simplifyPhoneNumberTypes(); | 125 | void simplifyPhoneNumberTypes(); |
125 | void makePhoneNumbersOLcompatible(); | 126 | void makePhoneNumbersOLcompatible(); |
126 | int hasPhoneNumberType( int type ); | 127 | int hasPhoneNumberType( int type ); |
127 | bool removeVoice(); | 128 | bool removeVoice(); |
128 | bool containsAdr(const Addressee& addr ); | 129 | bool containsAdr(const Addressee& addr ); |
129 | 130 | ||
130 | /** | 131 | /** |
131 | Set unique identifier. | 132 | Set unique identifier. |
132 | */ | 133 | */ |
133 | void setUid( const QString &uid ); | 134 | void setUid( const QString &uid ); |
134 | /** | 135 | /** |
135 | Return unique identifier. | 136 | Return unique identifier. |
136 | */ | 137 | */ |
@@ -634,32 +635,33 @@ class Addressee | |||
634 | /** | 635 | /** |
635 | Insert a phone number. If a phone number with the same id already exists | 636 | Insert a phone number. If a phone number with the same id already exists |
636 | in this addressee it is not duplicated. | 637 | in this addressee it is not duplicated. |
637 | */ | 638 | */ |
638 | void insertPhoneNumber( const PhoneNumber &phoneNumber ); | 639 | void insertPhoneNumber( const PhoneNumber &phoneNumber ); |
639 | 640 | ||
640 | /** | 641 | /** |
641 | Remove phone number. If no phone number with the given id exists for this | 642 | Remove phone number. If no phone number with the given id exists for this |
642 | addresse nothing happens. | 643 | addresse nothing happens. |
643 | */ | 644 | */ |
644 | void removePhoneNumber( const PhoneNumber &phoneNumber ); | 645 | void removePhoneNumber( const PhoneNumber &phoneNumber ); |
645 | 646 | ||
646 | /** | 647 | /** |
647 | Return phone number, which matches the given type. | 648 | Return phone number, which matches the given type. |
648 | */ | 649 | */ |
649 | PhoneNumber phoneNumber( int type ) const; | 650 | PhoneNumber phoneNumber( int type ) const; |
651 | QString phoneNumberString( int type ) const; | ||
650 | 652 | ||
651 | bool matchPhoneNumber( QRegExp* searchExp ) const; | 653 | bool matchPhoneNumber( QRegExp* searchExp ) const; |
652 | bool matchAddress( QRegExp* searchExp ) const; | 654 | bool matchAddress( QRegExp* searchExp ) const; |
653 | 655 | ||
654 | /** | 656 | /** |
655 | Return list of all phone numbers. | 657 | Return list of all phone numbers. |
656 | */ | 658 | */ |
657 | PhoneNumber::List phoneNumbers() const; | 659 | PhoneNumber::List phoneNumbers() const; |
658 | 660 | ||
659 | /** | 661 | /** |
660 | Return list of phone numbers with a special type. | 662 | Return list of phone numbers with a special type. |
661 | */ | 663 | */ |
662 | PhoneNumber::List phoneNumbers( int type ) const; | 664 | PhoneNumber::List phoneNumbers( int type ) const; |
663 | 665 | ||
664 | /** | 666 | /** |
665 | Return phone number with the given id. | 667 | Return phone number with the given id. |
@@ -718,33 +720,33 @@ class Addressee | |||
718 | 720 | ||
719 | /** | 721 | /** |
720 | Remove address. If no address with the given id exists for this | 722 | Remove address. If no address with the given id exists for this |
721 | addresse nothing happens. | 723 | addresse nothing happens. |
722 | */ | 724 | */ |
723 | void removeAddress( const Address &address ); | 725 | void removeAddress( const Address &address ); |
724 | 726 | ||
725 | /** | 727 | /** |
726 | Return address, which matches the given type. | 728 | Return address, which matches the given type. |
727 | */ | 729 | */ |
728 | Address address( int type ) const; | 730 | Address address( int type ) const; |
729 | 731 | ||
730 | /** | 732 | /** |
731 | Return list of all addresses. | 733 | Return list of all addresses. |
732 | */ | 734 | */ |
733 | Address::List addresses() const; | 735 | Address::List addresses() const; |
734 | 736 | Address otherAddress() const; | |
735 | /** | 737 | /** |
736 | Return list of addresses with a special type. | 738 | Return list of addresses with a special type. |
737 | */ | 739 | */ |
738 | Address::List addresses( int type ) const; | 740 | Address::List addresses( int type ) const; |
739 | 741 | ||
740 | /** | 742 | /** |
741 | Return address with the given id. | 743 | Return address with the given id. |
742 | */ | 744 | */ |
743 | Address findAddress( const QString &id ) const; | 745 | Address findAddress( const QString &id ) const; |
744 | 746 | ||
745 | /** | 747 | /** |
746 | Insert category. If the category already exists it is not duplicated. | 748 | Insert category. If the category already exists it is not duplicated. |
747 | */ | 749 | */ |
748 | void insertCategory( const QString & ); | 750 | void insertCategory( const QString & ); |
749 | 751 | ||
750 | /** | 752 | /** |