3 files changed, 94 insertions, 69 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 3b238f5..82b4b9b 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -223,248 +223,259 @@ void Addressee::computeCsum(const QString &dev)
     if ( mData->geo.isValid() ) l.append( mData->geo.asString() );
     if ( !mData->title .isEmpty() ) l.append( mData->title );
     if ( !mData->role.isEmpty() ) l.append( mData->role );
     if ( !mData->organization.isEmpty() ) l.append( mData->organization ); 
     if ( !mData->note.isEmpty() ) l.append( mData->note ); 
     if ( !mData->productId.isEmpty() ) l.append(mData->productId ); 
     if ( !mData->sortString.isEmpty() ) l.append( mData->sortString ); 
     if ( mData->secrecy.isValid() ) l.append( mData->secrecy.asString()); 
     // if ( !mData->logo.isEmpty() ) l.append(  ); 
     //if ( !mData->photo.isEmpty() ) l.append(  );
     //if ( !mData->sound.isEmpty() ) l.append(  );
     //if ( !mData->agent.isEmpty() ) l.append(  ); 
     if (  mData->url.isValid() )
         if ( ! mData->url.path().isEmpty()) l.append( mData->url.path()  ); 
     KABC::PhoneNumber::List phoneNumbers;
     KABC::PhoneNumber::List::Iterator phoneIter;
 
     QStringList t;
     for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
           ++phoneIter )
         t.append( ( *phoneIter ).number()+QString::number( ( *phoneIter ).type() ) );
     t.sort();
     uint iii;
     for ( iii = 0; iii < t.count(); ++iii)
         l.append( t[iii]  );
     t = mData->emails;
     t.sort();
     for ( iii = 0; iii < t.count(); ++iii)
         l.append( t[iii]  );
     t = mData->categories;
     t.sort();
     for ( iii = 0; iii < t.count(); ++iii)
         l.append( t[iii]  );
     t = mData->custom;
     t.sort();
     for ( iii = 0; iii < t.count(); ++iii) 
         if ( t[iii].left( 25 ) != "KADDRESSBOOK-X-ExternalID" ) {
             int find = t[iii].find (':')+1;
             //qDebug("lennnn %d %d  ", find, t[iii].length());
             if ( find < t[iii].length())
                 l.append( t[iii]  );
             
         }
     KABC::Address::List::Iterator addressIter;
     for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
           ++addressIter ) {
         t = (*addressIter).asList();
         t.sort();
         for ( iii = 0; iii < t.count(); ++iii)
             l.append( t[iii]  );
     }
     uint cs = getCsum4List(l);
 
 #if 0
     for ( iii = 0; iii < l.count(); ++iii)
         qDebug("%d***%s***",iii,l[iii].latin1());
     qDebug("CSUM computed %d %s %s", cs,QString::number (cs ).latin1(), uid().latin1() );
 #endif
     
     setCsum( dev, QString::number (cs ));
 }
 
 void Addressee::mergeContact( const Addressee& ad , bool isSubSet) // = false)
 {
+    // merge all standard non-outlook fields. 
+    //if isSubSet (e.g. mobile phone sync) merge all fields
 
     detach();
-    if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
-    if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
-    if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
-    if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
-    if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
-    if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
-    if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
-    if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
-    if ( !mData->birthday.isValid() ) 
-        if ( ad.mData->birthday.isValid()) 
-            mData->birthday =  ad.mData->birthday;
+    if ( isSubSet ) {
+        if ( mData->name.isEmpty() ) mData->name = ad.mData->name;
+        if ( mData->formattedName.isEmpty() ) mData->formattedName  = ad.mData->formattedName;
+        if ( mData->familyName.isEmpty()  )  mData->familyName  = ad.mData->familyName;
+        if ( mData->givenName.isEmpty() ) mData->givenName   = ad.mData->givenName ;
+        if ( mData->additionalName )  mData->additionalName  = ad.mData->additionalName;
+        if ( mData->prefix.isEmpty() )  mData->prefix  = ad.mData->prefix;
+        if ( mData->suffix.isEmpty() )  mData->suffix  = ad.mData->suffix;
+        if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
+        if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
+        if ( mData->nickName.isEmpty() )  mData->nickName  = ad.mData->nickName;
+        if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
+        if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
+        if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
+        if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
+        if ( !mData->birthday.isValid() ) 
+            if ( ad.mData->birthday.isValid()) 
+                mData->birthday =  ad.mData->birthday;
+
+    }
     if ( mData->mailer.isEmpty() ) mData->mailer = ad.mData->mailer;
     if ( !mData->timeZone.isValid() ) mData->timeZone = ad.mData->timeZone;
     if ( !mData->geo.isValid() ) mData->geo = ad.mData->geo;
-    if ( mData->title .isEmpty() ) mData->title = ad.mData->title  ;
-    if ( mData->role.isEmpty() ) mData->role = ad.mData->role ;
-    if ( mData->organization.isEmpty() ) mData->organization = ad.mData->organization ; 
-    if ( mData->note.isEmpty() ) mData->note = ad.mData->note ; 
     if ( mData->productId.isEmpty() ) mData->productId  = ad.mData->productId; 
     if ( mData->sortString.isEmpty() )  mData->sortString  = ad.mData->sortString; 
-    if ( !mData->secrecy.isValid() ) mData->secrecy = ad.mData->secrecy;
-    if ( ( !mData->url.isValid() && ad.mData->url.isValid() ) ) mData->url = ad.mData->url ;
     QStringList t;
     QStringList tAD;
     uint iii;
 
     // ********** phone numbers
-    PhoneNumber::List phoneAD = ad.phoneNumbers();
-    PhoneNumber::List::Iterator phoneItAD;
-    for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
-        bool found = false;
-        PhoneNumber::List::Iterator it;
-        for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
-            if ( ( *phoneItAD ).contains( (*it)  ) ) {
-                found = true;
-                (*it).setType( ( *phoneItAD ).type() );
-                (*it).setNumber( ( *phoneItAD ).number() );
-                break;
+    if ( isSubSet ) {
+        PhoneNumber::List phoneAD = ad.phoneNumbers();
+        PhoneNumber::List::Iterator phoneItAD;
+        for ( phoneItAD = phoneAD.begin(); phoneItAD != phoneAD.end(); ++phoneItAD ) {
+            bool found = false;
+            PhoneNumber::List::Iterator it;
+            for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
+                if ( ( *phoneItAD ).contains( (*it)  ) ) {
+                    found = true;
+                    (*it).setType( ( *phoneItAD ).type() );
+                    (*it).setNumber( ( *phoneItAD ).number() );
+                    break;
+                }
             }
+            // if ( isSubSet && ! found ) 
+            if (  ! found ) // LR try this one...
+                mData->phoneNumbers.append( *phoneItAD );                
         }
-        // if ( isSubSet && ! found ) 
-        if (  ! found ) // LR try this one...
-            mData->phoneNumbers.append( *phoneItAD );                
     }
     if ( isSubSet ) {
         // ************* emails;
         t = mData->emails;
         tAD = ad.mData->emails;
         for ( iii = 0; iii < tAD.count(); ++iii)
             if ( !t.contains(tAD[iii] ) )
                 mData->emails.append( tAD[iii] );
     }
 
     // ************* categories;
-    t = mData->categories;
-    tAD = ad.mData->categories;
-    for ( iii = 0; iii < tAD.count(); ++iii)
-        if ( !t.contains(tAD[iii] ) )
-            mData->categories.append( tAD[iii] );
+    if ( isSubSet ) {
+        t = mData->categories;
+        tAD = ad.mData->categories;
+        for ( iii = 0; iii < tAD.count(); ++iii)
+            if ( !t.contains(tAD[iii] ) )
+                mData->categories.append( tAD[iii] );
+    }
     QStringList::ConstIterator it;
     for( it = ad.mData->custom.begin(); it != ad.mData->custom.end(); ++it ) {
         QString qualifiedName = (*it).left( (*it).find( ":" )); 
         bool found = false;
         QStringList::ConstIterator itL;
         for( itL = mData->custom.begin(); itL != mData->custom.end(); ++itL ) {
             if ( (*itL).startsWith( qualifiedName ) ) {
                 found = true;
                 break;
             }
         }
         if ( ! found ) {
             mData->custom.append( *it );
         }
     }
     if ( mData->logo.undefined() && !ad.mData->logo.undefined() ) mData->logo = ad.mData->logo;
     if ( mData->photo.undefined() && !ad.mData->photo.undefined() ) mData->photo = ad.mData->photo;
     if ( !mData->sound.isIntern() ) {
         if ( mData->sound.url().isEmpty() ) {
             mData->sound = ad.mData->sound;
         }
     }
     if ( !mData->agent.isIntern() ) {
         if ( mData->agent.url().isEmpty() ) {
             mData->agent = ad.mData->agent;
         }
     }
     { 
         Key::List::Iterator itA;
         for( itA = ad.mData->keys.begin(); itA != ad.mData->keys.end(); ++itA ) {
             bool found = false;
             Key::List::Iterator it;
             for( it = mData->keys.begin(); it != mData->keys.end(); ++it ) {
                 if ( (*it) == (*itA)) {
                     found = true;
                     break;
                     
                 }
             }
             if ( ! found ) {
                 mData->keys.append( *itA );
             }
         }
     }
-    KABC::Address::List::Iterator addressIterA;
-    for ( addressIterA = ad.mData->addresses.begin(); addressIterA != ad.mData->addresses.end(); ++addressIterA ) {
-        bool found = false;
-        KABC::Address::List::Iterator addressIter;
-        for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
-              ++addressIter ) {
-            if ( (*addressIter) == (*addressIterA)) {
-                found = true;
-                (*addressIter).setType( (*addressIterA).type() );
-                break;
-            }
+    if ( isSubSet ) {
+        KABC::Address::List::Iterator addressIterA;
+        for ( addressIterA = ad.mData->addresses.begin(); addressIterA != ad.mData->addresses.end(); ++addressIterA ) {
+            bool found = false;
+            KABC::Address::List::Iterator addressIter;
+            for ( addressIter = mData->addresses.begin(); addressIter != mData->addresses.end();
+                  ++addressIter ) {
+                if ( (*addressIter) == (*addressIterA)) {
+                    found = true;
+                    (*addressIter).setType( (*addressIterA).type() );
+                    break;
+                }
 
-        }
-        if ( isSubSet && ! found ) {
-            mData->addresses.append( *addressIterA );
+            }
+            if ( isSubSet && ! found ) {
+                mData->addresses.append( *addressIterA );
+            }
         }
     }
     //qDebug("merge contact %s ", ad.uid().latin1());
     setUid( ad.uid() );
     setRevision( ad.revision() );
 }
 
 bool Addressee::removeVoice()
 {
     PhoneNumber::List phoneN = phoneNumbers();
     PhoneNumber::List::Iterator phoneIt;
     bool found = false;
     for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
         if ( (*phoneIt).type() & PhoneNumber::Voice) { // voice found
             if ((*phoneIt).type() - PhoneNumber::Voice ) {
                 (*phoneIt).setType((*phoneIt).type() - PhoneNumber::Voice );
                 insertPhoneNumber( (*phoneIt) );
                 found = true;
             }
         }
         
     }
     return found;
 }
 
 bool Addressee::containsAdr(const Addressee& ad )
 {
     if ( ! ad.mData->familyName.isEmpty()  )  if ( mData->familyName  != ad.mData->familyName) return false;
     if ( ! ad.mData->givenName.isEmpty() )if (  mData->givenName   != ad.mData->givenName ) return false;
     if (  ad.mData->url.isValid() ) if (mData->url != ad.mData->url) return false ;
     if ( ! ad.mData->role.isEmpty() ) if (mData->role != ad.mData->role) return false ;
     if ( ! ad.mData->organization.isEmpty() ) if (mData->organization != ad.mData->organization) return false ; 
     if ( ! ad.mData->note.isEmpty() ) if (mData->note != ad.mData->note) return false ; 
     if ( ! ad.mData->title .isEmpty() ) if (mData->title != ad.mData->title ) return false ;
 
     // compare phone numbers
     PhoneNumber::List phoneN = ad.phoneNumbers();
     PhoneNumber::List::Iterator phoneIt;
     bool found = false;
     for ( phoneIt = phoneN.begin(); phoneIt != phoneN.end(); ++phoneIt ) {
         bool found = false;
         PhoneNumber::List phoneL = ad.phoneNumbers();
         PhoneNumber::List::Iterator phoneItL;
         for ( phoneItL = phoneL.begin(); phoneItL != phoneL.end(); ++phoneItL ) {
             if ( ( *phoneItL ).number() == ( *phoneIt ).number()  ) {
                 found = true;
                 break;
             }
         }
         if ( ! found )
             return false;
     }
     return true;
    
 }
 void Addressee::simplifyAddresses()
 {
 
 
     Address::List list;
     Address::List::Iterator it;
     Address::List::Iterator it2;
     for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
         it2 = it;
diff --git a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
index ae4cfbb..8165b4c 100644
--- a/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
+++ b/kabc/plugins/sharpdtm/sharpdtmconverter.cpp
@@ -19,129 +19,130 @@
 */
 
 /*
 Enhanced Version of the file for platform independent KDE tools.
 Copyright (c) 2004 Ulf Schenk
 
 $Id$
 */
 
 #include "kglobal.h"
 #include <qregexp.h>
 
 
 #include "sharpdtmconverter.h"
 
 #include <sl/slcategories.h>
 #include <libkdepim/ksyncprofile.h>
 //US #include <qpe/categoryselect.h>
 
 
 using namespace KABC;
 using namespace SlCategory;
 
 SharpDTMConverter::SharpDTMConverter() : catDB(0)
 {
 }
 
 SharpDTMConverter::~SharpDTMConverter()
 {
   deinit();
 }
 
 bool SharpDTMConverter::init()
 {
   catDB = new SlCategory::SlCategories();
 
   if (!catDB)
     return false;
 
 //  catDB->load( categoryFileName() );
   return true;
 }
 
 void SharpDTMConverter::deinit()
 {
   if (catDB)
   {
     delete catDB;
     catDB = 0;
   }
 }
 
 bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBase* database, Addressee &addr )
 {
         SlZDataBase* db = (SlZDataBase*)database;
 
     // for syncing: we need setting of the two fields
     addr.setExternalUID( QString::number( contact ) );
     addr.setOriginalExternalUID( QString::number( contact ) ); 
     addr.setTempSyncStat(  SYNC_TEMPSTATE_NEW_EXTERNAL );
 
 
     // name
     //qDebug("SharpDTMConverter::sharpToAddressee check if the fileAs transformation works!!");
-    addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); // needs fix
+    addr.setFormattedName(db->readField(ZdbAdrs::FileAs)); 
+    addr.setName(db->readField(ZdbAdrs::FullName));
 
     addr.setFamilyName( db->readField(ZdbAdrs::LastName) );
     addr.setGivenName( db->readField(ZdbAdrs::FirstName) );
     addr.setAdditionalName( db->readField(ZdbAdrs::MiddleName) );
     addr.setPrefix( db->readField(ZdbAdrs::Title) );
     addr.setSuffix( db->readField(ZdbAdrs::Suffix) );
 
 
     QString emailstr = db->readField(ZdbAdrs::Emails);
     emailstr.replace( QRegExp(","), " " ); 
     emailstr.replace( QRegExp(";"), " " ); 
     emailstr.replace( QRegExp(":"), " " ); 
     //qDebug("SharpDTMConverter::sharpToAddressee whats the character to seperate the emailadresses? %s ", emailstr.latin1());
     QStringList emails = QStringList::split(" ", emailstr.simplifyWhiteSpace());
     bool defE = false;
     bool found = false;
     for ( QStringList::Iterator it = emails.begin(); it != emails.end(); ++it ) {
         if (found )
             defE = false;
         else
             found = defE = ((*it).lower() == db->readField(ZdbAdrs::DefaultEmail).lower());
       addr.insertEmail( *it, defE );
     }
     if ( ! found )
         if (!db->readField(ZdbAdrs::DefaultEmail).isEmpty())
             addr.insertEmail(db->readField(ZdbAdrs::DefaultEmail), true);
 
     // home
     if ((!db->readField(ZdbAdrs::HomeStreet).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCity).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeState).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeZip).isEmpty()) ||
         (!db->readField(ZdbAdrs::HomeCountry).isEmpty()))
     {
       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.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())
@@ -161,282 +162,285 @@ bool SharpDTMConverter::sharpToAddressee( const CardId &contact, const SlZDataBa
         (!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.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.setNumber( db->readField(ZdbAdrs::BusinessMobile) );
       addr.insertPhoneNumber( businessmobile );
     }
 
     if (!db->readField(ZdbAdrs::BusinessPager).isEmpty())
     {
       PhoneNumber businesspager;
       businesspager.setType( PhoneNumber::Work | 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);
         //qDebug("SharpDTMConverter::sharpToAddressee pleas check that gender works!! : Gender: %s", gen.latin1());
         //qDebug("SharpDTMConverter::sharpToAddressee: may be int db->readUshortField(\"ZdbAdrs::Gender\") is here better suited");
-
-    if (gen == "male")
+    if (gen == "1")
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "male");
-    else if (gen == "female")
+    else if (gen == "2")
       addr.insertCustom( "KADDRESSBOOK", "X-Gender", "female");
+    else 
+        addr.insertCustom( "KADDRESSBOOK", "X-Gender", "undef");
 
 
     QDate ann = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Anniversary) ); 
     if (ann.isValid()) {
       QString dt = KGlobal::locale()->formatDate(ann, true, KLocale::ISODate);
       //qDebug("qtopiaToAddressee annyversary found:%s", dt.latin1());
       addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", dt);
-    }
+    } else
+        addr.insertCustom( "KADDRESSBOOK", "X-Anniversary", " ");
+        
   
 
     addr.insertCustom( "KADDRESSBOOK", "X-Children", db->readField(ZdbAdrs::Children) );
 
 
     QDate birthd = KGlobal::locale()->readDate( db->readField(ZdbAdrs::Birthday) );
     //qDebug("birtd %s ", birthd.toString().latin1());
     if (birthd.isValid())
       addr.setBirthday( birthd );
 
     addr.setNickName( db->readField(ZdbAdrs::Nickname) );
 
     // others
     //US I put opies BusinessWebPage into Ka/Pi's notes block, because no other native field is available.
     //QString notes = db->readField(ZdbAdrs::Notes);
     //notes += "\nBusinessWebPage: " + db->readField(ZdbAdrs::BusinessWebPage) + "\n";
     if ( addr.url().isEmpty() )
         addr.setUrl( db->readField(ZdbAdrs::BusinessWebPage) );
     addr.setNote( db->readField(ZdbAdrs::Notes).replace( QRegExp("\\r"), ""));
 
 
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const;
 
         //qDebug("SharpDTMConverter::sharpToAddressee please check that the categories will be converted" );
     QArray<int> catArray = db->readCategories();
     QString cat;
 
     for ( unsigned int i=0; i < catArray.size(); i++ ) {
       cat = catDB->label(catArray[i]);
       if ( cat.isEmpty() )
         addr.insertCategory(QString::number(catArray[i]));
       else
         addr.insertCategory( cat );
     }
 
     return true;
 }
 
 bool SharpDTMConverter::addresseeToSharp( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {
     bool cellHome = false, cellWork = false;
     // name
     database->writeField(ZdbAdrs::LastName, addr.familyName());
     database->writeField(ZdbAdrs::FirstName, addr.givenName());
     database->writeField(ZdbAdrs::MiddleName, addr.additionalName());
     database->writeField(ZdbAdrs::Title, addr.prefix());
     database->writeField(ZdbAdrs::Suffix, addr.suffix());
 
     //qDebug("SharpDTMConverter::addresseeToSharp check if the fileAs transformation works!!\n%s",addr.formattedName().latin1() );
     QString formattedName = addr.formattedName();
     if ( formattedName.isEmpty() ) {
         if ( !addr.familyName().isEmpty() ) {
             formattedName = addr.familyName();
             if ( !addr.givenName().isEmpty() ) {
                 formattedName += ", ";
                 formattedName += addr.givenName();
             }
         } else
             formattedName = addr.givenName();
     }
     database->writeField(ZdbAdrs::FileAs, formattedName);
-    database->writeField(ZdbAdrs::FullName, formattedName);
+    database->writeField(ZdbAdrs::FullName, addr.name());
 
     // email
     //qDebug("SharpDTMConverter::addresseeToSharp check which seperator we need here for the emails!!");
     //qDebug("SharpDTMConverter::addresseeToSharp its probably the same from sharpToAddressee");
     QString emails = addr.emails().join(" ");
     database->writeField(ZdbAdrs::Emails, emails );
 
     database->writeField(ZdbAdrs::DefaultEmail, addr.preferredEmail() );
     // home
     const Address homeaddress = addr.address(Address::Home);
     database->writeField(ZdbAdrs::HomeStreet, homeaddress.street());
     database->writeField(ZdbAdrs::HomeCity, homeaddress.locality());
     database->writeField(ZdbAdrs::HomeState, homeaddress.region());
     database->writeField(ZdbAdrs::HomeZip, homeaddress.postalCode());
     database->writeField(ZdbAdrs::HomeCountry, homeaddress.country());
     
     PhoneNumber homephone = addr.phoneNumber( PhoneNumber::Home );
     database->writeField(ZdbAdrs::HomePhone, homephone.number());
     PhoneNumber homefax = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax );
     database->writeField(ZdbAdrs::HomeFax, homefax.number());
     PhoneNumber homemobile = addr.phoneNumber( PhoneNumber::Home | PhoneNumber::Cell );
     database->writeField(ZdbAdrs::HomeMobile, homemobile.number());
     if (!homemobile.number().isEmpty()) {
       cellHome = true;
     }
     database->writeField(ZdbAdrs::HomeWebPage, addr.url().url());
     // business
     const Address businessaddress = addr.address(Address::Work);
         //qDebug("write business address ");
     database->writeField(ZdbAdrs::BusinessStreet, businessaddress.street());
     database->writeField(ZdbAdrs::BusinessCity, businessaddress.locality());
     database->writeField(ZdbAdrs::BusinessState, businessaddress.region());
     database->writeField(ZdbAdrs::BusinessZip, businessaddress.postalCode());
     database->writeField(ZdbAdrs::BusinessCountry, businessaddress.country());
     
     PhoneNumber businessphone = addr.phoneNumber( PhoneNumber::Work );
     database->writeField(ZdbAdrs::BusinessPhone, businessphone.number());
 
     PhoneNumber businessfax = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax );
     database->writeField(ZdbAdrs::BusinessFax, businessfax.number());
 
     PhoneNumber businessmobile = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Cell );
     database->writeField(ZdbAdrs::BusinessMobile, businessmobile.number());
     if (!businessmobile.number().isEmpty()) {
         cellWork = true;
     }
     PhoneNumber mobile = addr.phoneNumber( PhoneNumber::Cell );
     if (! mobile.number().isEmpty()) {
         if ( ! cellHome ) 
             database->writeField(ZdbAdrs::HomeMobile, mobile.number());
         else if (! cellWork )
             database->writeField(ZdbAdrs::BusinessMobile, mobile.number());
     }
 
     PhoneNumber businesspager = addr.phoneNumber( PhoneNumber::Work | PhoneNumber::Pager );
     database->writeField(ZdbAdrs::BusinessPager, businesspager.number());
 
     database->writeField(ZdbAdrs::JobTitle, addr.role());
     database->writeField(ZdbAdrs::Company, addr.organization());
 
     database->writeField(ZdbAdrs::Profession, addr.custom( "KADDRESSBOOK", "X-Profession" ));
     database->writeField(ZdbAdrs::Assistant, addr.custom( "KADDRESSBOOK", "X-AssistantsName" ));
     database->writeField(ZdbAdrs::Department, addr.custom( "KADDRESSBOOK", "X-Department" ));
     database->writeField(ZdbAdrs::Manager, addr.custom( "KADDRESSBOOK", "X-ManagersName" ));
     database->writeField(ZdbAdrs::Office, addr.custom( "KADDRESSBOOK", "X-Office" ));
 
     //personal
     database->writeField(ZdbAdrs::Spouse, addr.custom( "KADDRESSBOOK", "X-Spouse" ));
 
     QString gt = addr.custom( "KADDRESSBOOK", "X-Gender" );
         //qDebug("SharpDTMConverter::addresseeToSharp please check that gender works!! : Gender: %s", gt.latin1());
         //qDebug("SharpDTMConverter::addresseeToSharp: may be writeField(\"ZdbAdrs::Gender\", ushort) is here better suited?");
         //qDebug("SharpDTMConverter::addresseeToSharp: check also the reverse functionality in sharpToAddressee");
     if (gt == "male")
-      database->writeField(ZdbAdrs::Gender, "male");
+      database->writeField(ZdbAdrs::Gender, "1");
     else if (gt == "female")
-      database->writeField(ZdbAdrs::Gender, "female");
+      database->writeField(ZdbAdrs::Gender, "2");
     else
       database->writeField(ZdbAdrs::Gender, "");
 
     QString dateS ;
     QDate dt = KGlobal::locale()->readDate(addr.custom("KADDRESSBOOK", "X-Anniversary" ), "%Y-%m-%d"); // = Qt::ISODate
     if ( dt.isValid() ) {
         dateS =  KGlobal::locale()->formatDate(dt, true  );
     }
     database->writeField(ZdbAdrs::Anniversary, dateS );
     database->writeField(ZdbAdrs::Children, addr.custom( "KADDRESSBOOK", "X-Children" ));
     dt = addr.birthday().date(); 
     dateS = ""; 
     if ( dt.isValid() ) {
         dateS =  KGlobal::locale()->formatDate(dt, true );
     }
     database->writeField(ZdbAdrs::Birthday, dateS);
     database->writeField(ZdbAdrs::Nickname, addr.nickName());
 
     // other
     database->writeField(ZdbAdrs::Notes, addr.note());
 
 //US    QString groups() const { return find( Qtopia::Groups ); }
 //US    QStringList groupList() const; 
 
 
         //qDebug("SharpDTMConverter::addresseeToSharp please check if category transformation works");
 
     return true;
 }
 
 
 bool SharpDTMConverter::setCategories( const Addressee &addr, SlZDataBase* database , const CardId &contact )
 {  
     QStringList list = addr.categories();
 
         QArray<int> ids(list.count());
         uint index = 0;
         for(uint i=0; i<ids.size(); i++){
                 if(catDB->exists(list[i])){
                         ids[index] = catDB->id(list[i]);
             qDebug("set ex cat %d %s ",ids[index] , list[i].latin1());
                         index++;
                 } else {
                         ids[index] = catDB->addCategory(list[i]);
             qDebug("add new cat %d %s ",ids[index] , list[i].latin1());
                         index++;
                 }
         }
     bool res ;
     if ( res = database->updateCategories(contact, ids) )
         qDebug("cat updated ");
     else
         qDebug("error cat updating ");
 
     return res;
 }
 
 #if 0
         m_pCategories = new SlCategories;
 catDB
 
         if(categories == QString::null) return true;
         QStringList list = CSVParser::parse(categories);
         QArray<int> ids(list.count());
diff --git a/kaddressbook/kabcore.cpp b/kaddressbook/kabcore.cpp
index 42e147f..d970ff1 100644
--- a/kaddressbook/kabcore.cpp
+++ b/kaddressbook/kabcore.cpp
@@ -2292,139 +2292,149 @@ void KABCore::manageCategories( )
     int dw = QApplication::desktop()->width();
     int dh = QApplication::desktop()->height();
     cp->setGeometry( (dw-w)/2, (dh - h )/2 ,w,h );
     if ( !cp->exec() ) {
         delete cp;
         return;
     }
     int count = 0;
     int cc = 0;
     message( i18n("Please wait, processing categories..."));
     if ( cp->addCat() ) {
         KABC::AddressBook::Iterator it;
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             ++cc;
             if ( cc %10 == 0)
                 message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             for( i = 0; i<   catIncList.count(); ++i ) {
                 if ( !catList.contains (catIncList[i])) {
                     catList.append( catIncList[i] );
                     //qDebug("add cat %s ",  catIncList[i].latin1());
                     ++count;
                 }
             }
         }
         catList.sort();
         KABPrefs::instance()->mCustomCategories = catList;
         KABPrefs::instance()->writeConfig();
         message(QString::number( count )+ i18n(" categories added to list! "));
     } else {
         QStringList catList = KABPrefs::instance()->mCustomCategories;
         QStringList catIncList;
         QStringList newCatList;
         KABC::AddressBook::Iterator it;
         for( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) { 
             ++cc;
             if ( cc %10 == 0)
                 message(i18n("Processing contact #%1").arg(cc));
             QStringList catIncList = (*it).categories();
             int i;
             if ( catIncList.count() ) {
                 newCatList.clear();
                 for( i = 0; i<   catIncList.count(); ++i ) {
                     if ( catList.contains (catIncList[i])) {
                         newCatList.append( catIncList[i] );
                     }
                 }
                 newCatList.sort();
                 (*it).setCategories( newCatList );
                 mAddressBook->insertAddressee( (*it) );
             }
         } 
         setModified( true );
         mViewManager->refreshView();
         message( i18n("Removing categories done!"));
     }
     delete cp;
 }
 void KABCore::removeVoice()
 {
     if ( KMessageBox::questionYesNo( this, i18n("After importing, phone numbers\nmay have two or more types.\n(E.g. work+voice)\nThese numbers are shown as \"other\".\nClick Yes to remove the voice type\nfrom numbers with more than one type.\n\nRemove voice type?") ) == KMessageBox::No )
         return;
-    KABC::Addressee::List list;
     XXPortSelectDialog dlg( this, false, this );
-    if ( dlg.exec() )
-        list = dlg.contacts();
-    else
+    if ( !dlg.exec() )
         return;
-    KABC::Addressee::List::Iterator it;
-    for ( it = list.begin(); it != list.end(); ++it ) {
-        if ( (*it).removeVoice() )
-            addrModified((*it), false );
+    mAddressBook->setUntagged();
+    dlg.tagSelected();
+    message(i18n("Removing voice..."), false );
+    KABC::AddressBook::Iterator it;
+    for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
+        if ( (*it).tagged() ) {
+            (*it).removeVoice();
+        }
     }
+    message(i18n("Refreshing view...") );
+    qApp->processEvents();
+    mViewManager->refreshView( "" );
+    Addressee add;
+    mDetails->setAddressee( add );
+    message(i18n("Remove voice completed!") );
+
+
+
 }
 
 void KABCore::setFormattedName()
 {
     KABFormatPrefs setpref;
     if ( !setpref.exec() ) {
         return;
     }
     XXPortSelectDialog dlg( this, false, this );
     if ( !dlg.exec() )
         return;
     mAddressBook->setUntagged();
     dlg.tagSelected();
     int count = 0;
     KABC::AddressBook::Iterator it;
     for ( it = mAddressBook->begin(); it != mAddressBook->end(); ++it ) {
         if ( (*it).tagged() ) {
             ++count;
             if ( count %10 == 0 )
                 message(i18n("Changing contact #%1").arg( count ) );
             qApp->processEvents();
             QString fName;
             if ( setpref.simple->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::SimpleName );
             else if ( setpref.full->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::FullName );
             else if ( setpref.reverse->isChecked() )
                 fName = NameEditDialog::formattedName( (*it), NameEditDialog::ReverseName );
             else 
                 fName = (*it).organization();
             if ( setpref.setCompany->isChecked() )
                 if ( fName.isEmpty() || fName =="," )
                     fName = (*it).organization();
             (*it).setFormattedName( fName );
         }
     }
     message(i18n("Refreshing view...") );
     qApp->processEvents();
     mViewManager->refreshView( "" );
     Addressee add;
     mDetails->setAddressee( add );
     message(i18n("Setting formatted name completed!") );
 }
 
 void KABCore::clipboardDataChanged()
 {
 
   if ( mReadWrite )
     mActionPaste->setEnabled( !QApplication::clipboard()->text().isEmpty() );
 
 }
 
 void KABCore::updateActionMenu()
 {
   UndoStack *undo = UndoStack::instance();
   RedoStack *redo = RedoStack::instance();
 
   if ( undo->isEmpty() )
     mActionUndo->setText( i18n( "Undo" ) );
   else
     mActionUndo->setText( i18n( "Undo %1" ).arg( undo->top()->name() ) );
 
   mActionUndo->setEnabled( !undo->isEmpty() );
 
@@ -3070,159 +3080,159 @@ bool KABCore::synchronizeAddressbooks( KABC::AddressBook* local, KABC::AddressBo
                                     inR = inL;
                                     inR.setIDStr( ":" );
                                     inR.setResource( 0 );
                                     remote->insertAddressee( inR, false );
                                 }
                             }
                         }
                     } else {
                         ++filteredOUT; 
                     }
                 }
             }
         }
         ++incCounter;
     }
     el.clear();
     syncManager->hideProgressBar();
     mLastAddressbookSync = QDateTime::currentDateTime().addSecs( 1 );
     // get rid of micro seconds
     QTime t =  mLastAddressbookSync.time();
     mLastAddressbookSync.setTime( QTime (t.hour (), t.minute (), t.second () )  );
     addresseeLSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRevision( mLastAddressbookSync );
     addresseeRSync.setRole( i18n("!Remote from: ")+mCurrentSyncName ) ;
     addresseeLSync.setRole(i18n("!Local from: ") + mCurrentSyncName  );
     addresseeRSync.setGivenName( i18n("!DO NOT EDIT!") ) ;
     addresseeLSync.setGivenName(i18n("!DO NOT EDIT!")   );
     addresseeRSync.setOrganization( "!"+mLastAddressbookSync.toString() ) ;
     addresseeLSync.setOrganization("!"+ mLastAddressbookSync.toString() );
     addresseeRSync.setNote( "" ) ;
     addresseeLSync.setNote( "" );
 
     if ( mGlobalSyncMode ==  SYNC_MODE_NORMAL)
         remote->insertAddressee( addresseeRSync, false );
     local->insertAddressee( addresseeLSync, false );
     QString mes;
     mes .sprintf(  i18n("Synchronization summary:\n\n %d items added to local\n %d items added to remote\n %d items updated on local\n %d items updated on remote\n %d items deleted on local\n %d items deleted on remote\n %d incoming filtered out\n %d outgoing filtered out"),addedAddressee, addedAddresseeR, changedLocal, changedRemote, deletedAddresseeL, deletedAddresseeR, filteredIN, filteredOUT ); 
     qDebug( mes );
     mes = i18n("Local addressbook changed!\n") +mes;
     if ( syncManager->mShowSyncSummary ) { 
         if ( KMessageBox::Cancel == KMessageBox::warningContinueCancel(this, mes,
                                                                        i18n("KA/Pi  Synchronization"),i18n("Write back"))) {
             qDebug("cancelled ");
             return false;
         }
     }
     return syncOK;
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::sync(KSyncManager* manager, QString filename, int mode)
 { 
 
     //pending prepare addresseeview for output
     //pending detect, if remote file has REV field. if not switch to external sync
     mGlobalSyncMode = SYNC_MODE_NORMAL;
     if ( manager != syncManager )
         qDebug("KABCore::sync:: ERROR! :: manager != syncManager ");
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal(filename,"syncContact");
     bool syncOK = false;
     if ( abLocal.load() ) {
-        qDebug("AB loaded %s,sync mode %d",filename.latin1(), mode );
+        qDebug("Sync:AB loaded %s,sync mode %d",filename.latin1(), mode );
         bool external = false;
         bool isXML = false;
         if ( filename.right(4) == ".xml") {
             mGlobalSyncMode = SYNC_MODE_EXTERNAL;
             isXML = true;
             abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, true );
         } else {
             external = !manager->mIsKapiFile;
             if ( external ) {
-                qDebug("Setting vcf mode to external ");
+                qDebug("Sync:Setting vcf mode to external ");
                 mGlobalSyncMode = SYNC_MODE_EXTERNAL;
                 AddressBook::Iterator it;  
                 for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
                     (*it).setID( mCurrentSyncDevice, (*it).uid() );
                     (*it).computeCsum( mCurrentSyncDevice );
                 }
             }
         }
         //AddressBook::Iterator it;
         //QStringList vcards;
         //for ( it = abLocal.begin(); it != abLocal.end(); ++it ) {
         //  qDebug("Name %s ", (*it).familyName().latin1());
         //}
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, mode );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile )
                 {
                     if ( external )
                         abLocal.removeSyncAddressees( !isXML);
-                    qDebug("Saving remote AB ");
+                    qDebug("Sync:Saving remote AB ");
                     if ( ! abLocal.saveAB()) 
                         qDebug("Error writing back AB to file ");
                     if (  external ) {
                         // afterwrite processing
                         abLocal.postExternSync( mAddressBook,mCurrentSyncDevice ,isXML);
                     }
                 }
         }
         setModified();
         
     }
     abLocal.removeResources();
     if ( syncOK )
         mViewManager->refreshView();
     return syncOK;
 
 }
 void  KABCore::removeSyncInfo( QString syncProfile) 
 {
     qDebug("AB:removeSyncInfo for profile %s ", syncProfile.latin1());
     mAddressBook->removeSyncInfo( syncProfile );
     setModified();
 }
 
 
 //this is a overwritten callbackmethods from the syncinterface
 bool KABCore::syncExternal(KSyncManager* manager, QString  resource)
 {
     if (  resource == "phone" )
         return syncPhone();
     disableBR( true );
    if ( manager != syncManager )
         qDebug("KABCore::syncExternal:: ERROR! :: manager != syncManager ");
     QString mCurrentSyncDevice = manager->getCurrentSyncDevice();
 
     AddressBook abLocal( resource,"syncContact");
     bool syncOK = false;
     message(i18n("Loading DTM address data..."), false);
     if ( abLocal.load() ) {
         qDebug("AB sharp loaded ,sync device %s",mCurrentSyncDevice.latin1());
         mGlobalSyncMode = SYNC_MODE_EXTERNAL;
         message(i18n("Sync preprocessing..."),false);
         abLocal.preExternSync( mAddressBook ,mCurrentSyncDevice, false );
         message(i18n("Synchronizing..."),false);
         syncOK = synchronizeAddressbooks( mAddressBook, &abLocal, syncManager->mSyncAlgoPrefs );
         if (  syncOK ) {
             if ( syncManager->mWriteBackFile ) {
                 abLocal.removeSyncAddressees( false );
                 message(i18n("Saving DTM address data..."),false);
                 abLocal.saveAB();
                 message(i18n("Sync postprocessing..."),false);
                 abLocal.postExternSync( mAddressBook,mCurrentSyncDevice, true );
             }
         } else
             message( i18n("Sync cancelled or failed.") );
         setModified();
     }
     abLocal.removeResources();
     if ( syncOK ) {
         mViewManager->refreshView();
         message(i18n("DTM syncing finished."));
     }
     disableBR( false );
     return syncOK;