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
@@ -109,24 +109,25 @@ class Addressee
     void removeID(const QString &);
     void computeCsum(const QString &dev);
     ulong getCsum4List( const QStringList &  attList);
     /**
       Return, if the address book entry is empty.
      */
     bool isEmpty() const;
     void setExternalUID( const QString &id );
     const QString externalUID() const;
     void setOriginalExternalUID( const QString &id );
     QString originalExternalUID() const;
     void mergeContact(  const Addressee& ad, bool isSubSet ); 
+    void mergeOLContact(  const Addressee& ad ); 
     void simplifyEmails();
     void simplifyAddresses();
     void simplifyPhoneNumbers();
     void simplifyPhoneNumberTypes();
     void makePhoneNumbersOLcompatible();
     int hasPhoneNumberType( int type );
     bool removeVoice();
     bool containsAdr(const Addressee& addr );
     
     /**
       Set unique identifier.
      */
@@ -638,24 +639,25 @@ class Addressee
     void insertPhoneNumber( const PhoneNumber &phoneNumber );
 
     /**
       Remove phone number. If no phone number with the given id exists for this
       addresse nothing happens.
      */
     void removePhoneNumber( const PhoneNumber &phoneNumber );
 
     /**
       Return phone number, which matches the given type.
      */
     PhoneNumber phoneNumber( int type ) const;
+    QString phoneNumberString( int type ) const;
 
     bool matchPhoneNumber( QRegExp* searchExp ) const;
     bool matchAddress( QRegExp* searchExp ) const;
 
     /**
       Return list of all phone numbers.
      */
     PhoneNumber::List phoneNumbers() const;
 
     /**
       Return list of phone numbers with a special type.
      */
@@ -722,25 +724,25 @@ class Addressee
      */
     void removeAddress( const Address &address );
 
     /**
       Return address, which matches the given type.
      */
     Address address( int type ) const;
 
     /**
       Return list of all addresses.
      */
     Address::List addresses() const;
-
+    Address otherAddress() const;
     /**
       Return list of addresses with a special type.
      */
     Address::List addresses( int type ) const;
 
     /**
       Return address with the given id.
      */
     Address findAddress( const QString &id ) const;
 
     /**
       Insert category. If the category already exists it is not duplicated.