author | zautrix <zautrix> | 2005-10-28 14:43:31 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2005-10-28 14:43:31 (UTC) |
commit | ab099bc1be027fe01dc252a9d7a0f8821e782d65 (patch) (unidiff) | |
tree | 85bfb03f334da60dffcc52d54202f51d0f947e3f /kabc | |
parent | caaa030d8bc2aa82c53e5d30abc314b992d7226f (diff) | |
download | kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.zip kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.tar.gz kdepimpi-ab099bc1be027fe01dc252a9d7a0f8821e782d65.tar.bz2 |
fixxxx
-rw-r--r-- | kabc/addressee.cpp | 4 | ||||
-rw-r--r-- | kabc/addressee.h | 2 | ||||
-rw-r--r-- | kabc/field.cpp | 8 |
3 files changed, 12 insertions, 2 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 789a694..0d8e8e8 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp | |||
@@ -1094,8 +1094,12 @@ QString Addressee::isdnLabel() | |||
1094 | QString Addressee::pagerLabel() | 1094 | QString Addressee::pagerLabel() |
1095 | { | 1095 | { |
1096 | return i18n("Pager"); | 1096 | return i18n("Pager"); |
1097 | } | 1097 | } |
1098 | QString Addressee::otherPhoneLabel() | ||
1099 | { | ||
1100 | return i18n("Other Phone"); | ||
1101 | } | ||
1098 | 1102 | ||
1099 | QString Addressee::sipLabel() | 1103 | QString Addressee::sipLabel() |
1100 | { | 1104 | { |
1101 | return i18n("SIP"); | 1105 | return i18n("SIP"); |
diff --git a/kabc/addressee.h b/kabc/addressee.h index 0c488eb..fcadda6 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h | |||
@@ -357,9 +357,9 @@ class Addressee | |||
357 | /** | 357 | /** |
358 | Return translated label for pager field. | 358 | Return translated label for pager field. |
359 | */ | 359 | */ |
360 | static QString pagerLabel(); | 360 | static QString pagerLabel(); |
361 | 361 | static QString otherPhoneLabel(); | |
362 | /** | 362 | /** |
363 | Return translated label for sip field. | 363 | Return translated label for sip field. |
364 | */ | 364 | */ |
365 | static QString sipLabel(); | 365 | static QString sipLabel(); |
diff --git a/kabc/field.cpp b/kabc/field.cpp index 20885de..6f2b307 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -87,9 +87,10 @@ class Field::FieldImpl | |||
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; } |
@@ -205,8 +206,10 @@ QString Field::label() | |||
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"); |
@@ -309,8 +312,10 @@ QString Field::value( const KABC::Addressee &a ) | |||
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(); |
@@ -441,8 +446,9 @@ Field::List Field::allFields() | |||
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 | } |