1 files changed, 5 insertions, 5 deletions

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
@@ -119,105 +119,105 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
       Address homeaddress;
       homeaddress.setType(Address::Home);
 //US    homeaddress.setPostOfficeBox( "" );
 //US    homeaddress.setExtended( "" );
       homeaddress.setStreet( db->readField(ZdbAdrs::HomeStreet).replace( QRegExp("\\r"), ""));
       homeaddress.setLocality( db->readField(ZdbAdrs::HomeCity) );
       homeaddress.setRegion( db->readField(ZdbAdrs::HomeState) );
       homeaddress.setPostalCode( db->readField(ZdbAdrs::HomeZip) );
       homeaddress.setCountry( db->readField(ZdbAdrs::HomeCountry) );
 
       addr.insertAddress( homeaddress );
     }
 
     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 );
     }
 
     if (!db->readField(ZdbAdrs::HomeFax).isEmpty())
     {
       PhoneNumber homefax;
       homefax.setType( PhoneNumber::Home | PhoneNumber::Fax );
       homefax.setNumber( db->readField(ZdbAdrs::HomeFax) );
       addr.insertPhoneNumber( homefax );
     }
 
     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 );
     }
 
     addr.setUrl( db->readField(ZdbAdrs::HomeWebPage) );
 
 
     // business
     if ((!db->readField(ZdbAdrs::BusinessStreet).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessCity).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessState).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessZip).isEmpty()) ||
         (!db->readField(ZdbAdrs::BusinessCountry).isEmpty()))
     {
       Address businessaddress;
       businessaddress.setType(Address::Work);
 //US    businessaddress.setPostOfficeBox( "" );
 //US    businessaddress.setExtended( "" );
       businessaddress.setStreet( db->readField(ZdbAdrs::BusinessStreet).replace( QRegExp("\\r"), "") );
       businessaddress.setLocality( db->readField(ZdbAdrs::BusinessCity) );
       businessaddress.setRegion( db->readField(ZdbAdrs::BusinessState) );
       businessaddress.setPostalCode( db->readField(ZdbAdrs::BusinessZip) );
       businessaddress.setCountry( db->readField(ZdbAdrs::BusinessCountry) );
 
       addr.insertAddress( businessaddress );
     }
 
 
     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 );
     }
 
     if (!db->readField(ZdbAdrs::BusinessFax).isEmpty())
     {
       PhoneNumber businessfax;
       businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
       businessfax.setNumber( db->readField(ZdbAdrs::BusinessFax) );
       addr.insertPhoneNumber( businessfax );
     }
 
     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 );
     }
 
     addr.setRole( db->readField(ZdbAdrs::JobTitle) );
     addr.setOrganization( db->readField(ZdbAdrs::Company) );
     addr.insertCustom( "KADDRESSBOOK", "X-Profession", db->readField(ZdbAdrs::Profession) );
     addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", db->readField(ZdbAdrs::Assistant) );
     addr.insertCustom( "KADDRESSBOOK", "X-Department", db->readField(ZdbAdrs::Department) );
     addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", db->readField(ZdbAdrs::Manager) );
     addr.insertCustom( "KADDRESSBOOK", "X-Office", db->readField(ZdbAdrs::Office) );
 
     //personal
     addr.insertCustom( "KADDRESSBOOK", "X-SpousesName", db->readField(ZdbAdrs::Spouse) );
 
 	QString gen = db->readField(ZdbAdrs::Gender);