From d7738fdfc685192eb2f8317db6ffad3c246001c8 Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 24 Feb 2006 18:49:56 +0000
Subject: kapi sync

---
(limited to 'kabc/addressee.h')

diff --git a/kabc/addressee.h b/kabc/addressee.h
index aac78dc..0ea1803 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -118,6 +118,7 @@ class Addressee
     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();
@@ -647,6 +648,7 @@ class Addressee
       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;
@@ -731,7 +733,7 @@ class Addressee
       Return list of all addresses.
      */
     Address::List addresses() const;
-
+    Address otherAddress() const;
     /**
       Return list of addresses with a special type.
      */
--
cgit v0.9.0.2