many new bugs...

1 files changed, 68 insertions, 6 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7e1e414..661bdf6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -565,49 +565,101 @@ void Addressee::simplifyAddresses()
     if (  mData->url.isValid() )
         max = 1; 
     if ( mData->addresses.count() <= max ) return ;
     int count = 0;
     for( it = mData->addresses.begin(); it != mData->addresses.end(); ++it ) {
         if ( count >= max )
             list.append( *it );
         ++count;
     }
     for( it = list.begin(); it != list.end(); ++it ) {
         removeAddress( (*it) );
     }
 }
 
 // removes all emails but the first 
 // needed by phone sync
 void Addressee::simplifyEmails()
 { 
     if ( mData->emails.count() == 0 ) return ;
     QString email = mData->emails.first();
     detach();
     mData->emails.clear();
     mData->emails.append( email );
 }
+void Addressee::makePhoneNumbersOLcompatible()
+{
+    KABC::PhoneNumber::List::Iterator phoneIter; 
+    KABC::PhoneNumber::List::Iterator phoneIter2; 
+    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
+          ++phoneIter ) {
+        ( *phoneIter ).makeCompat();
+    } 
+    int hasHome = hasPhoneNumberType( PhoneNumber::Home | PhoneNumber::Pref );
+    int hasHome2 = hasPhoneNumberType( PhoneNumber::Home );
+    int hasWork = hasPhoneNumberType( PhoneNumber::Work | PhoneNumber::Pref );
+    int hasWork2 = hasPhoneNumberType( PhoneNumber::Work );
+    int hasCell = hasPhoneNumberType( PhoneNumber::Cell );
+    int hasCell2 = hasPhoneNumberType( PhoneNumber::Car );
+    for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
+          ++phoneIter ) {
+        if ( (*phoneIter).type() ==  PhoneNumber::Home && ! hasHome ) {
+            (*phoneIter).setType(  PhoneNumber::Home | PhoneNumber::Pref );
+            ++hasHome;
+            if ( hasHome2 ) --hasHome2;
+        } else if ( ( (*phoneIter).type() ==  PhoneNumber::Home | PhoneNumber::Pref) && hasHome>1 && !hasHome2 ) {
+            (*phoneIter).setType(  PhoneNumber::Home );
+            --hasHome;
+            ++hasHome2;
+        } else  if ( (*phoneIter).type() ==  PhoneNumber::Work && ! hasWork ) {
+            (*phoneIter).setType(  PhoneNumber::Work | PhoneNumber::Pref );
+            ++hasWork;
+            if ( hasWork2 ) --hasWork2;
+        } else if ( ( (*phoneIter).type() ==  PhoneNumber::Work | PhoneNumber::Pref) &&  hasWork > 1 && ! hasWork2 ) {
+            (*phoneIter).setType(  PhoneNumber::Work );
+            --hasWork;
+            ++hasWork2;
+        } else if ( (*phoneIter).type() ==  PhoneNumber::Cell &&  hasCell > 1 && !hasCell2) {
+            (*phoneIter).setType(  PhoneNumber::Car );
+            ++hasCell2;
+            --hasCell;
+        } else if ( (*phoneIter).type() ==  PhoneNumber::Car &&  hasCell2 > 1 && !hasCell) {
+            (*phoneIter).setType(  PhoneNumber::Cell );
+            ++hasCell;
+            --hasCell2;
+        } else{
+            phoneIter2 = phoneIter;
+            ++phoneIter2;
+            for ( ; phoneIter2 != mData->phoneNumbers.end();
+            ++phoneIter2 ) {
+                if ( (*phoneIter2).type() == (*phoneIter).type() ) {
+                    (*phoneIter2).setType( PhoneNumber::Voice );
 
+                }
+            }
+        }
+    }
+}
 void Addressee::simplifyPhoneNumbers()
 {
     int max = 4;
     int inList = mData->phoneNumbers.count();
     KABC::PhoneNumber::List removeNumbers;
     KABC::PhoneNumber::List::Iterator phoneIter;
     if ( inList > max ) {
         // delete non-preferred numbers
         for ( phoneIter = mData->phoneNumbers.begin(); phoneIter != mData->phoneNumbers.end();
               ++phoneIter ) {
             if ( inList > max ) {
                 if ( ! (( *phoneIter ).type() &  PhoneNumber::Pref )) {
                     removeNumbers.append( ( *phoneIter ) );
                     --inList;
                 }
             } else
                 break;
         }
         for ( phoneIter = removeNumbers.begin(); phoneIter != removeNumbers.end();
               ++phoneIter ) {
             removePhoneNumber(( *phoneIter ));
         }
         // delete preferred numbers
         if ( inList > max ) {
@@ -976,81 +1028,81 @@ QString Addressee::businessAddressPostalCodeLabel()
   return i18n("Business Address Postal Code");
 }
 
 
 QString Addressee::businessAddressCountryLabel()
 {
   return i18n("Business Address Country");
 }
 
 
 QString Addressee::businessAddressLabelLabel()
 {
   return i18n("Business Address Label");
 }
 
 
 QString Addressee::homePhoneLabel()
 {
   return i18n("Home Phone");
 }
 
 
 QString Addressee::businessPhoneLabel()
 {
-  return i18n("Business Phone");
+  return i18n("Work Phone");
 }
 
 
 QString Addressee::mobilePhoneLabel()
 {
   return i18n("Mobile Phone");
 }
 QString Addressee::mobileWorkPhoneLabel()
 {
-  return i18n("Mobile (work)");
+  return i18n("Mobile2 (work)");
 }
 QString Addressee::mobileHomePhoneLabel()
 {
-  return i18n("Mobile (home)");
+  return i18n("Mobile");
 }
 
 
 QString Addressee::homeFaxLabel()
 {
-  return i18n("Home Fax");
+  return i18n("Fax (Home)");
 }
 
 
 QString Addressee::businessFaxLabel()
 {
-  return i18n("Business Fax");
+  return i18n("Fax (Work)");
 }
 
 
 QString Addressee::carPhoneLabel()
 {
-  return i18n("Car Phone");
+  return i18n("Mobile2 (work)");
 }
 
 
 QString Addressee::isdnLabel()
 {
   return i18n("ISDN");
 }
 
 
 QString Addressee::pagerLabel()
 {
   return i18n("Pager");
 }
 
 QString Addressee::sipLabel()
 {
   return i18n("SIP");
 }
 
 QString Addressee::emailLabel()
 {
   return i18n("Email Address");
 }
 
@@ -1631,48 +1683,58 @@ void Addressee::removePhoneNumber( const PhoneNumber &phoneNumber )
   }
 }
 
 PhoneNumber Addressee::phoneNumber( int type ) const
 {
   PhoneNumber phoneNumber( "", type );
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPatternP( (*it).type(), type ) ) {
       if ( (*it).type() & PhoneNumber::Pref )
         return (*it);
       else if ( phoneNumber.number().isEmpty() )
         phoneNumber = (*it);
     }
   }
 
   return phoneNumber;
 }
 
 PhoneNumber::List Addressee::phoneNumbers() const
 {
   return mData->phoneNumbers;
 }
 
+int  Addressee::hasPhoneNumberType( int type )
+{
+    int retval = 0;
+  PhoneNumber::List::ConstIterator it;
+  for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
+      if ( (*it).type() == type )
+          ++retval;
+  }
+  return retval;
+}
 PhoneNumber::List Addressee::phoneNumbers( int type ) const
 {
   PhoneNumber::List list;
 
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( matchBinaryPattern( (*it).type(), type ) ) {
       list.append( *it );
     }
   }
   return list;
 }
 
 PhoneNumber Addressee::findPhoneNumber( const QString &id ) const
 {
   PhoneNumber::List::ConstIterator it;
   for( it = mData->phoneNumbers.begin(); it != mData->phoneNumbers.end(); ++it ) {
     if ( (*it).id() == id ) {
       return *it;
     }
   }
   return PhoneNumber();
 }