1 files changed, 49 insertions, 49 deletions

diff --git a/kabc/converter/sharpdtm/sharpdtmconverter.cpp b/kabc/converter/sharpdtm/sharpdtmconverter.cpp
index b3e2ee1..4cf2eb3 100644
--- a/kabc/converter/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/converter/sharpdtm/sharpdtmconverter.cpp
@@ -46,50 +46,50 @@ SharpDTMConverter::~SharpDTMConverter()
   deinit();
 }
 
 bool SharpDTMConverter::init()
 {
   catDB = new SlCategory::SlCategories();
-  
-  if (!catDB) 
+
+  if (!catDB)
     return false;
-    
+
 //  catDB->load( categoryFileName() );
   return true;
 }
 
 void SharpDTMConverter::deinit()
 {
-  if (catDB) 
+  if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
 }
-  
-bool SharpDTMConverter::sharpToAddressee( const PimContact &contact, Addressee &addr )
+
+bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
 {
 /*US
     // name
     addr.setFormattedName(contact.fileAs());
     addr.setFamilyName( contact.lastName() );
     addr.setGivenName( contact.firstName() );
     addr.setAdditionalName( contact.middleName() );
     addr.setPrefix( contact.nameTitle() );
     addr.setSuffix( contact.suffix() );
-  
-    
+
+
     // email
     QStringList emails = contact.emailList();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       addr.insertEmail( *it, ((*it) == contact.defaultEmail()) );
     }
 
-    if (!contact.defaultEmail().isEmpty()) 
+    if (!contact.defaultEmail().isEmpty())
       addr.insertEmail(contact.defaultEmail(), true);
-    
+
     // home
     if ((!contact.homeStreet().isEmpty()) ||
         (!contact.homeCity().isEmpty()) ||
         (!contact.homeState().isEmpty()) ||
         (!contact.homeZip().isEmpty()) ||
         (!contact.homeCountry().isEmpty()))
@@ -100,42 +100,42 @@ bool SharpDTMConverter::sharpToAddressee( const PimContact &contact, Addressee &
 //US    homeaddress.setExtended( "" );
       homeaddress.setStreet( contact.homeStreet() );
       homeaddress.setLocality( contact.homeCity() );
       homeaddress.setRegion( contact.homeState() );
       homeaddress.setPostalCode( contact.homeZip() );
       homeaddress.setCountry( contact.homeCountry() );
-    
+
       addr.insertAddress( homeaddress );
     }
-    
+
     if (!contact.homePhone().isEmpty())
     {
       PhoneNumber homephone;
       homephone.setType( PhoneNumber::Home );
       homephone.setNumber( contact.homePhone() );
       addr.insertPhoneNumber( homephone );
     }
-    
+
     if (!contact.homeFax().isEmpty())
     {
       PhoneNumber homefax;
       homefax.setType( PhoneNumber::Home | PhoneNumber::Fax );
       homefax.setNumber( contact.homeFax() );
       addr.insertPhoneNumber( homefax );
     }
-    
+
     if (!contact.homeMobile().isEmpty())
     {
       PhoneNumber homemobile;
       homemobile.setType( PhoneNumber::Home | PhoneNumber::Cell );
       homemobile.setNumber( contact.homeMobile() );
       addr.insertPhoneNumber( homemobile );
     }
-    
+
     addr.setUrl( contact.homeWebpage() );
-                
+
 
     // business
     if ((!contact.businessStreet().isEmpty()) ||
         (!contact.businessCity().isEmpty()) ||
         (!contact.businessState().isEmpty()) ||
         (!contact.businessZip().isEmpty()) ||
@@ -147,33 +147,33 @@ bool SharpDTMConverter::sharpToAddressee( const PimContact &contact, Addressee &
 //US    businessaddress.setExtended( "" );
       businessaddress.setStreet( contact.businessStreet() );
       businessaddress.setLocality( contact.businessCity() );
       businessaddress.setRegion( contact.businessState() );
       businessaddress.setPostalCode( contact.businessZip() );
       businessaddress.setCountry( contact.businessCountry() );
-    
+
       addr.insertAddress( businessaddress );
     }
-    
-    
+
+
     if (!contact.businessPhone().isEmpty())
     {
       PhoneNumber businessphone;
       businessphone.setType( PhoneNumber::Work );
       businessphone.setNumber( contact.businessPhone() );
       addr.insertPhoneNumber( businessphone );
     }
-    
+
     if (!contact.businessFax().isEmpty())
     {
       PhoneNumber businessfax;
       businessfax.setType( PhoneNumber::Work | PhoneNumber::Fax );
       businessfax.setNumber( contact.businessFax() );
       addr.insertPhoneNumber( businessfax );
     }
-    
+
     if (!contact.businessMobile().isEmpty())
     {
       PhoneNumber businessmobile;
       businessmobile.setType( PhoneNumber::Work | PhoneNumber::Cell );
       businessmobile.setNumber( contact.businessMobile() );
       addr.insertPhoneNumber( businessmobile );
@@ -183,13 +183,13 @@ bool SharpDTMConverter::sharpToAddressee( const PimContact &contact, Addressee &
     {
       PhoneNumber businesspager;
       businesspager.setType( PhoneNumber::Work | PhoneNumber::Pager );
       businesspager.setNumber( contact.businessPager() );
       addr.insertPhoneNumber( businesspager );
     }
-        
+
     addr.setRole( contact.jobTitle() ); //?
     addr.setOrganization( contact.company() );
     addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() );
     addr.insertCustom( "KADDRESSBOOK", "X-AssistantsName", contact.assistant() );
     addr.insertCustom( "KADDRESSBOOK", "X-Department", contact.department() );
     addr.insertCustom( "KADDRESSBOOK", "X-ManagersName", contact.manager() );
@@ -200,69 +200,69 @@ bool SharpDTMConverter::sharpToAddressee( const PimContact &contact, Addressee &
     // qtopia uses this categorization:
     // enum GenderType { UnspecifiedGender=0, Male, Female };
     if (contact.gender() == PimContact::Male)
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
     else if (contact.gender() == PimContact::Female)
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
-        
+
     if (contact.anniversary().isValid()) {
       QString dt = KGlobal::locale()->formatDate(contact.anniversary(), true, KLocale::ISODate);
-//US      
+//US
 //      qDebug("QtopiaConverter::qtopiaToAddressee found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
     }
-    
+
     addr.insertCustom( "KADDRESSBOOK", "X-Children", contact.children() );
     if (contact.birthday().isValid())
       addr.setBirthday( contact.birthday() );
-     
+
     addr.setNickName( contact.nickname() );
 
     // others
     //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
     QString notes = contact.notes();
     notes += "\nBusinessWebPage: " + contact.businessWebpage() + "\n";
-        
+
     addr.setNote( contact.notes() );
 
-    
-        
+
+
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
-    
+
     QArray<int> catArray = contact.categories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label("contact", catArray[i]);
       if ( !cat.isEmpty() )
         addr.insertCategory( cat );
     }
-*/    
+*/
     return true;
 }
 
-bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, PimContact &contact )
+bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, const SlZDataBase* database , const CardId &contact )
 {
 /*US
     // name
     contact.setLastName(addr.familyName());
     contact.setFirstName(addr.givenName());
     contact.setMiddleName(addr.additionalName());
     contact.setNameTitle(addr.prefix());
     contact.setSuffix(addr.suffix());
     contact.setFileAs();
-    
-    
+
+
     // email
     QStringList emails = addr.emails();
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
       contact.insertEmail(*it);
     }
     contact.setDefaultEmail( addr.preferredEmail() );
-    
+
 
     // home
     const Address homeaddress = addr.address(Address::Home);
     if (!homeaddress.isEmpty()) {
       contact.setHomeStreet(homeaddress.street());
       contact.setHomeCity(homeaddress.locality());
@@ -271,23 +271,23 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, PimContact &con
       contact.setHomeCountry(homeaddress.country());
     }
 
     PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home );
     if (!homephone.number().isEmpty())
       contact.setHomePhone(homephone.number());
-    
+
     PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax );
     if (!homefax.number().isEmpty())
       contact.setHomeFax(homefax.number());
-    
+
     PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell );
     if (!homemobile.number().isEmpty())
       contact.setHomeMobile(homemobile.number());
-    
+
     contact.setHomeWebpage(addr.url().url());
-                
+
 
     // business
     const Address businessaddress = addr.address(Address::Work);
     if (!businessaddress.isEmpty()) {
       contact.setBusinessStreet(businessaddress.street());
       contact.setBusinessCity(businessaddress.locality());
@@ -296,21 +296,21 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, PimContact &con
       contact.setBusinessCountry(businessaddress.country());
     }
 
     PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work );
     if (!businessphone.number().isEmpty())
       contact.setBusinessPhone(businessphone.number());
-    
+
     PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax );
     if (!businessfax.number().isEmpty())
       contact.setBusinessFax(businessfax.number());
-    
+
     PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell );
     if (!businessmobile.number().isEmpty())
       contact.setBusinessMobile(businessmobile.number());
-        
+
     PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager );
     if (!businesspager.number().isEmpty())
       contact.setBusinessPager(businesspager.number());
 
     contact.setJobTitle(addr.role());
     contact.setCompany(addr.organization());
@@ -330,33 +330,33 @@ bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, PimContact &con
       contact.setGender(PimContact::Male);
     else if (gt = "female")
       contact.setGender(PimContact::Female);
     else
       contact.setGender(PimContact::UnspecifiedGender);
 
-          
-    QDate dt = KGlobal::locale()->readDate( 
+
+    QDate dt = KGlobal::locale()->readDate(
             addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate
     contact.setAnniversary( dt );
-    
+
     contact.setChildren(addr.custom( "KADDRESSBOOK", "X-Children" ));
-    
+
     contact.setBirthday(addr.birthday().date());
     contact.setNickname(addr.nickName());
 
     // other
     contact.setNotes(addr.note());
-    
+
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
 
     QStringList cats = addr.categories();
-    
+
     QArray<int> iar;
     if ( !cats.isEmpty() ) {
       QArray<int> iar = catDB->ids("contact", cats);
       contact.setCategories(iar);
     }
-*/    
+*/
     return true;
 }