-rw-r--r-- | kabc/addressee.cpp | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 155ce24..7e1e414 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -213,193 +213,218 @@ void Addressee::computeCsum(const QString &dev) | |||
213 | //if ( !mData->name.isEmpty() ) l.append(mData->name); | 213 | //if ( !mData->name.isEmpty() ) l.append(mData->name); |
214 | //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); | 214 | //if ( !mData->formattedName.isEmpty() ) l.append(mData->formattedName ); |
215 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); | 215 | if ( !mData->familyName.isEmpty() ) l.append( mData->familyName ); |
216 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); | 216 | if ( !mData->givenName.isEmpty() ) l.append(mData->givenName ); |
217 | if ( !mData->additionalName.isEmpty() ) l.append( mData->additionalName ); | 217 | if ( !mData->additionalName.isEmpty() ) l.append( mData->additionalName ); |
218 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); | 218 | if ( !mData->prefix.isEmpty() ) l.append( mData->prefix ); |
219 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); | 219 | if ( !mData->suffix.isEmpty() ) l.append( mData->suffix ); |
220 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); | 220 | if ( !mData->nickName.isEmpty() ) l.append( mData->nickName ); |
221 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); | 221 | if ( mData->birthday.isValid() ) l.append( mData->birthday.toString() ); |
222 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); | 222 | if ( !mData->mailer.isEmpty() ) l.append( mData->mailer ); |
223 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); | 223 | if ( mData->timeZone.isValid() ) l.append( mData->timeZone.asString() ); |
224 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); | 224 | if ( mData->geo.isValid() ) l.append( mData->geo.asString() ); |
225 | if ( !mData->title .isEmpty() ) l.append( mData->title ); | 225 | if ( !mData->title .isEmpty() ) l.append( mData->title ); |
226 | if ( !mData->role.isEmpty() ) l.append( mData->role ); | 226 | if ( !mData->role.isEmpty() ) l.append( mData->role ); |
227 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); | 227 | if ( !mData->organization.isEmpty() ) l.append( mData->organization ); |
228 | if ( !mData->note.isEmpty() ) l.append( mData->note ); | 228 | if ( !mData->note.isEmpty() ) l.append( mData->note ); |
229 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); | 229 | if ( !mData->productId.isEmpty() ) l.append(mData->productId ); |
230 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); | 230 | if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); |
231 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); | 231 | if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); |
232 | if ( !mData->logo.undefined() ) { | 232 | if ( !mData->logo.undefined() ) { |
233 | if ( !mData->logo.isIntern() ) | 233 | if ( !mData->logo.isIntern() ) |
234 | l.append( mData->logo.url() ); | 234 | l.append( mData->logo.url() ); |
235 | else | 235 | else |
236 | l.append( QString::number(mData->logo.data().width()* mData->logo.data().height())); | 236 | l.append( QString::number(mData->logo.data().width()* mData->logo.data().height())); |
237 | } else { | 237 | } else { |
238 | l.append( "nologo"); | 238 | l.append( "nologo"); |
239 | } | 239 | } |
240 | if ( !mData->photo.undefined() ) { | 240 | if ( !mData->photo.undefined() ) { |
241 | if ( !mData->photo.isIntern() ) | 241 | if ( !mData->photo.isIntern() ) |
242 | l.append( mData->photo.url() ); | 242 | l.append( mData->photo.url() ); |
243 | else | 243 | else |
244 | l.append( QString::number(mData->photo.data().width()* mData->photo.data().height())); | 244 | l.append( QString::number(mData->photo.data().width()* mData->photo.data().height())); |
245 | } else { | 245 | } else { |
246 | l.append( "nophoto"); | 246 | l.append( "nophoto"); |
247 | } | 247 | } |
248 | #if 0 | 248 | #if 0 |
249 | if ( !mData->sound.undefined() ) { | 249 | if ( !mData->sound.undefined() ) { |
250 | if ( !mData->sound.isIntern() ) | 250 | if ( !mData->sound.isIntern() ) |
251 | l.append( mData->sound.url() ); | 251 | l.append( mData->sound.url() ); |
252 | else | 252 | else |
253 | l.append( QString(mData->sound.data().with()* mData->sound.data().height())); | 253 | l.append( QString(mData->sound.data().with()* mData->sound.data().height())); |
254 | } else { | 254 | } else { |
255 | l.append( "nosound"); | 255 | l.append( "nosound"); |
256 | } | 256 | } |
257 | #endif | 257 | #endif |
258 | //if ( !mData->agent.isEmpty() ) l.append( ); | 258 | //if ( !mData->agent.isEmpty() ) l.append( ); |
259 | if ( mData->url.isValid() ) | 259 | if ( mData->url.isValid() ) |
260 | if ( ! mData->url.path().isEmpty()) l.append( mData->url.path() ); | 260 | if ( ! mData->url.path().isEmpty()) l.append( mData->url.path() ); |
261 | KABC::PhoneNumber::List phoneNumbers; | 261 | KABC::PhoneNumber::List phoneNumbers; |
262 | KABC::PhoneNumber::List::Iterator phoneIter; | 262 | KABC::PhoneNumber::List::Iterator phoneIter; |
263 | 263 | ||
264 | QStringList t; | 264 | QStringList t; |
265 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); | 265 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); |
266 | ++phoneIter ) | 266 | ++phoneIter ) |
267 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); | 267 | t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) ); |
268 | t.sort(); | 268 | t.sort(); |
269 | uint iii; | 269 | uint iii; |
270 | for ( iii = 0; iii < t.count(); ++iii) | 270 | for ( iii = 0; iii < t.count(); ++iii) |
271 | l.append( t[iii] ); | 271 | l.append( t[iii] ); |
272 | t = mData->emails; | 272 | t = mData->emails; |
273 | t.sort(); | 273 | t.sort(); |
274 | for ( iii = 0; iii < t.count(); ++iii) | 274 | for ( iii = 0; iii < t.count(); ++iii) |
275 | l.append( t[iii] ); | 275 | l.append( t[iii] ); |
276 | t = mData->categories; | 276 | t = mData->categories; |
277 | t.sort(); | 277 | t.sort(); |
278 | for ( iii = 0; iii < t.count(); ++iii) | 278 | for ( iii = 0; iii < t.count(); ++iii) |
279 | l.append( t[iii] ); | 279 | l.append( t[iii] ); |
280 | t = mData->custom; | 280 | t = mData->custom; |
281 | t.sort(); | 281 | t.sort(); |
282 | for ( iii = 0; iii < t.count(); ++iii) | 282 | for ( iii = 0; iii < t.count(); ++iii) |
283 | if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) { | 283 | if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) { |
284 | int find = t[iii].find (':')+1; | 284 | int find = t[iii].find (':')+1; |
285 | //qDebug("lennnn %d %d ", find, t[iii].length()); | 285 | //qDebug("lennnn %d %d ", find, t[iii].length()); |
286 | if ( find < t[iii].length()) | 286 | if ( find < t[iii].length()) |
287 | l.append( t[iii] ); | 287 | l.append( t[iii] ); |
288 | 288 | ||
289 | } | 289 | } |
290 | KABC::Address::List::Iterator addressIter; | 290 | KABC::Address::List::Iterator addressIter; |
291 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); | 291 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); |
292 | ++addressIter ) { | 292 | ++addressIter ) { |
293 | t = (*addressIter).asList(); | 293 | t = (*addressIter).asList(); |
294 | t.sort(); | 294 | t.sort(); |
295 | for ( iii = 0; iii < t.count(); ++iii) | 295 | for ( iii = 0; iii < t.count(); ++iii) |
296 | l.append( t[iii] ); | 296 | l.append( t[iii] ); |
297 | } | 297 | } |
298 | uint cs = getCsum4List(l); | 298 | uint cs = getCsum4List(l); |
299 | 299 | ||
300 | #if 0 | 300 | #if 0 |
301 | for ( iii = 0; iii < l.count(); ++iii) | 301 | for ( iii = 0; iii < l.count(); ++iii) |
302 | qDebug("%d***%s***",iii,l[iii].latin1()); | 302 | qDebug("%d***%s***",iii,l[iii].latin1()); |
303 | qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); | 303 | qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() ); |
304 | #endif | 304 | #endif |
305 | 305 | ||
306 | 306 | ||
307 | setCsum( dev, QString::number (cs )); | 307 | setCsum( dev, QString::number (cs )); |
308 | } | 308 | } |
309 | bool Addressee::matchAddress( QRegExp* re ) const | ||
310 | { | ||
311 | KABC::Address::List::Iterator addressIter; | ||
312 | for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end(); | ||
313 | ++addressIter ) { | ||
314 | if ( (*addressIter).matchAddress( re ) ) | ||
315 | return true; | ||
316 | } | ||
317 | return false; | ||
318 | } | ||
319 | bool Addressee::matchPhoneNumber( QRegExp* re ) const | ||
320 | { | ||
321 | KABC::PhoneNumber::List::Iterator phoneIter; | ||
322 | |||
323 | for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end(); ++phoneIter ) { | ||
324 | #if QT_VERSION >= 0x030000 | ||
325 | if (re->search( (*phoneIter).number() ) == 0) | ||
326 | #else | ||
327 | if (re->match( (*phoneIter).number() ) == 0) | ||
328 | #endif | ||
329 | return true; | ||
309 | 330 | ||
331 | } | ||
332 | return false; | ||
333 | |||
334 | } | ||
310 | void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) | 335 | void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false) |
311 | { | 336 | { |
312 | // merge all standard non-outlook fields. | 337 | // merge all standard non-outlook fields. |
313 | //if isSubSet (e.g. mobile phone sync) merge all fields | 338 | //if isSubSet (e.g. mobile phone sync) merge all fields |
314 | 339 | ||
315 | detach(); | 340 | detach(); |
316 | if ( isSubSet ) { | 341 | if ( isSubSet ) { |
317 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; | 342 | if ( mData->name.isEmpty() ) mData->name = ad.mData->name; |
318 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; | 343 | if ( mData->formattedName.isEmpty() ) mData->formattedName = ad.mData->formattedName; |
319 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; | 344 | if ( mData->familyName.isEmpty() ) mData->familyName = ad.mData->familyName; |
320 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; | 345 | if ( mData->givenName.isEmpty() ) mData->givenName = ad.mData->givenName ; |
321 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; | 346 | if ( mData->additionalName ) mData->additionalName = ad.mData->additionalName; |
322 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; | 347 | if ( mData->prefix.isEmpty() ) mData->prefix = ad.mData->prefix; |
323 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; | 348 | if ( mData->suffix.isEmpty() ) mData->suffix = ad.mData->suffix; |
324 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; | 349 | if ( mData->title .isEmpty() ) mData->title = ad.mData->title ; |
325 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; | 350 | if ( mData->role.isEmpty() ) mData->role = ad.mData->role ; |
326 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; | 351 | if ( mData->nickName.isEmpty() ) mData->nickName = ad.mData->nickName; |
327 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; | 352 | if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; |
328 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; | 353 | if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; |
329 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; | 354 | if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy; |
330 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; | 355 | if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ; |
331 | if ( !mData->birthday.isValid() ) | 356 | if ( !mData->birthday.isValid() ) |
332 | if ( ad.mData->birthday.isValid()) | 357 | if ( ad.mData->birthday.isValid()) |
333 | mData->birthday = ad.mData->birthday; | 358 | mData->birthday = ad.mData->birthday; |
334 | 359 | ||
335 | } | 360 | } |
336 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; | 361 | if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer; |
337 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; | 362 | if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone; |
338 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; | 363 | if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo; |
339 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; | 364 | if ( mData->productId.isEmpty() ) mData->productId = ad.mData->productId; |
340 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; | 365 | if ( mData->sortString.isEmpty() ) mData->sortString = ad.mData->sortString; |
341 | QStringList t; | 366 | QStringList t; |
342 | QStringList tAD; | 367 | QStringList tAD; |
343 | uint iii; | 368 | uint iii; |
344 | 369 | ||
345 | // ********** phone numbers | 370 | // ********** phone numbers |
346 | if ( isSubSet ) { | 371 | if ( isSubSet ) { |
347 | PhoneNumber::List phoneAD = ad.phoneNumbers(); | 372 | PhoneNumber::List phoneAD = ad.phoneNumbers(); |
348 | PhoneNumber::List::Iterator phoneItAD; | 373 | PhoneNumber::List::Iterator phoneItAD; |
349 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { | 374 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { |
350 | bool found = false; | 375 | bool found = false; |
351 | PhoneNumber::List::Iterator it; | 376 | PhoneNumber::List::Iterator it; |
352 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | 377 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { |
353 | if ( ( *phoneItAD ).contains( (*it) ) ) { | 378 | if ( ( *phoneItAD ).contains( (*it) ) ) { |
354 | found = true; | 379 | found = true; |
355 | (*it).setType( ( *phoneItAD ).type() ); | 380 | (*it).setType( ( *phoneItAD ).type() ); |
356 | (*it).setNumber( ( *phoneItAD ).number() ); | 381 | (*it).setNumber( ( *phoneItAD ).number() ); |
357 | break; | 382 | break; |
358 | } | 383 | } |
359 | } | 384 | } |
360 | // if ( isSubSet && ! found ) | 385 | // if ( isSubSet && ! found ) |
361 | if ( ! found ) // LR try this one... | 386 | if ( ! found ) // LR try this one... |
362 | mData->phoneNumbers.append( *phoneItAD ); | 387 | mData->phoneNumbers.append( *phoneItAD ); |
363 | } | 388 | } |
364 | } else { | 389 | } else { |
365 | PhoneNumber::List phoneAD = ad.phoneNumbers(); | 390 | PhoneNumber::List phoneAD = ad.phoneNumbers(); |
366 | PhoneNumber::List::Iterator phoneItAD; | 391 | PhoneNumber::List::Iterator phoneItAD; |
367 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { | 392 | for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) { |
368 | bool found = false; | 393 | bool found = false; |
369 | PhoneNumber::List::Iterator it; | 394 | PhoneNumber::List::Iterator it; |
370 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { | 395 | for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) { |
371 | if ( ( *phoneItAD ).contains( (*it) ) ) { | 396 | if ( ( *phoneItAD ).contains( (*it) ) ) { |
372 | found = true; | 397 | found = true; |
373 | (*it).setType( ( *phoneItAD ).type() ); | 398 | (*it).setType( ( *phoneItAD ).type() ); |
374 | (*it).setNumber( ( *phoneItAD ).number() ); | 399 | (*it).setNumber( ( *phoneItAD ).number() ); |
375 | break; | 400 | break; |
376 | } | 401 | } |
377 | } | 402 | } |
378 | if ( ! found ) { // append numbers which do not have work or home type | 403 | if ( ! found ) { // append numbers which do not have work or home type |
379 | if ( ! ( ( *phoneItAD ).type() & (PhoneNumber::Work | PhoneNumber::Home) ) ) | 404 | if ( ! ( ( *phoneItAD ).type() & (PhoneNumber::Work | PhoneNumber::Home) ) ) |
380 | mData->phoneNumbers.append( *phoneItAD ); | 405 | mData->phoneNumbers.append( *phoneItAD ); |
381 | } | 406 | } |
382 | } | 407 | } |
383 | } | 408 | } |
384 | if ( isSubSet ) { | 409 | if ( isSubSet ) { |
385 | // ************* emails; | 410 | // ************* emails; |
386 | t = mData->emails; | 411 | t = mData->emails; |
387 | tAD = ad.mData->emails; | 412 | tAD = ad.mData->emails; |
388 | for ( iii = 0; iii < tAD.count(); ++iii) | 413 | for ( iii = 0; iii < tAD.count(); ++iii) |
389 | if ( !t.contains(tAD[iii] ) ) | 414 | if ( !t.contains(tAD[iii] ) ) |
390 | mData->emails.append( tAD[iii] ); | 415 | mData->emails.append( tAD[iii] ); |
391 | } | 416 | } |
392 | 417 | ||
393 | // ************* categories; | 418 | // ************* categories; |
394 | if ( isSubSet ) { | 419 | if ( isSubSet ) { |
395 | t = mData->categories; | 420 | t = mData->categories; |
396 | tAD = ad.mData->categories; | 421 | tAD = ad.mData->categories; |
397 | for ( iii = 0; iii < tAD.count(); ++iii) | 422 | for ( iii = 0; iii < tAD.count(); ++iii) |
398 | if ( !t.contains(tAD[iii] ) ) | 423 | if ( !t.contains(tAD[iii] ) ) |
399 | mData->categories.append( tAD[iii] ); | 424 | mData->categories.append( tAD[iii] ); |
400 | } | 425 | } |
401 | QStringList::ConstIterator it; | 426 | QStringList::ConstIterator it; |
402 | for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) { | 427 | for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) { |
403 | QString qualifiedName = (*it).left( (*it).find( ":" )); | 428 | QString qualifiedName = (*it).left( (*it).find( ":" )); |
404 | bool found = false; | 429 | bool found = false; |
405 | QStringList::ConstIterator itL; | 430 | QStringList::ConstIterator itL; |