-rw-r--r-- | kabc/field.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp index 20885de..6f2b307 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -83,17 +83,18 @@ class Field::FieldImpl | |||
83 | Title, | 83 | Title, |
84 | Role, | 84 | Role, |
85 | Organization, | 85 | Organization, |
86 | Note, | 86 | Note, |
87 | Url, | 87 | Url, |
88 | Resource, | 88 | Resource, |
89 | Sip, | 89 | Sip, |
90 | MobileWorkPhone, | 90 | MobileWorkPhone, |
91 | MobileHomePhone | 91 | MobileHomePhone, |
92 | OtherPhone | ||
92 | }; | 93 | }; |
93 | 94 | ||
94 | int fieldId() { return mFieldId; } | 95 | int fieldId() { return mFieldId; } |
95 | int category() { return mCategory; } | 96 | int category() { return mCategory; } |
96 | 97 | ||
97 | QString label() { return mLabel; } | 98 | QString label() { return mLabel; } |
98 | QString key() { return mKey; } | 99 | QString key() { return mKey; } |
99 | QString app() { return mApp; } | 100 | QString app() { return mApp; } |
@@ -201,16 +202,18 @@ QString Field::label() | |||
201 | case FieldImpl::Url: | 202 | case FieldImpl::Url: |
202 | return Addressee::urlLabel(); | 203 | return Addressee::urlLabel(); |
203 | case FieldImpl::Resource: | 204 | case FieldImpl::Resource: |
204 | return Addressee::resourceLabel(); | 205 | return Addressee::resourceLabel(); |
205 | case FieldImpl::Category: | 206 | case FieldImpl::Category: |
206 | return Addressee::categoryLabel(); | 207 | return Addressee::categoryLabel(); |
207 | case FieldImpl::Sip: | 208 | case FieldImpl::Sip: |
208 | return Addressee::sipLabel(); | 209 | return Addressee::sipLabel(); |
210 | case FieldImpl::OtherPhone: | ||
211 | return Addressee::otherPhoneLabel(); | ||
209 | case FieldImpl::CustomField: | 212 | case FieldImpl::CustomField: |
210 | return mImpl->label(); | 213 | return mImpl->label(); |
211 | default: | 214 | default: |
212 | return i18n("Unknown Field"); | 215 | return i18n("Unknown Field"); |
213 | } | 216 | } |
214 | } | 217 | } |
215 | 218 | ||
216 | int Field::category() | 219 | int Field::category() |
@@ -305,16 +308,18 @@ QString Field::value( const KABC::Addressee &a ) | |||
305 | case FieldImpl::CarPhone: | 308 | case FieldImpl::CarPhone: |
306 | return a.phoneNumber( PhoneNumber::Car ).number(); | 309 | return a.phoneNumber( PhoneNumber::Car ).number(); |
307 | case FieldImpl::Isdn: | 310 | case FieldImpl::Isdn: |
308 | return a.phoneNumber( PhoneNumber::Isdn ).number(); | 311 | return a.phoneNumber( PhoneNumber::Isdn ).number(); |
309 | case FieldImpl::Pager: | 312 | case FieldImpl::Pager: |
310 | return a.phoneNumber( PhoneNumber::Pager ).number(); | 313 | return a.phoneNumber( PhoneNumber::Pager ).number(); |
311 | case FieldImpl::Sip: | 314 | case FieldImpl::Sip: |
312 | return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number(); | 315 | return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number(); |
316 | case FieldImpl::OtherPhone: | ||
317 | return a.phoneNumber( PhoneNumber::Voice ).number(); | ||
313 | case FieldImpl::HomeAddressStreet: | 318 | case FieldImpl::HomeAddressStreet: |
314 | return a.address( Address::Home ).street(); | 319 | return a.address( Address::Home ).street(); |
315 | case FieldImpl::HomeAddressLocality: | 320 | case FieldImpl::HomeAddressLocality: |
316 | return a.address( Address::Home ).locality(); | 321 | return a.address( Address::Home ).locality(); |
317 | case FieldImpl::HomeAddressRegion: | 322 | case FieldImpl::HomeAddressRegion: |
318 | return a.address( Address::Home ).region(); | 323 | return a.address( Address::Home ).region(); |
319 | case FieldImpl::HomeAddressPostalCode: | 324 | case FieldImpl::HomeAddressPostalCode: |
320 | return a.address( Address::Home ).postalCode(); | 325 | return a.address( Address::Home ).postalCode(); |
@@ -437,16 +442,17 @@ Field::List Field::allFields() | |||
437 | createField( FieldImpl::Mailer, Email ); | 442 | createField( FieldImpl::Mailer, Email ); |
438 | createField( FieldImpl::Title, Organization ); | 443 | createField( FieldImpl::Title, Organization ); |
439 | createField( FieldImpl::Role, Organization ); | 444 | createField( FieldImpl::Role, Organization ); |
440 | createField( FieldImpl::Organization, Organization ); | 445 | createField( FieldImpl::Organization, Organization ); |
441 | createField( FieldImpl::Note ); | 446 | createField( FieldImpl::Note ); |
442 | createField( FieldImpl::Url ); | 447 | createField( FieldImpl::Url ); |
443 | createField( FieldImpl::Resource ); | 448 | createField( FieldImpl::Resource ); |
444 | createField( FieldImpl::Sip ); | 449 | createField( FieldImpl::Sip ); |
450 | createField( FieldImpl::OtherPhone ); | ||
445 | } | 451 | } |
446 | 452 | ||
447 | return mAllFields; | 453 | return mAllFields; |
448 | } | 454 | } |
449 | 455 | ||
450 | Field::List Field::defaultFields() | 456 | Field::List Field::defaultFields() |
451 | { | 457 | { |
452 | if ( mDefaultFields.isEmpty() ) { | 458 | if ( mDefaultFields.isEmpty() ) { |