-rw-r--r-- | kabc/field.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/kabc/field.cpp b/kabc/field.cpp index 5c561c3..fd51026 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp | |||
@@ -78,25 +78,24 @@ class Field::FieldImpl | |||
78 | CarPhone, | 78 | CarPhone, |
79 | Isdn, | 79 | Isdn, |
80 | Pager, | 80 | Pager, |
81 | Email, | 81 | Email, |
82 | Mailer, | 82 | Mailer, |
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 | DefaultFormattedName, | ||
91 | MobileWorkPhone, | 90 | MobileWorkPhone, |
92 | MobileHomePhone | 91 | MobileHomePhone |
93 | }; | 92 | }; |
94 | 93 | ||
95 | int fieldId() { return mFieldId; } | 94 | int fieldId() { return mFieldId; } |
96 | int category() { return mCategory; } | 95 | int category() { return mCategory; } |
97 | 96 | ||
98 | QString label() { return mLabel; } | 97 | QString label() { return mLabel; } |
99 | QString key() { return mKey; } | 98 | QString key() { return mKey; } |
100 | QString app() { return mApp; } | 99 | QString app() { return mApp; } |
101 | 100 | ||
102 | private: | 101 | private: |
@@ -120,26 +119,24 @@ Field::Field( FieldImpl *impl ) | |||
120 | } | 119 | } |
121 | 120 | ||
122 | Field::~Field() | 121 | Field::~Field() |
123 | { | 122 | { |
124 | delete mImpl; | 123 | delete mImpl; |
125 | } | 124 | } |
126 | 125 | ||
127 | QString Field::label() | 126 | QString Field::label() |
128 | { | 127 | { |
129 | switch ( mImpl->fieldId() ) { | 128 | switch ( mImpl->fieldId() ) { |
130 | case FieldImpl::FormattedName: | 129 | case FieldImpl::FormattedName: |
131 | return Addressee::formattedNameLabel(); | 130 | return Addressee::formattedNameLabel(); |
132 | case FieldImpl::DefaultFormattedName: | ||
133 | return Addressee::defaultFormattedNameLabel(); | ||
134 | case FieldImpl::FamilyName: | 131 | case FieldImpl::FamilyName: |
135 | return Addressee::familyNameLabel(); | 132 | return Addressee::familyNameLabel(); |
136 | case FieldImpl::GivenName: | 133 | case FieldImpl::GivenName: |
137 | return Addressee::givenNameLabel(); | 134 | return Addressee::givenNameLabel(); |
138 | case FieldImpl::AdditionalName: | 135 | case FieldImpl::AdditionalName: |
139 | return Addressee::additionalNameLabel(); | 136 | return Addressee::additionalNameLabel(); |
140 | case FieldImpl::Prefix: | 137 | case FieldImpl::Prefix: |
141 | return Addressee::prefixLabel(); | 138 | return Addressee::prefixLabel(); |
142 | case FieldImpl::Suffix: | 139 | case FieldImpl::Suffix: |
143 | return Addressee::suffixLabel(); | 140 | return Addressee::suffixLabel(); |
144 | case FieldImpl::NickName: | 141 | case FieldImpl::NickName: |
145 | return Addressee::nickNameLabel(); | 142 | return Addressee::nickNameLabel(); |
@@ -239,26 +236,24 @@ QString Field::categoryLabel( int category ) | |||
239 | case CustomCategory: | 236 | case CustomCategory: |
240 | return i18n("Custom"); | 237 | return i18n("Custom"); |
241 | default: | 238 | default: |
242 | return i18n("Undefined"); | 239 | return i18n("Undefined"); |
243 | } | 240 | } |
244 | } | 241 | } |
245 | 242 | ||
246 | QString Field::value( const KABC::Addressee &a ) | 243 | QString Field::value( const KABC::Addressee &a ) |
247 | { | 244 | { |
248 | switch ( mImpl->fieldId() ) { | 245 | switch ( mImpl->fieldId() ) { |
249 | case FieldImpl::FormattedName: | 246 | case FieldImpl::FormattedName: |
250 | return a.formattedName(); | 247 | return a.formattedName(); |
251 | case FieldImpl::DefaultFormattedName: | ||
252 | return a.defaultFormattedName(); | ||
253 | case FieldImpl::FamilyName: | 248 | case FieldImpl::FamilyName: |
254 | return a.familyName(); | 249 | return a.familyName(); |
255 | case FieldImpl::GivenName: | 250 | case FieldImpl::GivenName: |
256 | return a.givenName(); | 251 | return a.givenName(); |
257 | case FieldImpl::AdditionalName: | 252 | case FieldImpl::AdditionalName: |
258 | return a.additionalName(); | 253 | return a.additionalName(); |
259 | case FieldImpl::Prefix: | 254 | case FieldImpl::Prefix: |
260 | return a.prefix(); | 255 | return a.prefix(); |
261 | case FieldImpl::Suffix: | 256 | case FieldImpl::Suffix: |
262 | return a.suffix(); | 257 | return a.suffix(); |
263 | case FieldImpl::NickName: | 258 | case FieldImpl::NickName: |
264 | return a.nickName(); | 259 | return a.nickName(); |
@@ -399,25 +394,24 @@ bool Field::setValue( KABC::Addressee &a, const QString &value ) | |||
399 | } | 394 | } |
400 | } | 395 | } |
401 | 396 | ||
402 | bool Field::isCustom() | 397 | bool Field::isCustom() |
403 | { | 398 | { |
404 | return mImpl->fieldId() == FieldImpl::CustomField; | 399 | return mImpl->fieldId() == FieldImpl::CustomField; |
405 | } | 400 | } |
406 | 401 | ||
407 | Field::List Field::allFields() | 402 | Field::List Field::allFields() |
408 | { | 403 | { |
409 | if ( mAllFields.isEmpty() ) { | 404 | if ( mAllFields.isEmpty() ) { |
410 | createField( FieldImpl::FormattedName, Frequent ); | 405 | createField( FieldImpl::FormattedName, Frequent ); |
411 | createField( FieldImpl::DefaultFormattedName, Frequent ); | ||
412 | createField( FieldImpl::FamilyName, Frequent ); | 406 | createField( FieldImpl::FamilyName, Frequent ); |
413 | createField( FieldImpl::GivenName, Frequent ); | 407 | createField( FieldImpl::GivenName, Frequent ); |
414 | createField( FieldImpl::AdditionalName ); | 408 | createField( FieldImpl::AdditionalName ); |
415 | createField( FieldImpl::Prefix ); | 409 | createField( FieldImpl::Prefix ); |
416 | createField( FieldImpl::Suffix ); | 410 | createField( FieldImpl::Suffix ); |
417 | createField( FieldImpl::NickName, Personal ); | 411 | createField( FieldImpl::NickName, Personal ); |
418 | createField( FieldImpl::Birthday, Personal ); | 412 | createField( FieldImpl::Birthday, Personal ); |
419 | createField( FieldImpl::Category ); | 413 | createField( FieldImpl::Category ); |
420 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); | 414 | createField( FieldImpl::HomeAddressStreet, Address|Personal ); |
421 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); | 415 | createField( FieldImpl::HomeAddressLocality, Address|Personal ); |
422 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); | 416 | createField( FieldImpl::HomeAddressRegion, Address|Personal ); |
423 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); | 417 | createField( FieldImpl::HomeAddressPostalCode, Address|Personal ); |