added fields to kapi

1 files changed, 19 insertions, 1 deletions

diff --git a/kabc/field.cpp b/kabc/field.cpp
index 89d0b77..5c561c3 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -85,9 +85,12 @@ class Field::FieldImpl
       Organization,
       Note,
       Url,
       Resource,
-      Sip
+      Sip,
+      DefaultFormattedName,
+      MobileWorkPhone,
+      MobileHomePhone
     };
 
     int fieldId() { return mFieldId; }
     int category() { return mCategory; }
@@ -125,8 +128,10 @@ QString Field::label()
 {
   switch ( mImpl->fieldId() ) {
     case FieldImpl::FormattedName:
       return Addressee::formattedNameLabel();
+    case FieldImpl::DefaultFormattedName:
+      return Addressee::defaultFormattedNameLabel();
     case FieldImpl::FamilyName:
       return Addressee::familyNameLabel();
     case FieldImpl::GivenName:
       return Addressee::givenNameLabel();
@@ -169,8 +174,12 @@ QString Field::label()
     case FieldImpl::BusinessPhone:
       return Addressee::businessPhoneLabel();
     case FieldImpl::MobilePhone:
       return Addressee::mobilePhoneLabel();
+    case FieldImpl::MobileHomePhone:
+      return Addressee::mobileHomePhoneLabel();
+    case FieldImpl::MobileWorkPhone:
+      return Addressee::mobileWorkPhoneLabel();
     case FieldImpl::HomeFax:
       return Addressee::homeFaxLabel();
     case FieldImpl::BusinessFax:
       return Addressee::businessFaxLabel();
@@ -238,8 +247,10 @@ QString Field::value( const KABC::Addressee &a )
 {
   switch ( mImpl->fieldId() ) {
     case FieldImpl::FormattedName:
       return a.formattedName();
+    case FieldImpl::DefaultFormattedName:
+      return a.defaultFormattedName();
     case FieldImpl::FamilyName:
       return a.familyName();
     case FieldImpl::GivenName:
       return a.givenName();
@@ -287,8 +298,12 @@ QString Field::value( const KABC::Addressee &a )
     case FieldImpl::BusinessPhone:
       return a.phoneNumber( PhoneNumber::Work ).number();
     case FieldImpl::MobilePhone:
       return a.phoneNumber( PhoneNumber::Cell ).number();
+    case FieldImpl::MobileWorkPhone:
+      return a.phoneNumber( PhoneNumber::Cell  | PhoneNumber::Work ).number();
+    case FieldImpl::MobileHomePhone:
+      return a.phoneNumber( PhoneNumber::Cell | PhoneNumber::Home  ).number();
     case FieldImpl::HomeFax:
       return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number();
     case FieldImpl::BusinessFax:
       return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
@@ -392,8 +407,9 @@ bool Field::isCustom()
 Field::List Field::allFields()
 {
   if ( mAllFields.isEmpty() ) {
     createField( FieldImpl::FormattedName, Frequent );
+    createField( FieldImpl::DefaultFormattedName, Frequent );
     createField( FieldImpl::FamilyName, Frequent );
     createField( FieldImpl::GivenName, Frequent );
     createField( FieldImpl::AdditionalName );
     createField( FieldImpl::Prefix );
@@ -415,8 +431,10 @@ Field::List Field::allFields()
     createField( FieldImpl::BusinessAddressLabel, Address|Organization );
     createField( FieldImpl::HomePhone, Personal|Frequent );
     createField( FieldImpl::BusinessPhone, Organization|Frequent );
     createField( FieldImpl::MobilePhone, Frequent );
+    createField( FieldImpl::MobileHomePhone, Frequent );
+    createField( FieldImpl::MobileWorkPhone, Frequent );
     createField( FieldImpl::HomeFax );
     createField( FieldImpl::BusinessFax );
     createField( FieldImpl::CarPhone );
     createField( FieldImpl::Isdn );