-rw-r--r-- | kabc/field.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp index 6f2b307..7c6d7a9 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -74,9 +74,8 @@ class Field::FieldImpl | |||
74 | BusinessPhone, | 74 | BusinessPhone, |
75 | MobilePhone, | 75 | MobilePhone, |
76 | HomeFax, | 76 | HomeFax, |
77 | BusinessFax, | 77 | BusinessFax, |
78 | CarPhone, | ||
79 | Isdn, | 78 | Isdn, |
80 | Pager, | 79 | Pager, |
81 | Email, | 80 | Email, |
82 | Mailer, | 81 | Mailer, |
@@ -87,9 +86,8 @@ class Field::FieldImpl | |||
87 | Url, | 86 | Url, |
88 | Resource, | 87 | Resource, |
89 | Sip, | 88 | Sip, |
90 | MobileWorkPhone, | 89 | MobileWorkPhone, |
91 | MobileHomePhone, | ||
92 | OtherPhone | 90 | OtherPhone |
93 | }; | 91 | }; |
94 | 92 | ||
95 | int fieldId() { return mFieldId; } | 93 | int fieldId() { return mFieldId; } |
@@ -172,18 +170,14 @@ QString Field::label() | |||
172 | case FieldImpl::BusinessPhone: | 170 | case FieldImpl::BusinessPhone: |
173 | return Addressee::businessPhoneLabel(); | 171 | return Addressee::businessPhoneLabel(); |
174 | case FieldImpl::MobilePhone: | 172 | case FieldImpl::MobilePhone: |
175 | return Addressee::mobilePhoneLabel(); | 173 | return Addressee::mobilePhoneLabel(); |
176 | case FieldImpl::MobileHomePhone: | ||
177 | return Addressee::mobileHomePhoneLabel(); | ||
178 | case FieldImpl::MobileWorkPhone: | 174 | case FieldImpl::MobileWorkPhone: |
179 | return Addressee::mobileWorkPhoneLabel(); | 175 | return Addressee::mobileWorkPhoneLabel(); |
180 | case FieldImpl::HomeFax: | 176 | case FieldImpl::HomeFax: |
181 | return Addressee::homeFaxLabel(); | 177 | return Addressee::homeFaxLabel(); |
182 | case FieldImpl::BusinessFax: | 178 | case FieldImpl::BusinessFax: |
183 | return Addressee::businessFaxLabel(); | 179 | return Addressee::businessFaxLabel(); |
184 | case FieldImpl::CarPhone: | ||
185 | return Addressee::carPhoneLabel(); | ||
186 | case FieldImpl::Isdn: | 180 | case FieldImpl::Isdn: |
187 | return Addressee::isdnLabel(); | 181 | return Addressee::isdnLabel(); |
188 | case FieldImpl::Pager: | 182 | case FieldImpl::Pager: |
189 | return Addressee::pagerLabel(); | 183 | return Addressee::pagerLabel(); |
@@ -298,16 +292,12 @@ QString Field::value( const KABC::Addressee &a ) | |||
298 | case FieldImpl::MobilePhone: | 292 | case FieldImpl::MobilePhone: |
299 | return a.phoneNumber( PhoneNumber::Cell ).number(); | 293 | return a.phoneNumber( PhoneNumber::Cell ).number(); |
300 | case FieldImpl::MobileWorkPhone: | 294 | case FieldImpl::MobileWorkPhone: |
301 | return a.phoneNumber( PhoneNumber::Car ).number(); | 295 | return a.phoneNumber( PhoneNumber::Car ).number(); |
302 | case FieldImpl::MobileHomePhone: | ||
303 | return a.phoneNumber( PhoneNumber::Cell ).number(); | ||
304 | case FieldImpl::HomeFax: | 296 | case FieldImpl::HomeFax: |
305 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); | 297 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); |
306 | case FieldImpl::BusinessFax: | 298 | case FieldImpl::BusinessFax: |
307 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); | 299 | return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); |
308 | case FieldImpl::CarPhone: | ||
309 | return a.phoneNumber( PhoneNumber::Car ).number(); | ||
310 | case FieldImpl::Isdn: | 300 | case FieldImpl::Isdn: |
311 | return a.phoneNumber( PhoneNumber::Isdn ).number(); | 301 | return a.phoneNumber( PhoneNumber::Isdn ).number(); |
312 | case FieldImpl::Pager: | 302 | case FieldImpl::Pager: |
313 | return a.phoneNumber( PhoneNumber::Pager ).number(); | 303 | return a.phoneNumber( PhoneNumber::Pager ).number(); |
@@ -430,13 +420,11 @@ Field::List Field::allFields() | |||
430 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); | 420 | createField( FieldImpl::BusinessAddressLabel, Address|Organization ); |
431 | createField( FieldImpl::HomePhone, Personal|Frequent ); | 421 | createField( FieldImpl::HomePhone, Personal|Frequent ); |
432 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); | 422 | createField( FieldImpl::BusinessPhone, Organization|Frequent ); |
433 | createField( FieldImpl::MobilePhone, Frequent ); | 423 | createField( FieldImpl::MobilePhone, Frequent ); |
434 | createField( FieldImpl::MobileHomePhone, Frequent ); | ||
435 | createField( FieldImpl::MobileWorkPhone, Frequent ); | 424 | createField( FieldImpl::MobileWorkPhone, Frequent ); |
436 | createField( FieldImpl::HomeFax ); | 425 | createField( FieldImpl::HomeFax ); |
437 | createField( FieldImpl::BusinessFax ); | 426 | createField( FieldImpl::BusinessFax ); |
438 | createField( FieldImpl::CarPhone ); | ||
439 | createField( FieldImpl::Isdn ); | 427 | createField( FieldImpl::Isdn ); |
440 | createField( FieldImpl::Pager ); | 428 | createField( FieldImpl::Pager ); |
441 | createField( FieldImpl::Email, Email|Frequent ); | 429 | createField( FieldImpl::Email, Email|Frequent ); |
442 | createField( FieldImpl::Mailer, Email ); | 430 | createField( FieldImpl::Mailer, Email ); |