-rw-r--r-- | kabc/field.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp index 7c6d7a9..203f696 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -1,99 +1,101 @@ | |||
1 | /*** Warning! This file has been generated by the script makeaddressee ***/ | 1 | /*** Warning! This file has been generated by the script makeaddressee ***/ |
2 | /* | 2 | /* |
3 | This file is part of libkabc. | 3 | This file is part of libkabc. |
4 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> | 4 | Copyright (c) 2002 Cornelius Schumacher <schumacher@kde.org> |
5 | 5 | ||
6 | This library is free software; you can redistribute it and/or | 6 | This library is free software; you can redistribute it and/or |
7 | modify it under the terms of the GNU Library General Public | 7 | modify it under the terms of the GNU Library General Public |
8 | License as published by the Free Software Foundation; either | 8 | License as published by the Free Software Foundation; either |
9 | version 2 of the License, or (at your option) any later version. | 9 | version 2 of the License, or (at your option) any later version. |
10 | 10 | ||
11 | This library is distributed in the hope that it will be useful, | 11 | This library is distributed in the hope that it will be useful, |
12 | but WITHOUT ANY WARRANTY; without even the implied warranty of | 12 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | 13 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
14 | Library General Public License for more details. | 14 | Library General Public License for more details. |
15 | 15 | ||
16 | You should have received a copy of the GNU Library General Public License | 16 | You should have received a copy of the GNU Library General Public License |
17 | along with this library; see the file COPYING.LIB. If not, write to | 17 | along with this library; see the file COPYING.LIB. If not, write to |
18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, | 18 | the Free Software Foundation, Inc., 59 Temple Place - Suite 330, |
19 | Boston, MA 02111-1307, USA. | 19 | Boston, MA 02111-1307, USA. |
20 | */ | 20 | */ |
21 | 21 | ||
22 | /* | 22 | /* |
23 | Enhanced Version of the file for platform independent KDE tools. | 23 | Enhanced Version of the file for platform independent KDE tools. |
24 | Copyright (c) 2004 Ulf Schenk | 24 | Copyright (c) 2004 Ulf Schenk |
25 | 25 | ||
26 | $Id$ | 26 | $Id$ |
27 | */ | 27 | */ |
28 | 28 | ||
29 | #include <klocale.h> | 29 | #include <klocale.h> |
30 | #include <kconfig.h> | 30 | #include <kconfig.h> |
31 | #include <kconfigbase.h> | 31 | #include <kconfigbase.h> |
32 | #include <kglobal.h> | 32 | #include <kglobal.h> |
33 | 33 | ||
34 | #include "field.h" | 34 | #include "field.h" |
35 | #include "resource.h" | 35 | #include "resource.h" |
36 | //Added by qt3to4: | ||
37 | #include <Q3ValueList> | ||
36 | 38 | ||
37 | using namespace KABC; | 39 | using namespace KABC; |
38 | 40 | ||
39 | class Field::FieldImpl | 41 | class Field::FieldImpl |
40 | { | 42 | { |
41 | public: | 43 | public: |
42 | FieldImpl( int fieldId, int category = 0, | 44 | FieldImpl( int fieldId, int category = 0, |
43 | const QString &label = QString::null, | 45 | const QString &label = QString::null, |
44 | const QString &key = QString::null, | 46 | const QString &key = QString::null, |
45 | const QString &app = QString::null ) | 47 | const QString &app = QString::null ) |
46 | : mFieldId( fieldId ), mCategory( category ), mLabel( label ), | 48 | : mFieldId( fieldId ), mCategory( category ), mLabel( label ), |
47 | mKey( key ), mApp( app ) {} | 49 | mKey( key ), mApp( app ) {} |
48 | 50 | ||
49 | enum FieldId | 51 | enum FieldId |
50 | { | 52 | { |
51 | CustomField, | 53 | CustomField, |
52 | FormattedName, | 54 | FormattedName, |
53 | FamilyName, | 55 | FamilyName, |
54 | GivenName, | 56 | GivenName, |
55 | AdditionalName, | 57 | AdditionalName, |
56 | Prefix, | 58 | Prefix, |
57 | Suffix, | 59 | Suffix, |
58 | NickName, | 60 | NickName, |
59 | Birthday, | 61 | Birthday, |
60 | Category, | 62 | Category, |
61 | HomeAddressStreet, | 63 | HomeAddressStreet, |
62 | HomeAddressLocality, | 64 | HomeAddressLocality, |
63 | HomeAddressRegion, | 65 | HomeAddressRegion, |
64 | HomeAddressPostalCode, | 66 | HomeAddressPostalCode, |
65 | HomeAddressCountry, | 67 | HomeAddressCountry, |
66 | HomeAddressLabel, | 68 | HomeAddressLabel, |
67 | BusinessAddressStreet, | 69 | BusinessAddressStreet, |
68 | BusinessAddressLocality, | 70 | BusinessAddressLocality, |
69 | BusinessAddressRegion, | 71 | BusinessAddressRegion, |
70 | BusinessAddressPostalCode, | 72 | BusinessAddressPostalCode, |
71 | BusinessAddressCountry, | 73 | BusinessAddressCountry, |
72 | BusinessAddressLabel, | 74 | BusinessAddressLabel, |
73 | HomePhone, | 75 | HomePhone, |
74 | BusinessPhone, | 76 | BusinessPhone, |
75 | MobilePhone, | 77 | MobilePhone, |
76 | HomeFax, | 78 | HomeFax, |
77 | BusinessFax, | 79 | BusinessFax, |
78 | Isdn, | 80 | Isdn, |
79 | Pager, | 81 | Pager, |
80 | Email, | 82 | Email, |
81 | Mailer, | 83 | Mailer, |
82 | Title, | 84 | Title, |
83 | Role, | 85 | Role, |
84 | Organization, | 86 | Organization, |
85 | Note, | 87 | Note, |
86 | Url, | 88 | Url, |
87 | Resource, | 89 | Resource, |
88 | Sip, | 90 | Sip, |
89 | MobileWorkPhone, | 91 | MobileWorkPhone, |
90 | OtherPhone | 92 | OtherPhone |
91 | }; | 93 | }; |
92 | 94 | ||
93 | int fieldId() { return mFieldId; } | 95 | int fieldId() { return mFieldId; } |
94 | int category() { return mCategory; } | 96 | int category() { return mCategory; } |
95 | 97 | ||
96 | QString label() { return mLabel; } | 98 | QString label() { return mLabel; } |
97 | QString key() { return mKey; } | 99 | QString key() { return mKey; } |
98 | QString app() { return mApp; } | 100 | QString app() { return mApp; } |
99 | 101 | ||
@@ -316,269 +318,269 @@ QString Field::value( const KABC::Addressee &a ) | |||
316 | case FieldImpl::HomeAddressCountry: | 318 | case FieldImpl::HomeAddressCountry: |
317 | return a.address( Address::Home ).country(); | 319 | return a.address( Address::Home ).country(); |
318 | case FieldImpl::BusinessAddressStreet: | 320 | case FieldImpl::BusinessAddressStreet: |
319 | return a.address( Address::Work ).street(); | 321 | return a.address( Address::Work ).street(); |
320 | case FieldImpl::BusinessAddressLocality: | 322 | case FieldImpl::BusinessAddressLocality: |
321 | return a.address( Address::Work ).locality(); | 323 | return a.address( Address::Work ).locality(); |
322 | case FieldImpl::BusinessAddressRegion: | 324 | case FieldImpl::BusinessAddressRegion: |
323 | return a.address( Address::Work ).region(); | 325 | return a.address( Address::Work ).region(); |
324 | case FieldImpl::BusinessAddressPostalCode: | 326 | case FieldImpl::BusinessAddressPostalCode: |
325 | return a.address( Address::Work ).postalCode(); | 327 | return a.address( Address::Work ).postalCode(); |
326 | case FieldImpl::BusinessAddressCountry: | 328 | case FieldImpl::BusinessAddressCountry: |
327 | return a.address( Address::Work ).country(); | 329 | return a.address( Address::Work ).country(); |
328 | case FieldImpl::CustomField: | 330 | case FieldImpl::CustomField: |
329 | return a.custom( mImpl->app(), mImpl->key() ); | 331 | return a.custom( mImpl->app(), mImpl->key() ); |
330 | default: | 332 | default: |
331 | return QString::null; | 333 | return QString::null; |
332 | } | 334 | } |
333 | } | 335 | } |
334 | 336 | ||
335 | bool Field::setValue( KABC::Addressee &a, const QString &value ) | 337 | bool Field::setValue( KABC::Addressee &a, const QString &value ) |
336 | { | 338 | { |
337 | switch ( mImpl->fieldId() ) { | 339 | switch ( mImpl->fieldId() ) { |
338 | case FieldImpl::FormattedName: | 340 | case FieldImpl::FormattedName: |
339 | a.setFormattedName( value ); | 341 | a.setFormattedName( value ); |
340 | return true; | 342 | return true; |
341 | case FieldImpl::FamilyName: | 343 | case FieldImpl::FamilyName: |
342 | a.setFamilyName( value ); | 344 | a.setFamilyName( value ); |
343 | return true; | 345 | return true; |
344 | case FieldImpl::GivenName: | 346 | case FieldImpl::GivenName: |
345 | a.setGivenName( value ); | 347 | a.setGivenName( value ); |
346 | return true; | 348 | return true; |
347 | case FieldImpl::AdditionalName: | 349 | case FieldImpl::AdditionalName: |
348 | a.setAdditionalName( value ); | 350 | a.setAdditionalName( value ); |
349 | return true; | 351 | return true; |
350 | case FieldImpl::Prefix: | 352 | case FieldImpl::Prefix: |
351 | a.setPrefix( value ); | 353 | a.setPrefix( value ); |
352 | return true; | 354 | return true; |
353 | case FieldImpl::Suffix: | 355 | case FieldImpl::Suffix: |
354 | a.setSuffix( value ); | 356 | a.setSuffix( value ); |
355 | return true; | 357 | return true; |
356 | case FieldImpl::NickName: | 358 | case FieldImpl::NickName: |
357 | a.setNickName( value ); | 359 | a.setNickName( value ); |
358 | return true; | 360 | return true; |
359 | case FieldImpl::Mailer: | 361 | case FieldImpl::Mailer: |
360 | a.setMailer( value ); | 362 | a.setMailer( value ); |
361 | return true; | 363 | return true; |
362 | case FieldImpl::Title: | 364 | case FieldImpl::Title: |
363 | a.setTitle( value ); | 365 | a.setTitle( value ); |
364 | return true; | 366 | return true; |
365 | case FieldImpl::Role: | 367 | case FieldImpl::Role: |
366 | a.setRole( value ); | 368 | a.setRole( value ); |
367 | return true; | 369 | return true; |
368 | case FieldImpl::Organization: | 370 | case FieldImpl::Organization: |
369 | a.setOrganization( value ); | 371 | a.setOrganization( value ); |
370 | return true; | 372 | return true; |
371 | case FieldImpl::Note: | 373 | case FieldImpl::Note: |
372 | a.setNote( value ); | 374 | a.setNote( value ); |
373 | return true; | 375 | return true; |
374 | case FieldImpl::Birthday: | 376 | case FieldImpl::Birthday: |
375 | //US | 377 | //US |
376 | //the generated code had the following format: return a.setBirthday( QDate::fromString( value, Qt::ISODate ) ); | 378 | //the generated code had the following format: return a.setBirthday( QDate::fromString( value, Qt::ISODate ) ); |
377 | // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ? | 379 | // But Qt::IsoDate and QDate::fromString was not specified. Do I have the wrong QT version ? |
378 | { | 380 | { |
379 | QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d"); // = Qt::ISODate | 381 | QDate dt = KGlobal::locale()->readDate( value, "%Y-%m-%d"); // = Qt::ISODate |
380 | a.setBirthday(dt); | 382 | a.setBirthday((QDateTime)dt); |
381 | } | 383 | } |
382 | return true; | 384 | return true; |
383 | case FieldImpl::CustomField: | 385 | case FieldImpl::CustomField: |
384 | a.insertCustom( mImpl->app(), mImpl->key(), value ); | 386 | a.insertCustom( mImpl->app(), mImpl->key(), value ); |
385 | //US never copy the resourcename back to the adressee. | 387 | //US never copy the resourcename back to the adressee. |
386 | case FieldImpl::Resource: | 388 | case FieldImpl::Resource: |
387 | default: | 389 | default: |
388 | return false; | 390 | return false; |
389 | } | 391 | } |
390 | } | 392 | } |
391 | 393 | ||
392 | bool Field::isCustom() | 394 | bool Field::isCustom() |
393 | { | 395 | { |
394 | return mImpl->fieldId() == FieldImpl::CustomField; | 396 | return mImpl->fieldId() == FieldImpl::CustomField; |
395 | } | 397 | } |
396 | 398 | ||
397 | Field::List Field::allFields() | 399 | Field::List Field::allFields() |
398 | { | 400 | { |
399 | if ( mAllFields.isEmpty() ) { | 401 | if ( mAllFields.isEmpty() ) { |
400 | createField( FieldImpl::FormattedName, Frequent ); | 402 | createField( FieldImpl::FormattedName, Frequent ); |
401 | createField( FieldImpl::FamilyName, Frequent ); | 403 | createField( FieldImpl::FamilyName, Frequent ); |
402 | createField( FieldImpl::GivenName, Frequent ); | 404 | createField( FieldImpl::GivenName, Frequent ); |
403 | createField( FieldImpl::AdditionalName ); | 405 | createField( FieldImpl::AdditionalName ); |
404 | createField( FieldImpl::Prefix ); | 406 | createField( FieldImpl::Prefix ); |
405 | createField( FieldImpl::Suffix ); | 407 | createField( FieldImpl::Suffix ); |
406 | createField( FieldImpl::NickName, Personal ); | 408 | createField( FieldImpl::NickName, Personal ); |
407 | createField( FieldImpl::Birthday, Personal ); | 409 | createField( FieldImpl::Birthday, Personal ); |
408 | createField( FieldImpl::Category ); | 410 | createField( FieldImpl::Category ); |
409 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); | 411 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); |
410 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); | 412 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); |
411 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); | 413 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); |
412 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); | 414 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); |
413 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); | 415 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); |
414 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); | 416 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); |
415 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); | 417 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); |
416 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); | 418 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); |
417 | createField( FieldImpl::BusinessAddressRegion, Address|Organization ); | 419 | createField( FieldImpl::BusinessAddressRegion, Address|Organization ); |
418 | createField( FieldImpl::BusinessAddressPostalCode, Address|Organization ); | 420 | createField( FieldImpl::BusinessAddressPostalCode, Address|Organization ); |
419 | createField( FieldImpl::BusinessAddressCountry, Address|Organization ); | 421 | createField( FieldImpl::BusinessAddressCountry, Address|Organization ); |
420 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); | 422 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); |
421 | createField( FieldImpl::HomePhone, Personal|Frequent ); | 423 | createField( FieldImpl::HomePhone, Personal|Frequent ); |
422 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); | 424 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); |
423 | createField( FieldImpl::MobilePhone, Frequent ); | 425 | createField( FieldImpl::MobilePhone, Frequent ); |
424 | createField( FieldImpl::MobileWorkPhone, Frequent ); | 426 | createField( FieldImpl::MobileWorkPhone, Frequent ); |
425 | createField( FieldImpl::HomeFax ); | 427 | createField( FieldImpl::HomeFax ); |
426 | createField( FieldImpl::BusinessFax ); | 428 | createField( FieldImpl::BusinessFax ); |
427 | createField( FieldImpl::Isdn ); | 429 | createField( FieldImpl::Isdn ); |
428 | createField( FieldImpl::Pager ); | 430 | createField( FieldImpl::Pager ); |
429 | createField( FieldImpl::Email, Email|Frequent ); | 431 | createField( FieldImpl::Email, Email|Frequent ); |
430 | createField( FieldImpl::Mailer, Email ); | 432 | createField( FieldImpl::Mailer, Email ); |
431 | createField( FieldImpl::Title, Organization ); | 433 | createField( FieldImpl::Title, Organization ); |
432 | createField( FieldImpl::Role, Organization ); | 434 | createField( FieldImpl::Role, Organization ); |
433 | createField( FieldImpl::Organization, Organization ); | 435 | createField( FieldImpl::Organization, Organization ); |
434 | createField( FieldImpl::Note ); | 436 | createField( FieldImpl::Note ); |
435 | createField( FieldImpl::Url ); | 437 | createField( FieldImpl::Url ); |
436 | createField( FieldImpl::Resource ); | 438 | createField( FieldImpl::Resource ); |
437 | createField( FieldImpl::Sip ); | 439 | createField( FieldImpl::Sip ); |
438 | createField( FieldImpl::OtherPhone ); | 440 | createField( FieldImpl::OtherPhone ); |
439 | } | 441 | } |
440 | 442 | ||
441 | return mAllFields; | 443 | return mAllFields; |
442 | } | 444 | } |
443 | 445 | ||
444 | Field::List Field::defaultFields() | 446 | Field::List Field::defaultFields() |
445 | { | 447 | { |
446 | if ( mDefaultFields.isEmpty() ) { | 448 | if ( mDefaultFields.isEmpty() ) { |
447 | createDefaultField( FieldImpl::GivenName ); | 449 | createDefaultField( FieldImpl::GivenName ); |
448 | createDefaultField( FieldImpl::FamilyName ); | 450 | createDefaultField( FieldImpl::FamilyName ); |
449 | createDefaultField( FieldImpl::Email ); | 451 | createDefaultField( FieldImpl::Email ); |
450 | } | 452 | } |
451 | 453 | ||
452 | return mDefaultFields; | 454 | return mDefaultFields; |
453 | } | 455 | } |
454 | 456 | ||
455 | void Field::createField( int id, int category ) | 457 | void Field::createField( int id, int category ) |
456 | { | 458 | { |
457 | mAllFields.append( new Field( new FieldImpl( id, category ) ) ); | 459 | mAllFields.append( new Field( new FieldImpl( id, category ) ) ); |
458 | } | 460 | } |
459 | 461 | ||
460 | void Field::createDefaultField( int id, int category ) | 462 | void Field::createDefaultField( int id, int category ) |
461 | { | 463 | { |
462 | mDefaultFields.append( new Field( new FieldImpl( id, category ) ) ); | 464 | mDefaultFields.append( new Field( new FieldImpl( id, category ) ) ); |
463 | } | 465 | } |
464 | 466 | ||
465 | void Field::deleteFields() | 467 | void Field::deleteFields() |
466 | { | 468 | { |
467 | Field::List::ConstIterator it; | 469 | Field::List::ConstIterator it; |
468 | 470 | ||
469 | for( it = mAllFields.begin(); it != mAllFields.end(); ++it ) { | 471 | for( it = mAllFields.begin(); it != mAllFields.end(); ++it ) { |
470 | delete (*it); | 472 | delete (*it); |
471 | } | 473 | } |
472 | mAllFields.clear(); | 474 | mAllFields.clear(); |
473 | 475 | ||
474 | for( it = mDefaultFields.begin(); it != mDefaultFields.end(); ++it ) { | 476 | for( it = mDefaultFields.begin(); it != mDefaultFields.end(); ++it ) { |
475 | delete (*it); | 477 | delete (*it); |
476 | } | 478 | } |
477 | mDefaultFields.clear(); | 479 | mDefaultFields.clear(); |
478 | 480 | ||
479 | for( it = mCustomFields.begin(); it != mCustomFields.end(); ++it ) { | 481 | for( it = mCustomFields.begin(); it != mCustomFields.end(); ++it ) { |
480 | delete (*it); | 482 | delete (*it); |
481 | } | 483 | } |
482 | mCustomFields.clear(); | 484 | mCustomFields.clear(); |
483 | } | 485 | } |
484 | 486 | ||
485 | void Field::saveFields( const QString &identifier, | 487 | void Field::saveFields( const QString &identifier, |
486 | const Field::List &fields ) | 488 | const Field::List &fields ) |
487 | { | 489 | { |
488 | KConfig *cfg = KGlobal::config(); | 490 | KConfig *cfg = KGlobal::config(); |
489 | KConfigGroupSaver( cfg, "KABCFields" ); | 491 | KConfigGroupSaver( cfg, "KABCFields" ); |
490 | saveFields( cfg, identifier, fields ); | 492 | saveFields( cfg, identifier, fields ); |
491 | } | 493 | } |
492 | 494 | ||
493 | void Field::saveFields( KConfig *cfg, const QString &identifier, | 495 | void Field::saveFields( KConfig *cfg, const QString &identifier, |
494 | const Field::List &fields ) | 496 | const Field::List &fields ) |
495 | { | 497 | { |
496 | QValueList<int> fieldIds; | 498 | Q3ValueList<int> fieldIds; |
497 | 499 | ||
498 | //US | 500 | //US |
499 | // qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1()); | 501 | // qDebug("Field::saveFields to %s %s", cfg->getFileName().latin1(), identifier.latin1()); |
500 | 502 | ||
501 | int custom = 0; | 503 | int custom = 0; |
502 | Field::List::ConstIterator it; | 504 | Field::List::ConstIterator it; |
503 | for( it = fields.begin(); it != fields.end(); ++it ) { | 505 | for( it = fields.begin(); it != fields.end(); ++it ) { |
504 | //US | 506 | //US |
505 | // qDebug("Field::saveFields field:%i", (*it)->mImpl->fieldId()); | 507 | // qDebug("Field::saveFields field:%i", (*it)->mImpl->fieldId()); |
506 | 508 | ||
507 | fieldIds.append( (*it)->mImpl->fieldId() ); | 509 | fieldIds.append( (*it)->mImpl->fieldId() ); |
508 | if( (*it)->isCustom() ) { | 510 | if( (*it)->isCustom() ) { |
509 | QStringList customEntry; | 511 | QStringList customEntry; |
510 | customEntry << (*it)->mImpl->label(); | 512 | customEntry << (*it)->mImpl->label(); |
511 | customEntry << (*it)->mImpl->key(); | 513 | customEntry << (*it)->mImpl->key(); |
512 | customEntry << (*it)->mImpl->app(); | 514 | customEntry << (*it)->mImpl->app(); |
513 | cfg->writeEntry( "KABC_CustomEntry_" + identifier + "_" + | 515 | cfg->writeEntry( "KABC_CustomEntry_" + identifier + "_" + |
514 | QString::number( custom++ ), customEntry ); | 516 | QString::number( custom++ ), customEntry ); |
515 | } | 517 | } |
516 | } | 518 | } |
517 | cfg->writeEntry( identifier, fieldIds ); | 519 | cfg->writeEntry( identifier, fieldIds ); |
518 | } | 520 | } |
519 | 521 | ||
520 | Field::List Field::restoreFields( const QString &identifier ) | 522 | Field::List Field::restoreFields( const QString &identifier ) |
521 | { | 523 | { |
522 | //US | 524 | //US |
523 | // qDebug("Field::restoreFields, identifier: %s", identifier.latin1()); | 525 | // qDebug("Field::restoreFields, identifier: %s", identifier.latin1()); |
524 | 526 | ||
525 | KConfig *cfg = KGlobal::config(); | 527 | KConfig *cfg = KGlobal::config(); |
526 | KConfigGroupSaver( cfg, "KABCFields" ); | 528 | KConfigGroupSaver( cfg, "KABCFields" ); |
527 | cfg->setGroup( "KABCFields" ); | 529 | cfg->setGroup( "KABCFields" ); |
528 | 530 | ||
529 | Field::List l = restoreFields( cfg, identifier ); | 531 | Field::List l = restoreFields( cfg, identifier ); |
530 | 532 | ||
531 | return l; | 533 | return l; |
532 | } | 534 | } |
533 | 535 | ||
534 | Field::List Field::restoreFields( KConfig *cfg, const QString &identifier ) | 536 | Field::List Field::restoreFields( KConfig *cfg, const QString &identifier ) |
535 | { | 537 | { |
536 | QValueList<int> fieldIds = cfg->readIntListEntry( identifier); | 538 | Q3ValueList<int> fieldIds = cfg->readIntListEntry( identifier); |
537 | //US | 539 | //US |
538 | // qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1()); | 540 | // qDebug("Field::restoreFields from %s, identifier: %s", cfg->getFileName().latin1(), identifier.latin1()); |
539 | 541 | ||
540 | Field::List fields; | 542 | Field::List fields; |
541 | 543 | ||
542 | int custom = 0; | 544 | int custom = 0; |
543 | QValueList<int>::ConstIterator it; | 545 | Q3ValueList<int>::ConstIterator it; |
544 | for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) { | 546 | for( it = fieldIds.begin(); it != fieldIds.end(); ++it ) { |
545 | FieldImpl *f = 0; | 547 | FieldImpl *f = 0; |
546 | if ( (*it) == FieldImpl::CustomField ) { | 548 | if ( (*it) == FieldImpl::CustomField ) { |
547 | QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" + | 549 | QStringList customEntry = cfg->readListEntry( "KABC_CustomEntry_" + |
548 | identifier + "_" + | 550 | identifier + "_" + |
549 | QString::number( custom++ ) ); | 551 | QString::number( custom++ ) ); |
550 | f = new FieldImpl( *it, CustomCategory, customEntry[ 0 ], | 552 | f = new FieldImpl( *it, CustomCategory, customEntry[ 0 ], |
551 | customEntry[ 1 ], customEntry[ 2 ] ); | 553 | customEntry[ 1 ], customEntry[ 2 ] ); |
552 | } else { | 554 | } else { |
553 | f = new FieldImpl( *it ); | 555 | f = new FieldImpl( *it ); |
554 | } | 556 | } |
555 | fields.append( new Field( f ) ); | 557 | fields.append( new Field( f ) ); |
556 | } | 558 | } |
557 | 559 | ||
558 | return fields; | 560 | return fields; |
559 | } | 561 | } |
560 | 562 | ||
561 | bool Field::equals( Field *field ) | 563 | bool Field::equals( Field *field ) |
562 | { | 564 | { |
563 | bool sameId = ( mImpl->fieldId() == field->mImpl->fieldId() ); | 565 | bool sameId = ( mImpl->fieldId() == field->mImpl->fieldId() ); |
564 | 566 | ||
565 | if ( !sameId ) return false; | 567 | if ( !sameId ) return false; |
566 | 568 | ||
567 | if ( mImpl->fieldId() != FieldImpl::CustomField ) return true; | 569 | if ( mImpl->fieldId() != FieldImpl::CustomField ) return true; |
568 | 570 | ||
569 | return mImpl->key() == field->mImpl->key(); | 571 | return mImpl->key() == field->mImpl->key(); |
570 | } | 572 | } |
571 | 573 | ||
572 | Field *Field::createCustomField( const QString &label, int category, | 574 | Field *Field::createCustomField( const QString &label, int category, |
573 | const QString &key, const QString &app ) | 575 | const QString &key, const QString &app ) |
574 | { | 576 | { |
575 | Field *field = new Field( new FieldImpl( FieldImpl::CustomField, | 577 | Field *field = new Field( new FieldImpl( FieldImpl::CustomField, |
576 | category | CustomCategory, | 578 | category | CustomCategory, |
577 | label, key, app ) ); | 579 | label, key, app ) ); |
578 | //US | 580 | //US |
579 | // qDebug("Field::createCustomField label %s", label.latin1() ); | 581 | // qDebug("Field::createCustomField label %s", label.latin1() ); |
580 | 582 | ||
581 | mCustomFields.append( field ); | 583 | mCustomFields.append( field ); |
582 | 584 | ||
583 | return field; | 585 | return field; |
584 | } | 586 | } |