-rw-r--r-- | kabc/field.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp index d95cd19..89d0b77 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -52,16 +52,17 @@ class Field::FieldImpl | |||
52 | FormattedName, | 52 | FormattedName, |
53 | FamilyName, | 53 | FamilyName, |
54 | GivenName, | 54 | GivenName, |
55 | AdditionalName, | 55 | AdditionalName, |
56 | Prefix, | 56 | Prefix, |
57 | Suffix, | 57 | Suffix, |
58 | NickName, | 58 | NickName, |
59 | Birthday, | 59 | Birthday, |
60 | Category, | ||
60 | HomeAddressStreet, | 61 | HomeAddressStreet, |
61 | HomeAddressLocality, | 62 | HomeAddressLocality, |
62 | HomeAddressRegion, | 63 | HomeAddressRegion, |
63 | HomeAddressPostalCode, | 64 | HomeAddressPostalCode, |
64 | HomeAddressCountry, | 65 | HomeAddressCountry, |
65 | HomeAddressLabel, | 66 | HomeAddressLabel, |
66 | BusinessAddressStreet, | 67 | BusinessAddressStreet, |
67 | BusinessAddressLocality, | 68 | BusinessAddressLocality, |
@@ -190,16 +191,18 @@ QString Field::label() | |||
190 | case FieldImpl::Organization: | 191 | case FieldImpl::Organization: |
191 | return Addressee::organizationLabel(); | 192 | return Addressee::organizationLabel(); |
192 | case FieldImpl::Note: | 193 | case FieldImpl::Note: |
193 | return Addressee::noteLabel(); | 194 | return Addressee::noteLabel(); |
194 | case FieldImpl::Url: | 195 | case FieldImpl::Url: |
195 | return Addressee::urlLabel(); | 196 | return Addressee::urlLabel(); |
196 | case FieldImpl::Resource: | 197 | case FieldImpl::Resource: |
197 | return Addressee::resourceLabel(); | 198 | return Addressee::resourceLabel(); |
199 | case FieldImpl::Category: | ||
200 | return Addressee::categoryLabel(); | ||
198 | case FieldImpl::Sip: | 201 | case FieldImpl::Sip: |
199 | return Addressee::sipLabel(); | 202 | return Addressee::sipLabel(); |
200 | case FieldImpl::CustomField: | 203 | case FieldImpl::CustomField: |
201 | return mImpl->label(); | 204 | return mImpl->label(); |
202 | default: | 205 | default: |
203 | return i18n("Unknown Field"); | 206 | return i18n("Unknown Field"); |
204 | } | 207 | } |
205 | } | 208 | } |
@@ -272,16 +275,18 @@ QString Field::value( const KABC::Addressee &a ) | |||
272 | } | 275 | } |
273 | else | 276 | else |
274 | return QString::null; | 277 | return QString::null; |
275 | case FieldImpl::Url: | 278 | case FieldImpl::Url: |
276 | return a.url().prettyURL(); | 279 | return a.url().prettyURL(); |
277 | //US | 280 | //US |
278 | case FieldImpl::Resource: | 281 | case FieldImpl::Resource: |
279 | return a.resource()->resourceName(); | 282 | return a.resource()->resourceName(); |
283 | case FieldImpl::Category: | ||
284 | return a.categories().join(","); | ||
280 | case FieldImpl::HomePhone: | 285 | case FieldImpl::HomePhone: |
281 | return a.phoneNumber( PhoneNumber::Home ).number(); | 286 | return a.phoneNumber( PhoneNumber::Home ).number(); |
282 | case FieldImpl::BusinessPhone: | 287 | case FieldImpl::BusinessPhone: |
283 | return a.phoneNumber( PhoneNumber::Work ).number(); | 288 | return a.phoneNumber( PhoneNumber::Work ).number(); |
284 | case FieldImpl::MobilePhone: | 289 | case FieldImpl::MobilePhone: |
285 | return a.phoneNumber( PhoneNumber::Cell ).number(); | 290 | return a.phoneNumber( PhoneNumber::Cell ).number(); |
286 | case FieldImpl::HomeFax: | 291 | case FieldImpl::HomeFax: |
287 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); | 292 | return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); |
@@ -390,16 +395,17 @@ Field::List Field::allFields() | |||
390 | createField( FieldImpl::FormattedName, Frequent ); | 395 | createField( FieldImpl::FormattedName, Frequent ); |
391 | createField( FieldImpl::FamilyName, Frequent ); | 396 | createField( FieldImpl::FamilyName, Frequent ); |
392 | createField( FieldImpl::GivenName, Frequent ); | 397 | createField( FieldImpl::GivenName, Frequent ); |
393 | createField( FieldImpl::AdditionalName ); | 398 | createField( FieldImpl::AdditionalName ); |
394 | createField( FieldImpl::Prefix ); | 399 | createField( FieldImpl::Prefix ); |
395 | createField( FieldImpl::Suffix ); | 400 | createField( FieldImpl::Suffix ); |
396 | createField( FieldImpl::NickName, Personal ); | 401 | createField( FieldImpl::NickName, Personal ); |
397 | createField( FieldImpl::Birthday, Personal ); | 402 | createField( FieldImpl::Birthday, Personal ); |
403 | createField( FieldImpl::Category ); | ||
398 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); | 404 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); |
399 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); | 405 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); |
400 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); | 406 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); |
401 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); | 407 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); |
402 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); | 408 | createField( FieldImpl::HomeAddressCountry, Address|Personal ); |
403 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); | 409 | createField( FieldImpl::HomeAddressLabel, Address|Personal ); |
404 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); | 410 | createField( FieldImpl::BusinessAddressStreet, Address|Organization ); |
405 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); | 411 | createField( FieldImpl::BusinessAddressLocality, Address|Organization ); |