1 files changed, 5 insertions, 1 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index fda62f1..e241281 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1,777 +1,781 @@
 /*** 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;
   QString externalUID;
   QString originalExternalUID;
   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;
   int mTempSyncStat;
   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));
+  mData->revision = QDateTime ( QDate( 2003,1,1));
   mData->mTempSyncStat =  SYNC_TEMPSTATE_INITIAL;
 }
 
 Addressee::~Addressee()
 {
 }
 
 Addressee::Addressee( const Addressee &a )
 {
   mData = a.mData;
 }
 
 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]  );
     }
     uint cs = getCsum4List(l);
     // qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
     setCsum( dev, QString::number (cs ));
 }
 
 void Addressee::mergeContact( const Addressee& ad )
 {
 
     detach();
     if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
     if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
     if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
     if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
     if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
     if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
     if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
     if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
     if ( !mData->birthday.isValid() ) 
         if ( ad.mData->birthday.isValid()) 
         mData->birthday =  ad.mData->birthday;
     if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
     if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
     if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
     if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
     if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
     if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
     if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
     if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
     if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
     if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
     if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
 
     // pending:
     // merging phonenumbers 
     // merging addresses
     // merging emails;
     // merging categories;
     // merging custom;
     // merging keys
+    qDebug("merge contact %s ", ad.uid().latin1());
+    setUid( ad.uid() );
 }
 
 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 );
     //qDebug("setID2 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
 }
 void Addressee::setTempSyncStat( int id )
 {
     if ( mData->mTempSyncStat == id ) return;
     detach();
     mData->mTempSyncStat = id;
 }
 int Addressee::tempSyncStat() const
 {
     return mData->mTempSyncStat;
 }
 
 QString Addressee::getID( const QString &  prof)
 {
     return KIdManager::getId ( mData->mExternalId, prof ); 
 }
 
 void Addressee::setCsum( const QString & prof , const QString & id )
 {
     detach();
     //qDebug("setcsum1 %s %s %s",mData->mExternalId.latin1(), prof.latin1(), id.latin1() );
     mData->mExternalId = KIdManager::setCsum ( mData->mExternalId, prof, id );
     //qDebug("setcsum2 %s ",mData->mExternalId.latin1() );
 }
 
 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::setExternalUID( const QString &id )
 {
   if ( id == mData->externalUID ) return;
   detach();
   mData->empty = false;
   mData->externalUID = id;
 }
 
 QString Addressee::externalUID() const
 {
   return mData->externalUID;
 }
 void Addressee::setOriginalExternalUID( const QString &id )
 {
   if ( id == mData->originalExternalUID ) return;
   detach();
   mData->empty = false;
+  qDebug("*******Set orig uid %s ", id.latin1());
   mData->originalExternalUID = id;
 }
 
 QString Addressee::originalExternalUID() const
 {
   return mData->originalExternalUID;
 }
 
 void Addressee::setUid( const QString &id )
 {
   if ( id == mData->uid ) return;
   detach();
+  qDebug("****setuid %s ", id.latin1());
   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