many new bugs...

1 files changed, 1 insertions, 1 deletions

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
@@ -323,513 +323,513 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
     for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) {
       QString identifier = "X-" + (*strIt).left( (*strIt).find( ":" ) );
       QString value = (*strIt).mid( (*strIt).find( ":" ) + 1 );
       if ( value.isEmpty() )
         continue;
 
       VCardLine line( identifier, value );
       if ( version == VCard::v2_1 ) {
         line.addParameter( "CHARSET", "UTF-8" );
         line.addParameter( "ENCODING", "8BIT" );
       }
       card.addLine( line );
     }
 
     vCardList.append( card );
   }
 
   return VCardParser::createVCards( vCardList );
 }
 
 Addressee::List VCardTool::parseVCards( const QString& vcard )
 {
   static const QChar semicolonSep( ';' );
   static const QChar commaSep( ',' );
   QString identifier;
 
   Addressee::List addrList;
   const VCard::List vCardList = VCardParser::parseVCards( vcard );
 
   VCard::List::ConstIterator cardIt;
   VCard::List::ConstIterator listEnd( vCardList.end() );
   for ( cardIt = vCardList.begin(); cardIt != listEnd; ++cardIt ) {
     Addressee addr;
 
     const QStringList idents = (*cardIt).identifiers();
     QStringList::ConstIterator identIt;
     QStringList::ConstIterator identEnd( idents.end() );
     for ( identIt = idents.begin(); identIt != identEnd; ++identIt ) {
       const VCardLine::List lines = (*cardIt).lines( (*identIt) );
       VCardLine::List::ConstIterator lineIt;
 
       // iterate over the lines
       for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) {
         identifier = (*lineIt).identifier().lower();
         // ADR
         if ( identifier == "adr" ) {
           Address address;
           const QStringList addrParts = splitString( semicolonSep, (*lineIt).valueString() );
           if ( addrParts.count() > 0 )
             address.setPostOfficeBox( addrParts[ 0 ] );
           if ( addrParts.count() > 1 )
             address.setExtended( addrParts[ 1 ] );
           if ( addrParts.count() > 2 )
             address.setStreet( addrParts[ 2 ] );
           if ( addrParts.count() > 3 )
             address.setLocality( addrParts[ 3 ] );
           if ( addrParts.count() > 4 )
             address.setRegion( addrParts[ 4 ] );
           if ( addrParts.count() > 5 )
             address.setPostalCode( addrParts[ 5 ] );
           if ( addrParts.count() > 6 )
             address.setCountry( addrParts[ 6 ] );
 
           int type = 0;
 
           const QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
             type += mAddressTypeMap[ (*it).lower() ];
 
           address.setType( type );
           addr.insertAddress( address );
         }
 
         // AGENT
         else if ( identifier == "agent" )
           addr.setAgent( parseAgent( *lineIt ) );
 
         // BDAY
         else if ( identifier == "bday" )
           addr.setBirthday( parseDateTime( (*lineIt).valueString() ) );
 
         // CATEGORIES
         else if ( identifier == "categories" ) {
           const QStringList categories = splitString( commaSep, (*lineIt).valueString() );
           addr.setCategories( categories );
         }
 
         // CLASS
         else if ( identifier == "class" )
           addr.setSecrecy( parseSecrecy( *lineIt ) );
 
         // EMAIL
         else if ( identifier == "email" ) {
           const QStringList types = (*lineIt).parameters( "type" );
           addr.insertEmail( (*lineIt).valueString(), types.findIndex( "PREF" ) != -1 );
         }
 
         // FN
         else if ( identifier == "fn" )
           addr.setFormattedName( (*lineIt).valueString() );
 
         // GEO
         else if ( identifier == "geo" ) {
           Geo geo;
 
           const QStringList geoParts = QStringList::split( ';', (*lineIt).valueString(), true );
           geo.setLatitude( geoParts[ 0 ].toFloat() );
           geo.setLongitude( geoParts[ 1 ].toFloat() );
 
           addr.setGeo( geo );
         }
 
         // KEY
         else if ( identifier == "key" )
           addr.insertKey( parseKey( *lineIt ) );
 
         // LABEL
         else if ( identifier == "label" ) {
           int type = 0;
 
           const QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
             type += mAddressTypeMap[ (*it).lower() ];
 
           bool available = false;
           KABC::Address::List addressList = addr.addresses();
           KABC::Address::List::Iterator it;
           for ( it = addressList.begin(); it != addressList.end(); ++it ) {
             if ( (*it).type() == type ) {
               (*it).setLabel( (*lineIt).valueString() );
               addr.insertAddress( *it );
               available = true;
               break;
             }
           }
 
           if ( !available ) { // a standalone LABEL tag
             KABC::Address address( type );
             address.setLabel( (*lineIt).valueString() );
             addr.insertAddress( address );
           }
         }
 
         // LOGO
         else if ( identifier == "logo" )
           addr.setLogo( parsePicture( *lineIt ) );
 
         // MAILER
         else if ( identifier == "mailer" )
           addr.setMailer( (*lineIt).valueString() );
 
         // N
         else if ( identifier == "n" ) {
           const QStringList nameParts = splitString( semicolonSep, (*lineIt).valueString() );
           if ( nameParts.count() > 0 )
             addr.setFamilyName( nameParts[ 0 ] );
           if ( nameParts.count() > 1 )
             addr.setGivenName( nameParts[ 1 ] );
           if ( nameParts.count() > 2 )
             addr.setAdditionalName( nameParts[ 2 ] );
           if ( nameParts.count() > 3 )
             addr.setPrefix( nameParts[ 3 ] );
           if ( nameParts.count() > 4 )
             addr.setSuffix( nameParts[ 4 ] );
         }
 
         // NAME
         else if ( identifier == "name" )
           addr.setName( (*lineIt).valueString() );
 
         // NICKNAME
         else if ( identifier == "nickname" )
           addr.setNickName( (*lineIt).valueString() );
 
         // NOTE
         else if ( identifier == "note" )
           addr.setNote( (*lineIt).valueString() );
 
         // ORGANIZATION
         else if ( identifier == "org" )
           addr.setOrganization( (*lineIt).valueString() );
 
         // PHOTO
         else if ( identifier == "photo" )
           addr.setPhoto( parsePicture( *lineIt ) );
 
         // PROID
         else if ( identifier == "prodid" )
           addr.setProductId( (*lineIt).valueString() );
 
         // REV
         else if ( identifier == "rev" )
           addr.setRevision( parseDateTime( (*lineIt).valueString() ) );
 
         // ROLE
         else if ( identifier == "role" )
           addr.setRole( (*lineIt).valueString() );
 
         // SORT-STRING
         else if ( identifier == "sort-string" )
           addr.setSortString( (*lineIt).valueString() );
 
         // SOUND
         else if ( identifier == "sound" )
           addr.setSound( parseSound( *lineIt ) );
 
         // TEL
         else if ( identifier == "tel" ) {
           PhoneNumber phone;
           phone.setNumber( (*lineIt).valueString() );
 
           int type = 0;
 
           const QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it )
             type += mPhoneTypeMap[(*it).upper()];
 
           phone.setType( type );
 
           addr.insertPhoneNumber( phone );
         }
 
         // TITLE
         else if ( identifier == "title" )
           addr.setTitle( (*lineIt).valueString() );
 
         // TZ
         else if ( identifier == "tz" ) {
           TimeZone tz;
           const QString date = (*lineIt).valueString();
 
           int hours = date.mid( 1, 2).toInt();
           int minutes = date.mid( 4, 2 ).toInt();
           int offset = ( hours * 60 ) + minutes;
           offset = offset * ( date[ 0 ] == '+' ? 1 : -1 );
 
           tz.setOffset( offset );
           addr.setTimeZone( tz );
         }
 
         // UID
         else if ( identifier == "uid" )
           addr.setUid( (*lineIt).valueString() );
 
         // URL
         else if ( identifier == "url" )
           addr.setUrl( KURL( (*lineIt).valueString() ) );
 
         // 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 )
 {
   QDateTime dateTime;
 
   if ( str.find( '-' ) == -1 ) { // is base format (yyyymmdd)
     dateTime.setDate( QDate( str.left( 4 ).toInt(), str.mid( 4, 2 ).toInt(),
                              str.mid( 6, 2 ).toInt() ) );
 
     if ( str.find( 'T' ) ) // has time information yyyymmddThh:mm:ss
       dateTime.setTime( QTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
                                str.mid( 17, 2 ).toInt() ) );
 
   } else { // is extended format yyyy-mm-dd
     dateTime.setDate( QDate( str.left( 4 ).toInt(), str.mid( 5, 2 ).toInt(),
                              str.mid( 8, 2 ).toInt() ) );
 
     if ( str.find( 'T' ) ) // has time information yyyy-mm-ddThh:mm:ss
       dateTime.setTime( QTime( str.mid( 11, 2 ).toInt(), str.mid( 14, 2 ).toInt(),
                                str.mid( 17, 2 ).toInt() ) );
   }
 
   return dateTime;
 }
 
 QString VCardTool::createDateTime( const QDateTime &dateTime )
 {
   QString str;
 
   if ( dateTime.date().isValid() ) {
     str.sprintf( "%4d-%02d-%02d", dateTime.date().year(), dateTime.date().month(),
                  dateTime.date().day() );
     if ( dateTime.time().isValid() ) {
       QString tmp;
       tmp.sprintf( "T%02d:%02d:%02dZ", dateTime.time().hour(), dateTime.time().minute(),
                    dateTime.time().second() );
       str += tmp;
     }
   }
 
   return str;
 }
 
 Picture VCardTool::parsePicture( const VCardLine &line )
 {
   Picture pic;
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "encoding" ) != -1 ) {
     QImage img;
     img.loadFromData( line.valueBytes() );
     pic.setData( img );
   } else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       pic.setUrl( line.valueString() );
   }
 
   if ( params.findIndex( "type" ) != -1 )
     pic.setType( line.parameter( "type" ) );
 
   return pic;
 }
 
 VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pic )
 {
   VCardLine line( identifier );
 
   if ( pic.isIntern() ) {
     if ( !pic.data().isNull() ) {
       QByteArray input;
       QDataStream s( input, IO_WriteOnly );
       s.setVersion( 4 );
       s << pic.data();
       line.setValueBytes( input );
       line.addParameter( "encoding", "b" );
       line.addParameter( "type", "image/png" );
     }
   } else if ( !pic.url().isEmpty() ) {
     QByteArray ba;
     line.setValueString( pic.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }
 
 Sound VCardTool::parseSound( const VCardLine &line )
 {
   Sound snd;
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "encoding" ) != -1 )
     snd.setData( line.valueBytes() );
   else if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       snd.setUrl( line.valueString() );
   }
 
 /* TODO: support sound types
   if ( params.contains( "type" ) )
     snd.setType( line.parameter( "type" ) );
 */
 
   return snd;
 }
 
 VCardLine VCardTool::createSound( const Sound &snd )
 {
   VCardLine line( "SOUND" );
 
   if ( snd.isIntern() ) {
     if ( !snd.data().isEmpty() ) {
       line.setValueBytes( snd.data() );
       line.addParameter( "encoding", "b" );
       // TODO: need to store sound type!!!
     }
   } else if ( !snd.url().isEmpty() ) {
     line.setValueString( snd.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }
 
 Key VCardTool::parseKey( const VCardLine &line )
 {
   Key key;
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "encoding" ) != -1 )
     key.setBinaryData( line.valueBytes() );
   else
     key.setTextData( line.valueString() );
 
   if ( params.findIndex( "type" ) != -1 ) {
     if ( line.parameter( "type" ).lower() == "x509" )
       key.setType( Key::X509 );
     else if ( line.parameter( "type" ).lower() == "pgp" )
       key.setType( Key::PGP );
     else {
       key.setType( Key::Custom );
       key.setCustomTypeString( line.parameter( "type" ) );
     }
   }
 
   return key;
 }
 
 VCardLine VCardTool::createKey( const Key &key )
 {
   VCardLine line( "KEY" );
 
   if ( key.isBinary() ) {
     if ( !key.binaryData().isEmpty() ) {
       line.setValueBytes( key.binaryData() );
       line.addParameter( "encoding", "b" );
     }
   } else if ( !key.textData().isEmpty() )
     line.setValueString( key.textData() );
 
   if ( key.type() == Key::X509 )
     line.addParameter( "type", "X509" );
   else if ( key.type() == Key::PGP )
     line.addParameter( "type", "PGP" );
   else if ( key.type() == Key::Custom )
     line.addParameter( "type", key.customTypeString() );
 
   return line;
 }
 
 Secrecy VCardTool::parseSecrecy( const VCardLine &line )
 {
   Secrecy secrecy;
 
   if ( line.valueString().lower() == "public" )
     secrecy.setType( Secrecy::Public );
   if ( line.valueString().lower() == "private" )
     secrecy.setType( Secrecy::Private );
   if ( line.valueString().lower() == "confidential" )
     secrecy.setType( Secrecy::Confidential );
 
   return secrecy;
 }
 
 VCardLine VCardTool::createSecrecy( const Secrecy &secrecy )
 {
   VCardLine line( "CLASS" );
 
   int type = secrecy.type();
 
   if ( type == Secrecy::Public )
     line.setValueString( "PUBLIC" );
   else if ( type == Secrecy::Private )
     line.setValueString( "PRIVATE" );
   else if ( type == Secrecy::Confidential )
     line.setValueString( "CONFIDENTIAL" );
 
   return line;
 }
 
 Agent VCardTool::parseAgent( const VCardLine &line )
 {
   Agent agent;
 
   const QStringList params = line.parameterList();
   if ( params.findIndex( "value" ) != -1 ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       agent.setUrl( line.valueString() );
   } else {
     QString str = line.valueString();
     str.replace( QRegExp("\\\\n"), "\r\n" );
     str.replace( QRegExp("\\\\N"), "\r\n" );
     str.replace( QRegExp("\\\\;"), ";" );
     str.replace( QRegExp("\\\\:"), ":" );
     str.replace( QRegExp("\\\\,"), "," );
 
     const Addressee::List list = parseVCards( str );
     if ( list.count() > 0 ) {
       Addressee *addr = new Addressee;
       *addr = list[ 0 ];
       agent.setAddressee( addr );
     }
   }
 
   return agent;
 }
 
 VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent )
 {
   VCardLine line( "AGENT" );
 
   if ( agent.isIntern() ) {
     if ( agent.addressee() != 0 ) {
       Addressee::List list;
       list.append( *agent.addressee() );
 
       QString str = createVCards( list, version );
       str.replace( QRegExp("\\r\\n"), "\\n" );
       str.replace( QRegExp(";"), "\\;" );
       str.replace( QRegExp(":"), "\\:" );
       str.replace( QRegExp(","), "\\," );
       line.setValueString( str );
     }
   } else if ( !agent.url().isEmpty() ) {
     line.setValueString( agent.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }