summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2005-10-28 21:15:00 (UTC)
committer zautrix <zautrix>2005-10-28 21:15:00 (UTC)
commit85d2ea5c17a2b2c7a4ae4dd954bc635a56239b57 (patch) (side-by-side diff)
tree8628f5cef407eaeee2d8b893f82d296d5dcd4787 /kabc
parent16e87ac5b81352c51343715cf1080191aaba9611 (diff)
downloadkdepimpi-85d2ea5c17a2b2c7a4ae4dd954bc635a56239b57.zip
kdepimpi-85d2ea5c17a2b2c7a4ae4dd954bc635a56239b57.tar.gz
kdepimpi-85d2ea5c17a2b2c7a4ae4dd954bc635a56239b57.tar.bz2
fixx
Diffstat (limited to 'kabc') (more/less context) (show whitespace changes)
-rw-r--r--kabc/addressee.cpp14
-rw-r--r--kabc/addressee.h5
-rw-r--r--kabc/field.cpp12
-rw-r--r--kabc/phonenumber.cpp4
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
@@ -1054,17 +1054,13 @@ 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");
}
QString Addressee::homeFaxLabel()
@@ -1078,14 +1074,8 @@ QString Addressee::businessFaxLabel()
return i18n("Fax (Work)");
}
-QString Addressee::carPhoneLabel()
-{
- return i18n("Mobile2 (Car)");
-}
-
-
QString Addressee::isdnLabel()
{
return i18n("ISDN");
}
diff --git a/kabc/addressee.h b/kabc/addressee.h
index fcadda6..aac78dc 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -331,9 +331,8 @@ class Addressee
Return translated label for mobilePhone field.
*/
static QString mobilePhoneLabel();
static QString mobileWorkPhoneLabel();
- static QString mobileHomePhoneLabel();
/**
Return translated label for homeFax field.
*/
@@ -343,12 +342,8 @@ class Addressee
Return translated label for businessFax field.
*/
static QString businessFaxLabel();
- /**
- Return translated label for carPhone field.
- */
- static QString carPhoneLabel();
/**
Return translated label for isdn field.
*/
diff --git a/kabc/field.cpp b/kabc/field.cpp
index 6f2b307..7c6d7a9 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -74,9 +74,8 @@ class Field::FieldImpl
BusinessPhone,
MobilePhone,
HomeFax,
BusinessFax,
- CarPhone,
Isdn,
Pager,
Email,
Mailer,
@@ -87,9 +86,8 @@ class Field::FieldImpl
Url,
Resource,
Sip,
MobileWorkPhone,
- MobileHomePhone,
OtherPhone
};
int fieldId() { return mFieldId; }
@@ -172,18 +170,14 @@ 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();
- case FieldImpl::CarPhone:
- return Addressee::carPhoneLabel();
case FieldImpl::Isdn:
return Addressee::isdnLabel();
case FieldImpl::Pager:
return Addressee::pagerLabel();
@@ -298,16 +292,12 @@ QString Field::value( const KABC::Addressee &a )
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();
@@ -430,13 +420,11 @@ 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 );
createField( FieldImpl::Pager );
createField( FieldImpl::Email, Email|Frequent );
createField( FieldImpl::Mailer, Email );
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 90cc4cf..6db1bcf 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -232,9 +232,9 @@ PhoneNumber::TypeList PhoneNumber::supportedTypeList()
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 )
@@ -283,9 +283,9 @@ QString PhoneNumber::typeLabel( int type )
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");