-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 | |||
@@ -87,7 +87,6 @@ class Field::FieldImpl | |||
87 | Url, | 87 | Url, |
88 | Resource, | 88 | Resource, |
89 | Sip, | 89 | Sip, |
90 | DefaultFormattedName, | ||
91 | MobileWorkPhone, | 90 | MobileWorkPhone, |
92 | MobileHomePhone | 91 | MobileHomePhone |
93 | }; | 92 | }; |
@@ -129,8 +128,6 @@ QString Field::label() | |||
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: |
@@ -248,8 +245,6 @@ QString Field::value( const KABC::Addressee &a ) | |||
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: |
@@ -408,7 +403,6 @@ 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 ); |