-rw-r--r-- | kabc/addressee.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 028d3bb..eec0f1f 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -303,49 +303,50 @@ void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) | |||
303 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 303 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
304 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 304 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
305 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 305 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
306 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 306 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
307 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 307 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
308 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 308 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
309 | QStringList t; | 309 | QStringList t; |
310 | QStringList tAD; | 310 | QStringList tAD; |
311 | uint iii; | 311 | uint iii; |
312 | 312 | ||
313 | // ********** phone numbers | 313 | // ********** phone numbers |
314 | PhoneNumber::List phoneAD = ad.phoneNumbers(); | 314 | PhoneNumber::List phoneAD = ad.phoneNumbers(); |
315 | PhoneNumber::List::Iterator phoneItAD; | 315 | PhoneNumber::List::Iterator phoneItAD; |
316 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { | 316 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { |
317 | bool found = false; | 317 | bool found = false; |
318 | PhoneNumber::List::Iterator it; | 318 | PhoneNumber::List::Iterator it; |
319 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | 319 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { |
320 | if ( ( *phoneItAD ).contains( (*it) ) ) { | 320 | if ( ( *phoneItAD ).contains( (*it) ) ) { |
321 | found = true; | 321 | found = true; |
322 | (*it).setType( ( *phoneItAD ).type() ); | 322 | (*it).setType( ( *phoneItAD ).type() ); |
323 | (*it).setNumber( ( *phoneItAD ).number() ); | 323 | (*it).setNumber( ( *phoneItAD ).number() ); |
324 | break; | 324 | break; |
325 | } | 325 | } |
326 | } | 326 | } |
327 | if ( isSubSet && ! found ) | 327 | // if ( isSubSet && ! found ) |
328 | if ( ! found ) // LR try this one... | ||
328 | mData->phoneNumbers.append( *phoneItAD ); | 329 | mData->phoneNumbers.append( *phoneItAD ); |
329 | } | 330 | } |
330 | if ( isSubSet ) { | 331 | if ( isSubSet ) { |
331 | // ************* emails; | 332 | // ************* emails; |
332 | t = mData->emails; | 333 | t = mData->emails; |
333 | tAD = ad.mData->emails; | 334 | tAD = ad.mData->emails; |
334 | for ( iii = 0; iii < tAD.count(); ++iii) | 335 | for ( iii = 0; iii < tAD.count(); ++iii) |
335 | if ( !t.contains(tAD[iii] ) ) | 336 | if ( !t.contains(tAD[iii] ) ) |
336 | mData->emails.append( tAD[iii] ); | 337 | mData->emails.append( tAD[iii] ); |
337 | } | 338 | } |
338 | 339 | ||
339 | // ************* categories; | 340 | // ************* categories; |
340 | t = mData->categories; | 341 | t = mData->categories; |
341 | tAD = ad.mData->categories; | 342 | tAD = ad.mData->categories; |
342 | for ( iii = 0; iii < tAD.count(); ++iii) | 343 | for ( iii = 0; iii < tAD.count(); ++iii) |
343 | if ( !t.contains(tAD[iii] ) ) | 344 | if ( !t.contains(tAD[iii] ) ) |
344 | mData->categories.append( tAD[iii] ); | 345 | mData->categories.append( tAD[iii] ); |
345 | QStringList::ConstIterator it; | 346 | QStringList::ConstIterator it; |
346 | for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) { | 347 | for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) { |
347 | QString qualifiedName = (*it).left( (*it).find( ":" )); | 348 | QString qualifiedName = (*it).left( (*it).find( ":" )); |
348 | bool found = false; | 349 | bool found = false; |
349 | QStringList::ConstIterator itL; | 350 | QStringList::ConstIterator itL; |
350 | for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) { | 351 | for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) { |
351 | if ( (*itL).startsWith( qualifiedName ) ) { | 352 | if ( (*itL).startsWith( qualifiedName ) ) { |