| -rw-r--r-- | kabc/addressee.cpp | 123 | ||||
| -rw-r--r-- | kabc/addressee.h | 2 |
2 files changed, 104 insertions, 21 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 548305a..cb10160 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -234,11 +234,4 @@ void Addressee::computeCsum(const QString &dev) //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 + if ( mData->url.isValid() ) + if ( ! mData->url.path().isEmpty()) l.append( mData->url.path() ); KABC::PhoneNumber::List phoneNumbers; @@ -279,3 +272,3 @@ void Addressee::computeCsum(const QString &dev) -void Addressee::mergeContact( const Addressee& ad ) +void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) { @@ -293,3 +286,3 @@ void Addressee::mergeContact( const Addressee& ad ) if ( ad.mData->birthday.isValid()) - mData->birthday = ad.mData->birthday; + mData->birthday = ad.mData->birthday; if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; @@ -305,15 +298,105 @@ void Addressee::mergeContact( const Addressee& ad ) if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; - PhoneNumber::List phoneAD = phoneNumbers(); - PhoneNumber::List::Iterator phoneItAD; - bool found = false; - for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { + QStringList t; + QStringList tAD; + uint iii; + if ( isSubSet ) { + // ********** phone numbers + PhoneNumber::List phoneAD = ad.phoneNumbers(); + PhoneNumber::List::Iterator phoneItAD; + for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { + bool found = false; + PhoneNumber::List::Iterator it; + for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { + if ( (*it) == ( *phoneItAD ) ) { + found = true; + break; + } + } + if ( ! found ) + mData->phoneNumbers.append( *phoneItAD ); + } + // ************* emails; + t = mData->emails; + tAD = ad.mData->emails; + for ( iii = 0; iii < tAD.count(); ++iii) + if ( !t.contains(tAD[iii] ) ) + mData->emails.append( tAD[iii] ); + // ************* categories; + t = mData->categories; + tAD = ad.mData->categories; + for ( iii = 0; iii < tAD.count(); ++iii) + if ( !t.contains(tAD[iii] ) ) + mData->categories.append( tAD[iii] ); - + + } + + QStringList::ConstIterator it; + for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) { + QString qualifiedName = (*it).left( (*it).find( ":" )); + bool found = false; + QStringList::ConstIterator itL; + for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) { + if ( (*itL).startsWith( qualifiedName ) ) { + found = true; + break; + } + } + if ( ! found ) { + mData->custom.append( *it ); + } + } + if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo; + if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo; + if ( !mData->sound.isIntern() ) { + if ( mData->sound.url().isEmpty() ) { + mData->sound = ad.mData->sound; + } + } + if ( !mData->agent.isIntern() ) { + if ( mData->agent.url().isEmpty() ) { + mData->agent = ad.mData->agent; + } } + +#if 0 + + if ( mData->url.isValid() ) + if ( ! mData->url.path().isEmpty()) l.append( mData->url.path() ); + 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] ); + } + +#endif + // pending: - // merging phonenumbers // merging addresses - // merging emails; - // merging categories; - // merging custom; // merging keys diff --git a/kabc/addressee.h b/kabc/addressee.h index 03138f6..e7900c6 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h @@ -118,3 +118,3 @@ class Addressee QString originalExternalUID() const; - void mergeContact( const Addressee& ad ); + void mergeContact( const Addressee& ad, bool isSubSet = false ); void simplifyEmails(); |