code cleanup

1 files changed, 50 insertions, 48 deletions

diff --git a/kabc/converter/qtopia/qtopiaconverter.cpp b/kabc/converter/qtopia/qtopiaconverter.cpp
index 498e89e..ac513b6 100644
--- a/kabc/converter/qtopia/qtopiaconverter.cpp
+++ b/kabc/converter/qtopia/qtopiaconverter.cpp
@@ -49,23 +49,23 @@ QtopiaConverter::~QtopiaConverter()
 bool QtopiaConverter::init()
 {
   catDB = new Categories();
-  
-  if (!catDB) 
+
+  if (!catDB)
     return false;
-    
+
   catDB->load( categoryFileName() );
   return true;
 }
 
 void QtopiaConverter::deinit()
 {
-  if (catDB) 
+  if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
 }
-  
+
 bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &addr )
 {
     // name
@@ -75,17 +75,17 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
     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()) ||
@@ -102,10 +102,10 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       homeaddress.setRegion( contact.homeState() );
       homeaddress.setPostalCode( contact.homeZip() );
       homeaddress.setCountry( contact.homeCountry() );
-    
+
       addr.insertAddress( homeaddress );
     }
-    
+
     if (!contact.homePhone().isEmpty())
     {
       PhoneNumber homephone;
@@ -113,7 +113,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       homephone.setNumber( contact.homePhone() );
       addr.insertPhoneNumber( homephone );
     }
-    
+
     if (!contact.homeFax().isEmpty())
     {
       PhoneNumber homefax;
@@ -121,7 +121,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       homefax.setNumber( contact.homeFax() );
       addr.insertPhoneNumber( homefax );
     }
-    
+
     if (!contact.homeMobile().isEmpty())
     {
       PhoneNumber homemobile;
@@ -129,9 +129,9 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       homemobile.setNumber( contact.homeMobile() );
       addr.insertPhoneNumber( homemobile );
     }
-    
+
     addr.setUrl( contact.homeWebpage() );
-                
+
 
     // business
     if ((!contact.businessStreet().isEmpty()) ||
@@ -149,11 +149,11 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       businessaddress.setRegion( contact.businessState() );
       businessaddress.setPostalCode( contact.businessZip() );
       businessaddress.setCountry( contact.businessCountry() );
-    
+
       addr.insertAddress( businessaddress );
     }
-    
-    
+
+
     if (!contact.businessPhone().isEmpty())
     {
       PhoneNumber businessphone;
@@ -161,7 +161,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       businessphone.setNumber( contact.businessPhone() );
       addr.insertPhoneNumber( businessphone );
     }
-    
+
     if (!contact.businessFax().isEmpty())
     {
       PhoneNumber businessfax;
@@ -169,7 +169,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       businessfax.setNumber( contact.businessFax() );
       addr.insertPhoneNumber( businessfax );
     }
-    
+
     if (!contact.businessMobile().isEmpty())
     {
       PhoneNumber businessmobile;
@@ -185,7 +185,7 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       businesspager.setNumber( contact.businessPager() );
       addr.insertPhoneNumber( businesspager );
     }
-        
+
     addr.setRole( contact.jobTitle() ); //?
     addr.setOrganization( contact.company() );
     addr.insertCustom( "KADDRESSBOOK", "X-Profession", contact.profession() );
@@ -202,41 +202,43 @@ bool QtopiaConverter::qtopiaToAddressee( const PimContact &contact, Addressee &a
       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() )
+      if ( cat.isEmpty() )
+        addr.insertCategory(QString::number(catArray[i]));
+      else
         addr.insertCategory( cat );
     }
-    
+
     return true;
 }
 
@@ -249,15 +251,15 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     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);
@@ -272,17 +274,17 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     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);
@@ -297,15 +299,15 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     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());
@@ -331,30 +333,30 @@ bool QtopiaConverter::addresseeToQtopia( const Addressee &addr, PimContact &cont
     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;
 }