From f83a59cf4f9d0cff4111b6f5c88e88e6dc96e79e Mon Sep 17 00:00:00 2001
From: zautrix <zautrix>
Date: Fri, 28 Oct 2005 03:24:50 +0000
Subject: many new bugs...

---
(limited to 'kabc/vcard21parser.cpp')

diff --git a/kabc/vcard21parser.cpp b/kabc/vcard21parser.cpp
index 277de22..60d02b8 100644
--- a/kabc/vcard21parser.cpp
+++ b/kabc/vcard21parser.cpp
@@ -170,8 +170,7 @@ bool VCardLineX::isValid() const
                     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 )
@@ -279,9 +278,9 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
         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;
+            type |= PhoneNumber::Pref;
+        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 ) )
@@ -302,13 +301,12 @@ KABC::Addressee VCard21Parser::readFromString( const QString &data)
           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 ) {
--
cgit v0.9.0.2