many new bugs...

8 files changed, 194 insertions, 25 deletions

diff --git a/kabc/addressee.cpp b/kabc/addressee.cpp
index 7e1e414..661bdf6 100644
--- a/kabc/addressee.cpp
+++ b/kabc/addressee.cpp
@@ -581,17 +581,69 @@ void Addressee::simplifyAddresses()
 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
@@ -992,49 +1044,49 @@ QString Addressee::businessAddressLabelLabel()
 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");
 }
 
@@ -1647,16 +1699,26 @@ PhoneNumber Addressee::phoneNumber( int type ) const
   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 );
diff --git a/kabc/addressee.h b/kabc/addressee.h
index d1c07cb..0c488eb 100644
--- a/kabc/addressee.h
+++ b/kabc/addressee.h
@@ -117,16 +117,18 @@ class Addressee
     const QString externalUID() const;
     void setOriginalExternalUID( const QString &id );
     QString originalExternalUID() const;
     void mergeContact(  const Addressee& ad, bool isSubSet ); 
     void simplifyEmails();
     void simplifyAddresses();
     void simplifyPhoneNumbers();
     void simplifyPhoneNumberTypes();
+    void makePhoneNumbersOLcompatible();
+    int hasPhoneNumberType( int type );
     bool removeVoice();
     bool containsAdr(const Addressee& addr );
     
     /**
       Set unique identifier.
      */
     void setUid( const QString &uid );
     /**
diff --git a/kabc/field.cpp b/kabc/field.cpp
index fd51026..20885de 100644
--- a/kabc/field.cpp
+++ b/kabc/field.cpp
@@ -284,37 +284,37 @@ QString Field::value( const KABC::Addressee &a )
     case FieldImpl::Url:
       return a.url().prettyURL();
 //US    
     case FieldImpl::Resource:
       return a.resource()->resourceName();
     case FieldImpl::Category:
         return a.categories().join(",");
     case FieldImpl::HomePhone:
-      return a.phoneNumber( PhoneNumber::Home ).number();
+      return a.phoneNumber( PhoneNumber::Home| PhoneNumber::Pref  ).number();
     case FieldImpl::BusinessPhone:
-      return a.phoneNumber( PhoneNumber::Work ).number();
+      return a.phoneNumber( PhoneNumber::Work| PhoneNumber::Pref  ).number();
     case FieldImpl::MobilePhone:
       return a.phoneNumber( PhoneNumber::Cell ).number();
     case FieldImpl::MobileWorkPhone:
-      return a.phoneNumber( PhoneNumber::Cell  | PhoneNumber::Work ).number();
+      return a.phoneNumber( PhoneNumber::Car ).number();
     case FieldImpl::MobileHomePhone:
-      return a.phoneNumber( PhoneNumber::Cell | PhoneNumber::Home  ).number();
+      return a.phoneNumber( PhoneNumber::Cell  ).number();
     case FieldImpl::HomeFax:
       return a.phoneNumber( PhoneNumber::Home | PhoneNumber::Fax ).number();
     case FieldImpl::BusinessFax:
       return a.phoneNumber( PhoneNumber::Work | PhoneNumber::Fax ).number();
     case FieldImpl::CarPhone:
       return a.phoneNumber( PhoneNumber::Car ).number();
     case FieldImpl::Isdn:
       return a.phoneNumber( PhoneNumber::Isdn ).number();
     case FieldImpl::Pager:
       return a.phoneNumber( PhoneNumber::Pager ).number();
     case FieldImpl::Sip:
-      return a.phoneNumber( PhoneNumber::Sip ).number();
+      return a.phoneNumber( PhoneNumber::Pcs | PhoneNumber::Pref ).number();
     case FieldImpl::HomeAddressStreet:
       return a.address( Address::Home ).street();
     case FieldImpl::HomeAddressLocality:
       return a.address( Address::Home ).locality();
     case FieldImpl::HomeAddressRegion:
       return a.address( Address::Home ).region();
     case FieldImpl::HomeAddressPostalCode:
       return a.address( Address::Home ).postalCode();
diff --git a/kabc/phonenumber.cpp b/kabc/phonenumber.cpp
index 4c6231d..0d46ba7 100644
--- a/kabc/phonenumber.cpp
+++ b/kabc/phonenumber.cpp
@@ -60,17 +60,72 @@ bool PhoneNumber::operator==( const PhoneNumber &p ) const
   
   return true;
 }
 
 bool PhoneNumber::operator!=( const PhoneNumber &p ) const
 {
   return !( p == *this );
 }
+void PhoneNumber::makeCompat()
+{
+    mType = getCompatType( mType );
+}
+int PhoneNumber::getCompatType( int type )
+{
 
+    if ((type & Cell) == Cell) {
+        if ((type & Work) == Work)
+            return Car;
+        return Cell;
+    }
+  if ((type & Home) == Home) {
+      if ((type & Pref) == Pref) 
+          return (Home | Pref);
+      if ((type & Fax) == Fax) 
+          return (Home | Fax);
+      return  (Home);
+  }
+  if ((type & Work) == Work) {
+      if ((type & Pref) == Pref) 
+          return (Work| Pref);
+      if ((type & Fax) == Fax) 
+          return (Fax |Work);
+      if ((type & Msg) == Msg) {
+          if ((type & Voice) == Voice)
+              return ( Msg | Voice |Work);
+          return ( Msg | Work);
+      }
+      return  Work;
+  }
+  if ((type & Pcs) == Pcs) {
+      if ((type & Pref) == Pref) 
+          return Pcs | Pref;
+      return  Pcs;
+  }
+  if ((type & Car) == Car)
+      return Car;
+  if ((type & Pager) == Pager)
+      return Pager;
+  if ((type & Isdn) == Isdn)
+      return Isdn;
+  if ((type & Video) == Video)
+      return Video;
+
+  if ((type & Msg) == Msg)
+      return Msg;
+  if ((type & Fax) == Fax)
+    return Fax;
+
+  if ((type & Pref) == Pref)
+      return  Pref;
+
+  return Voice;
+
+}
 bool PhoneNumber::simplifyNumber()
 {
     QString Number;
     int i;
     Number = mNumber.stripWhiteSpace ();
     mNumber = "";
     for ( i = 0; i < Number.length(); ++i) {
         if ( Number.at(i).isDigit() || Number.at(i) == '+'|| Number.at(i) == '*'|| Number.at(i) == '#' )
@@ -158,28 +213,80 @@ QString PhoneNumber::label() const
   return typeLabel( type() );
 }
 
 PhoneNumber::TypeList PhoneNumber::typeList()
 {
   TypeList list;
   
   list << Home << Work << Msg << Pref << Voice << Fax << Cell << Video
-       << Bbs << Modem << Car << Isdn << Pcs << Pager << Sip;
+       << Bbs << Modem << Car << Isdn << Pcs << Pager;
 
   return list;
 }
 
 QString PhoneNumber::label( int type )
 {
   return typeLabel( type );
 }
 
 QString PhoneNumber::typeLabel( int type )
 {
+  if ((type & Cell) == Cell)
+      return i18n("Mobile");
+  if ((type & Home) == Home) {
+      if ((type & Pref) == Pref) 
+          return i18n("Home");
+      if ((type & Fax) == Fax) 
+          return i18n("Fax (Home)");
+      return  i18n("Home2");
+  }
+  
+  if ((type & Work) == Work) {
+      if ((type & Pref) == Pref) 
+          return i18n("Work");
+      if ((type & Fax) == Fax) 
+          return i18n("Fax (Work)");
+      if ((type & Msg) == Msg) {
+          if ((type & Voice) == Voice)
+              return i18n("Assistent");
+          return i18n("Company");
+      }
+      return  i18n("Work2");
+  }
+  if ((type & Pcs) == Pcs) {
+      if ((type & Pref) == Pref) 
+          return i18n("SIP");
+      return i18n("VoIP");
+  }
+  if ((type & Car) == Car)
+      return i18n("Mobile2 (Work)");
+  if ((type & Pager) == Pager)
+      return i18n("Pager");
+  if ((type & Isdn) == Isdn)
+      return i18n("ISDN");
+  if ((type & Video) == Video)
+      return i18n("Video");
+
+  if ((type & Msg) == Msg)
+      return i18n("Callback");
+  if ((type & Fax) == Fax)
+    return i18n("Fax (Other)");
+
+  if ((type & Pref) == Pref)
+      return i18n("Primary");
+
+
+  return i18n("Other");
+
+
+#if 0
+
+
+
   QString typeString;
   
 
   if ((type & Cell) == Cell)
     typeString += i18n("Mobile") +" ";
   if ((type & Home) == Home)
     typeString += i18n("Home")+" ";
   else if ((type & Work) == Work)
@@ -215,16 +322,17 @@ QString PhoneNumber::typeLabel( int type )
   if (typeString.isEmpty()) {
       if ((type & Voice) == Voice)
           return i18n("Voice");
       else
           return i18n("Other");
   }
       
   return typeString.stripWhiteSpace();
+#endif
 }
 
 QDataStream &KABC::operator<<( QDataStream &s, const PhoneNumber &phone )
 {
     return s << phone.mId << phone.mType << phone.mNumber;
 }
 
 QDataStream &KABC::operator>>( QDataStream &s, PhoneNumber &phone )
diff --git a/kabc/phonenumber.h b/kabc/phonenumber.h
index 2d4d3e0..b9d6a17 100644
--- a/kabc/phonenumber.h
+++ b/kabc/phonenumber.h
@@ -59,21 +59,20 @@ class PhoneNumber
       @li @p Cell -  Cell phone
       @li @p Video - Video phone
       @li @p Bbs -   Mailbox
       @li @p Modem - Modem
       @li @p Car -   Car phone
       @li @p Isdn -  ISDN connection
       @li @p Pcs -   Personal Communication Service
       @li @p Pager - Pager
-      @li @p SIP   - VoIP
     */
     enum Types { Home = 1, Work = 2, Msg = 4, Pref = 8, Voice = 16, Fax = 32,
            Cell = 64, Video = 128, Bbs = 256, Modem = 512, Car = 1024,
-           Isdn = 2048, Pcs = 4096, Pager = 8192, Sip = 16384 };
+           Isdn = 2048, Pcs = 4096, Pager = 8192 };
 
     /**
       Create an empty phone number object.
     */  
     PhoneNumber();
 
     /**
       Create a phonenumber object.
@@ -146,16 +145,18 @@ class PhoneNumber
 
     /**
       Returns the translated label for phone number type.
       @obsolete
     */
     static QString label( int type );
     bool simplifyNumber();
     void simplifyType();
+    void makeCompat();
+    int getCompatType( int type );
 
   private:
     void init();
   
     QString mId;
   
     int mType;
     QString mNumber;
diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 277de22..60d02b8 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -165,18 +165,17 @@ bool VCardLineX::isValid() const
                     qualifiers.contains(VCARD_TEL_MSG)   ||
                     qualifiers.contains(VCARD_TEL_CELL)  ||
                     qualifiers.contains(VCARD_TEL_PAGER) ||
                     qualifiers.contains(VCARD_TEL_BBS)   ||
                     qualifiers.contains(VCARD_TEL_MODEM) ||
                     qualifiers.contains(VCARD_TEL_CAR)   ||
                     qualifiers.contains(VCARD_TEL_ISDN)  ||
                     qualifiers.contains(VCARD_TEL_VIDEO) ||
-                    qualifiers.contains(VCARD_TEL_PCS)   ||
-                    qualifiers.contains(VCARD_TEL_SIP)
+                    qualifiers.contains(VCARD_TEL_PCS)  
          ) )
         return true;
       if ( name == VCARD_TZ )
         return true;
       if ( name == VCARD_TITLE )
         return true;
       break;
 
@@ -275,18 +274,18 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
       int type = 0;
       if ( (*i).qualified ) {
         if ( (*i).qualifiers.contains( VCARD_TEL_HOME ) )
           type |= PhoneNumber::Home;
         if ( (*i).qualifiers.contains( VCARD_TEL_WORK ) )
           type |= PhoneNumber::Work;
         if ( (*i).qualifiers.contains( VCARD_TEL_PREF ) )
           type |= PhoneNumber::Pref;
-        // if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
-        //  type |= PhoneNumber::Voice;
+        if ( (*i).qualifiers.contains( VCARD_TEL_VOICE ) )
+            type |= PhoneNumber::Voice;
         if ( (*i).qualifiers.contains( VCARD_TEL_FAX ) )
           type |= PhoneNumber::Fax;
         if ( (*i).qualifiers.contains( VCARD_TEL_MSG ) )
           type |= PhoneNumber::Msg;
         if ( (*i).qualifiers.contains( VCARD_TEL_CELL ) )
           type |= PhoneNumber::Cell;
         if ( (*i).qualifiers.contains( VCARD_TEL_PAGER ) )
           type |= PhoneNumber::Pager;
@@ -297,23 +296,22 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
         if ( (*i).qualifiers.contains( VCARD_TEL_CAR ) )
           type |= PhoneNumber::Car;
         if ( (*i).qualifiers.contains( VCARD_TEL_ISDN ) )
           type |= PhoneNumber::Isdn;
         if ( (*i).qualifiers.contains( VCARD_TEL_VIDEO ) )
           type |= PhoneNumber::Video;
         if ( (*i).qualifiers.contains( VCARD_TEL_PCS ) )
           type |= PhoneNumber::Pcs;
-        if ( (*i).qualifiers.contains( VCARD_TEL_SIP ) )
-          type |= PhoneNumber::Sip;
+       
       }
       addressee.insertPhoneNumber( PhoneNumber( (*i).parameters[ 0 ], type ) );
     }
   }
-
+  addressee.makePhoneNumbersOLcompatible();
   //set the addressee's addresses
   for ( QValueListIterator<VCardLineX> i = mVCard->_vcdata->begin();i != mVCard->_vcdata->end(); ++i ) {
     if ( (*i).name == VCARD_ADR ) {
       int type = 0;
       if ( (*i).qualified ) {
         if ( (*i).qualifiers.contains( VCARD_ADR_DOM ) )
           type |= Address::Dom;
         if ( (*i).qualifiers.contains( VCARD_ADR_INTL ) )
diff --git a/kabc/vcardformatimpl.cpp b/kabc/vcardformatimpl.cpp
index ec5ed80..26fd4f0 100644
--- a/kabc/vcardformatimpl.cpp
+++ b/kabc/vcardformatimpl.cpp
@@ -276,17 +276,17 @@ bool VCardFormatImpl::loadAddressee( Addressee& addressee, VCard *v )
       Address address = addressee.address( type );
       if ( address.isEmpty() )
         address.setType( type );
 
       address.setLabel( QString::fromUtf8( cl->value()->asString() ) );
       addressee.insertAddress( address );
     }
   }
-
+  addressee.makePhoneNumbersOLcompatible();
   return true;
 }
 
 void VCardFormatImpl::saveAddressee( const Addressee &addressee, VCard *v, bool intern )
 {
 //US   ContentLine cl;
 //US  QString value;
 
@@ -590,17 +590,16 @@ void VCardFormatImpl::addTelephoneValue( VCard *v, const PhoneNumber &p )
   if( p.type() & PhoneNumber::Cell ) params.append( new Param( "TYPE", "cell" ) );
   if( p.type() & PhoneNumber::Video ) params.append( new Param( "TYPE", "video" ) );
   if( p.type() & PhoneNumber::Bbs ) params.append( new Param( "TYPE", "bbs" ) );
   if( p.type() & PhoneNumber::Modem ) params.append( new Param( "TYPE", "modem" ) );
   if( p.type() & PhoneNumber::Car ) params.append( new Param( "TYPE", "car" ) );
   if( p.type() & PhoneNumber::Isdn ) params.append( new Param( "TYPE", "isdn" ) );
   if( p.type() & PhoneNumber::Pcs ) params.append( new Param( "TYPE", "pcs" ) );
   if( p.type() & PhoneNumber::Pager ) params.append( new Param( "TYPE", "pager" ) );
-  if( p.type() & PhoneNumber::Sip ) params.append( new Param( "TYPE", "sip" ) );
   cl.setParamList( params );
 
   v->add(cl);
 }
 
 PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
 {
   PhoneNumber p;
@@ -623,17 +622,16 @@ PhoneNumber VCardFormatImpl::readTelephoneValue( ContentLine *cl )
       else if ( tmpStr == "cell" ) type |= PhoneNumber::Cell;
       else if ( tmpStr == "video" ) type |= PhoneNumber::Video;
       else if ( tmpStr == "bbs" ) type |= PhoneNumber::Bbs;
       else if ( tmpStr == "modem" ) type |= PhoneNumber::Modem;
       else if ( tmpStr == "car" ) type |= PhoneNumber::Car;
       else if ( tmpStr == "isdn" ) type |= PhoneNumber::Isdn;
       else if ( tmpStr == "pcs" ) type |= PhoneNumber::Pcs;
       else if ( tmpStr == "pager" ) type |= PhoneNumber::Pager;
-      else if ( tmpStr == "sip" ) type |= PhoneNumber::Sip;
     }
   }
   p.setType( type );
 
   return p;
 }
 
 QString VCardFormatImpl::readTextValue( ContentLine *cl )
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index c3d92b6..204326e 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -571,17 +571,17 @@ Addressee::List VCardTool::parseVCards( const QString& vcard )
         // X-
         else if ( identifier.startsWith( "x-" ) ) {
           const QString key = (*lineIt).identifier().mid( 2 );
           int dash = key.find( "-" );
           addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).valueString() );
         }
       }
     }
-
+    addr.makePhoneNumbersOLcompatible();
     addrList.append( addr );
   }
 
   return addrList;
 }
 
 QDateTime VCardTool::parseDateTime( const QString &str )
 {