| -rw-r--r-- | kabc/addressee.cpp | 14 | ||||
| -rw-r--r-- | kabc/addressee.h | 5 | ||||
| -rw-r--r-- | kabc/field.cpp | 12 | ||||
| -rw-r--r-- | kabc/phonenumber.cpp | 4 |
4 files changed, 4 insertions, 31 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 0d8e8e8..2f4a9af 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -1056,13 +1056,9 @@ QString Addressee::businessPhoneLabel() QString Addressee::mobilePhoneLabel() { - return i18n("Mobile Phone"); + return i18n("Mobile"); } QString Addressee::mobileWorkPhoneLabel() { - return i18n("Mobile2 (Work)"); -} -QString Addressee::mobileHomePhoneLabel() -{ - return i18n("Mobile (Home)"); + return i18n("Mobile2"); } @@ -1080,10 +1076,4 @@ QString Addressee::businessFaxLabel() -QString Addressee::carPhoneLabel() -{ - return i18n("Mobile2 (Car)"); -} - - QString Addressee::isdnLabel() { diff --git a/kabc/addressee.h b/kabc/addressee.h index fcadda6..aac78dc 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h @@ -333,5 +333,4 @@ class Addressee static QString mobilePhoneLabel(); static QString mobileWorkPhoneLabel(); - static QString mobileHomePhoneLabel(); /** @@ -345,8 +344,4 @@ class Addressee static QString businessFaxLabel(); - /** - Return translated label for carPhone field. - */ - static QString carPhoneLabel(); /** diff --git a/kabc/field.cpp b/kabc/field.cpp index 6f2b307..7c6d7a9 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp @@ -76,5 +76,4 @@ class Field::FieldImpl HomeFax, BusinessFax, - CarPhone, Isdn, Pager, @@ -89,5 +88,4 @@ class Field::FieldImpl Sip, MobileWorkPhone, - MobileHomePhone, OtherPhone }; @@ -174,6 +172,4 @@ QString Field::label() case FieldImpl::MobilePhone: return Addressee::mobilePhoneLabel(); - case FieldImpl::MobileHomePhone: - return Addressee::mobileHomePhoneLabel(); case FieldImpl::MobileWorkPhone: return Addressee::mobileWorkPhoneLabel(); @@ -182,6 +178,4 @@ QString Field::label() case FieldImpl::BusinessFax: return Addressee::businessFaxLabel(); - case FieldImpl::CarPhone: - return Addressee::carPhoneLabel(); case FieldImpl::Isdn: return Addressee::isdnLabel(); @@ -300,12 +294,8 @@ QString Field::value( const KABC::Addressee &a ) case FieldImpl::MobileWorkPhone: return a.phoneNumber( PhoneNumber::Car ).number(); - case FieldImpl::MobileHomePhone: - return a.phoneNumber( PhoneNumber::Cell ).number(); case FieldImpl::HomeFax: return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number(); case FieldImpl::BusinessFax: return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number(); - case FieldImpl::CarPhone: - return a.phoneNumber( PhoneNumber::Car ).number(); case FieldImpl::Isdn: return a.phoneNumber( PhoneNumber::Isdn ).number(); @@ -432,9 +422,7 @@ Field::List Field::allFields() 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 ); createField( FieldImpl::Pager ); diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index 90cc4cf..6db1bcf 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp @@ -234,5 +234,5 @@ QStringList PhoneNumber::supportedTypeListNames() static QStringList list; if ( list.count() == 0 ) - list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2 (Work)") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other"); + list << i18n("Home") << i18n("Work") << i18n("Mobile") << i18n("SIP") << i18n("VoIP") <<i18n("Home2")<< i18n("Work2") << i18n("Mobile2") << i18n("Assistent") << i18n("Company") << i18n("Fax (Home)") << i18n("Fax (Work)") << i18n("Fax (Other)") << i18n("Pager") << i18n("ISDN") << i18n("Video") << i18n("Callback") << i18n("Primary")<< i18n("Other"); return list; } @@ -285,5 +285,5 @@ QString PhoneNumber::typeLabel( int type ) } if ((type & Car) == Car) - return i18n("Mobile2 (Work)"); + return i18n("Mobile2"); if ((type & Pager) == Pager) return i18n("Pager"); |