fixed some newline probs

2 files changed, 6 insertions, 6 deletions

diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 9ea084d..bec2a0c 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -1,233 +1,233 @@
 /*
     This file is part of libkabc.
     Copyright (c) 2003 Tobias Koenig <tokoe@kde.org>
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
     License as published by the Free Software Foundation; either
     version 2 of the License, or (at your option) any later version.
 
     This library is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
     Library General Public License for more details.
 
     You should have received a copy of the GNU Library General Public License
     along with this library; see the file COPYING.LIB.  If not, write to
     the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
     Boston, MA 02111-1307, USA.
 */
 
 #include <qregexp.h>
 
 #include <kmdcodec.h>
 
 #include "vcardparser.h"
 
 #define FOLD_WIDTH 75
 
 using namespace KABC;
 
 VCardParser::VCardParser()
 {
 }
 
 VCardParser::~VCardParser()
 {
 }
 
 VCard::List VCardParser::parseVCards( const QString& text )
 {
   VCard currentVCard;
   VCard::List vCardList;
   QString currentLine;
 
   QStringList lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), text );
   QStringList::Iterator it;
 
   bool inVCard = false;
   for ( it = lines.begin(); it != lines.end(); ++it ) {
 
     if ( (*it).isEmpty() ) // empty line
       continue;
 
     if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous
       currentLine += (*it).remove( 0, 1 );
       continue;
     } else {
       if ( inVCard && !currentLine.isEmpty() ) { // now parse the line
         int colon = currentLine.find( ':' );
         if ( colon == -1 ) { // invalid line
           currentLine = (*it);
           continue;
         }
 
         VCardLine vCardLine;
         QString key = currentLine.left( colon ).stripWhiteSpace();
         QString value = currentLine.mid( colon + 1 );
 
         QStringList params = QStringList::split( ';', key );
         vCardLine.setIdentifier( params[0] );
         if ( params.count() > 1 ) { // find all parameters
           for ( uint i = 1; i < params.count(); ++i ) {
             QStringList pair = QStringList::split( '=', params[i] );
 //US            if ( pair.size() == 1 ) {
             if ( pair.count() == 1 ) {
                 pair.prepend( "type" );
             }
             if ( pair[1].contains( ',' ) ) { // parameter in type=x,y,z format
               QStringList args = QStringList::split( ',', pair[ 1 ] );
               for ( uint j = 0; j < args.count(); ++j )
                 vCardLine.addParameter( pair[0].lower(), args[j] );
             } else
               vCardLine.addParameter( pair[0].lower(), pair[1] );
           }
         }
 
         params = vCardLine.parameterList();
         if ( params.contains( "encoding" ) ) { // have to decode the data
 #if 0
           QByteArray input, output;
           input = value.local8Bit();
           if ( vCardLine.parameter( "encoding" ).lower() == "b" )
             KCodecs::base64Decode( input, output );
           else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" )
             KCodecs::quotedPrintableDecode( input, output );
 
           //qDebug("VCardParser::parseVCards has to be verified");
           //US I am not sure if this is correct
           //US          vCardLine.setValue( output );
           QCString cs(output);
           qDebug("len1 %d len2 %d ",input.size(), output.size( ));
 #endif
           QCString cs = value.local8Bit();
           qDebug("****************************************** ");
           qDebug("************* WARNING ******************** ");
           qDebug("****************************************** ");
           qDebug("Make sure, the decoding is done after");
           qDebug("QVariant conversion!");
           qDebug("Insert Line DECODING OKAY, where this is implemented");
           // use for decoding the above code!
           vCardLine.setValue( cs );
         } else {
         
             //qDebug("VCardParser::parseVCards has to be verified");
 //US          vCardLine.setValue( value.replace( "\\n", "\n" ) );
-          vCardLine.setValue( value.replace( QRegExp("\\n"), "\n" ) );
+          vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) );
         }
 
         currentVCard.addLine( vCardLine );
       }
       // we do not save the start and end tag as vcardline
       if ( (*it).lower().startsWith( "begin:vcard" ) ) {
         inVCard = true;
         //qDebug("VCardParser::parseVCards has to be verified");
 //US        currentLine.setLength( 0 );
         currentLine = "";
         currentVCard.clear(); // flush vcard
         continue;
       }
 
       if ( (*it).lower().startsWith( "end:vcard" ) ) {
         inVCard = false;
         vCardList.append( currentVCard );
         //qDebug("VCardParser::parseVCards has to be verified");
 //US        currentLine.setLength( 0 );
         currentLine = "";
         currentVCard.clear(); // flush vcard
         continue;
       }
 
       currentLine = (*it);
     }
   }
 
   return vCardList;
 }
 
 QString VCardParser::createVCards( const VCard::List& list )
 {
   QString text;
   QString textLine;
   QString encodingType;
   QStringList idents;
   QStringList params;
   QStringList values;
   QStringList::ConstIterator identIt;
   QStringList::Iterator paramIt;
   QStringList::Iterator valueIt;
 
   VCardLine::List lines;
   VCardLine::List::Iterator lineIt;
   VCard::List::ConstIterator cardIt;
 
   bool hasEncoding;
 
   
   // iterate over the cards
   for ( cardIt = list.begin(); cardIt != list.end(); ++cardIt ) {
     text.append( "BEGIN:VCARD\r\n" );
 
     idents = (*cardIt).identifiers();
     for ( identIt = idents.begin(); identIt != idents.end(); ++identIt ) {
       VCard card = (*cardIt);
       lines = card.lines( (*identIt) );
 
       // iterate over the lines
       for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) {
         if ( !(*lineIt).value().asString().isEmpty() ) {
           textLine = (*lineIt).identifier();
 
           params = (*lineIt).parameterList();
           hasEncoding = false;
           if ( params.count() > 0 ) { // we have parameters
             for ( paramIt = params.begin(); paramIt != params.end(); ++paramIt ) {
               if ( (*paramIt) == "encoding" ) {
                 hasEncoding = true;
                 encodingType = (*lineIt).parameter( "encoding" ).lower();
               }
 
               values = (*lineIt).parameters( *paramIt );
               for ( valueIt = values.begin(); valueIt != values.end(); ++valueIt ) {
                 textLine.append( ";" + (*paramIt).upper() );
                 if ( !(*valueIt).isEmpty() )
                   textLine.append( "=" + (*valueIt) );
               }
             }
           }
 
           if ( hasEncoding ) { // have to encode the data
             QByteArray input, output;
             
     qDebug("VCardParser::createVCards has to be verified");
 //US            input = (*lineIt).value().toByteArray();
 
 //US I am not sure if this is correct    
             QCString cs ((*lineIt).value().toCString());
             input = cs;
             
             if ( encodingType == "b" )
               KCodecs::base64Encode( input, output );
             else if ( encodingType == "quoted-printable" )
               KCodecs::quotedPrintableEncode( input, output );
             textLine.append( ":" + QString( output ) );
           } else {
     qDebug("VCardParser::createVCards has to be verified");
 //US            textLine.append( ":" + (*lineIt).value().asString().replace( "\n", "\\n" ) );
             textLine.append( ":" + (*lineIt).value().asString().replace( QRegExp("\n"), "\\n" ) );
           }
           if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line
             for ( uint i = 0; i <= ( textLine.length() / FOLD_WIDTH ); ++i )
               text.append( ( i == 0 ? "" : " " ) + textLine.mid( i * FOLD_WIDTH, FOLD_WIDTH ) + "\r\n" );
           } else
             text.append( textLine + "\r\n" );
         }
       }
     }
 
     text.append( "END:VCARD\r\n" );
     text.append( "\r\n" );
   }
 
   return text;
 }
diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp
index 3fb212e..d1f823b 100644
--- a/kabc/vcardparser/vcardtool.cpp
+++ b/kabc/vcardparser/vcardtool.cpp
@@ -47,852 +47,852 @@ VCardTool::VCardTool()
   mPhoneTypeMap.insert( "WORK", PhoneNumber::Work );
   mPhoneTypeMap.insert( "MSG", PhoneNumber::Msg );
   mPhoneTypeMap.insert( "PREF", PhoneNumber::Pref );
   mPhoneTypeMap.insert( "VOICE", PhoneNumber::Voice );
   mPhoneTypeMap.insert( "FAX", PhoneNumber::Fax );
   mPhoneTypeMap.insert( "CELL", PhoneNumber::Cell );
   mPhoneTypeMap.insert( "VIDEO", PhoneNumber::Video );
   mPhoneTypeMap.insert( "BBS", PhoneNumber::Bbs );
   mPhoneTypeMap.insert( "MODEM", PhoneNumber::Modem );
   mPhoneTypeMap.insert( "CAR", PhoneNumber::Car );
   mPhoneTypeMap.insert( "ISDN", PhoneNumber::Isdn );
   mPhoneTypeMap.insert( "PCS", PhoneNumber::Pcs );
   mPhoneTypeMap.insert( "PAGER", PhoneNumber::Pager );
   mPhoneTypeMap.insert( "SIP", PhoneNumber::Sip );
 }
 
 VCardTool::~VCardTool()
 {
 }
 
 QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
 {
   VCard::List vCardList;
 
   Addressee::List::Iterator addrIt;
   for ( addrIt = list.begin(); addrIt != list.end(); ++addrIt ) {
     VCard card;
     QStringList::ConstIterator strIt;
 
     // ADR + LABEL
     Address::List addresses = (*addrIt).addresses();
     for ( Address::List::Iterator it = addresses.begin(); it != addresses.end(); ++it ) {
       QStringList address;
 
 /*US       
       address.append( (*it).postOfficeBox().replace( ';', "\\;" ) );
       address.append( (*it).extended().replace( ';', "\\;" ) );
       address.append( (*it).street().replace( ';', "\\;" ) );
       address.append( (*it).locality().replace( ';', "\\;" ) );
       address.append( (*it).region().replace( ';', "\\;" ) );
       address.append( (*it).postalCode().replace( ';', "\\;" ) );
       address.append( (*it).country().replace( ';', "\\;" ) );
 */
 //US using the old implementation instead
       //qDebug("VCardTool::createVCards has to be verified");
       address.append( (*it).postOfficeBox().replace(  QRegExp(";"), "\\;" ) );
       address.append( (*it).extended().replace( QRegExp(";"), "\\;" ) );
       address.append(  (*it).street().replace( QRegExp(";"), "\\;" ) );
       address.append( (*it).locality().replace( QRegExp(";"), "\\;" ) );
       address.append( (*it).region().replace( QRegExp(";"), "\\;" ) );
       address.append( (*it).postalCode().replace( QRegExp(";"), "\\;" ) );
       address.append( (*it).country().replace( QRegExp(";"), "\\;" ) );
 
       VCardLine adrLine( "ADR", address.join( ";" ) );
       VCardLine labelLine( "LABEL", (*it).label() );
 
       bool hasLabel = !(*it).label().isEmpty();
       QMap<QString, int>::Iterator typeIt;
       for ( typeIt = mAddressTypeMap.begin(); typeIt != mAddressTypeMap.end(); ++typeIt ) {
         if ( typeIt.data() & (*it).type() ) {
           if ( version == VCard::v3_0 ) {
             adrLine.addParameter( "TYPE", typeIt.key().lower() );
           }
           else {
             adrLine.addParameter( "TYPE", typeIt.key() );
           }
           if ( hasLabel ) {
             if ( version == VCard::v3_0 ) {
               labelLine.addParameter( "TYPE",  typeIt.key().lower() );
             }          
             else {
               labelLine.addParameter( "TYPE",  typeIt.key() );
             }
           }
         }
       }
 
       card.addLine( adrLine );
       if ( hasLabel )
         card.addLine( labelLine );
     }
 
     // AGENT
     card.addLine( createAgent( version, (*addrIt).agent() ) );
 
     // BDAY
     card.addLine( VCardLine( "BDAY", createDateTime( (*addrIt).birthday() ) ) );
 
     // CATEGORIES
     if ( version == VCard::v3_0 ) {
       QStringList categories = (*addrIt).categories();
       QStringList::Iterator catIt;
       for ( catIt = categories.begin(); catIt != categories.end(); ++catIt )
       {
 //US using the old implementation instead
           // qDebug("VCardTool::createVCards has to be verified");
 //US        (*catIt).replace( ',', "\\," );
         (*catIt).replace( QRegExp(","), "\\," );
       }
       card.addLine( VCardLine( "CATEGORIES", categories.join( "," ) ) );
     }
 
     // CLASS
     if ( version == VCard::v3_0 ) {
       card.addLine( createSecrecy( (*addrIt).secrecy() ) );
     }
     
     // EMAIL
     QStringList emails = (*addrIt).emails();
     bool pref = true;
     for ( strIt = emails.begin(); strIt != emails.end(); ++strIt ) {
       VCardLine line( "EMAIL", *strIt );
       if ( pref == true ) {
         line.addParameter( "TYPE", "PREF" );
         pref = false;
       }
       card.addLine( line );
     }
 
     // FN
     card.addLine( VCardLine( "FN", (*addrIt).formattedName() ) );
 
     // GEO
     Geo geo = (*addrIt).geo();
     if ( geo.isValid() ) {
       QString str;
       str.sprintf( "%.6f;%.6f", geo.latitude(), geo.longitude() );
       card.addLine( VCardLine( "GEO", str ) );
     }
 
     // KEY
     Key::List keys = (*addrIt).keys();
     Key::List::ConstIterator keyIt;
     for ( keyIt = keys.begin(); keyIt != keys.end(); ++keyIt )
       card.addLine( createKey( *keyIt ) );
 
     // LOGO
     card.addLine( createPicture( "LOGO", (*addrIt).logo() ) );
 
     // MAILER
     card.addLine( VCardLine( "MAILER", (*addrIt).mailer() ) );
 
     // N
     QStringList name;
 //US using the old implementation instead
     //qDebug("VCardTool::createVCards has to be verified");
 /*US    
     name.append( (*addrIt).familyName().replace( ';', "\\;" ) );
     name.append( (*addrIt).givenName().replace( ';', "\\;" ) );
     name.append( (*addrIt).additionalName().replace( ';', "\\;" ) );
     name.append( (*addrIt).prefix().replace( ';', "\\;" ) );
     name.append( (*addrIt).suffix().replace( ';', "\\;" ) );
 */    
     name.append( (*addrIt).familyName().replace( QRegExp(";"), "\\;" ) );
     name.append( (*addrIt).givenName().replace( QRegExp(";"), "\\;" ) );
     name.append( (*addrIt).additionalName().replace( QRegExp(";"), "\\;" ) );
     name.append( (*addrIt).prefix().replace( QRegExp(";"), "\\;" ) );
     name.append( (*addrIt).suffix().replace( QRegExp(";"), "\\;" ) );
 
     if ( !name.join( "" ).isEmpty() )
       card.addLine( VCardLine( "N", name.join( ";" ) ) );
 
     // NICKNAME
     if ( version == VCard::v3_0 )
       card.addLine( VCardLine( "NICKNAME", (*addrIt).nickName() ) );
 
     // NOTE
     card.addLine( VCardLine( "NOTE", (*addrIt).note() ) );
 
     // ORG
     card.addLine( VCardLine( "ORG", (*addrIt).organization() ) );
 
     // PHOTO
     card.addLine( createPicture( "PHOTO", (*addrIt).photo() ) );
 
     // PROID
     if ( version == VCard::v3_0 )
       card.addLine( VCardLine( "PRODID", (*addrIt).productId() ) );
 
     // REV
     card.addLine( VCardLine( "REV", createDateTime( (*addrIt).revision() ) ) );
 
     // ROLE
     card.addLine( VCardLine( "ROLE", (*addrIt).role() ) );
 
     // SORT-STRING
     if ( version == VCard::v3_0 )
       card.addLine( VCardLine( "SORT-STRING", (*addrIt).sortString() ) );
 
     // SOUND
     card.addLine( createSound( (*addrIt).sound() ) );
 
     // TEL
     PhoneNumber::List phoneNumbers = (*addrIt).phoneNumbers();
     PhoneNumber::List::ConstIterator phoneIt;
     for ( phoneIt = phoneNumbers.begin(); phoneIt != phoneNumbers.end(); ++phoneIt ) {
       VCardLine line( "TEL", (*phoneIt).number() );
 
       QMap<QString, int>::Iterator typeIt;
       for ( typeIt = mPhoneTypeMap.begin(); typeIt != mPhoneTypeMap.end(); ++typeIt ) {
         if ( typeIt.data() & (*phoneIt).type() )
           if ( version == VCard::v3_0 )
             line.addParameter( "TYPE", typeIt.key().lower() );
           else
             line.addParameter( "TYPE", typeIt.key() );
       }
 
       card.addLine( line );
     }
 
     // TITLE
     card.addLine( VCardLine( "TITLE", (*addrIt).title() ) );
 
     // TZ
     TimeZone timeZone = (*addrIt).timeZone();
     if ( timeZone.isValid() ) {
       QString str;
 
       int neg = 1;
       if ( timeZone.offset() < 0 )
         neg = -1;
 
       str.sprintf( "%c%02d:%02d", ( timeZone.offset() >= 0 ? '+' : '-' ),
                                   ( timeZone.offset() / 60 ) * neg,
                                   ( timeZone.offset() % 60 ) * neg );
 
       card.addLine( VCardLine( "TZ", str ) );
     }
 
     // UID
     card.addLine( VCardLine( "UID", (*addrIt).uid() ) );
 
     // URL
     card.addLine( VCardLine( "URL", (*addrIt).url().url() ) );
 
     // VERSION
     if ( version == VCard::v2_1 )
       card.addLine( VCardLine( "VERSION", "2.1" ) );
     if ( version == VCard::v3_0 )
       card.addLine( VCardLine( "VERSION", "3.0" ) );
 
     // X-
     QStringList customs = (*addrIt).customs();
     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;
 
       card.addLine( VCardLine( identifier, value ) );
     }
 
     vCardList.append( card );
   }
 
   return VCardParser::createVCards( vCardList );
 }
 
 Addressee::List VCardTool::parseVCards( const QString& vcard )
 {
   QChar semicolonSep( ';' );
   QChar commaSep( ',' );
   QString identifier;
 
   Addressee::List addrList;
   VCard::List vCardList = VCardParser::parseVCards( vcard );
   VCard::List::Iterator cardIt;
   for ( cardIt = vCardList.begin(); cardIt != vCardList.end(); ++cardIt ) {
     Addressee addr;
     QStringList idents = (*cardIt).identifiers();
     QStringList::ConstIterator identIt;
     for ( identIt = idents.begin(); identIt != idents.end(); ++identIt ) {
       VCard card = (*cardIt);
       VCardLine::List lines = card.lines( (*identIt) );
       VCardLine::List::Iterator lineIt;
 
       // iterate over the lines
       for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) {
         QStringList params = (*lineIt).parameterList();
 
         identifier = (*lineIt).identifier().lower();
         // ADR
         if ( identifier == "adr" ) {
           Address address;
           QStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() );
           if ( addrParts.count() > 0 )
             address.setPostOfficeBox( addrParts[ 0 ] );
           if ( addrParts.count() > 1 )
             address.setExtended( addrParts[ 1 ] );
           if ( addrParts.count() > 2 )
             address.setStreet( addrParts[ 2 ].replace ( QRegExp("\\\\n") , "\n")  );
           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;
 
           QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it )
             type += mAddressTypeMap[ (*it).lower() ];
 
           if ( !type )
             type = Address::Home; // default
 
           address.setType( type );
           addr.insertAddress( address );
         }
 
         // AGENT
         if ( identifier == "agent" )
           addr.setAgent( parseAgent( *lineIt ) );
 
         // BDAY
         if ( identifier == "bday" )
           addr.setBirthday( parseDateTime( (*lineIt).value().asString() ) );
 
         // CATEGORIES
         if ( identifier == "categories" ) {
           QStringList categories = splitString( commaSep, (*lineIt).value().asString() );
           addr.setCategories( categories );
         }
 
         // CLASS
         if ( identifier == "class" )
           addr.setSecrecy( parseSecrecy( *lineIt ) );
 
         // EMAIL
         if ( identifier == "email" ) {
           QStringList types = (*lineIt).parameters( "type" );
           addr.insertEmail( (*lineIt).value().asString(), types.contains( "PREF" ) );
         }
 
         // FN
         if ( identifier == "fn" )
           addr.setFormattedName( (*lineIt).value().asString() );
 
         // GEO
         if ( identifier == "geo" ) {
           Geo geo;
 
           QStringList geoParts = QStringList::split( ';', (*lineIt).value().asString(), true );
           geo.setLatitude( geoParts[ 0 ].toFloat() );
           geo.setLongitude( geoParts[ 1 ].toFloat() );
 
           addr.setGeo( geo );
         }
 
         // KEY
         if ( identifier == "key" )
           addr.insertKey( parseKey( *lineIt ) );
 
         // LABEL
         if ( identifier == "label" ) {
           int type = 0;
 
           QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it )
             type += mAddressTypeMap[ (*it).lower() ];
 
           if ( !type )
             type = Address::Home;
 
           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).value().asString() );
               addr.insertAddress( *it );
             }
           }
         }
 
         // LOGO
         if ( identifier == "logo" )
           addr.setLogo( parsePicture( *lineIt ) );
 
         // MAILER
         if ( identifier == "mailer" )
           addr.setMailer( (*lineIt).value().asString() );
 
         // N
         if ( identifier == "n" ) {
           QStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() );
           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 ] );
         }
 
         // NICKNAME
         if ( identifier == "nickname" )
           addr.setNickName( (*lineIt).value().asString() );
 
         // NOTE
         if ( identifier == "note" ) {
 // #ifdef DESKTOP_VERSION
 //           addr.setNote( (*lineIt).value().asString() );
 // #else
           QString note = (*lineIt).value().asString();
           if ( ! note.isEmpty() )
               addr.setNote( note.replace ( QRegExp("\\\\n") , "\n")  ); 
           else
               addr.setNote( note );
           //#endif
         }
 
         // ORGANIZATION
         if ( identifier == "org" )
           addr.setOrganization( (*lineIt).value().asString() );
 
         // PHOTO
         if ( identifier == "photo" )
           addr.setPhoto( parsePicture( *lineIt ) );
 
         // PROID
         if ( identifier == "prodid" )
           addr.setProductId( (*lineIt).value().asString() );
 
         // REV
         if ( identifier == "rev" )
           addr.setRevision( parseDateTime( (*lineIt).value().asString() ) );
 
         // ROLE
         if ( identifier == "role" )
           addr.setRole( (*lineIt).value().asString() );
 
         // SORT-STRING
         if ( identifier == "sort-string" )
           addr.setSortString( (*lineIt).value().asString() );
 
         // SOUND
         if ( identifier == "sound" )
           addr.setSound( parseSound( *lineIt ) );
 
         // TEL
         if ( identifier == "tel" ) {
           PhoneNumber phone;
           phone.setNumber( (*lineIt).value().asString() );
 
           int type = 0;
 
           QStringList types = (*lineIt).parameters( "type" );
           for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it )
             type += mPhoneTypeMap[(*it).upper()];
 
           if ( !type )
             type = PhoneNumber::Home; // default
 
           phone.setType( type );
 
           addr.insertPhoneNumber( phone );
         }
 
         // TITLE
         if ( identifier == "title" )
           addr.setTitle( (*lineIt).value().asString() );
 
         // TZ
         if ( identifier == "tz" ) {
           TimeZone tz;
           QString date = (*lineIt).value().asString();
 
           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
         if ( identifier == "uid" )
           addr.setUid( (*lineIt).value().asString() );
 
         // URL
         if ( identifier == "url" )
           addr.setUrl( (*lineIt).value().asString() );
 
         // X-
         if ( identifier.startsWith( "x-" ) ) {
           QString key = (*lineIt).identifier().mid( 2 );
           int dash = key.find( "-" );
           addr.insertCustom( key.left( dash ), key.mid( dash + 1 ), (*lineIt).value().asString() );
         }
       }
     }
 
     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;
     
     QStringList params = line.parameterList();
     if ( params.contains( "encoding" ) ) {
         QCString cs(line.value().asCString());
         QByteArray input, output;
         input = line.value().asCString();
         if ( line.parameter( "encoding" ).lower() == "b" )
             KCodecs::base64Decode( input, output );
         else if ( line.parameter( "encoding" ).lower() == "quoted-printable" )
             KCodecs::quotedPrintableDecode( input, output );
         
         qDebug("********** DECODING OKAY ************** (picture)");
         pic.setData( QImage(output) );
         
     }
     else if ( params.contains( "value" ) ) {
         if ( line.parameter( "value" ).lower() == "uri" )
             pic.setUrl( line.value().asString() );
     }
     
     if ( params.contains( "type" ) )
         pic.setType( line.parameter( "type" ) );
     
     return pic;
 }
 
 VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pic )
 {
     // LR fixed
   VCardLine line( identifier );
 
   if ( pic.isIntern() ) {
     if ( !pic.data().isNull() ) {
 #if 0
       QByteArray input;
       QDataStream s( input, IO_WriteOnly );
       s.setVersion( 4 );
       s << pic.data();
       line.setValue( input );
 #else 
       QCString input;
       QDataStream s( input, IO_WriteOnly );
       s.setVersion( 4 );
       s << pic.data();
       //QCString cs(line.value().asCString());
       //QImage qi(cs);
       line.setValue( input );
 #endif
             
       line.addParameter( "encoding", "b" );
       line.addParameter( "type", "image/png" );
     }
   } else if ( !pic.url().isEmpty() ) {
     line.setValue( pic.url() );
     line.addParameter( "value", "URI" );
   }
   
   return line;
 }
 
 Sound VCardTool::parseSound( const VCardLine &line )
 {
   Sound snd;
 
   QStringList params = line.parameterList();
   if ( params.contains( "encoding" ) ) {
        qDebug("VCardTool::parseSound has to be verified");
 //US    snd.setData( line.value().asByteArray() );
 //US I am not sure if this is correct    
     QCString cs(line.value().asCString());
     snd.setData( cs );
   }
   else if ( params.contains( "value" ) ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       snd.setUrl( line.value().asString() );
   }
 
 /* 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() ) {
     qDebug("VCardTool::createSound has to be verified");
 //US      line.setValue( snd.data() );
 
 //US I am not sure if this is correct    
       QCString cs(snd.data());
       line.setValue( cs );
       
       
       line.addParameter( "encoding", "b" );
       // TODO: need to store sound type!!!
     }
   } else if ( !snd.url().isEmpty() ) {
     line.setValue( snd.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }
 
 Key VCardTool::parseKey( const VCardLine &line )
 {
   Key key;
 
   QStringList params = line.parameterList();
   if ( params.contains( "encoding" ) ) {
     qDebug("VCardTool::parseKey has to be verified");
 //US    key.setBinaryData( line.value().asByteArray() );
 
 //US I am not sure if this is correct    
       QCString cs( line.value().asCString() );
       key.setBinaryData( cs );
   }
   else
     key.setTextData( line.value().asString() );
 
   if ( params.contains( "type" ) ) {
     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() ) {
     qDebug("VCardTool::createKey has to be verified");
 //US      line.setValue( key.binaryData() );
 //US I am not sure if this is correct    
     QCString cs(key.binaryData());
     line.setValue( cs );
       
       
       line.addParameter( "encoding", "b" );
     }
   } else if ( !key.textData().isEmpty() )
     line.setValue( 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.value().asString().lower() == "public" )
     secrecy.setType( Secrecy::Public );
   if ( line.value().asString().lower() == "private" )
     secrecy.setType( Secrecy::Private );
   if ( line.value().asString().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.setValue( "PUBLIC" );
   else if ( type == Secrecy::Private )
     line.setValue( "PRIVATE" );
   else if ( type == Secrecy::Confidential )
     line.setValue( "CONFIDENTIAL" );
 
   return line;
 }
 
 Agent VCardTool::parseAgent( const VCardLine &line )
 {
   Agent agent;
 
   QStringList params = line.parameterList();
   if ( params.contains( "value" ) ) {
     if ( line.parameter( "value" ).lower() == "uri" )
       agent.setUrl( line.value().asString() );
   } else {
     QString str = line.value().asString();
     
 //US using the old implementation instead
     qDebug("VCardTool::parseAgent has to be verified");
 /*US    
     str.replace( "\\n", "\r\n" );
     str.replace( "\\N", "\r\n" );
     str.replace( "\\;", ";" );
     str.replace( "\\:", ":" );
     str.replace( "\\,", "," );
 */
-    str.replace( QRegExp("\\n") , "\r\n" );
-    str.replace( QRegExp("\\N") , "\r\n" );
-    str.replace( QRegExp("\\;") , ";" );
-    str.replace( QRegExp("\\:") , ":" );
-    str.replace( QRegExp("\\,") , "," );
+    str.replace( QRegExp("\\\\n") , "\r\n" );
+    str.replace( QRegExp("\\\\N") , "\r\n" );
+    str.replace( QRegExp("\\\\;") , ";" );
+    str.replace( QRegExp("\\\\:") , ":" );
+    str.replace( QRegExp("\\\\,") , "," );
     
     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 );
       
 //US using the old implementation instead
     qDebug("VCardTool::createAgent has to be verified");
 /*US    
       str.replace( "\r\n", "\\n" );
       str.replace( ";", "\\;" );
       str.replace( ":", "\\:" );
       str.replace( ",", "\\," );
 */      
       str.replace( QRegExp("\r\n"), "\\n" );
       str.replace( QRegExp(";"), "\\;" );
       str.replace( QRegExp(":"), "\\:" );
       str.replace( QRegExp(","), "\\," );
       line.setValue( str );
     }
   } else if ( !agent.url().isEmpty() ) {
     line.setValue( agent.url() );
     line.addParameter( "value", "URI" );
   }
 
   return line;
 }
 
 QStringList VCardTool::splitString( const QChar &sep, const QString &str )
 {
   QStringList list;
   QString value( str );
 
   int start = 0;
   int pos = value.find( sep, start );
 
   while ( pos != -1 ) {
     if ( value[ pos - 1 ] != '\\' ) {
       if ( pos > start && pos <= (int)value.length() )
         list << value.mid( start, pos - start );
       else
         list << QString::null;
 
       start = pos + 1;
       pos = value.find( sep, start );
     } else {
       if ( pos != 0 ) {
         value.replace( pos - 1, 2, sep );
         pos = value.find( sep, pos );
       } else    
         pos = value.find( sep, pos + 1 );
     }
   }
 
   int l = value.length() - 1;
   if ( value.mid( start, l - start + 1 ).length() > 0 )
     list << value.mid( start, l - start + 1 );
   else
     list << QString::null;
 
   return list;
 }