| -rw-r--r-- | kabc/addressee.cpp | 14 | ||||
| -rw-r--r-- | kabc/addressee.h | 7 | ||||
| -rw-r--r-- | kabc/field.cpp | 12 | ||||
| -rw-r--r-- | kabc/phonenumber.cpp | 4 |
4 files changed, 5 insertions, 32 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp index 0d8e8e8..2f4a9af 100644 --- a/kabc/addressee.cpp +++ b/kabc/addressee.cpp @@ -1050,46 +1050,36 @@ QString Addressee::homePhoneLabel() QString Addressee::businessPhoneLabel() { return i18n("Work Phone"); } 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"); } QString Addressee::homeFaxLabel() { return i18n("Fax (Home)"); } QString Addressee::businessFaxLabel() { return i18n("Fax (Work)"); } -QString Addressee::carPhoneLabel() -{ - return i18n("Mobile2 (Car)"); -} - - QString Addressee::isdnLabel() { return i18n("ISDN"); } QString Addressee::pagerLabel() { diff --git a/kabc/addressee.h b/kabc/addressee.h index fcadda6..aac78dc 100644 --- a/kabc/addressee.h +++ b/kabc/addressee.h @@ -327,33 +327,28 @@ class Addressee */ static QString businessPhoneLabel(); /** Return translated label for mobilePhone field. */ static QString mobilePhoneLabel(); static QString mobileWorkPhoneLabel(); - static QString mobileHomePhoneLabel(); /** Return translated label for homeFax field. */ static QString homeFaxLabel(); /** Return translated label for businessFax field. */ static QString businessFaxLabel(); - /** - Return translated label for carPhone field. - */ - static QString carPhoneLabel(); - + /** Return translated label for isdn field. */ static QString isdnLabel(); /** Return translated label for pager field. */ diff --git a/kabc/field.cpp b/kabc/field.cpp index 6f2b307..7c6d7a9 100644 --- a/kabc/field.cpp +++ b/kabc/field.cpp @@ -70,30 +70,28 @@ class Field::FieldImpl BusinessAddressPostalCode, BusinessAddressCountry, BusinessAddressLabel, HomePhone, BusinessPhone, MobilePhone, HomeFax, BusinessFax, - CarPhone, Isdn, Pager, Email, Mailer, Title, Role, Organization, Note, Url, Resource, Sip, MobileWorkPhone, - MobileHomePhone, OtherPhone }; int fieldId() { return mFieldId; } int category() { return mCategory; } QString label() { return mLabel; } QString key() { return mKey; } @@ -168,26 +166,22 @@ QString Field::label() case FieldImpl::BusinessAddressLabel: return Addressee::businessAddressLabelLabel(); case FieldImpl::HomePhone: return Addressee::homePhoneLabel(); 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(); - case FieldImpl::CarPhone: - return Addressee::carPhoneLabel(); case FieldImpl::Isdn: return Addressee::isdnLabel(); case FieldImpl::Pager: return Addressee::pagerLabel(); case FieldImpl::Email: return Addressee::emailLabel(); case FieldImpl::Mailer: return Addressee::mailerLabel(); @@ -294,24 +288,20 @@ QString Field::value( const KABC::Addressee &a ) case FieldImpl::HomePhone: return a.phoneNumber( PhoneNumber::Home| PhoneNumber::Pref ).number(); case FieldImpl::BusinessPhone: return a.phoneNumber( PhoneNumber::Work| PhoneNumber::Pref ).number(); case FieldImpl::MobilePhone: return a.phoneNumber( PhoneNumber::Cell ).number(); 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(); case FieldImpl::Pager: return a.phoneNumber( PhoneNumber::Pager ).number(); case FieldImpl::Sip: return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number(); case FieldImpl::OtherPhone: return a.phoneNumber( PhoneNumber::Voice ).number(); @@ -426,21 +416,19 @@ Field::List Field::allFields() createField( FieldImpl::BusinessAddressLocality, Address|Organization ); createField( FieldImpl::BusinessAddressRegion, Address|Organization ); createField( FieldImpl::BusinessAddressPostalCode, Address|Organization ); createField( FieldImpl::BusinessAddressCountry, Address|Organization ); 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 ); createField( FieldImpl::Pager ); createField( FieldImpl::Email, Email|Frequent ); createField( FieldImpl::Mailer, Email ); createField( FieldImpl::Title, Organization ); createField( FieldImpl::Role, Organization ); createField( FieldImpl::Organization, Organization ); createField( FieldImpl::Note ); diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp index 90cc4cf..6db1bcf 100644 --- a/kabc/phonenumber.cpp +++ b/kabc/phonenumber.cpp @@ -228,17 +228,17 @@ PhoneNumber::TypeList PhoneNumber::supportedTypeList() if ( list.count() == 0 ) list << (Home| Pref) << (Work| Pref) << Cell <<(Pcs|Pref)<< Pcs<< Home << Work << Car << (Work| Msg | Voice) << (Work| Msg) << (Home | Fax) << (Work| Fax) << Fax<< Pager << Isdn << Video << Msg << Pref << Voice; return list; } 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; } int PhoneNumber::typeListIndex4Type(int type ) { TypeList list = supportedTypeList(); int i = 0; while ( i < list.count() ) { @@ -279,17 +279,17 @@ QString PhoneNumber::typeLabel( int type ) return i18n("Work2"); } if ((type & Pcs) == Pcs) { if ((type & Pref) == Pref) return i18n("SIP"); return i18n("VoIP"); } if ((type & Car) == Car) - return i18n("Mobile2 (Work)"); + return i18n("Mobile2"); if ((type & Pager) == Pager) return i18n("Pager"); if ((type & Isdn) == Isdn) return i18n("ISDN"); if ((type & Video) == Video) return i18n("Video"); if ((type & Msg) == Msg) |