more AB sync

6 files changed, 213 insertions, 39 deletions

diff --git a/kabc/address.cpp b/kabc/address.cpp
index c820a6c..5ffe511 100644
--- a/kabc/address.cpp
+++ b/kabc/address.cpp
@@ -1,651 +1,664 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 //US added kglobal.h
 #include <kglobal.h>
 
 #include <kapplication.h>
 #include <kdebug.h>
 #include <klocale.h>
 #include <ksimpleconfig.h>
 #include <kstandarddirs.h>
 
 #include <qfile.h>
 
 #include "address.h"
 
 using namespace KABC;
 
 QMap<QString, QString> Address::mISOMap;
 
 Address::Address() :
   mEmpty( true ), mType( 0 )
 {
   mId = KApplication::randomString( 10 );
 }
 
 Address::Address( int type ) :
   mEmpty( true ), mType( type )
 {
   mId = KApplication::randomString( 10 );
 }
 
 bool Address::operator==( const Address &a ) const
 {
   if ( mPostOfficeBox != a.mPostOfficeBox ) return false;
   if ( mExtended != a.mExtended ) return false;
   if ( mStreet != a.mStreet ) return false;
   if ( mLocality != a.mLocality ) return false;
   if ( mRegion != a.mRegion ) return false;
   if ( mPostalCode != a.mPostalCode ) return false;
   if ( mCountry != a.mCountry ) return false;
   if ( mLabel != a.mLabel ) return false;
   
   return true;
 }
 
 bool Address::operator!=( const Address &a ) const
 {
   return !( a == *this );
 }
 
 bool Address::isEmpty() const
 {
   if ( mPostOfficeBox.isEmpty() &&
        mExtended.isEmpty() &&
        mStreet.isEmpty() &&
        mLocality.isEmpty() &&
        mRegion.isEmpty() &&
        mPostalCode.isEmpty() &&
        mCountry.isEmpty() &&
        mLabel.isEmpty() ) {
     return true;
   }
   return false;
 }
 
+QStringList Address::asList()
+{
+    QStringList result;
+    if ( ! mPostOfficeBox.isEmpty() )result.append(mPostOfficeBox);
+    if ( ! mExtended.isEmpty())result.append(mExtended);
+    if ( ! mStreet.isEmpty())result.append(mStreet);
+    if ( ! mLocality.isEmpty() )result.append(mLocality);
+    if ( ! mRegion.isEmpty())result.append(mRegion);
+    if ( ! mPostalCode.isEmpty())result.append(mPostalCode);
+    if ( ! mCountry.isEmpty())result.append(mCountry);
+    if ( ! mLabel.isEmpty() )result.append(mLabel);
+    return result;
+}
 void Address::clear()
 {
   *this = Address();
 }
 
 void Address::setId( const QString &id )
 {
   mEmpty = false;
 
   mId = id;
 }
 
 QString Address::id() const
 {
   return mId;
 }
 
 void Address::setType( int type )
 {
   mEmpty = false;
 
   mType = type;
 }
 
 int Address::type() const
 {
   return mType;
 }
 
 QString Address::typeLabel() const
 {
   QString label;
   bool first = true;
 
   TypeList list = typeList();
 
   TypeList::Iterator it;
   for ( it = list.begin(); it != list.end(); ++it ) {
     if ( ( type() & (*it) ) && ( (*it) != Pref ) ) {
       label.append( ( first ? "" : "/" ) + typeLabel( *it ) );
       if ( first )
         first = false;
     }
   }
 
   return label;
 }
 
 void Address::setPostOfficeBox( const QString &s )
 {
   mEmpty = false;
 
   mPostOfficeBox = s;
 }
 
 QString Address::postOfficeBox() const
 {
   return mPostOfficeBox;
 }
 
 QString Address::postOfficeBoxLabel()
 {
   return i18n("Post Office Box");
 }
 
 
 void Address::setExtended( const QString &s )
 {
   mEmpty = false;
 
   mExtended = s;
 }
 
 QString Address::extended() const
 {
   return mExtended;
 }
 
 QString Address::extendedLabel()
 {
   return i18n("Extended Address Information");
 }
 
 
 void Address::setStreet( const QString &s )
 {
   mEmpty = false;
 
   mStreet = s;
 }
 
 QString Address::street() const
 {
   return mStreet;
 }
 
 QString Address::streetLabel()
 {
   return i18n("Street");
 }
 
 
 void Address::setLocality( const QString &s )
 {
   mEmpty = false;
 
   mLocality = s;
 }
 
 QString Address::locality() const
 {
   return mLocality;
 }
 
 QString Address::localityLabel()
 {
   return i18n("Locality");
 }
 
 
 void Address::setRegion( const QString &s )
 {
   mEmpty = false;
 
   mRegion = s;
 }
 
 QString Address::region() const
 {
   return mRegion;
 }
 
 QString Address::regionLabel()
 {
   return i18n("Region");
 }
 
 
 void Address::setPostalCode( const QString &s )
 {
   mEmpty = false;
 
   mPostalCode = s;
 }
 
 QString Address::postalCode() const
 {
   return mPostalCode;
 }
 
 QString Address::postalCodeLabel()
 {
   return i18n("Postal Code");
 }
 
 
 void Address::setCountry( const QString &s )
 {
   mEmpty = false;
 
   mCountry = s;
 }
 
 QString Address::country() const
 {
   return mCountry;
 }
 
 QString Address::countryLabel()
 {
   return i18n("Country");
 }
 
 
 void Address::setLabel( const QString &s )
 {
   mEmpty = false;
 
   mLabel = s;
 }
 
 QString Address::label() const
 {
   return mLabel;
 }
 
 QString Address::labelLabel()
 {
   return i18n("Delivery Label");
 }
 
 Address::TypeList Address::typeList()
 {
   TypeList list;
 
   list << Dom << Intl << Postal << Parcel << Home << Work << Pref;
 
   return list;
 }
 
 QString Address::typeLabel( int type )
 {
     QString label;
     if ( type & Dom )
         label +=  i18n("Domestic")+" ";
     if ( type & Intl )
         label +=  i18n("International")+" ";
     if ( type &  Postal )
         label +=  i18n("Postal")+" ";
     if ( type & Parcel  )
         label +=  i18n("Parcel")+" ";
     if ( type & Work )
         label +=  i18n("Work Address", "Work")+" ";
     if ( type & Home )
         label +=  i18n("Home Address", "Home") +" ";
     if ( type & Pref )
         label +=  i18n("Preferred Address", "(p)");
     if ( label.isEmpty() )
         label =  i18n("Other");
     return label;
 
 #if 0
   switch ( type ) {
     case Dom:
       return i18n("Domestic");
       break;
     case Intl:
       return i18n("International");
       break;
     case Postal:
       return i18n("Postal");
       break;
     case Parcel:
       return i18n("Parcel");
       break;
     case Home:
       return i18n("Home Address", "Home");
       break;
     case Work:
       return i18n("Work Address", "Work");
       break;
     case Pref:
       return i18n("Preferred Address");
       break;
     default:
       return i18n("Other");
       break;
   }
 #endif
 }
 
 void Address::dump() const
 {
     qDebug("Address::dump() +++++++++++++++++ ");
 #if 0
   kdDebug(5700) << "  Address {" << endl;
   kdDebug(5700) << "    Id: " << id() << endl;
   kdDebug(5700) << "    Extended: " << extended() << endl;
   kdDebug(5700) << "    Street: " << street() << endl;
   kdDebug(5700) << "    Postal Code: " << postalCode() << endl;
   kdDebug(5700) << "    Locality: " << locality() << endl;
   kdDebug(5700) << "  }" << endl;
 #endif
 }
 
 
 QString Address::formattedAddress( const QString &realName
                                  , const QString &orgaName ) const
 {
   QString ciso;
   QString addrTemplate;
   QString ret;
 
   // **************************************************************
   // LR:  currently we have no iso handling - we will format the address manually here
 
  QString text;
       if ( !street().isEmpty() )
         text += street() + "\n";
 
       if ( !postOfficeBox().isEmpty() )
         text += postOfficeBox() + "\n";
 
       text += locality() + QString(" ") + region();
 
       if ( !postalCode().isEmpty() )
         text += QString(", ") + postalCode();
 
       text += "\n";
 
       if ( !country().isEmpty() )
         text += country() + "\n";
 
       text += extended();
 
 
   return text;
   // **************************************************************
 
   // FIXME: first check for iso-country-field and prefer that one
   if ( !country().isEmpty() ) {
     ciso = countryToISO( country() );
   } else {
     // fall back to our own country
     ciso = KGlobal::locale()->country();
   }
   //qDebug("ciso %s ",ciso.latin1() );
   KSimpleConfig entry( locate( "locale", 
         QString( "l10n/" ) + ciso + QString( "/entry.desktop" ) ) );
   entry.setGroup( "KCM Locale" );
   
   // decide whether this needs special business address formatting
   if ( orgaName.isNull() ) {
     addrTemplate = entry.readEntry( "AddressFormat" );
   } else {
     addrTemplate = entry.readEntry( "BusinessAddressFormat" );
     if ( addrTemplate.isEmpty() )
       addrTemplate = entry.readEntry( "AddressFormat" );
   }
   
   // in the case there's no format found at all, default to what we've always
   // used:
   if ( addrTemplate.isEmpty() ) {
       qDebug("address format database incomplete****************** ");
     kdWarning(5700) << "address format database incomplete "
         << "(no format for locale " << ciso 
         << " found). Using default address formatting." << endl;
     addrTemplate = "%0(%n\\n)%0(%cm\\n)%0(%s\\n)%0(PO BOX %p\\n)%0(%l%w%r)%,%z";
   }
   
   // scan
   parseAddressTemplateSection( addrTemplate, ret, realName, orgaName );
 
   // now add the country line if needed (formatting this time according to
   // the rules of our own system country )
   if ( !country().isEmpty() ) {
     KSimpleConfig entry( locate( "locale", QString( "l10n/" )
           + KGlobal::locale()->country() + QString( "/entry.desktop" ) ) );
     entry.setGroup( "KCM Locale" );
     QString cpos = entry.readEntry( "AddressCountryPosition" );
     if ( "BELOW" == cpos || cpos.isEmpty() ) {
       ret = ret + "\n\n" + country().upper();
     } else if ( "below" == cpos ) {
       ret = ret + "\n\n" + country();
     } else if ( "ABOVE" == cpos ) {
       ret = country().upper() + "\n\n" + ret;
     } else if ( "above" == cpos ) {
       ret = country() + "\n\n" + ret;
     }
   }
   
   return ret;
 }
 
 bool Address::parseAddressTemplateSection( const QString &tsection, 
     QString &result, const QString &realName, const QString &orgaName ) const
 {
   // This method first parses and substitutes any bracketed sections and
   // after that replaces any tags with their values. If a bracketed section
   // or a tag evaluate to zero, they are not just removed but replaced
   // with a placeholder. This is because in the last step conditionals are
   // resolved which depend on information about zero-evaluations.
   result = tsection;
   int stpos = 0;
   bool ret = false;
   
   // first check for brackets that have to be evaluated first 
   int fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
   while ( -1 != fpos ) {
     int bpos1 = fpos + KABC_FMTTAG_purgeempty.length();
     int bpos2;
     // expect opening bracket and find next balanced closing bracket. If 
     // next char is no opening bracket, continue parsing (no valid tag)
     if ( '(' == result[bpos1] ) {
       bpos2 = findBalancedBracket( result, bpos1 );
       if ( -1 != bpos2 ) {
         // we have balanced brackets, recursively parse:
         QString rplstr;
         bool purge = !parseAddressTemplateSection( result.mid( bpos1+1,
                                                    bpos2-bpos1-1 ), rplstr,
                                                    realName, orgaName );
         if ( purge ) {
           // purge -> remove all
           // replace with !_P_!, so conditional tags work later
           result.replace( fpos, bpos2 - fpos + 1, "!_P_!" );
           // leave stpos as it is
         } else {
           // no purge -> replace with recursively parsed string
           result.replace( fpos, bpos2 - fpos + 1, rplstr );
           ret = true;
           stpos = fpos + rplstr.length();
         }
       } else {
         // unbalanced brackets:  keep on parsing (should not happen 
         // and will result in bad formatting)
         stpos = bpos1; 
       }
     }
     fpos = result.find( KABC_FMTTAG_purgeempty, stpos );
   }
 
   // after sorting out all purge tags, we just search'n'replace the rest,
   // keeping track of whether at least one tag evaluates to something.
   // The following macro needs QString for R_FIELD
   // It substitutes !_P_! for empty fields so conditional tags work later
 #define REPLTAG(R_TAG,R_FIELD) \
   if ( result.contains(R_TAG, false) ) { \
     QString rpl = R_FIELD.isEmpty() ? QString("!_P_!") : R_FIELD; \
     result.replace( R_TAG, rpl ); \
     if ( !R_FIELD.isEmpty() ) { \
       ret = true; \
     } \
   }
   REPLTAG( KABC_FMTTAG_realname, realName );
   REPLTAG( KABC_FMTTAG_REALNAME, realName.upper() );
   REPLTAG( KABC_FMTTAG_company, orgaName );
   REPLTAG( KABC_FMTTAG_COMPANY, orgaName.upper() );
   REPLTAG( KABC_FMTTAG_pobox, postOfficeBox() );
   REPLTAG( KABC_FMTTAG_street, street() );
   REPLTAG( KABC_FMTTAG_STREET, street().upper() );
   REPLTAG( KABC_FMTTAG_zipcode, postalCode() );
   REPLTAG( KABC_FMTTAG_location, locality() );
   REPLTAG( KABC_FMTTAG_LOCATION, locality().upper() );
   REPLTAG( KABC_FMTTAG_region, region() );
   REPLTAG( KABC_FMTTAG_REGION, region().upper() );
   result.replace( KABC_FMTTAG_newline, "\n" );
 #undef REPLTAG
  
   // conditional comma 
   fpos = result.find( KABC_FMTTAG_condcomma, 0 );
   while ( -1 != fpos ) {
     QString str1 = result.mid( fpos - 5, 5 );
     QString str2 = result.mid( fpos + 2, 5 );
     if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
       result.replace( fpos, 2, ", " );
     } else {
       result.remove( fpos, 2 );
     }
     fpos = result.find( KABC_FMTTAG_condcomma, fpos );
   }
   // conditional whitespace
   fpos = result.find( KABC_FMTTAG_condwhite, 0 );
   while ( -1 != fpos ) {
     QString str1 = result.mid( fpos - 5, 5 );
     QString str2 = result.mid( fpos + 2, 5 );
     if ( str1 != "!_P_!" && str2 != "!_P_!" ) {
       result.replace( fpos, 2, " " );
     } else {
       result.remove( fpos, 2 );
     }
     fpos = result.find( KABC_FMTTAG_condwhite, fpos );
   }
 
   // remove purged:
 //US my QT version does not support remove. So lets do it the old fashioned way.  
 //US  result.remove( "!_P_!" );
   int n = result.find("!_P_!");
   if (n >= 0)
       result.remove( n, 5 );
 
   return ret;
 }
 
 int Address::findBalancedBracket( const QString &tsection, int pos ) const
 {
   int balancecounter = 0;
   for( unsigned int i = pos + 1; i < tsection.length(); i++ ) {
     if ( ')' == tsection.at(i) && 0 == balancecounter ) {
       // found end of brackets
       return i;
     } else
     if ( '(' == tsection.at(i) ) {
       // nested brackets
       balancecounter++;
     }
   }
   return -1;
 }
 
 QString Address::countryToISO( const QString &cname )
 {
   // we search a map file for translations from country names to
   // iso codes, storing caching things in a QMap for faster future 
   // access.
 /*US
   
   QString isoCode = mISOMap[ cname ];
   if ( !isoCode.isEmpty() )
     return isoCode;
 
   QString mapfile = KGlobal::dirs()->findResource( "data", 
           QString::fromLatin1( "kabc/countrytransl.map" ) );
 
   QFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
     QTextStream s( &file );
     QString strbuf = s.readLine();
     while( !strbuf.isNull() ) {
       if ( strbuf.startsWith( cname ) ) {
         int index = strbuf.findRev('\t');
         strbuf = strbuf.mid(index+1, 2);
         file.close();
         mISOMap[ cname ] = strbuf;
         return strbuf;
       }
       strbuf = s.readLine();
     }
     file.close();
   }
 */  
   // fall back to system country
   mISOMap[ cname ] = KGlobal::locale()->country();
   return KGlobal::locale()->country();
 }
 
 QString Address::ISOtoCountry( const QString &ISOname )
 {
 /*US
   // get country name from ISO country code (e.g. "no" -> i18n("Norway"))
   QString mapfile = KGlobal::dirs()->findResource( "data", 
           QString::fromLatin1( "kabc/countrytransl.map" ) );
 
 kdWarning() << "MAPFILE : " << mapfile << endl;
   QFile file( mapfile );
   if ( file.open( IO_ReadOnly ) ) {
     QTextStream s( &file );
     QString searchStr = "\t" + ISOname.simplifyWhiteSpace().lower();
 kdWarning() << "Suche : " << searchStr << endl;
     QString strbuf = s.readLine();
     int pos;
     while( !strbuf.isNull() ) {
       if ( (pos=strbuf.find( searchStr )) != -1 ) {
         file.close();
         return i18n(strbuf.left(pos).utf8());
       }
       strbuf = s.readLine();
     }
     file.close();
   }
 */
   return ISOname;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const Address &addr )
 {
     return s << addr.mId << addr.mType << addr.mPostOfficeBox <<
             addr.mExtended << addr.mStreet << addr.mLocality <<
             addr.mRegion << addr.mPostalCode << addr.mCountry <<
             addr.mLabel;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Address &addr )
 {
     s >> addr.mId >> addr.mType >> addr.mPostOfficeBox >> addr.mExtended >>
             addr.mStreet >> addr.mLocality >> addr.mRegion >>
             addr.mPostalCode >> addr.mCountry >> addr.mLabel;
 
     addr.mEmpty = false;
 
     return s;
 }
diff --git a/kabc/address.h b/kabc/address.h
index ad132a7..6b53c7e 100644
--- a/kabc/address.h
+++ b/kabc/address.h
@@ -1,346 +1,347 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESS_H
 #define KABC_ADDRESS_H
 
 #include <qmap.h>
 #include <qstring.h>
 #include <qvaluelist.h>
 
 // template tags for address formatting localization
 #define KABC_FMTTAG_realname   QString("%n")
 #define KABC_FMTTAG_REALNAME   QString("%N")
 #define KABC_FMTTAG_company    QString("%cm")
 #define KABC_FMTTAG_COMPANY    QString("%CM")
 #define KABC_FMTTAG_pobox      QString("%p")
 #define KABC_FMTTAG_street     QString("%s")
 #define KABC_FMTTAG_STREET     QString("%S")
 #define KABC_FMTTAG_zipcode    QString("%z")
 #define KABC_FMTTAG_location   QString("%l")
 #define KABC_FMTTAG_LOCATION   QString("%L")
 #define KABC_FMTTAG_region     QString("%r")
 #define KABC_FMTTAG_REGION     QString("%R")
 #define KABC_FMTTAG_newline    QString("\\n")
 #define KABC_FMTTAG_condcomma  QString("%,")
 #define KABC_FMTTAG_condwhite  QString("%w")
 #define KABC_FMTTAG_purgeempty QString("%0")
 
 namespace KABC {
 
 /**
   @short Postal address information.
   
   This class represents information about a postal address.
 */
 class Address
 {
     friend QDataStream &operator<<( QDataStream &, const Address & );
     friend QDataStream &operator>>( QDataStream &, Address & );
 
   public:
     /**
       List of addresses.
     */
     typedef QValueList<Address> List;
     typedef QValueList<int> TypeList;
   
     /**
       Address types:
      
       @li @p Dom -    domestic
       @li @p Intl -   international
       @li @p Postal - postal
       @li @p Parcel - parcel
       @li @p Home -   home address
       @li @p Work -   address at work
       @li @p Pref -   preferred address
     */
     enum Type { Dom = 1, Intl = 2, Postal = 4, Parcel = 8, Home = 16, Work = 32,
            Pref = 64 };
 
     /**
       Constructor that creates an empty Address, which is initialized
       with a unique id (see @ref id()).
     */
     Address();
   
     /**
       This is like @ref Address() just above, with the difference
       that you can specify the type.
     */
     Address( int );
 
     bool operator==( const Address & ) const;
     bool operator!=( const Address & ) const;
   
     /**
       Returns true, if the address is empty.
     */
     bool isEmpty() const;
 
     /**
       Clears all entries of the address.
     */
     void clear();
+    QStringList asList();
 
     /**
       Sets the unique id.
     */
     void setId( const QString & );
 
     /*
       Returns the unique id.
     */
     QString id() const;
 
     /**
       Sets the type of address. See enum for definiton of types. 
      
       @param type type, can be a bitwise or of multiple types.
     */
     void setType( int type );
 
     /**
       Returns the type of address. Can be a bitwise or of multiple types.
     */
     int type() const;
 
     /**
       Returns a translated string of all types the address has.
     */
     QString typeLabel() const;
 
     /**
       Sets the post office box.
     */
     void setPostOfficeBox( const QString & );
 
     /**
       Returns the post office box.
     */
     QString postOfficeBox() const;
 
     /**
       Returns the translated label for post office box field.
     */
     static QString postOfficeBoxLabel();
 
     /**
       Sets the extended address information.
     */
     void setExtended( const QString & );
 
     /**
       Returns the extended address information.
     */
     QString extended() const;
 
     /**
       Returns the translated label for extended field.
     */
     static QString extendedLabel();
     
     /**
       Sets the street (including number).
     */
     void setStreet( const QString & );
 
     /**
       Returns the street.
     */
     QString street() const;
 
     /**
       Returns the translated label for street field.
     */
     static QString streetLabel();
 
     /**
       Sets the locality, e.g. city.
     */
     void setLocality( const QString & );
 
     /**
       Returns the locality.
     */
     QString locality() const;
 
     /**
       Returns the translated label for locality field.
     */
     static QString localityLabel();
 
     /**
       Sets the region, e.g. state.
     */
     void setRegion( const QString & );
 
     /**
       Returns the region.
     */
     QString region() const;
 
     /**
       Returns the translated label for region field.
     */
     static QString regionLabel();
  
     /**
       Sets the postal code.
     */
     void setPostalCode( const QString & );
 
     /**
       Returns the postal code.
     */
     QString postalCode() const;
 
     /**
       Returns the translated label for postal code field.
     */
     static QString postalCodeLabel();
 
     /**
       Sets the country.
     */
     void setCountry( const QString & );
 
     /**
       Returns the country.
     */
     QString country() const;
 
     /**
       Returns the translated label for country field.
     */
     static QString countryLabel();
 
     /**
       Sets the delivery label. This is the literal text to be used as label.
     */
     void setLabel( const QString & );
 
     /**
       Returns the delivery label.
     */
     QString label() const;
 
     /**
       Returns the translated label for delivery label field.
     */
     static QString labelLabel();
 
     /**
       Returns the list of available types.
     */
     static TypeList typeList();
 
     /**
       Returns the translated label for a special type.
     */
     static QString typeLabel( int type );
 
     /**
       Used for debug output.
     */
     void dump() const;
 
     /** 
       Returns this address formatted according to the country-specific
       address formatting rules. The formatting rules applied depend on 
       either the addresses {@link #country country} field, or (if the 
       latter is empty) on the system country setting. If companyName is
       provided, an available business address format will be preferred.
       
       @param realName   the formatted name of the contact
       @param orgaName   the name of the organization or company
       @return           the formatted address (containing newline characters)
     */
     QString formattedAddress( const QString &realName=QString::null
                             , const QString &orgaName=QString::null ) const;
 
     /**
       Returns ISO code for a localized country name. Only localized country
       names will be understood. This might be replaced by a KLocale method in
       the future.
       @param cname  name of the country
       @return       two digit ISO code
     */
     static QString countryToISO( const QString &cname );
 
     /**
       Returns a localized country name for a ISO code. 
       This might be replaced by a KLocale method in the future.
       @param ISOname two digit ISO code
       @return        localized name of the country
       @since 3.2
     */
     static QString ISOtoCountry( const QString &ISOname );
 
   private:
     /** 
       Parses a snippet of an address template
       @param tsection   the template string to be parsed
       @param result     QString reference in which the result will be stored
       @return           true if at least one tag evaluated positively, else false
     */
     bool parseAddressTemplateSection( const QString &tsection
                                     ,       QString &result
                                     , const QString &realName
                                     , const QString &orgaName ) const;
 
     /** 
       Finds the balanced closing bracket starting from the opening bracket at 
       pos in tsection.
       @return  position of closing bracket, -1 for unbalanced brackets
     */
     int  findBalancedBracket( const QString &tsection, int pos ) const;
 
     bool mEmpty;
   
     QString mId;
     int mType;
   
     QString mPostOfficeBox;
     QString mExtended;
     QString mStreet;
     QString mLocality;
     QString mRegion;
     QString mPostalCode;
     QString mCountry;
     QString mLabel;
 
     static QMap<QString, QString> mISOMap;
 };
 
 QDataStream &operator<<( QDataStream &, const Address & );
 QDataStream &operator>>( QDataStream &, Address & );
 
 }
 
 #endif
diff --git a/kabc/addressbook.cpp b/kabc/addressbook.cpp
index 16e1653..ec9f893 100644
--- a/kabc/addressbook.cpp
+++ b/kabc/addressbook.cpp
@@ -1,788 +1,849 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 /*US
 
 #include <qfile.h>
 #include <qregexp.h>
 #include <qtimer.h>
 
 #include <kapplication.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
 
 #include "errorhandler.h"
 */
 #include <qptrlist.h>
 
 #include <kglobal.h>
 #include <klocale.h>
 #include <kdebug.h>
 #include <libkcal/syncdefines.h>
 #include "addressbook.h"
 #include "resource.h"
 
 //US #include "addressbook.moc"
 
 using namespace KABC;
 
 struct AddressBook::AddressBookData
 {
   Addressee::List mAddressees;
   Addressee::List mRemovedAddressees;
   Field::List mAllFields;
   KConfig *mConfig;
   KRES::Manager<Resource> *mManager;
 //US  ErrorHandler *mErrorHandler;
 };
 
 struct AddressBook::Iterator::IteratorData
 {
   Addressee::List::Iterator mIt;
 };
 
 struct AddressBook::ConstIterator::ConstIteratorData
 {
   Addressee::List::ConstIterator mIt;
 };
 
 AddressBook::Iterator::Iterator()
 {
   d = new IteratorData;
 }
 
 AddressBook::Iterator::Iterator( const AddressBook::Iterator &i )
 {
   d = new IteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator=( const AddressBook::Iterator &i )
 {
   if( this == &i ) return *this; // guard against self assignment
   delete d; // delete the old data the Iterator was completely constructed before
   d = new IteratorData;
   d->mIt = i.d->mIt;
   return *this;
 }
 
 AddressBook::Iterator::~Iterator()
 {
   delete d;
 }
 
 const Addressee &AddressBook::Iterator::operator*() const
 {
   return *(d->mIt);
 }
 
 Addressee &AddressBook::Iterator::operator*()
 {
   return *(d->mIt);
 }
 
 Addressee *AddressBook::Iterator::operator->()
 {
   return &(*(d->mIt));
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::Iterator &AddressBook::Iterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::Iterator::operator==( const Iterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::Iterator::operator!=( const Iterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::ConstIterator::ConstIterator()
 {
   d = new ConstIteratorData;
 }
 
 AddressBook::ConstIterator::ConstIterator( const AddressBook::ConstIterator &i )
 {
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator=( const AddressBook::ConstIterator &i )
 {
   if( this  == &i ) return *this; // guard for self assignment
   delete d; // delete the old data because the Iterator was really constructed before
   d = new ConstIteratorData;
   d->mIt = i.d->mIt;
   return *this;
 }
 
 AddressBook::ConstIterator::~ConstIterator()
 {
   delete d;
 }
 
 const Addressee &AddressBook::ConstIterator::operator*() const
 {
   return *(d->mIt);
 }
 
 const Addressee* AddressBook::ConstIterator::operator->() const
 {
   return &(*(d->mIt));
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++()
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator++(int)
 {
   (d->mIt)++;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--()
 {
   (d->mIt)--;
   return *this;
 }
 
 AddressBook::ConstIterator &AddressBook::ConstIterator::operator--(int)
 {
   (d->mIt)--;
   return *this;
 }
 
 bool AddressBook::ConstIterator::operator==( const ConstIterator &it )
 {
   return ( d->mIt == it.d->mIt );
 }
 
 bool AddressBook::ConstIterator::operator!=( const ConstIterator &it )
 {
   return ( d->mIt != it.d->mIt );
 }
 
 
 AddressBook::AddressBook()
 {
   init(0, "contact");
 }
 
 AddressBook::AddressBook( const QString &config )
 {
   init(config, "contact");
 }
 
 AddressBook::AddressBook( const QString &config, const QString &family )
 {
   init(config, family);
 
 }
 
 // the default family is "contact"
 void AddressBook::init(const QString &config, const QString &family )
 {
+  blockLSEchange = false;
   d = new AddressBookData;
   QString fami = family;
   qDebug("new ab ");
   if (config != 0) {
       qDebug("config != 0 ");
       if ( family == "syncContact" ) {
           qDebug("creating sync config ");
           fami = "contact";
           KConfig* con = new KConfig( locateLocal("config", "syncContactrc") );
           con->setGroup( "General" );
           con->writeEntry( "ResourceKeys", QString("sync") );
           con->writeEntry( "Standard", QString("sync") );
           con->setGroup( "Resource_sync" );
           con->writeEntry( "FileFormat", QString("vcard") );
           con->writeEntry( "FileName", config );
           con->writeEntry( "ResourceIdentifier", QString("sync") );
           con->writeEntry( "ResourceName", QString("sync_res") );
           con->writeEntry( "ResourceType", QString("file") );
           //con->sync();
           d->mConfig = con;
       }
       else
     d->mConfig = new KConfig( locateLocal("config", config) );
 //    qDebug("AddressBook::init 1  config=%s",config.latin1() );
   }
   else {
     d->mConfig = 0;
 //    qDebug("AddressBook::init 1  config=0");
   }
 
 //US  d->mErrorHandler = 0;
   d->mManager = new KRES::Manager<Resource>( fami, false );
   d->mManager->readConfig( d->mConfig );
   if ( family == "syncContact" ) {
       KRES::Manager<Resource> *manager = d->mManager;
       KRES::Manager<Resource>::ActiveIterator it;
       for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
           (*it)->setAddressBook( this );
           if ( !(*it)->open() )
               error( QString( "Unable to open resource '%1'!" ).arg( (*it)->resourceName() ) );
       }
       Resource *res = standardResource();
       if ( !res ) {
           qDebug("ERROR: no standard resource");
           res = manager->createResource( "file" );
           if ( res )
               {
                   addResource( res );
               }
           else
               qDebug(" No resource available!!!");
       }
       setStandardResource( res );
       manager->writeConfig();
   }
   addCustomField( i18n( "Department" ), KABC::Field::Organization,
                                 "X-Department", "KADDRESSBOOK" );
   addCustomField( i18n( "Profession" ), KABC::Field::Organization,
                                 "X-Profession", "KADDRESSBOOK" );
   addCustomField( i18n( "Assistant's Name" ), KABC::Field::Organization,
                                 "X-AssistantsName", "KADDRESSBOOK" );
   addCustomField( i18n( "Manager's Name" ), KABC::Field::Organization,
                                 "X-ManagersName", "KADDRESSBOOK" );
   addCustomField( i18n( "Spouse's Name" ), KABC::Field::Personal,
                                 "X-SpousesName", "KADDRESSBOOK" );
   addCustomField( i18n( "Office" ), KABC::Field::Personal,
                                 "X-Office", "KADDRESSBOOK" );
   addCustomField( i18n( "IM Address" ), KABC::Field::Personal,
                                 "X-IMAddress", "KADDRESSBOOK" );
   addCustomField( i18n( "Anniversary" ), KABC::Field::Personal,
                                 "X-Anniversary", "KADDRESSBOOK" );
 
   //US added this field to become compatible with Opie/qtopia addressbook
   // values can be "female" or "male" or "". An empty field represents undefined.
   addCustomField( i18n( "Gender" ), KABC::Field::Personal,
                                 "X-Gender", "KADDRESSBOOK" );
   addCustomField( i18n( "Children" ), KABC::Field::Personal,
                                 "X-Children", "KADDRESSBOOK" );
   addCustomField( i18n( "FreeBusyUrl" ), KABC::Field::Personal,
                                 "X-FreeBusyUrl", "KADDRESSBOOK" );
   addCustomField( i18n( "ExternalID" ), KABC::Field::Personal,
                                 "X-ExternalID", "KADDRESSBOOK" );
 }
 
 AddressBook::~AddressBook()
 {
   delete d->mConfig; d->mConfig = 0;
   delete d->mManager; d->mManager = 0;
 //US  delete d->mErrorHandler; d->mErrorHandler = 0;
   delete d; d = 0;
 }
 
 bool AddressBook::load()
 {
 
 
   clear();
 
   KRES::Manager<Resource>::ActiveIterator it;
   bool ok = true;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     if ( !(*it)->load() ) {
       error( i18n("Unable to load resource '%1'").arg( (*it)->resourceName() ) );
       ok = false;
     }
 
   // mark all addressees as unchanged
   Addressee::List::Iterator addrIt;
   for ( addrIt = d->mAddressees.begin(); addrIt != d->mAddressees.end(); ++addrIt )
     (*addrIt).setChanged( false );
 
+  blockLSEchange = true;
   return ok;
 }
 
 bool AddressBook::save( Ticket *ticket )
 {
   kdDebug(5700) << "AddressBook::save()"<< endl;
 
   if ( ticket->resource() ) {
     deleteRemovedAddressees();
     return ticket->resource()->save( ticket );
   }
 
   return false;
 }
 bool AddressBook::saveAB()
 {
   bool ok = true;
 
   deleteRemovedAddressees();
 
   KRES::Manager<Resource>::ActiveIterator it;
   KRES::Manager<Resource> *manager = d->mManager;
   for ( it = manager->activeBegin(); it != manager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() ) {
       Ticket *ticket = requestSaveTicket( *it );
 //        qDebug("StdAddressBook::save '%s'", (*it)->resourceName().latin1() );
       if ( !ticket ) {
         error( i18n( "Unable to save to resource '%1'. It is locked." )
                    .arg( (*it)->resourceName() ) );
         return false;
       }
 
       //if ( !save( ticket ) ) 
       if ( ticket->resource() ) {
           if ( ! ticket->resource()->save( ticket )  )
               ok = false;
       } else 
           ok = false;
           
     }
   }
   return ok;
 }
 
 AddressBook::Iterator AddressBook::begin()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::begin() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.begin();
   return it;
 }
 
 AddressBook::Iterator AddressBook::end()
 {
   Iterator it = Iterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 AddressBook::ConstIterator AddressBook::end() const
 {
   ConstIterator it = ConstIterator();
   it.d->mIt = d->mAddressees.end();
   return it;
 }
 
 void AddressBook::clear()
 {
   d->mAddressees.clear();
 }
 
 Ticket *AddressBook::requestSaveTicket( Resource *resource )
 {
   kdDebug(5700) << "AddressBook::requestSaveTicket()" << endl;
 
   if ( !resource )
   {
     qDebug("AddressBook::requestSaveTicket no resource" );
     resource = standardResource();
   }
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( (*it) == resource ) {
       if ( (*it)->readOnly() || !(*it)->isOpen() )
         return 0;
       else
         return (*it)->requestSaveTicket();
     }
   }
 
   return 0;
 }
 
 void AddressBook::insertAddressee( const Addressee &a, bool setRev )
 {
-  Addressee::List::Iterator it;
-  for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
-    if ( a.uid() == (*it).uid() ) {
-        if ( setRev && (*it).uid().left( 19 ) == QString("last-syncAddressee-") ) {
-            return;
-        }
-      bool changed = false;
-      Addressee addr = a;
-      if ( addr != (*it) )
-        changed = true;
-
-      (*it) = a;
-      if ( (*it).resource() == 0 )
-        (*it).setResource( standardResource() );
-
-      if ( changed ) {
-          if ( setRev ) {
+    if ( blockLSEchange && setRev && a.uid().left( 19 ) == QString("last-syncAddressee-") ) {
+        return;
+    }
+    bool found = false;
+    Addressee::List::Iterator it;
+    for ( it = d->mAddressees.begin(); it != d->mAddressees.end(); ++it ) {
+        if ( a.uid() == (*it).uid() ) {
+       
+            bool changed = false;
+            Addressee addr = a;
+            if ( addr != (*it) )
+                changed = true;
+
+            (*it) = a;
+            if ( (*it).resource() == 0 )
+                (*it).setResource( standardResource() );
+
+            if ( changed ) {
+                if ( setRev ) {
               
-              // get rid of micro seconds
-              QDateTime dt =  QDateTime::currentDateTime();
-              QTime t =  dt.time();
-              dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
-              (*it).setRevision( dt ); 
-          }
-        (*it).setChanged( true );
-      }
-
-      return;
+                    // get rid of micro seconds
+                    QDateTime dt =  QDateTime::currentDateTime();
+                    QTime t =  dt.time();
+                    dt.setTime( QTime (t.hour (), t.minute (), t.second () )  );
+                    (*it).setRevision( dt ); 
+                }
+                (*it).setChanged( true );
+            }
+
+            found = true;
+        } else {
+            if ( (*it).uid() == QString("last-syncAddressee-") ) {
+                QString name = (*it).uid().mid( 19 );
+                Addressee b = a;
+                QString id = b.getID( name );
+                if (  ! id.isEmpty() ) {
+                    QString des = (*it).note();
+                    int startN;
+                    if( (startN = des.find( id ) ) >= 0 ) {
+                        int endN = des.find( ",", startN+1 );
+                        des =  des.left( startN ) + des.mid( endN+1 );
+                        (*it).setNote( des );
+                    }
+                }
+            }
+        }
     }
-  }
-  d->mAddressees.append( a );
-  Addressee& addr = d->mAddressees.last();
-  if ( addr.resource() == 0 )
-    addr.setResource( standardResource() );
+    if ( found )
+        return;
+    d->mAddressees.append( a );
+    Addressee& addr = d->mAddressees.last();
+    if ( addr.resource() == 0 )
+        addr.setResource( standardResource() );
 
-  addr.setChanged( true );
+    addr.setChanged( true );
 }
 
 void AddressBook::removeAddressee( const Addressee &a )
 {
   Iterator it;
+  Iterator it2;
+  bool found = false;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
-      removeAddressee( it );
-      return;
+        found = true;
+        it2 = it;
+    } else {
+        if ( (*it).uid() == QString("last-syncAddressee-") ) {
+            QString name = (*it).uid().mid( 19 );
+            Addressee b = a;
+            QString id = b.getID( name );
+            if ( ! id.isEmpty() ) {
+                QString des = (*it).note();
+                if( des.find( id ) < 0 ) {
+                    des +=   id  + ",";
+                    (*it).setNote( des );
+                }
+            }
+        }
+        
     }
   }
+
+  if ( found )
+      removeAddressee( it2 );
+      
+}
+
+void AddressBook::removeDeletedAddressees()
+{
+    deleteRemovedAddressees();
+    Iterator it = begin();
+    Iterator it2 ;
+    QDateTime dt ( QDate( 2004,1,1) );
+    while ( it != end() ) {
+        (*it).setRevision( dt );
+        if ( (*it).tempSyncStat() == SYNC_TEMPSTATE_DELETE ) {
+            it2 = it;
+            ++it;
+            removeAddressee( it2 );
+        } else
+            ++it;
+    }
+    deleteRemovedAddressees();
 }
 
 void AddressBook::removeAddressee( const Iterator &it )
 {
   d->mRemovedAddressees.append( (*it) );
   d->mAddressees.remove( it.d->mIt );
 }
 
 AddressBook::Iterator AddressBook::find( const Addressee &a )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( a.uid() == (*it).uid() ) {
       return it;
     }
   }
   return end();
 }
 
 Addressee AddressBook::findByUid( const QString &uid )
 {
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( uid == (*it).uid() ) {
       return *it;
     }
   }
   return Addressee();
 }
+#if 0
 Addressee::List AddressBook::getExternLastSyncAddressees()
 {
     Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).uid().left( 19 ) == "last-syncAddressee-"  ) {
-        if ( (*it).familyName().left(3) == "E: " )
+        if ( (*it).familyName().left(4) == "!E: " )
             results.append( *it );
     }
   }
 
   return results;
 }
+#endif
 void AddressBook::resetTempSyncStat()
 {
     Iterator it;
   for ( it = begin(); it != end(); ++it ) {
       (*it).setTempSyncStat ( SYNC_TEMPSTATE_INITIAL );
   }
 
 }
  
 QStringList AddressBook:: uidList()
 {
     QStringList results;
     Iterator it;
     for ( it = begin(); it != end(); ++it ) {
         results.append( (*it).uid() );
     }
     return results;
 }
 
 
 Addressee::List AddressBook::allAddressees()
 {
    return d->mAddressees; 
  
 }
 
 Addressee::List AddressBook::findByName( const QString &name )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( name == (*it).realName() ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByEmail( const QString &email )
 {
   Addressee::List results;
   QStringList mailList;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     mailList = (*it).emails();
     for ( QStringList::Iterator ite = mailList.begin(); ite != mailList.end(); ++ite ) {
       if ( email == (*ite) ) {
         results.append( *it );
       }
     }
   }
 
   return results;
 }
 
 Addressee::List AddressBook::findByCategory( const QString &category )
 {
   Addressee::List results;
 
   Iterator it;
   for ( it = begin(); it != end(); ++it ) {
     if ( (*it).hasCategory( category) ) {
       results.append( *it );
     }
   }
 
   return results;
 }
 
 void AddressBook::dump() const
 {
   kdDebug(5700) << "AddressBook::dump() --- begin ---" << endl;
 
   ConstIterator it;
   for( it = begin(); it != end(); ++it ) {
     (*it).dump();
   }
 
   kdDebug(5700) << "AddressBook::dump() ---  end  ---" << endl;
 }
 
 QString AddressBook::identifier()
 {
   QStringList identifier;
 
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( !(*it)->identifier().isEmpty() )
       identifier.append( (*it)->identifier() );
   }
 
   return identifier.join( ":" );
 }
 
 Field::List AddressBook::fields( int category )
 {
   if ( d->mAllFields.isEmpty() ) {
     d->mAllFields = Field::allFields();
   }
 
   if ( category == Field::All ) return d->mAllFields;
 
   Field::List result;
   Field::List::ConstIterator it;
   for( it = d->mAllFields.begin(); it != d->mAllFields.end(); ++it ) {
     if ( (*it)->category() & category ) result.append( *it );
   }
 
   return result;
 }
 
 bool AddressBook::addCustomField( const QString &label, int category,
                                   const QString &key, const QString &app )
 {
   if ( d->mAllFields.isEmpty() ) {
     d->mAllFields = Field::allFields();
   }
 //US  QString a = app.isNull() ? KGlobal::instance()->instanceName() : app;
   QString a = app.isNull() ? KGlobal::getAppName() : app;
 
   QString k = key.isNull() ? label : key;
 
   Field *field = Field::createCustomField( label, category, k, a );
 
   if ( !field ) return false;
 
   d->mAllFields.append( field );
 
   return true;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const AddressBook &ab )
 {
   if (!ab.d) return s;
 
   return s << ab.d->mAddressees;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, AddressBook &ab )
 {
   if (!ab.d) return s;
 
   s >> ab.d->mAddressees;
 
   return s;
 }
 
 bool AddressBook::addResource( Resource *resource )
 {
   if ( !resource->open() ) {
     kdDebug(5700) << "AddressBook::addResource(): can't add resource" << endl;
     return false;
   }
 
   resource->setAddressBook( this );
 
   d->mManager->add( resource );
   return true;
 }
 
 bool AddressBook::removeResource( Resource *resource )
 {
   resource->close();
 
   if ( resource == standardResource() )
     d->mManager->setStandardResource( 0 );
 
   resource->setAddressBook( 0 );
 
   d->mManager->remove( resource );
   return true;
 }
 
 QPtrList<Resource> AddressBook::resources()
 {
   QPtrList<Resource> list;
 
 //  qDebug("AddressBook::resources() 1");
 
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it )
     list.append( *it );
 
   return list;
 }
 
 /*US
 void AddressBook::setErrorHandler( ErrorHandler *handler )
 {
   delete d->mErrorHandler;
   d->mErrorHandler = handler;
 }
 */
 
 void AddressBook::error( const QString& msg )
 {
 /*US
   if ( !d->mErrorHandler ) // create default error handler
     d->mErrorHandler = new ConsoleErrorHandler;
 
   if ( d->mErrorHandler )
     d->mErrorHandler->error( msg );
   else
     kdError(5700) << "no error handler defined" << endl;
 */
     kdDebug(5700) << "msg" << endl;
     qDebug(msg);
 }
 
 void AddressBook::deleteRemovedAddressees()
 {
   Addressee::List::Iterator it;
   for ( it = d->mRemovedAddressees.begin(); it != d->mRemovedAddressees.end(); ++it ) {
     Resource *resource = (*it).resource();
     if ( resource && !resource->readOnly() && resource->isOpen() )
       resource->removeAddressee( *it );
   }
 
   d->mRemovedAddressees.clear();
 }
 
 void AddressBook::setStandardResource( Resource *resource )
 {
 //  qDebug("AddressBook::setStandardResource 1");
   d->mManager->setStandardResource( resource );
 }
 
 Resource *AddressBook::standardResource()
 {
   return d->mManager->standardResource();
 }
 
 KRES::Manager<Resource> *AddressBook::resourceManager()
 {
   return d->mManager;
 }
 
 void AddressBook::cleanUp()
 {
   KRES::Manager<Resource>::ActiveIterator it;
   for ( it = d->mManager->activeBegin(); it != d->mManager->activeEnd(); ++it ) {
     if ( !(*it)->readOnly() && (*it)->isOpen() )
       (*it)->cleanUp();
   }
 }
diff --git a/kabc/addressbook.h b/kabc/addressbook.h
index 253de68..2f2678b 100644
--- a/kabc/addressbook.h
+++ b/kabc/addressbook.h
@@ -1,334 +1,336 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESSBOOK_H
 #define KABC_ADDRESSBOOK_H
 
 #include <qobject.h>
 
 #include <kresources/manager.h>
 #include <qptrlist.h>
 
 #include "addressee.h"
 #include "field.h"
 
 namespace KABC {
 
 class ErrorHandler;
 class Resource;
 class Ticket;
 
 /**
   @short Address Book
 
   This class provides access to a collection of address book entries.
 */
 class AddressBook : public QObject
 {
     Q_OBJECT
 
     friend QDataStream &operator<<( QDataStream &, const AddressBook & );
     friend QDataStream &operator>>( QDataStream &, AddressBook & );
     friend class StdAddressBook;
 
   public:
     /**
       @short Address Book Iterator
 
       This class provides an iterator for address book entries.
     */
     class Iterator
     {
       public:
         Iterator();
         Iterator( const Iterator & );
               ~Iterator();
 
               Iterator &operator=( const Iterator & );
         const Addressee &operator*() const;
         Addressee &operator*();
         Addressee* operator->();
         Iterator &operator++();
         Iterator &operator++(int);
         Iterator &operator--();
         Iterator &operator--(int);
         bool operator==( const Iterator &it );
         bool operator!=( const Iterator &it );
 
               struct IteratorData;
         IteratorData *d;
     };
 
     /**
       @short Address Book Const Iterator
 
       This class provides a const iterator for address book entries.
     */
     class ConstIterator
     {
       public:
         ConstIterator();
         ConstIterator( const ConstIterator & );
               ~ConstIterator();
 
               ConstIterator &operator=( const ConstIterator & );
         const Addressee &operator*() const;
         const Addressee* operator->() const;
         ConstIterator &operator++();
         ConstIterator &operator++(int);
         ConstIterator &operator--();
         ConstIterator &operator--(int);
         bool operator==( const ConstIterator &it );
         bool operator!=( const ConstIterator &it );
 
               struct ConstIteratorData;
         ConstIteratorData *d;
     };
 
     /**
       Constructs a address book object.
 
       @param format File format class.
     */
     AddressBook();
     AddressBook( const QString &config );
     AddressBook( const QString &config, const QString &family );
     virtual ~AddressBook();
 
     /**
       Requests a ticket for saving the addressbook. Calling this function locks
       the addressbook for all other processes. If the address book is already
       locked the function returns 0. You need the returned @ref Ticket object
       for calling the @ref save() function.
 
       @see save()
     */
     Ticket *requestSaveTicket( Resource *resource=0 );
 
     /**
       Load address book from file.
     */
     bool load();
 
     /**
       Save address book. The address book is saved to the file, the Ticket
       object has been requested for by @ref requestSaveTicket().
 
       @param ticket a ticket object returned by @ref requestSaveTicket()
     */
     bool save( Ticket *ticket );
     bool saveAB( );
 
     /**
       Returns a iterator for first entry of address book.
     */
     Iterator begin();
 
     /**
       Returns a const iterator for first entry of address book.
     */
     ConstIterator begin() const;
 
     /**
       Returns a iterator for first entry of address book.
     */
     Iterator end();
 
     /**
       Returns a const iterator for first entry of address book.
     */
     ConstIterator end() const;
 
     /**
       Removes all entries from address book.
     */
     void clear();
 
     /**
       Insert an Addressee object into address book. If an object with the same
       unique id already exists in the address book it it replaced by the new
       one. If not the new object is appended to the address book.
     */
     void insertAddressee( const Addressee &, bool setRev = true );
 
     /**
       Removes entry from the address book.
     */
     void removeAddressee( const Addressee & );
 
     /**
       This is like @ref removeAddressee() just above, with the difference that
       the first element is a iterator, returned by @ref begin().
     */
     void removeAddressee( const Iterator & );
 
     /**
       Find the specified entry in address book. Returns end(), if the entry
       couldn't be found.
     */
     Iterator find( const Addressee & );
 
     /**
       Find the entry specified by an unique id. Returns an empty Addressee
       object, if the address book does not contain an entry with this id.
     */
     Addressee findByUid( const QString & );
 
 
     /**
       Returns a list of all addressees in the address book. This list can
       be sorted with @ref KABC::AddresseeList for example.
     */
     Addressee::List allAddressees();
 
     /**
       Find all entries with the specified name in the address book. Returns
       an empty list, if no entries could be found.
     */
     Addressee::List findByName( const QString & );
 
     /**
       Find all entries with the specified email address  in the address book.
       Returns an empty list, if no entries could be found.
     */
     Addressee::List findByEmail( const QString & );
 
     /**
       Find all entries wich have the specified category in the address book.
       Returns an empty list, if no entries could be found.
     */
     Addressee::List findByCategory( const QString & );
 
     /**
       Return a string identifying this addressbook.
     */
     virtual QString identifier();
 
     /**
       Used for debug output.
     */
     void dump() const;
 
     void emitAddressBookLocked() { emit addressBookLocked( this ); }
     void emitAddressBookUnlocked() { emit addressBookUnlocked( this ); }
     void emitAddressBookChanged() { emit addressBookChanged( this ); }
 
     /**
       Return list of all Fields known to the address book which are associated
       with the given field category.
     */
     Field::List fields( int category = Field::All );
 
     /**
       Add custom field to address book.
 
       @param label    User visible label of the field.
       @param category Ored list of field categories.
       @param key      Identifier used as key for reading and writing the field.
       @param app      String used as application key for reading and writing
                       the field.
     */
     bool addCustomField( const QString &label, int category = Field::All,
                          const QString &key = QString::null,
                          const QString &app = QString::null );
 
 
     /**
       Add address book resource.
     */
     bool addResource( Resource * );
 
     /**
       Remove address book resource.
     */
     bool removeResource( Resource * );
 
     /**
       Return pointer list of all resources.
     */
     QPtrList<Resource> resources();
 
     /**
       Set the @p ErrorHandler, that is used by @ref error() to
       provide gui-independend error messages.
     */
     void setErrorHandler( ErrorHandler * );
 
     /**
       Shows gui independend error messages.
     */
     void error( const QString& );
 
     /**
       Query all resources to clean up their lock files
      */
     void cleanUp();
 
     // sync stuff 
-    Addressee::List getExternLastSyncAddressees();
+    //Addressee::List getExternLastSyncAddressees();
     void resetTempSyncStat(); 
     QStringList uidList(); 
+    void removeDeletedAddressees();
 
 
   signals:
     /**
       Emitted, when the address book has changed on disk.
     */
     void addressBookChanged( AddressBook * );
 
     /**
       Emitted, when the address book has been locked for writing.
     */
     void addressBookLocked( AddressBook * );
 
     /**
       Emitted, when the address book has been unlocked.
     */
     void addressBookUnlocked( AddressBook * );
 
   protected:
     void deleteRemovedAddressees();
     void setStandardResource( Resource * );
     Resource *standardResource();
     KRES::Manager<Resource> *resourceManager();
 
     void init(const QString &config, const QString &family);
 
   private:
 //US    QPtrList<Resource> mDummy; // Remove in KDE 4
 
 
     struct AddressBookData;
     AddressBookData *d;
+    bool blockLSEchange;
 };
 
 QDataStream &operator<<( QDataStream &, const AddressBook & );
 QDataStream &operator>>( QDataStream &, AddressBook & );
 
 }
 
 #endif
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7f04d8f..0f5d605 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,1683 +1,1778 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include <kconfig.h>
 
 #include <ksharedptr.h>
 #include <kdebug.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kidmanager.h>
 //US
 #include <kstandarddirs.h>
 #include <libkcal/syncdefines.h>
 
 //US #include "resource.h"
 #include "addressee.h"
 
 using namespace KABC;
 
 static bool matchBinaryPattern( int value, int pattern );
 
 struct Addressee::AddresseeData : public KShared
 {
   QString uid;
   QString name;
   QString formattedName;
   QString familyName;
   QString givenName;
   QString additionalName;
   QString prefix;
   QString suffix;
   QString nickName;
   QDateTime birthday;
   QString mailer;
   TimeZone timeZone;
   Geo geo;
   QString title;
   QString role;
   QString organization;
   QString note;
   QString productId;
   QDateTime revision;
   QString sortString;
   KURL url;
   Secrecy secrecy;
   Picture logo;
   Picture photo;
   Sound sound;
   Agent agent;
   QString mExternalId;
   PhoneNumber::List phoneNumbers;
   Address::List addresses;
   Key::List keys;
   QStringList emails;
   QStringList categories;
   QStringList custom;
 
   Resource *resource;
 
   bool empty    :1;
   bool changed  :1;
 };
 
 Addressee::Addressee()
 {
   mData = new AddresseeData;
   mData->empty = true;
   mData->changed = false;
   mData->resource = 0;
   mData->mExternalId = ":";
   mData->revision = QDateTime ( QDate( 2004,1,1));
   mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 
 Addressee::~Addressee()
 {
 }
 
 Addressee::Addressee( const Addressee &a )
 {
   mData = a.mData;
   mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 
 Addressee &Addressee::operator=( const Addressee &a )
 {
   mData = a.mData;
   return (*this);
 }
 
 Addressee Addressee::copy()
 {
   Addressee a;
   *(a.mData) = *mData;
   return a;
 }
 
 void Addressee::detach()
 {
   if ( mData.count() == 1 ) return;
   *this = copy();
 }
 
 bool Addressee::operator==( const Addressee &a ) const
 {
   if ( uid() != a.uid() ) return false;
   if ( mData->name != a.mData->name ) return false;
   if ( mData->formattedName != a.mData->formattedName ) return false;
   if ( mData->familyName != a.mData->familyName ) return false;
   if ( mData->givenName != a.mData->givenName ) return false;
   if ( mData->additionalName != a.mData->additionalName ) return false;
   if ( mData->prefix != a.mData->prefix ) return false;
   if ( mData->suffix != a.mData->suffix ) return false;
   if ( mData->nickName != a.mData->nickName ) return false;
   if ( mData->birthday != a.mData->birthday ) return false;
   if ( mData->mailer != a.mData->mailer ) return false;
   if ( mData->timeZone != a.mData->timeZone ) return false;
   if ( mData->geo != a.mData->geo ) return false;
   if ( mData->title != a.mData->title ) return false;
   if ( mData->role != a.mData->role ) return false;
   if ( mData->organization != a.mData->organization ) return false;
   if ( mData->note != a.mData->note ) return false;
   if ( mData->productId != a.mData->productId ) return false;
   if ( mData->revision != a.mData->revision ) return false;
   if ( mData->sortString != a.mData->sortString ) return false;
   if ( mData->secrecy != a.mData->secrecy ) return false;
   if ( mData->logo != a.mData->logo ) return false;
   if ( mData->photo != a.mData->photo ) return false;
   if ( mData->sound != a.mData->sound ) return false;
   if ( mData->agent != a.mData->agent ) return false;
   if ( ( mData->url.isValid() || a.mData->url.isValid() ) &&
        ( mData->url != a.mData->url ) ) return false;
   if ( mData->phoneNumbers != a.mData->phoneNumbers ) return false;
   if ( mData->addresses != a.mData->addresses ) return false;
   if ( mData->keys != a.mData->keys ) return false;
   if ( mData->emails != a.mData->emails ) return false;
   if ( mData->categories != a.mData->categories ) return false;
   if ( mData->custom != a.mData->custom ) return false;
 
   return true;
 }
 
 bool Addressee::operator!=( const Addressee &a ) const
 {
   return !( a == *this );
 }
 
 bool Addressee::isEmpty() const
 {
   return mData->empty;
 }
+ulong  Addressee::getCsum4List( const QStringList &  attList)
+{
+    int max = attList.count();
+    ulong cSum = 0;
+    int j,k,i;
+    int add;
+    for ( i = 0; i < max ; ++i ) {
+        QString s = attList[i];
+        if ( ! s.isEmpty() ){
+            j = s.length();
+            for ( k = 0; k < j; ++k ) {
+                int mul = k +1;
+                add = s[k].unicode ();
+                if ( k < 16 )
+                    mul = mul * mul;
+                int ii = i+1;
+                add = add * mul *ii*ii*ii;
+                cSum += add;
+            }
+        }
+            
+    }
+    //QString dump = attList.join(",");
+    //qDebug("csum: %d %s", cSum,dump.latin1()); 
+    
+    return cSum;
+
+}
+void Addressee::computeCsum(const QString &dev)
+{
+    QStringList l;
+    if ( !mData->name.isEmpty() ) l.append(mData->name);
+    if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName  );
+    if ( !mData->familyName.isEmpty()  ) l.append( mData->familyName );
+    if ( !mData->givenName.isEmpty() ) l.append(mData->givenName  );
+    if ( !mData->additionalName  ) l.append( mData->additionalName );
+    if ( !mData->prefix.isEmpty()  ) l.append( mData->prefix );
+    if ( !mData->suffix.isEmpty()  ) l.append( mData->suffix );
+    if ( !mData->nickName.isEmpty()  ) l.append( mData->nickName );
+    if ( mData->birthday.isValid()  ) l.append( mData->birthday.toString() );
+    if ( !mData->mailer.isEmpty() ) l.append( mData->mailer );
+    if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() );
+    if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
+    if ( !mData->title .isEmpty() ) l.append( mData->title );
+    if ( !mData->role.isEmpty() ) l.append( mData->role );
+    if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
+    if ( !mData->note.isEmpty() ) l.append( mData->note ); 
+    if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
+    if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
+    if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
+    // if ( !mData->logo.isEmpty() ) l.append(  ); 
+    //if ( !mData->photo.isEmpty() ) l.append(  );
+    //if ( !mData->sound.isEmpty() ) l.append(  );
+    //if ( !mData->agent.isEmpty() ) l.append(  ); 
+    //if (  mData->url.isValid() ) l.append(  ); 
+#if 0
+    if ( !mData->phoneNumbers.isEmpty() ) l.append(  ); 
+    if ( !mData->addresses.isEmpty() ) l.append(  );
+    //if ( !mData->keys.isEmpty() ) l.append(  );
+    if ( !mData->emails.isEmpty() ) l.append(  ); 
+    if ( !mData->categories .isEmpty() ) l.append(  );
+    if ( !mData->custom.isEmpty() ) l.append(  );
+#endif
+    KABC::PhoneNumber::List phoneNumbers;
+    KABC::PhoneNumber::List::Iterator phoneIter;
+
+    QStringList t;
+    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
+          ++phoneIter )
+        t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) );
+    t.sort();
+    uint iii;
+    for ( iii = 0; iii < t.count(); ++iii)
+        l.append( t[iii]  );
+    t = mData->emails;
+    t.sort();
+    for ( iii = 0; iii < t.count(); ++iii)
+        l.append( t[iii]  );
+    t = mData->categories;
+    t.sort();
+    for ( iii = 0; iii < t.count(); ++iii)
+        l.append( t[iii]  );
+    t = mData->custom;
+    t.sort();
+    for ( iii = 0; iii < t.count(); ++iii)
+        l.append( t[iii]  );
+    KABC::Address::List::Iterator addressIter;
+    for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
+          ++addressIter ) {
+        t = (*addressIter).asList();
+        t.sort();
+        for ( iii = 0; iii < t.count(); ++iii)
+            l.append( t[iii]  );
+    }
+    setCsum( dev, QString::number (getCsum4List(l)) );
+}
 void Addressee::removeID(const QString &prof)
 {
     detach();
     mData->mExternalId = KIdManager::removeId ( mData->mExternalId, prof);
     
 }
 void Addressee::setID( const QString & prof , const QString & id )
 {
     detach();
     mData->mExternalId = KIdManager::setId ( mData->mExternalId, prof, id );
 }
 void Addressee::setTempSyncStat( int id )
 {
     mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
     return mTempSyncStat;
 }
 
 QString Addressee::getID( const QString &  prof)
 {
     return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
     detach();
     mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
 }
 
 QString Addressee::getCsum( const QString &  prof)
 {
     return KIdManager::getCsum ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setIDStr( const QString & s )
 { 
     detach();
     mData->mExternalId = s;
 }
 
 QString Addressee::IDStr() const
 {
     return mData->mExternalId;
 }
 
 
 void Addressee::setUid( const QString &id )
 {
   if ( id == mData->uid ) return;
   detach();
   mData->empty = false;
   mData->uid = id;
 }
 
 QString Addressee::uid() const
 {
   if ( mData->uid.isEmpty() )
     mData->uid = KApplication::randomString( 10 );
 
   return mData->uid;
 }
 
 QString Addressee::uidLabel()
 {
   return i18n("Unique Identifier");
 }
 
 void Addressee::setName( const QString &name )
 {
   if ( name == mData->name ) return;
   detach();
   mData->empty = false;
   mData->name = name;
 }
 
 QString Addressee::name() const
 {
   return mData->name;
 }
 
 QString Addressee::nameLabel()
 {
   return i18n("Name");
 }
 
 
 void Addressee::setFormattedName( const QString &formattedName )
 {
   if ( formattedName == mData->formattedName ) return;
   detach();
   mData->empty = false;
   mData->formattedName = formattedName;
 }
 
 QString Addressee::formattedName() const
 {
   return mData->formattedName;
 }
 
 QString Addressee::formattedNameLabel()
 {
   return i18n("Formatted Name");
 }
 
 
 void Addressee::setFamilyName( const QString &familyName )
 {
   if ( familyName == mData->familyName ) return;
   detach();
   mData->empty = false;
   mData->familyName = familyName;
 }
 
 QString Addressee::familyName() const
 {
   return mData->familyName;
 }
 
 QString Addressee::familyNameLabel()
 {
   return i18n("Family Name");
 }
 
 
 void Addressee::setGivenName( const QString &givenName )
 {
   if ( givenName == mData->givenName ) return;
   detach();
   mData->empty = false;
   mData->givenName = givenName;
 }
 
 QString Addressee::givenName() const
 {
   return mData->givenName;
 }
 
 QString Addressee::givenNameLabel()
 {
   return i18n("Given Name");
 }
 
 
 void Addressee::setAdditionalName( const QString &additionalName )
 {
   if ( additionalName == mData->additionalName ) return;
   detach();
   mData->empty = false;
   mData->additionalName = additionalName;
 }
 
 QString Addressee::additionalName() const
 {
   return mData->additionalName;
 }
 
 QString Addressee::additionalNameLabel()
 {
   return i18n("Additional Names");
 }
 
 
 void Addressee::setPrefix( const QString &prefix )
 {
   if ( prefix == mData->prefix ) return;
   detach();
   mData->empty = false;
   mData->prefix = prefix;
 }
 
 QString Addressee::prefix() const
 {
   return mData->prefix;
 }
 
 QString Addressee::prefixLabel()
 {
   return i18n("Honorific Prefixes");
 }
 
 
 void Addressee::setSuffix( const QString &suffix )
 {
   if ( suffix == mData->suffix ) return;
   detach();
   mData->empty = false;
   mData->suffix = suffix;
 }
 
 QString Addressee::suffix() const
 {
   return mData->suffix;
 }
 
 QString Addressee::suffixLabel()
 {
   return i18n("Honorific Suffixes");
 }
 
 
 void Addressee::setNickName( const QString &nickName )
 {
   if ( nickName == mData->nickName ) return;
   detach();
   mData->empty = false;
   mData->nickName = nickName;
 }
 
 QString Addressee::nickName() const
 {
   return mData->nickName;
 }
 
 QString Addressee::nickNameLabel()
 {
   return i18n("Nick Name");
 }
 
 
 void Addressee::setBirthday( const QDateTime &birthday )
 {
   if ( birthday == mData->birthday ) return;
   detach();
   mData->empty = false;
   mData->birthday = birthday;
 }
 
 QDateTime Addressee::birthday() const
 {
   return mData->birthday;
 }
 
 QString Addressee::birthdayLabel()
 {
   return i18n("Birthday");
 }
 
 
 QString Addressee::homeAddressStreetLabel()
 {
   return i18n("Home Address Street");
 }
 
 
 QString Addressee::homeAddressLocalityLabel()
 {
   return i18n("Home Address Locality");
 }
 
 
 QString Addressee::homeAddressRegionLabel()
 {
   return i18n("Home Address Region");
 }
 
 
 QString Addressee::homeAddressPostalCodeLabel()
 {
   return i18n("Home Address Postal Code");
 }
 
 
 QString Addressee::homeAddressCountryLabel()
 {
   return i18n("Home Address Country");
 }
 
 
 QString Addressee::homeAddressLabelLabel()
 {
   return i18n("Home Address Label");
 }
 
 
 QString Addressee::businessAddressStreetLabel()
 {
   return i18n("Business Address Street");
 }
 
 
 QString Addressee::businessAddressLocalityLabel()
 {
   return i18n("Business Address Locality");
 }
 
 
 QString Addressee::businessAddressRegionLabel()
 {
   return i18n("Business Address Region");
 }
 
 
 QString Addressee::businessAddressPostalCodeLabel()
 {
   return i18n("Business Address Postal Code");
 }
 
 
 QString Addressee::businessAddressCountryLabel()
 {
   return i18n("Business Address Country");
 }
 
 
 QString Addressee::businessAddressLabelLabel()
 {
   return i18n("Business Address Label");
 }
 
 
 QString Addressee::homePhoneLabel()
 {
   return i18n("Home Phone");
 }
 
 
 QString Addressee::businessPhoneLabel()
 {
   return i18n("Business Phone");
 }
 
 
 QString Addressee::mobilePhoneLabel()
 {
   return i18n("Mobile Phone");
 }
 
 
 QString Addressee::homeFaxLabel()
 {
   return i18n("Home Fax");
 }
 
 
 QString Addressee::businessFaxLabel()
 {
   return i18n("Business Fax");
 }
 
 
 QString Addressee::carPhoneLabel()
 {
   return i18n("Car Phone");
 }
 
 
 QString Addressee::isdnLabel()
 {
   return i18n("ISDN");
 }
 
 
 QString Addressee::pagerLabel()
 {
   return i18n("Pager");
 }
 
 QString Addressee::sipLabel()
 {
   return i18n("SIP");
 }
 
 QString Addressee::emailLabel()
 {
   return i18n("Email Address");
 }
 
 
 void Addressee::setMailer( const QString &mailer )
 {
   if ( mailer == mData->mailer ) return;
   detach();
   mData->empty = false;
   mData->mailer = mailer;
 }
 
 QString Addressee::mailer() const
 {
   return mData->mailer;
 }
 
 QString Addressee::mailerLabel()
 {
   return i18n("Mail Client");
 }
 
 
 void Addressee::setTimeZone( const TimeZone &timeZone )
 {
   if ( timeZone == mData->timeZone ) return;
   detach();
   mData->empty = false;
   mData->timeZone = timeZone;
 }
 
 TimeZone Addressee::timeZone() const
 {
   return mData->timeZone;
 }
 
 QString Addressee::timeZoneLabel()
 {
   return i18n("Time Zone");
 }
 
 
 void Addressee::setGeo( const Geo &geo )
 {
   if ( geo == mData->geo ) return;
   detach();
   mData->empty = false;
   mData->geo = geo;
 }
 
 Geo Addressee::geo() const
 {
   return mData->geo;
 }
 
 QString Addressee::geoLabel()
 {
   return i18n("Geographic Position");
 }
 
 
 void Addressee::setTitle( const QString &title )
 {
   if ( title == mData->title ) return;
   detach();
   mData->empty = false;
   mData->title = title;
 }
 
 QString Addressee::title() const
 {
   return mData->title;
 }
 
 QString Addressee::titleLabel()
 {
   return i18n("Title");
 }
 
 
 void Addressee::setRole( const QString &role )
 {
   if ( role == mData->role ) return;
   detach();
   mData->empty = false;
   mData->role = role;
 }
 
 QString Addressee::role() const
 {
   return mData->role;
 }
 
 QString Addressee::roleLabel()
 {
   return i18n("Role");
 }
 
 
 void Addressee::setOrganization( const QString &organization )
 {
   if ( organization == mData->organization ) return;
   detach();
   mData->empty = false;
   mData->organization = organization;
 }
 
 QString Addressee::organization() const
 {
   return mData->organization;
 }
 
 QString Addressee::organizationLabel()
 {
   return i18n("Organization");
 }
 
 
 void Addressee::setNote( const QString &note )
 {
   if ( note == mData->note ) return;
   detach();
   mData->empty = false;
   mData->note = note;
 }
 
 QString Addressee::note() const
 {
   return mData->note;
 }
 
 QString Addressee::noteLabel()
 {
   return i18n("Note");
 }
 
 
 void Addressee::setProductId( const QString &productId )
 {
   if ( productId == mData->productId ) return;
   detach();
   mData->empty = false;
   mData->productId = productId;
 }
 
 QString Addressee::productId() const
 {
   return mData->productId;
 }
 
 QString Addressee::productIdLabel()
 {
   return i18n("Product Identifier");
 }
 
 
 void Addressee::setRevision( const QDateTime &revision )
 {
   if ( revision == mData->revision ) return;
   detach();
   mData->empty = false;
   mData->revision = revision;
 }
 
 QDateTime Addressee::revision() const
 {
   return mData->revision;
 }
 
 QString Addressee::revisionLabel()
 {
   return i18n("Revision Date");
 }
 
 
 void Addressee::setSortString( const QString &sortString )
 {
   if ( sortString == mData->sortString ) return;
   detach();
   mData->empty = false;
   mData->sortString = sortString;
 }
 
 QString Addressee::sortString() const
 {
   return mData->sortString;
 }
 
 QString Addressee::sortStringLabel()
 {
   return i18n("Sort String");
 }
 
 
 void Addressee::setUrl( const KURL &url )
 {
   if ( url == mData->url ) return;
   detach();
   mData->empty = false;
   mData->url = url;
 }
 
 KURL Addressee::url() const
 {
   return mData->url;
 }
 
 QString Addressee::urlLabel()
 {
   return i18n("URL");
 }
 
 
 void Addressee::setSecrecy( const Secrecy &secrecy )
 {
   if ( secrecy == mData->secrecy ) return;
   detach();
   mData->empty = false;
   mData->secrecy = secrecy;
 }
 
 Secrecy Addressee::secrecy() const
 {
   return mData->secrecy;
 }
 
 QString Addressee::secrecyLabel()
 {
   return i18n("Security Class");
 }
 
 
 void Addressee::setLogo( const Picture &logo )
 {
   if ( logo == mData->logo ) return;
   detach();
   mData->empty = false;
   mData->logo = logo;
 }
 
 Picture Addressee::logo() const
 {
   return mData->logo;
 }
 
 QString Addressee::logoLabel()
 {
   return i18n("Logo");
 }
 
 
 void Addressee::setPhoto( const Picture &photo )
 {
   if ( photo == mData->photo ) return;
   detach();
   mData->empty = false;
   mData->photo = photo;
 }
 
 Picture Addressee::photo() const
 {
   return mData->photo;
 }
 
 QString Addressee::photoLabel()
 {
   return i18n("Photo");
 }
 
 
 void Addressee::setSound( const Sound &sound )
 {
   if ( sound == mData->sound ) return;
   detach();
   mData->empty = false;
   mData->sound = sound;
 }
 
 Sound Addressee::sound() const
 {
   return mData->sound;
 }
 
 QString Addressee::soundLabel()
 {
   return i18n("Sound");
 }
 
 
 void Addressee::setAgent( const Agent &agent )
 {
   if ( agent == mData->agent ) return;
   detach();
   mData->empty = false;
   mData->agent = agent;
 }
 
 Agent Addressee::agent() const
 {
   return mData->agent;
 }
 
 QString Addressee::agentLabel()
 {
   return i18n("Agent");
 }
 
 
 
 void Addressee::setNameFromString( const QString &str )
 {
   setFormattedName( str );
   setName( str );
 
   static bool first = true;
   static QStringList titles;
   static QStringList suffixes;
   static QStringList prefixes;
 
   if ( first ) {
       first = false;
       titles += i18n( "Dr." );
       titles += i18n( "Miss" );
       titles += i18n( "Mr." );
       titles += i18n( "Mrs." );
       titles += i18n( "Ms." );
       titles += i18n( "Prof." );
 
       suffixes += i18n( "I" );
       suffixes += i18n( "II" );
       suffixes += i18n( "III" );
       suffixes += i18n( "Jr." );
       suffixes += i18n( "Sr." );
 
       prefixes += "van";
       prefixes += "von";
       prefixes += "de";
 
       KConfig config( locateLocal( "config", "kabcrc") );
       config.setGroup( "General" );
       titles += config.readListEntry( "Prefixes" );
       titles.remove( "" );
       prefixes += config.readListEntry( "Inclusions" );
       prefixes.remove( "" );
       suffixes += config.readListEntry( "Suffixes" );
       suffixes.remove( "" );
   }
 
   // clear all name parts
   setPrefix( "" );
   setGivenName( "" );
   setAdditionalName( "" );
   setFamilyName( "" );
   setSuffix( "" );
 
   if ( str.isEmpty() )
     return;
 
   int i = str.find(',');
   if( i < 0 ) {
     QStringList parts = QStringList::split( " ", str );
     int leftOffset = 0;
     int rightOffset = parts.count() - 1;
 
     QString suffix;
     while ( rightOffset >= 0 ) {
       if ( suffixes.contains( parts[ rightOffset ] ) ) {
         suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
         rightOffset--;
       } else
         break;
     }
     setSuffix( suffix );
 
     if ( rightOffset < 0 )
       return;
 
     if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
       setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
       rightOffset--;
     } else
       setFamilyName( parts[ rightOffset ] );
 
     QString prefix;
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
     setPrefix( prefix );
 
     if ( leftOffset < rightOffset ) {
       setGivenName( parts[ leftOffset ] );
       leftOffset++;
     }
 
     QString additionalName;
     while ( leftOffset < rightOffset ) {
       additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
       leftOffset++;
     }
     setAdditionalName( additionalName );
   } else {
     QString part1 = str.left( i );
     QString part2 = str.mid( i + 1 );
 
     QStringList parts = QStringList::split( " ", part1 );
     int leftOffset = 0;
     int rightOffset = parts.count() - 1;
 
     QString suffix;
     while ( rightOffset >= 0 ) {
       if ( suffixes.contains( parts[ rightOffset ] ) ) {
         suffix.prepend(parts[ rightOffset ] + (suffix.isEmpty() ? "" : " "));
         rightOffset--;
       } else
         break;
     }
     setSuffix( suffix );
 
     if ( rightOffset - 1 >= 0 && prefixes.contains( parts[ rightOffset - 1 ].lower() ) ) {
       setFamilyName( parts[ rightOffset - 1 ] + " " + parts[ rightOffset ] );
       rightOffset--;
     } else
       setFamilyName( parts[ rightOffset ] );
 
     QString prefix;
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
 
     parts = QStringList::split( " ", part2 );
 
     leftOffset = 0;
     rightOffset = parts.count();
 
     while ( leftOffset < rightOffset ) {
       if ( titles.contains( parts[ leftOffset ] ) ) {
         prefix.append( ( prefix.isEmpty() ? "" : " ") + parts[ leftOffset ] );
         leftOffset++;
       } else
         break;
     }
     setPrefix( prefix );
 
     if ( leftOffset < rightOffset ) {
       setGivenName( parts[ leftOffset ] );
       leftOffset++;
     }
 
     QString additionalName;
     while ( leftOffset < rightOffset ) {
       additionalName.append( ( additionalName.isEmpty() ? "" : " ") + parts[ leftOffset ] );
       leftOffset++;
     }
     setAdditionalName( additionalName );
   }
 }
 
 QString Addressee::realName() const
 {
   if ( !formattedName().isEmpty() )
     return formattedName();
 
   QString n = assembledName();
 
   if ( n.isEmpty() )
     n = name();
 
   return n;
 }
 
 QString Addressee::assembledName() const
 {
   QString name = prefix() + " " + givenName() + " " + additionalName() + " " +
               familyName() + " " + suffix();
 
   return name.simplifyWhiteSpace();
 }
 
 QString Addressee::fullEmail( const QString &email ) const
 {
   QString e;
   if ( email.isNull() ) {
     e = preferredEmail();
   } else {
     e = email;
   }
   if ( e.isEmpty() ) return QString::null;
 
   QString text;
   if ( realName().isEmpty() )
     text = e;
   else
     text = assembledName() + " <" + e + ">";
 
   return text;
 }
 
 void Addressee::insertEmail( const QString &email, bool preferred )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
 
   if ( it != mData->emails.end() ) {
     if ( !preferred || it == mData->emails.begin() ) return;
     mData->emails.remove( it );
     mData->emails.prepend( email );
   } else {
     if ( preferred ) {
       mData->emails.prepend( email );
     } else {
       mData->emails.append( email );
     }
   }
 }
 
 void Addressee::removeEmail( const QString &email )
 {
   detach();
 
   QStringList::Iterator it = mData->emails.find( email );
   if ( it == mData->emails.end() ) return;
 
   mData->emails.remove( it );
 }
 
 QString Addressee::preferredEmail() const
 {
   if ( mData->emails.count() == 0 ) return QString::null;
   else return mData->emails.first();
 }
 
 QStringList Addressee::emails() const
 {
   return mData->emails;
 }
 void Addressee::setEmails( const QStringList& emails ) {
     detach();
     mData->emails = emails;
 }
 void Addressee::insertPhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
   mData->empty = false;
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       *it = phoneNumber;
       return;
     }
   }
   mData->phoneNumbers.append( phoneNumber );
 }
 
 void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
 {
   detach();
 
   PhoneNumber::List::Iterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == phoneNumber.id() ) {
       mData->phoneNumbers.remove( it );
       return;
     }
   }
 }
 
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
   PhoneNumber phoneNumber( "", type );
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       if ( (*it).type() & PhoneNumber::Pref )
         return (*it);
       else if ( phoneNumber.number().isEmpty() )
         phoneNumber = (*it);
     }
   }
 
   return phoneNumber;
 }
 
 PhoneNumber::List Addressee::phoneNumbers() const
 {
   return mData->phoneNumbers;
 }
 
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
   PhoneNumber::List list;
 
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
   return list;
 }
 
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return PhoneNumber();
 }
 
 void Addressee::insertKey( const Key &key )
 {
   detach();
   mData->empty = false;
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       *it = key;
       return;
     }
   }
   mData->keys.append( key );
 }
 
 void Addressee::removeKey( const Key &key )
 {
   detach();
 
   Key::List::Iterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == key.id() ) {
       mData->keys.remove( key );
       return;
     }
   }
 }
 
 Key Addressee::key( int type, QString customTypeString ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           return *it;
         } else {
           if ( (*it).customTypeString() == customTypeString )
             return (*it);
         }
       } else {
         return *it;
       }
     }
   }
   return Key( QString(), type );
 }
 void Addressee::setKeys( const Key::List& list ) {
     detach();
     mData->keys = list;
 }
 
 Key::List Addressee::keys() const
 {
   return mData->keys;
 }
 
 Key::List Addressee::keys( int type, QString customTypeString ) const
 {
   Key::List list;
 
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).type() == type ) {
       if ( type == Key::Custom ) {
         if ( customTypeString.isEmpty() ) {
           list.append(*it);
         } else {
           if ( (*it).customTypeString() == customTypeString )
             list.append(*it);
         }
       } else {
         list.append(*it);
       }
     }
   }
   return list;
 }
 
 Key Addressee::findKey( const QString &id ) const
 {
   Key::List::ConstIterator it;
   for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Key();
 }
 
 QString Addressee::asString() const
 {
   return "Smith, agent Smith...";
 }
 
 void Addressee::dump() const
 {
     return;
   kdDebug(5700) << "Addressee {" << endl;
 
   kdDebug(5700) << "  Uid: '" << uid() << "'" << endl;
 
   kdDebug(5700) << "  Name: '" << name() << "'" << endl;
   kdDebug(5700) << "  FormattedName: '" << formattedName() << "'" << endl;
   kdDebug(5700) << "  FamilyName: '" << familyName() << "'" << endl;
   kdDebug(5700) << "  GivenName: '" << givenName() << "'" << endl;
   kdDebug(5700) << "  AdditionalName: '" << additionalName() << "'" << endl;
   kdDebug(5700) << "  Prefix: '" << prefix() << "'" << endl;
   kdDebug(5700) << "  Suffix: '" << suffix() << "'" << endl;
   kdDebug(5700) << "  NickName: '" << nickName() << "'" << endl;
   kdDebug(5700) << "  Birthday: '" << birthday().toString() << "'" << endl;
   kdDebug(5700) << "  Mailer: '" << mailer() << "'" << endl;
   kdDebug(5700) << "  TimeZone: '" << timeZone().asString() << "'" << endl;
   kdDebug(5700) << "  Geo: '" << geo().asString() << "'" << endl;
   kdDebug(5700) << "  Title: '" << title() << "'" << endl;
   kdDebug(5700) << "  Role: '" << role() << "'" << endl;
   kdDebug(5700) << "  Organization: '" << organization() << "'" << endl;
   kdDebug(5700) << "  Note: '" << note() << "'" << endl;
   kdDebug(5700) << "  ProductId: '" << productId() << "'" << endl;
   kdDebug(5700) << "  Revision: '" << revision().toString() << "'" << endl;
   kdDebug(5700) << "  SortString: '" << sortString() << "'" << endl;
   kdDebug(5700) << "  Url: '" << url().url() << "'" << endl;
   kdDebug(5700) << "  Secrecy: '" << secrecy().asString() << "'" << endl;
   kdDebug(5700) << "  Logo: '" << logo().asString() << "'" << endl;
   kdDebug(5700) << "  Photo: '" << photo().asString() << "'" << endl;
   kdDebug(5700) << "  Sound: '" << sound().asString() << "'" << endl;
   kdDebug(5700) << "  Agent: '" << agent().asString() << "'" << endl;
 
   kdDebug(5700) << "  Emails {" << endl;
   QStringList e = emails();
   QStringList::ConstIterator it;
   for( it = e.begin(); it != e.end(); ++it ) {
     kdDebug(5700) << "    " << (*it) << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "  PhoneNumbers {" << endl;
   PhoneNumber::List p = phoneNumbers();
   PhoneNumber::List::ConstIterator it2;
   for( it2 = p.begin(); it2 != p.end(); ++it2 ) {
     kdDebug(5700) << "    Type: " << int((*it2).type()) << " Number: " << (*it2).number() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   Address::List a = addresses();
   Address::List::ConstIterator it3;
   for( it3 = a.begin(); it3 != a.end(); ++it3 ) {
     (*it3).dump();
   }
 
   kdDebug(5700) << "  Keys {" << endl;
   Key::List k = keys();
   Key::List::ConstIterator it4;
   for( it4 = k.begin(); it4 != k.end(); ++it4 ) {
     kdDebug(5700) << "    Type: " << int((*it4).type()) <<
                      " Key: " << (*it4).textData() <<
                      " CustomString: " << (*it4).customTypeString() << endl;
   }
   kdDebug(5700) << "  }" << endl;
 
   kdDebug(5700) << "}" << endl;
 }
 
 
 void Addressee::insertAddress( const Address &address )
 {
   detach();
   mData->empty = false;
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       *it = address;
       return;
     }
   }
   mData->addresses.append( address );
 }
 
 void Addressee::removeAddress( const Address &address )
 {
   detach();
 
   Address::List::Iterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == address.id() ) {
       mData->addresses.remove( it );
       return;
     }
   }
 }
 
 Address Addressee::address( int type ) const
 {
   Address address( type );
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       if ( (*it).type() & Address::Pref )
         return (*it);
       else if ( address.isEmpty() )
         address = (*it);
     }
   }
 
   return address;
 }
 
 Address::List Addressee::addresses() const
 {
   return mData->addresses;
 }
 
 Address::List Addressee::addresses( int type ) const
 {
   Address::List list;
 
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
 
   return list;
 }
 
 Address Addressee::findAddress( const QString &id ) const
 {
   Address::List::ConstIterator it;
   for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return Address();
 }
 
 void Addressee::insertCategory( const QString &c )
 {
   detach();
   mData->empty = false;
 
   if ( mData->categories.contains( c ) ) return;
 
   mData->categories.append( c );
 }
 
 void Addressee::removeCategory( const QString &c )
 {
   detach();
 
   QStringList::Iterator it = mData->categories.find( c );
   if ( it == mData->categories.end() ) return;
 
   mData->categories.remove( it );
 }
 
 bool Addressee::hasCategory( const QString &c ) const
 {
   return ( mData->categories.contains( c ) );
 }
 
 void Addressee::setCategories( const QStringList &c )
 {
   detach();
   mData->empty = false;
 
   mData->categories = c;
 }
 
 QStringList Addressee::categories() const
 {
   return mData->categories;
 }
 
 void Addressee::insertCustom( const QString &app, const QString &name,
                               const QString &value )
 {
   if ( value.isNull() || name.isEmpty() || app.isEmpty() ) return;
 
   detach();
   mData->empty = false;
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
-      (*it) = qualifiedName + value;
+      (*it) = qualifiedName + value; 
       return;
     }
   }
-
   mData->custom.append( qualifiedName + value );
 }
 
 void Addressee::removeCustom( const QString &app, const QString &name)
 {
   detach();
 
   QString qualifiedName = app + "-" + name + ":";
 
   QStringList::Iterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       mData->custom.remove( it );
       return;
     }
   }
 }
 
 QString Addressee::custom( const QString &app, const QString &name ) const
 {
   QString qualifiedName = app + "-" + name + ":";
   QString value;
 
   QStringList::ConstIterator it;
   for( it = mData->custom.begin(); it != mData->custom.end(); ++it ) {
     if ( (*it).startsWith( qualifiedName ) ) {
       value = (*it).mid( (*it).find( ":" ) + 1 );
       break;
     }
   }
 
   return value;
 }
 
 void Addressee::setCustoms( const QStringList &l )
 {
   detach();
   mData->empty = false;
 
   mData->custom = l;
 }
 
 QStringList Addressee::customs() const
 {
   return mData->custom;
 }
 
 void Addressee::parseEmailAddress( const QString &rawEmail, QString &fullName,
                                    QString &email)
 {
   int startPos, endPos, len;
   QString partA, partB, result;
   char endCh = '>';
 
   startPos = rawEmail.find('<');
   if (startPos < 0)
   {
     startPos = rawEmail.find('(');
     endCh = ')';
   }
   if (startPos < 0)
   {
     // We couldn't find any separators, so we assume the whole string
     // is the email address
     email = rawEmail;
     fullName = "";
   }
   else
   {
     // We have a start position, try to find an end
     endPos = rawEmail.find(endCh, startPos+1);
 
     if (endPos < 0)
     {
       // We couldn't find the end of the email address. We can only
       // assume the entire string is the email address.
       email = rawEmail;
       fullName = "";
     }
     else
     {
       // We have a start and end to the email address
 
       // Grab the name part
       fullName = rawEmail.left(startPos).stripWhiteSpace();
 
       // grab the email part
       email = rawEmail.mid(startPos+1, endPos-startPos-1).stripWhiteSpace();
 
       // Check that we do not have any extra characters on the end of the
       // strings
       len = fullName.length();
       if (fullName[0]=='"' && fullName[len-1]=='"')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='<' && fullName[len-1]=='>')
         fullName = fullName.mid(1, len-2);
       else if (fullName[0]=='(' && fullName[len-1]==')')
         fullName = fullName.mid(1, len-2);
     }
   }
 }
 
 void Addressee::setResource( Resource *resource )
 {
     detach();
     mData->resource = resource;
 }
 
 Resource *Addressee::resource() const
 {
     return mData->resource;
 }
 
 //US
 QString Addressee::resourceLabel()
 {
   return i18n("Resource");
 }
 
 void Addressee::setChanged( bool value )
 {
     detach();
     mData->changed = value;
 }
 
 bool Addressee::changed() const
 {
     return mData->changed;
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const Addressee &a )
 {
   if (!a.mData) return s;
 
   s << a.uid(); 
 
   s << a.mData->name;
   s << a.mData->formattedName;
   s << a.mData->familyName;
   s << a.mData->givenName;
   s << a.mData->additionalName;
   s << a.mData->prefix;
   s << a.mData->suffix;
   s << a.mData->nickName;
   s << a.mData->birthday;
   s << a.mData->mailer;
   s << a.mData->timeZone;
   s << a.mData->geo;
   s << a.mData->title;
   s << a.mData->role;
   s << a.mData->organization;
   s << a.mData->note;
   s << a.mData->productId;
   s << a.mData->revision;
   s << a.mData->sortString;
   s << a.mData->url;
   s << a.mData->secrecy;
   s << a.mData->logo;
   s << a.mData->photo;
   s << a.mData->sound;
   s << a.mData->agent;
   s << a.mData->phoneNumbers;
   s << a.mData->addresses;
   s << a.mData->emails;
   s << a.mData->categories;
   s << a.mData->custom;
   s << a.mData->keys;
   return s;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, Addressee &a )
 {
   if (!a.mData) return s;
 
   s >> a.mData->uid;
 
   s >> a.mData->name;
   s >> a.mData->formattedName;
   s >> a.mData->familyName;
   s >> a.mData->givenName;
   s >> a.mData->additionalName;
   s >> a.mData->prefix;
   s >> a.mData->suffix;
   s >> a.mData->nickName;
   s >> a.mData->birthday;
   s >> a.mData->mailer;
   s >> a.mData->timeZone;
   s >> a.mData->geo;
   s >> a.mData->title;
   s >> a.mData->role;
   s >> a.mData->organization;
   s >> a.mData->note;
   s >> a.mData->productId;
   s >> a.mData->revision;
   s >> a.mData->sortString;
   s >> a.mData->url;
   s >> a.mData->secrecy;
   s >> a.mData->logo;
   s >> a.mData->photo;
   s >> a.mData->sound;
   s >> a.mData->agent;
   s >> a.mData->phoneNumbers;
   s >> a.mData->addresses;
   s >> a.mData->emails;
   s >> a.mData->categories;
   s >> a.mData->custom;
   s >> a.mData->keys;
 
   a.mData->empty = false;
 
   return s;
 }
 
 bool matchBinaryPattern( int value, int pattern )
 {
   /**
     We want to match all telephonnumbers/addresses which have the bits in the
     pattern set. More are allowed.
     if pattern == 0 we have a special handling, then we want only those with
     exactly no bit set.
    */
   if ( pattern == 0 )
     return ( value == 0 );
   else
     return ( pattern == ( pattern & value ) );
 }
diff --git a/kabc/addressee.h b/kabc/addressee.h
index f098371..0805458 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -1,838 +1,840 @@
 /*** Warning! This file has been generated by the script makeaddressee ***/
 /*
     This file is part of libkabc.
     Copyright (c) 2001 Cornelius Schumacher <schumacher@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #ifndef KABC_ADDRESSEE_H
 #define KABC_ADDRESSEE_H
 
 #include <qdatetime.h>
 #include <qstring.h>
 #include <qstringlist.h>
 #include <qvaluelist.h>
 
 #include <ksharedptr.h>
 #include <kurl.h>
 
 #include "address.h"
 #include "agent.h"
 #include "geo.h"
 #include "key.h"
 #include "phonenumber.h"
 #include "picture.h"
 #include "secrecy.h"
 #include "sound.h"
 #include "timezone.h"
 
 namespace KABC {
 
 class Resource;
 
 /**
   @short address book entry
 
   This class represents an entry in the address book.
 
   The data of this class is implicitly shared. You can pass this class by value.
 
   If you need the name of a field for presenting it to the user you should use
   the functions ending in Label(). They return a translated string which can be
   used as label for the corresponding field.
 
   About the name fields:
 
   givenName() is the first name and familyName() the last name. In some
   countries the family name comes first, that's the reason for the
   naming. formattedName() is the full name with the correct formatting.
   It is used as an override, when the correct formatting can't be generated
   from the other name fields automatically.
 
   realName() returns a fully formatted name(). It uses formattedName, if set,
   otherwise it constucts the name from the name fields. As fallback, if
   nothing else is set it uses name().
 
   name() is the NAME type of RFC2426. It can be used as internal name for the
   data enty, but shouldn't be used for displaying the data to the user.
  */
 class Addressee
 {
     friend QDataStream &operator<<( QDataStream &, const Addressee & );
     friend QDataStream &operator>>( QDataStream &, Addressee & );
 
   public:
     typedef QValueList<Addressee> List;
 
     /**
       Construct an empty address book entry.
      */
     Addressee();
     ~Addressee();
 
     Addressee( const Addressee & );
     Addressee &operator=( const Addressee & );
 
     bool operator==( const Addressee & ) const;
     bool operator!=( const Addressee & ) const;
     // sync stuff
     void setTempSyncStat(int id);
     int tempSyncStat() const;
     void setIDStr( const QString & );
     QString IDStr() const;
     void setID( const QString &, const QString & );
     QString  getID( const QString & );
     void setCsum( const QString &, const QString & );
     QString getCsum( const QString & );
     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;
 
     /**
       Set unique identifier.
      */
     void setUid( const QString &uid );
     /**
       Return unique identifier.
      */
     QString uid() const;
     /**
       Return translated label for uid field.
      */
     static QString uidLabel();
 
     /**
       Set name.
      */
     void setName( const QString &name );
     /**
       Return name.
      */
     QString name() const;
     /**
       Return translated label for name field.
      */
     static QString nameLabel();
 
     /**
       Set formatted name.
      */
     void setFormattedName( const QString &formattedName );
     /**
       Return formatted name.
      */
     QString formattedName() const;
     /**
       Return translated label for formattedName field.
      */
     static QString formattedNameLabel();
 
     /**
       Set family name.
      */
     void setFamilyName( const QString &familyName );
     /**
       Return family name.
      */
     QString familyName() const;
     /**
       Return translated label for familyName field.
      */
     static QString familyNameLabel();
 
     /**
       Set given name.
      */
     void setGivenName( const QString &givenName );
     /**
       Return given name.
      */
     QString givenName() const;
     /**
       Return translated label for givenName field.
      */
     static QString givenNameLabel();
 
     /**
       Set additional names.
      */
     void setAdditionalName( const QString &additionalName );
     /**
       Return additional names.
      */
     QString additionalName() const;
     /**
       Return translated label for additionalName field.
      */
     static QString additionalNameLabel();
 
     /**
       Set honorific prefixes.
      */
     void setPrefix( const QString &prefix );
     /**
       Return honorific prefixes.
      */
     QString prefix() const;
     /**
       Return translated label for prefix field.
      */
     static QString prefixLabel();
 
     /**
       Set honorific suffixes.
      */
     void setSuffix( const QString &suffix );
     /**
       Return honorific suffixes.
      */
     QString suffix() const;
     /**
       Return translated label for suffix field.
      */
     static QString suffixLabel();
 
     /**
       Set nick name.
      */
     void setNickName( const QString &nickName );
     /**
       Return nick name.
      */
     QString nickName() const;
     /**
       Return translated label for nickName field.
      */
     static QString nickNameLabel();
 
     /**
       Set birthday.
      */
     void setBirthday( const QDateTime &birthday );
     /**
       Return birthday.
      */
     QDateTime birthday() const;
     /**
       Return translated label for birthday field.
      */
     static QString birthdayLabel();
 
     /**
       Return translated label for homeAddressStreet field.
      */
     static QString homeAddressStreetLabel();
 
     /**
       Return translated label for homeAddressLocality field.
      */
     static QString homeAddressLocalityLabel();
 
     /**
       Return translated label for homeAddressRegion field.
      */
     static QString homeAddressRegionLabel();
 
     /**
       Return translated label for homeAddressPostalCode field.
      */
     static QString homeAddressPostalCodeLabel();
 
     /**
       Return translated label for homeAddressCountry field.
      */
     static QString homeAddressCountryLabel();
 
     /**
       Return translated label for homeAddressLabel field.
      */
     static QString homeAddressLabelLabel();
 
     /**
       Return translated label for businessAddressStreet field.
      */
     static QString businessAddressStreetLabel();
 
     /**
       Return translated label for businessAddressLocality field.
      */
     static QString businessAddressLocalityLabel();
 
     /**
       Return translated label for businessAddressRegion field.
      */
     static QString businessAddressRegionLabel();
 
     /**
       Return translated label for businessAddressPostalCode field.
      */
     static QString businessAddressPostalCodeLabel();
 
     /**
       Return translated label for businessAddressCountry field.
      */
     static QString businessAddressCountryLabel();
 
     /**
       Return translated label for businessAddressLabel field.
      */
     static QString businessAddressLabelLabel();
 
     /**
       Return translated label for homePhone field.
      */
     static QString homePhoneLabel();
 
     /**
       Return translated label for businessPhone field.
      */
     static QString businessPhoneLabel();
 
     /**
       Return translated label for mobilePhone field.
      */
     static QString mobilePhoneLabel();
 
     /**
       Return translated label for homeFax field.
      */
     static QString homeFaxLabel();
 
     /**
       Return translated label for businessFax field.
      */
     static QString businessFaxLabel();
 
     /**
       Return translated label for carPhone field.
      */
     static QString carPhoneLabel();
 
     /**
       Return translated label for isdn field.
      */
     static QString isdnLabel();
 
     /**
       Return translated label for pager field.
      */
     static QString pagerLabel();
 
     /**
       Return translated label for sip field.
      */
     static QString sipLabel();
 
     /**
       Return translated label for email field.
      */
     static QString emailLabel();
 
     /**
       Set mail client.
      */
     void setMailer( const QString &mailer );
     /**
       Return mail client.
      */
     QString mailer() const;
     /**
       Return translated label for mailer field.
      */
     static QString mailerLabel();
 
     /**
       Set time zone.
      */
     void setTimeZone( const TimeZone &timeZone );
     /**
       Return time zone.
      */
     TimeZone timeZone() const;
     /**
       Return translated label for timeZone field.
      */
     static QString timeZoneLabel();
 
     /**
       Set geographic position.
      */
     void setGeo( const Geo &geo );
     /**
       Return geographic position.
      */
     Geo geo() const;
     /**
       Return translated label for geo field.
      */
     static QString geoLabel();
 
     /**
       Set title.
      */
     void setTitle( const QString &title );
     /**
       Return title.
      */
     QString title() const;
     /**
       Return translated label for title field.
      */
     static QString titleLabel();
 
     /**
       Set role.
      */
     void setRole( const QString &role );
     /**
       Return role.
      */
     QString role() const;
     /**
       Return translated label for role field.
      */
     static QString roleLabel();
 
     /**
       Set organization.
      */
     void setOrganization( const QString &organization );
     /**
       Return organization.
      */
     QString organization() const;
     /**
       Return translated label for organization field.
      */
     static QString organizationLabel();
 
     /**
       Set note.
      */
     void setNote( const QString &note );
     /**
       Return note.
      */
     QString note() const;
     /**
       Return translated label for note field.
      */
     static QString noteLabel();
 
     /**
       Set product identifier.
      */
     void setProductId( const QString &productId );
     /**
       Return product identifier.
      */
     QString productId() const;
     /**
       Return translated label for productId field.
      */
     static QString productIdLabel();
 
     /**
       Set revision date.
      */
     void setRevision( const QDateTime &revision );
     /**
       Return revision date.
      */
     QDateTime revision() const;
     /**
       Return translated label for revision field.
      */
     static QString revisionLabel();
 
     /**
       Set sort string.
      */
     void setSortString( const QString &sortString );
     /**
       Return sort string.
      */
     QString sortString() const;
     /**
       Return translated label for sortString field.
      */
     static QString sortStringLabel();
 
     /**
       Set URL.
      */
     void setUrl( const KURL &url );
     /**
       Return URL.
      */
     KURL url() const;
     /**
       Return translated label for url field.
      */
     static QString urlLabel();
 
     /**
       Set security class.
      */
     void setSecrecy( const Secrecy &secrecy );
     /**
       Return security class.
      */
     Secrecy secrecy() const;
     /**
       Return translated label for secrecy field.
      */
     static QString secrecyLabel();
 
     /**
       Set logo.
      */
     void setLogo( const Picture &logo );
     /**
       Return logo.
      */
     Picture logo() const;
     /**
       Return translated label for logo field.
      */
     static QString logoLabel();
 
     /**
       Set photo.
      */
     void setPhoto( const Picture &photo );
     /**
       Return photo.
      */
     Picture photo() const;
     /**
       Return translated label for photo field.
      */
     static QString photoLabel();
 
     /**
       Set sound.
      */
     void setSound( const Sound &sound );
     /**
       Return sound.
      */
     Sound sound() const;
     /**
       Return translated label for sound field.
      */
     static QString soundLabel();
 
     /**
       Set agent.
      */
     void setAgent( const Agent &agent );
     /**
       Return agent.
      */
     Agent agent() const;
     /**
       Return translated label for agent field.
      */
     static QString agentLabel();
 
     /**
       Set name fields by parsing the given string and trying to associate the
       parts of the string with according fields. This function should probably
       be a bit more clever.
      */
     void setNameFromString( const QString & );
 
     /**
       Return the name of the addressee. This is calculated from all the name
       fields.
      */
     QString realName() const;
 
     /**
       Return the name that consists of all name parts.
      */
     QString assembledName() const;
 
     /**
       Return email address including real name.
 
       @param email Email address to be used to construct the full email string.
                    If this is QString::null the preferred email address is used.
      */
     QString fullEmail( const QString &email=QString::null ) const;
 
     /**
       Insert an email address. If the email address already exists in this
       addressee it is not duplicated.
 
       @param email Email address
       @param preferred Set to true, if this is the preferred email address of
                        the addressee.
      */
     void insertEmail( const QString &email, bool preferred=false );
 
     /**
       Remove email address. If the email address doesn't exist, nothing happens.
      */
     void removeEmail( const QString &email );
 
     /**
       Return preferred email address. This is the first email address or the
       last one added with @ref insertEmail() with a set preferred parameter.
      */
     QString preferredEmail() const;
 
     /**
       Return list of all email addresses.
      */
     QStringList emails() const;
 
     /**
        Set the emails to @param.
        The first email address gets the preferred one!
        @param list The list of email addresses.
      */
     void setEmails( const QStringList& list);
 
     /**
       Insert a phone number. If a phone number with the same id already exists
       in this addressee it is not duplicated.
      */
     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;
 
     /**
       Return list of all phone numbers.
      */
     PhoneNumber::List phoneNumbers() const;
 
     /**
       Return list of phone numbers with a special type.
      */
     PhoneNumber::List phoneNumbers( int type ) const;
 
     /**
       Return phone number with the given id.
      */
     PhoneNumber findPhoneNumber( const QString &id ) const;
 
     /**
       Insert a key. If a key with the same id already exists
       in this addressee it is not duplicated.
      */
     void insertKey( const Key &key );
 
     /**
       Remove a key. If no key with the given id exists for this
       addresse nothing happens.
      */
     void removeKey( const Key &key );
 
     /**
       Return key, which matches the given type.
       If @p type == Key::Custom you can specify a string
       that should match. If you leave the string empty, the first
       key with a custom value is returned.
      */
     Key key( int type, QString customTypeString = QString::null ) const;
 
     /**
       Return list of all keys.
      */
     Key::List keys() const;
 
     /**
        Set the list of keys
        @param keys The keys to be set.
      */
     void setKeys( const Key::List& keys);
 
     /**
       Return list of keys with a special type.
       If @p type == Key::Custom you can specify a string
       that should match. If you leave the string empty, all custom
       keys will be returned.
      */
     Key::List keys( int type, QString customTypeString = QString::null  ) const;
 
     /**
       Return key with the given id.
      */
     Key findKey( const QString &id ) const;
 
     /**
       Insert an address. If an address with the same id already exists
       in this addressee it is not duplicated.
      */
     void insertAddress( const Address &address );
 
     /**
       Remove address. If no address with the given id exists for this
       addresse nothing happens.
      */
     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;
 
     /**
       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.
      */
     void insertCategory( const QString & );
 
     /**
       Remove category.
      */
     void removeCategory( const QString & );
 
     /**
       Return, if addressee has the given category.
      */
     bool hasCategory( const QString & ) const;
 
     /**
       Set categories to given value.
      */
     void setCategories( const QStringList & );
 
     /**
       Return list of all set categories.
      */
     QStringList categories() const;
 
     /**
       Insert custom entry. The entry is identified by the name of the inserting
       application and a unique name. If an entry with the given app and name
       already exists its value is replaced with the new given value.
      */
     void insertCustom( const QString &app, const QString &name,
                        const QString &value );
 
     /**
       Remove custom entry.
      */
     void removeCustom( const QString &app, const QString &name );
 
     /**
       Return value of custom entry, identified by app and entry name.
      */
     QString custom( const QString &app, const QString &name ) const;
 
     /**
       Set all custom entries.
      */
     void setCustoms( const QStringList & );
 
     /**
       Return list of all custom entries.
      */
     QStringList customs() const;
 
     /**
       Parse full email address. The result is given back in fullName and email.
      */
     static void parseEmailAddress( const QString &rawEmail, QString &fullName,
                                    QString &email );
 
     /**
       Debug output.
      */
     void dump() const;
 
     /**
       Returns string representation of the addressee.
      */
     QString asString() const;
 
     /**
       Set resource where the addressee is from.
      */
     void setResource( Resource *resource );
 
     /**
       Return pointer to resource.
      */
     Resource *resource() const;
 
     /**
       Return resourcelabel.
      */
     //US
     static QString resourceLabel();
     
     /**
             Mark addressee as changed.
            */
     void setChanged( bool value );
 
           /**
             Return whether the addressee is changed.
            */
           bool changed() const;
 
   private:
     Addressee copy();
     void detach();
     int mTempSyncStat;
 
     struct AddresseeData;
     mutable KSharedPtr<AddresseeData> mData;
 };
 
 QDataStream &operator<<( QDataStream &, const Addressee & );
 QDataStream &operator>>( QDataStream &, Addressee & );
 
 }
 
 #endif