summaryrefslogtreecommitdiffabout
path: root/kabc
authorzautrix <zautrix>2005-10-28 03:41:01 (UTC)
committer zautrix <zautrix>2005-10-28 03:41:01 (UTC)
commitd934f3fe2a62f6a696992335124c4434cd77d990 (patch) (side-by-side diff)
tree88d33c54e3f8d08b09cf81f4cdbaeb7eb6a4bb9b /kabc
parentf83a59cf4f9d0cff4111b6f5c88e88e6dc96e79e (diff)
downloadkdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.zip
kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.gz
kdepimpi-d934f3fe2a62f6a696992335124c4434cd77d990.tar.bz2
and some bugs fixed
Diffstat (limited to 'kabc') (more/less context) (ignore whitespace changes)
-rw-r--r--kabc/addressee.cpp4
-rw-r--r--kabc/plugins/qtopia/qtopiaconverter.cpp8
-rw-r--r--kabc/plugins/sharpdtm/sharpdtmconverter.cpp10
3 files changed, 11 insertions, 11 deletions
diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 661bdf6..19c78ee 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -1064,5 +1064,5 @@ QString Addressee::mobileWorkPhoneLabel()
QString Addressee::mobileHomePhoneLabel()
{
- return i18n("Mobile");
+ return i18n("Mobile (Home)");
}
@@ -1082,5 +1082,5 @@ QString Addressee::businessFaxLabel()
QString Addressee::carPhoneLabel()
{
- return i18n("Mobile2 (work)");
+ return i18n("Mobile2 (car)");
}
diff --git a/kabc/plugins/qtopia/qtopiaconverter.cpp b/kabc/plugins/qtopia/qtopiaconverter.cpp
index 39d366b..9693a68 100644
--- a/kabc/plugins/qtopia/qtopiaconverter.cpp
+++ b/kabc/plugins/qtopia/qtopiaconverter.cpp
@@ -202,11 +202,11 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
KABC::PhoneNumber businessPhoneNum( el.attribute( "BusinessPhone" ),
- KABC::PhoneNumber::Work );
+ KABC::PhoneNumber::Work | KABC::PhoneNumber::Pref );
KABC::PhoneNumber businessFaxNum( el.attribute( "BusinessFax" ),
KABC::PhoneNumber::Work | KABC::PhoneNumber::Fax );
KABC::PhoneNumber businessMobile( el.attribute( "BusinessMobile" ),
- KABC::PhoneNumber::Work | KABC::PhoneNumber::Cell );
+ KABC::PhoneNumber::Car );
KABC::PhoneNumber businessPager( el.attribute( "BusinessPager" ),
- KABC::PhoneNumber::Work | KABC::PhoneNumber::Pager );
+ KABC::PhoneNumber::Pager );
if ( !businessPhoneNum.number().isEmpty() )
adr.insertPhoneNumber( businessPhoneNum );
@@ -231,5 +231,5 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
KABC::PhoneNumber homePhoneNum( el.attribute( "HomePhone" ),
- KABC::PhoneNumber::Home );
+ KABC::PhoneNumber::Home | KABC::PhoneNumber::Pref);
KABC::PhoneNumber homeFax( el.attribute( "HomeFax" ),
KABC::PhoneNumber::Home | KABC::PhoneNumber::Fax );
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index 4adcae4..3d429fa 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -133,5 +133,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
{
PhoneNumber homephone;
- homephone.setType( PhoneNumber::Home );
+ homephone.setType( PhoneNumber::Home | PhoneNumber::Pref );
homephone.setNumber( db->readField(ZdbAdrs::HomePhone) );
addr.insertPhoneNumber( homephone );
@@ -149,5 +149,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
{
PhoneNumber homemobile;
- homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
+ homemobile.setType( PhoneNumber::Cell );
homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) );
addr.insertPhoneNumber( homemobile );
@@ -181,5 +181,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
{
PhoneNumber businessphone;
- businessphone.setType( PhoneNumber::Work );
+ businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref );
businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) );
addr.insertPhoneNumber( businessphone );
@@ -197,5 +197,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
{
PhoneNumber businessmobile;
- businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
+ businessmobile.setType( PhoneNumber::Car );
businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
addr.insertPhoneNumber( businessmobile );
@@ -205,5 +205,5 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
{
PhoneNumber businesspager;
- businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
+ businesspager.setType( PhoneNumber::Pager );
businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) );
addr.insertPhoneNumber( businesspager );