and some bugs fixed

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
@@ -1062,9 +1062,9 @@ QString Addressee::mobileWorkPhoneLabel()
   return i18n("Mobile2 (work)");
 }
 QString Addressee::mobileHomePhoneLabel()
 {
-  return i18n("Mobile");
+  return i18n("Mobile (Home)");
 }
 
 
 QString Addressee::homeFaxLabel()
@@ -1080,9 +1080,9 @@ QString Addressee::businessFaxLabel()
 
 
 QString Addressee::carPhoneLabel()
 {
-  return i18n("Mobile2 (work)");
+  return i18n("Mobile2 (car)");
 }
 
 
 QString Addressee::isdnLabel()
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
@@ -200,15 +200,15 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
 
             adr.setOrganization( el.attribute( "Company" ) );
 
             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 );
             if ( !businessFaxNum.number().isEmpty() )
               adr.insertPhoneNumber( businessFaxNum );
@@ -229,9 +229,9 @@ bool QtopiaConverter::qtopiaToAddressee( const QDomElement& el, Addressee &adr )
                     adr.insertEmail( Emails[i], false );
             }
 
             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 );
 
             KABC::PhoneNumber homeMobile( el.attribute( "HomeMobile" ),
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
@@ -131,9 +131,9 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     if (!db->readField(ZdbAdrs::HomePhone).isEmpty())
     {
       PhoneNumber homephone;
-      homephone.setType( PhoneNumber::Home );
+      homephone.setType( PhoneNumber::Home | PhoneNumber::Pref );
       homephone.setNumber( db->readField(ZdbAdrs::HomePhone) );
       addr.insertPhoneNumber( homephone );
     }
 
@@ -147,9 +147,9 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     if (!db->readField(ZdbAdrs::HomeMobile).isEmpty())
     {
       PhoneNumber homemobile;
-      homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
+      homemobile.setType( PhoneNumber::Cell );
       homemobile.setNumber( db->readField(ZdbAdrs::HomeMobile) );
       addr.insertPhoneNumber( homemobile );
     }
 
@@ -179,9 +179,9 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     if (!db->readField(ZdbAdrs::BusinessPhone).isEmpty())
     {
       PhoneNumber businessphone;
-      businessphone.setType( PhoneNumber::Work );
+      businessphone.setType( PhoneNumber::Work | PhoneNumber::Pref );
       businessphone.setNumber( db->readField(ZdbAdrs::BusinessPhone) );
       addr.insertPhoneNumber( businessphone );
     }
 
@@ -195,17 +195,17 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
 
     if (!db->readField(ZdbAdrs::BusinessMobile).isEmpty())
     {
       PhoneNumber businessmobile;
-      businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
+      businessmobile.setType( PhoneNumber::Car );
       businessmobile.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
       addr.insertPhoneNumber( businessmobile );
     }
 
     if (!db->readField(ZdbAdrs::BusinessPager).isEmpty())
     {
       PhoneNumber businesspager;
-      businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
+      businesspager.setType(  PhoneNumber::Pager );
       businesspager.setNumber( db->readField(ZdbAdrs::BusinessPager) );
       addr.insertPhoneNumber( businesspager );
     }