| -rw-r--r-- | kabc/vcardparser/vcard.cpp | 84 | ||||
| -rw-r--r-- | kabc/vcardparser/vcard.h | 11 | ||||
| -rw-r--r-- | kabc/vcardparser/vcardline.cpp | 115 | ||||
| -rw-r--r-- | kabc/vcardparser/vcardline.h | 31 | ||||
| -rw-r--r-- | kabc/vcardparser/vcardparser.cpp | 131 | ||||
| -rw-r--r-- | kabc/vcardparser/vcardtool.cpp | 484 |
6 files changed, 425 insertions, 431 deletions
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp index da97ec2..24fd498 100644 --- a/kabc/vcardparser/vcard.cpp +++ b/kabc/vcardparser/vcard.cpp @@ -25,3 +25,2 @@ using namespace KABC; VCard::VCard() - : mLineMap( 0 ) { @@ -30,13 +29,4 @@ VCard::VCard() VCard::VCard( const VCard& vcard ) - : mLineMap( 0 ) { - if ( vcard.mLineMap ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - *mLineMap = *(vcard.mLineMap); - } else { - delete mLineMap; - mLineMap = 0; - } + mLineMap = vcard.mLineMap; } @@ -45,4 +35,2 @@ VCard::~VCard() { - delete mLineMap; - mLineMap = 0; } @@ -54,11 +42,3 @@ VCard& VCard::operator=( const VCard& vcard ) - if ( vcard.mLineMap ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - *mLineMap = *(vcard.mLineMap); - } else { - delete mLineMap; - mLineMap = 0; - } + mLineMap = vcard.mLineMap; @@ -69,4 +49,3 @@ void VCard::clear() { - if ( mLineMap ) - mLineMap->clear(); + mLineMap.clear(); } @@ -75,12 +54,9 @@ QStringList VCard::identifiers() const { - if ( !mLineMap ) - return QStringList(); - else { -//US method QMap::keys() not available yet. SO collect the data manually -//US return mLineMap->keys(); - + //return mLineMap.keys(); +//PP re: US method QMap::keys() not available yet. SO collect the data manually + QStringList result; - - QMap< QString, VCardLine::List >::ConstIterator it; - for( it = mLineMap->begin(); it != mLineMap->end(); ++it ) { + + QMap<QString, VCardLine::List>::ConstIterator it; + for( it = mLineMap.begin(); it != mLineMap.end(); ++it ) { result << it.key().latin1(); @@ -88,3 +64,2 @@ QStringList VCard::identifiers() const return result; - } } @@ -93,22 +68,24 @@ void VCard::addLine( const VCardLine& line ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - (*mLineMap)[ line.identifier() ].append( line ); + mLineMap[ line.identifier() ].append( line ); } -VCardLine::List VCard::lines( const QString& identifier ) +VCardLine::List VCard::lines( const QString& identifier ) const { - if ( !mLineMap ) + LineMap::ConstIterator it = mLineMap.find( identifier ); + if ( it == mLineMap.end() ) return VCardLine::List(); - else - return (*mLineMap)[ identifier ]; + + return *it; } -VCardLine VCard::line( const QString& identifier ) +VCardLine VCard::line( const QString& identifier ) const { - if ( !mLineMap ) + LineMap::ConstIterator it = mLineMap.find( identifier ); + if ( it == mLineMap.end() ) + return VCardLine(); + + if ( (*it).isEmpty() ) return VCardLine(); else - return (*mLineMap)[ identifier ][ 0 ]; + return (*it).first(); } @@ -117,8 +94,4 @@ void VCard::setVersion( Version version ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - else { -//US mLineMap->erase( "VERSION" ); - mLineMap->remove( "VERSION" ); - } + mLineMap.remove( "VERSION" ); + VCardLine line; @@ -127,6 +100,6 @@ void VCard::setVersion( Version version ) line.setIdentifier( "2.1" ); - if ( version == v3_0 ) + else if ( version == v3_0 ) line.setIdentifier( "3.0" ); - (*mLineMap)[ "VERSION" ].append( line ); + mLineMap[ "VERSION" ].append( line ); } @@ -135,6 +108,7 @@ VCard::Version VCard::version() const { - if ( !mLineMap ) + LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" ); + if ( versionEntry == mLineMap.end() ) return v3_0; - VCardLine line = (*mLineMap)[ "VERSION" ][ 0 ]; + VCardLine line = ( *versionEntry )[ 0 ]; if ( line.value() == "2.1" ) diff --git a/kabc/vcardparser/vcard.h b/kabc/vcardparser/vcard.h index ce672b5..0bee441 100644 --- a/kabc/vcardparser/vcard.h +++ b/kabc/vcardparser/vcard.h @@ -20,4 +20,4 @@ -#ifndef VCARD_H -#define VCARD_H +#ifndef VCARDPARSER_VCARD_H +#define VCARDPARSER_VCARD_H @@ -34,2 +34,3 @@ class VCard typedef QValueList<VCard> List; + typedef QMap< QString, VCardLine::List > LineMap; @@ -63,3 +64,3 @@ class VCard */ - VCardLine::List lines( const QString& identifier ); + VCardLine::List lines( const QString& identifier ) const; @@ -68,3 +69,3 @@ class VCard */ - VCardLine line( const QString& identifier ); + VCardLine line( const QString& identifier ) const; @@ -81,3 +82,3 @@ class VCard private: - QMap< QString, VCardLine::List > *mLineMap; + LineMap mLineMap; diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp index 84638f8..0972a35 100644 --- a/kabc/vcardparser/vcardline.cpp +++ b/kabc/vcardparser/vcardline.cpp @@ -24,4 +24,10 @@ using namespace KABC; +class VCardLine::VCardLinePrivate +{ + public: + QString mGroup; +}; + VCardLine::VCardLine() - : mParamMap( 0 ) + : d( 0 ) { @@ -30,3 +36,3 @@ VCardLine::VCardLine() VCardLine::VCardLine( const QString &identifier ) - : mParamMap( 0 ) + : d( 0 ) { @@ -35,7 +41,7 @@ VCardLine::VCardLine( const QString &identifier ) -VCardLine::VCardLine( const QString &identifier, const QVariant &value ) - : mParamMap( 0 ) +VCardLine::VCardLine( const QString &identifier, const QString &value ) + : d( 0 ) { mIdentifier = identifier; - mValue = value; + mValue.assign( value.data(), value.length() ); } @@ -43,14 +49,5 @@ VCardLine::VCardLine( const QString &identifier, const QVariant &value ) VCardLine::VCardLine( const VCardLine& line ) - : mParamMap( 0 ) + : d( 0 ) { - if ( line.mParamMap ) { - if ( !mParamMap ) - mParamMap = new QMap<QString, QStringList>; - - *mParamMap = *(line.mParamMap); - } else { - delete mParamMap; - mParamMap = 0; - } - + mParamMap = line.mParamMap; mValue = line.mValue; @@ -61,4 +58,4 @@ VCardLine::~VCardLine() { - delete mParamMap; - mParamMap = 0; + delete d; + d = 0; } @@ -70,12 +67,3 @@ VCardLine& VCardLine::operator=( const VCardLine& line ) - if ( line.mParamMap ) { - if ( !mParamMap ) - mParamMap = new QMap<QString, QStringList>; - - *mParamMap = *(line.mParamMap); - } else { - delete mParamMap; - mParamMap = 0; - } - + mParamMap = line.mParamMap; mValue = line.mValue; @@ -95,3 +83,9 @@ QString VCardLine::identifier() const } -void VCardLine::setValue( const QVariant& value ) + +void VCardLine::setValue( const QString& value ) +{ + mValue.duplicate( value.data(), value.length() ); +} + +void VCardLine::setValue( const QByteArray& value ) { @@ -102,2 +96,7 @@ QVariant VCardLine::value() const { + return QVariant( QCString( mValue.data(), mValue.size()+1 ) ); +} + +QByteArray VCardLine::valueBytes() const +{ return mValue; @@ -105,14 +104,36 @@ QVariant VCardLine::value() const +void VCardLine::setGroup( const QString& group ) +{ + if ( !d ) + d = new VCardLinePrivate(); + + d->mGroup = group; +} + +QString VCardLine::group() const +{ + if ( d ) + return d->mGroup; + else + return QString(); +} + +bool VCardLine::hasGroup() const +{ + if ( !d ) + return false; + else + return d->mGroup.isEmpty(); +} + QStringList VCardLine::parameterList() const { - if ( !mParamMap ) - return QStringList(); - else { + //return mParamMap.keys(); //US method QMap::keys() not available yet. SO collect the data manually //US return mParamMap->keys(); - + QStringList result; - + QMap<QString, QStringList>::ConstIterator it; - for( it = mParamMap->begin(); it != mParamMap->end(); ++it ) { + for( it = mParamMap.begin(); it != mParamMap.end(); ++it ) { result << it.key().latin1(); @@ -120,3 +141,2 @@ QStringList VCardLine::parameterList() const return result; - } } @@ -125,7 +145,4 @@ void VCardLine::addParameter( const QString& param, const QString& value ) { - if ( !mParamMap ) - mParamMap = new QMap<QString, QStringList>; - - QStringList &list = (*mParamMap)[ param ]; - if ( list.find( value ) == list.end() ) // not included yet + QStringList &list = mParamMap[ param ]; + if ( list.findIndex( value ) == -1 ) // not included yet list.append( value ); @@ -135,6 +152,7 @@ QStringList VCardLine::parameters( const QString& param ) const { - if ( !mParamMap ) + ParamMap::ConstIterator it = mParamMap.find( param ); + if ( it == mParamMap.end() ) return QStringList(); else - return (*mParamMap)[ param ]; + return *it; } @@ -143,6 +161,11 @@ QString VCardLine::parameter( const QString& param ) const { - if ( !mParamMap ) + ParamMap::ConstIterator it = mParamMap.find( param ); + if ( it == mParamMap.end() ) return QString::null; - else - return (*mParamMap)[ param ][ 0 ]; + else { + if ( (*it).isEmpty() ) + return QString::null; + else + return (*it).first(); + } } diff --git a/kabc/vcardparser/vcardline.h b/kabc/vcardparser/vcardline.h index 78b61f8..6e74b38 100644 --- a/kabc/vcardparser/vcardline.h +++ b/kabc/vcardparser/vcardline.h @@ -25,2 +25,3 @@ #include <qvaluelist.h> +#include <qcstring.h> #include <qvariant.h> @@ -35,2 +36,3 @@ class VCardLine typedef QValueList<VCardLine> List; + typedef QMap<QString, QStringList> ParamMap; @@ -38,3 +40,3 @@ class VCardLine VCardLine( const QString &identifier ); - VCardLine( const QString &identifier, const QVariant &value ); + VCardLine( const QString &identifier, const QString &value ); VCardLine( const VCardLine& ); @@ -58,3 +60,4 @@ class VCardLine */ - void setValue( const QVariant& value ); + void setValue( const QString& value ); + void setValue( const QByteArray& value ); @@ -64,2 +67,18 @@ class VCardLine QVariant value() const; + QByteArray valueBytes() const; + + /** + * Sets the group the line belongs to. + */ + void setGroup( const QString& group ); + + /** + * Returns the group the line belongs to. + */ + QString group() const; + + /** + * Returns whether the line belongs to a group. + */ + bool hasGroup() const; @@ -77,3 +96,3 @@ class VCardLine * Returns the values of a special parameter. - * You can get a list of all parameters with @ref paramList(). + * You can get a list of all parameters with paramList(). */ @@ -83,3 +102,3 @@ class VCardLine * Returns only the first value of a special parameter. - * You can get a list of all parameters with @ref paramList(). + * You can get a list of all parameters with paramList(). */ @@ -88,5 +107,5 @@ class VCardLine private: - QMap< QString, QStringList > *mParamMap; + ParamMap mParamMap; QString mIdentifier; - QVariant mValue; + QByteArray mValue; diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp index bec2a0c..7fae011 100644 --- a/kabc/vcardparser/vcardparser.cpp +++ b/kabc/vcardparser/vcardparser.cpp @@ -40,2 +40,4 @@ VCard::List VCardParser::parseVCards( const QString& text ) { + static QRegExp sep( "[\x0d\x0a]" ); + VCard currentVCard; @@ -44,7 +46,8 @@ VCard::List VCardParser::parseVCards( const QString& text ) - QStringList lines = QStringList::split( QRegExp( "[\x0d\x0a]" ), text ); - QStringList::Iterator it; + const QStringList lines = QStringList::split( sep, text ); + QStringList::ConstIterator it; bool inVCard = false; - for ( it = lines.begin(); it != lines.end(); ++it ) { + QStringList::ConstIterator linesEnd( lines.end() ); + for ( it = lines.begin(); it != linesEnd; ++it ) { @@ -54,3 +57,3 @@ VCard::List VCardParser::parseVCards( const QString& text ) if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous - currentLine += (*it).remove( 0, 1 ); + currentLine += QString( *it ).remove( 0, 1 ); continue; @@ -65,3 +68,3 @@ VCard::List VCardParser::parseVCards( const QString& text ) VCardLine vCardLine; - QString key = currentLine.left( colon ).stripWhiteSpace(); + const QString key = currentLine.left( colon ).stripWhiteSpace(); QString value = currentLine.mid( colon + 1 ); @@ -69,14 +72,33 @@ VCard::List VCardParser::parseVCards( const QString& text ) QStringList params = QStringList::split( ';', key ); - vCardLine.setIdentifier( params[0] ); + + // check for group + if ( params[0].find( '.' ) != -1 ) { + const QStringList groupList = QStringList::split( '.', params[0] ); + vCardLine.setGroup( groupList[0] ); + vCardLine.setIdentifier( groupList[1] ); + } else + 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 ) { + QStringList::ConstIterator paramIt = params.begin(); + for ( ++paramIt; paramIt != params.end(); ++paramIt ) { + QStringList pair = QStringList::split( '=', *paramIt ); if ( pair.count() == 1 ) { + // correct the fucking 2.1 'standard' + if ( pair[0].lower() == "quoted-printable" ) { + pair[0] = "encoding"; + pair[1] = "quoted-printable"; + } else if ( pair[0].lower() == "base64" ) { + pair[0] = "encoding"; + pair[1] = "base64"; + } else { 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] ); + // This is pretty much a faster pair[1].contains( ',' )... + if ( pair[1].find( ',' ) != -1 ) { // parameter in type=x,y,z format + const QStringList args = QStringList::split( ',', pair[ 1 ] ); + QStringList::ConstIterator argIt; + for ( argIt = args.begin(); argIt != args.end(); ++argIt ) + vCardLine.addParameter( pair[0].lower(), *argIt ); } else @@ -87,32 +109,27 @@ VCard::List VCardParser::parseVCards( const QString& text ) params = vCardLine.parameterList(); - if ( params.contains( "encoding" ) ) { // have to decode the data -#if 0 + if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data QByteArray input, output; - input = value.local8Bit(); - if ( vCardLine.parameter( "encoding" ).lower() == "b" ) + if ( vCardLine.parameter( "encoding" ).lower() == "b" || + vCardLine.parameter( "encoding" ).lower() == "base64" ) { + input = value.local8Bit(); KCodecs::base64Decode( input, output ); - else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) + } else if ( vCardLine.parameter( "encoding" ).lower() == "quoted-printable" ) { + // join any qp-folded lines + while ( value.mid(value.length()-1,1) == "=" && it != linesEnd ) { + value = value.remove( value.length()-1, 1 ) + (*it); + ++it; + } + input = value.local8Bit(); 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" ) ); + } +//PP our vcards are *supposed* to be in UTF-8 +// if ( vCardLine.parameter( "charset" ).lower() == "utf-8" ) { +// vCardLine.setValue( QString::fromUtf8( output.data(), output.size() ) ); +// } else + vCardLine.setValue( output ); +//PP our vcards are *supposed* to be in UTF-8 +// } else if ( vCardLine.parameter( "charset" ).lower() == "utf-8" ) { +// vCardLine.setValue( QString::fromUtf8( value.ascii() ) ); + } else vCardLine.setValue( value.replace( QRegExp("\\\\n"), "\n" ) ); - } @@ -120,2 +137,3 @@ VCard::List VCardParser::parseVCards( const QString& text ) } + // we do not save the start and end tag as vcardline @@ -123,4 +141,2 @@ VCard::List VCardParser::parseVCards( const QString& text ) inVCard = true; - //qDebug("VCardParser::parseVCards has to be verified"); -//US currentLine.setLength( 0 ); currentLine = ""; @@ -133,4 +149,2 @@ VCard::List VCardParser::parseVCards( const QString& text ) vCardList.append( currentVCard ); - //qDebug("VCardParser::parseVCards has to be verified"); -//US currentLine.setLength( 0 ); currentLine = ""; @@ -157,6 +171,6 @@ QString VCardParser::createVCards( const VCard::List& list ) QStringList::Iterator paramIt; - QStringList::Iterator valueIt; + QStringList::ConstIterator valueIt; VCardLine::List lines; - VCardLine::List::Iterator lineIt; + VCardLine::List::ConstIterator lineIt; VCard::List::ConstIterator cardIt; @@ -165,5 +179,5 @@ QString VCardParser::createVCards( const VCard::List& list ) - // iterate over the cards - for ( cardIt = list.begin(); cardIt != list.end(); ++cardIt ) { + VCard::List::ConstIterator listEnd( list.end() ); + for ( cardIt = list.begin(); cardIt != listEnd; ++cardIt ) { text.append( "BEGIN:VCARD\r\n" ); @@ -172,4 +186,3 @@ QString VCardParser::createVCards( const VCard::List& list ) for ( identIt = idents.begin(); identIt != idents.end(); ++identIt ) { - VCard card = (*cardIt); - lines = card.lines( (*identIt) ); + lines = (*cardIt).lines( (*identIt) ); @@ -178,3 +191,6 @@ QString VCardParser::createVCards( const VCard::List& list ) if ( !(*lineIt).value().asString().isEmpty() ) { - textLine = (*lineIt).identifier(); + if ( (*lineIt).hasGroup() ) + textLine = (*lineIt).group() + "." + (*lineIt).identifier(); + else + textLine = (*lineIt).identifier(); @@ -200,10 +216,3 @@ QString VCardParser::createVCards( const VCard::List& list ) 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; - + input = (*lineIt).valueBytes(); if ( encodingType == "b" ) @@ -213,7 +222,5 @@ QString VCardParser::createVCards( const VCard::List& list ) textLine.append( ":" + QString( output ) ); - } else { - qDebug("VCardParser::createVCards has to be verified"); -//US textLine.append( ":" + (*lineIt).value().asString().replace( "\n", "\\n" ) ); + } else textLine.append( ":" + (*lineIt).value().asString().replace( QRegExp("\n"), "\\n" ) ); - } + if ( textLine.length() > FOLD_WIDTH ) { // we have to fold the line diff --git a/kabc/vcardparser/vcardtool.cpp b/kabc/vcardparser/vcardtool.cpp index d1f823b..32b6c1e 100644 --- a/kabc/vcardparser/vcardtool.cpp +++ b/kabc/vcardparser/vcardtool.cpp @@ -22,4 +22,2 @@ #include <qstring.h> -#include <qregexp.h> -#include <kmdcodec.h> @@ -59,3 +57,2 @@ VCardTool::VCardTool() mPhoneTypeMap.insert( "PAGER", PhoneNumber::Pager ); - mPhoneTypeMap.insert( "SIP", PhoneNumber::Sip ); } @@ -66,2 +63,3 @@ VCardTool::~VCardTool() +// TODO: make list a const& QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) @@ -69,5 +67,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) VCard::List vCardList; + static const QRegExp semiExp(";"); - Addressee::List::Iterator addrIt; - for ( addrIt = list.begin(); addrIt != list.end(); ++addrIt ) { + Addressee::List::ConstIterator addrIt; + Addressee::List::ConstIterator listEnd( list.end() ); + for ( addrIt = list.begin(); addrIt != listEnd; ++addrIt ) { VCard card; @@ -76,46 +76,41 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // ADR + LABEL - Address::List addresses = (*addrIt).addresses(); - for ( Address::List::Iterator it = addresses.begin(); it != addresses.end(); ++it ) { + const Address::List addresses = (*addrIt).addresses(); + for ( Address::List::ConstIterator 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(";"), "\\;" ) ); + bool isEmpty = ( (*it).postOfficeBox().isEmpty() && + (*it).extended().isEmpty() && + (*it).street().isEmpty() && + (*it).locality().isEmpty() && + (*it).region().isEmpty() && + (*it).postalCode().isEmpty() && + (*it).country().isEmpty() ); + + address.append( (*it).postOfficeBox().replace( semiExp, "\\;" ) ); + address.append( (*it).extended().replace( semiExp, "\\;" ) ); + address.append( (*it).street().replace( semiExp, "\\;" ) ); + address.append( (*it).locality().replace( semiExp, "\\;" ) ); + address.append( (*it).region().replace( semiExp, "\\;" ) ); + address.append( (*it).postalCode().replace( semiExp, "\\;" ) ); + address.append( (*it).country().replace( semiExp, "\\;" ) ); VCardLine adrLine( "ADR", address.join( ";" ) ); + if ( version == VCard::v2_1 ) { + adrLine.addParameter( "CHARSET", "UTF-8" ); + adrLine.addParameter( "ENCODING", "8BIT" ); + } + VCardLine labelLine( "LABEL", (*it).label() ); + if ( version == VCard::v2_1 ) { + labelLine.addParameter( "CHARSET", "UTF-8" ); + labelLine.addParameter( "ENCODING", "8BIT" ); + } bool hasLabel = !(*it).label().isEmpty(); - QMap<QString, int>::Iterator typeIt; + QMap<QString, int>::ConstIterator 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() ); - } - } + adrLine.addParameter( "TYPE", typeIt.key() ); + if ( hasLabel ) + labelLine.addParameter( "TYPE", typeIt.key() ); } @@ -123,3 +118,4 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) - card.addLine( adrLine ); + if ( !isEmpty ) + card.addLine( adrLine ); if ( hasLabel ) @@ -139,9 +135,11 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) 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(","), "\\," ); + + VCardLine catLine( "CATEGORIES", categories.join( "," ) ); + if ( version == VCard::v2_1 ) { + catLine.addParameter( "CHARSET", "UTF-8" ); + catLine.addParameter( "ENCODING", "8BIT" ); } - card.addLine( VCardLine( "CATEGORIES", categories.join( "," ) ) ); + + card.addLine( catLine ); } @@ -152,5 +150,5 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) } - + // EMAIL - QStringList emails = (*addrIt).emails(); + const QStringList emails = (*addrIt).emails(); bool pref = true; @@ -158,3 +156,7 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) VCardLine line( "EMAIL", *strIt ); - if ( pref == true ) { + if ( version == VCard::v2_1 ) { + line.addParameter( "CHARSET", "UTF-8" ); + line.addParameter( "ENCODING", "8BIT" ); + } + if ( pref == true && emails.count() > 1 ) { line.addParameter( "TYPE", "PREF" ); @@ -166,3 +168,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // FN - card.addLine( VCardLine( "FN", (*addrIt).formattedName() ) ); + VCardLine fnLine( "FN", (*addrIt).formattedName() ); + if ( version == VCard::v2_1 ) { + fnLine.addParameter( "CHARSET", "UTF-8" ); + fnLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( fnLine ); @@ -177,3 +184,3 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // KEY - Key::List keys = (*addrIt).keys(); + const Key::List keys = (*addrIt).keys(); Key::List::ConstIterator keyIt; @@ -186,3 +193,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // MAILER - card.addLine( VCardLine( "MAILER", (*addrIt).mailer() ) ); + VCardLine mailerLine( "MAILER", (*addrIt).mailer() ); + if ( version == VCard::v2_1 ) { + mailerLine.addParameter( "CHARSET", "UTF-8" ); + mailerLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( mailerLine ); @@ -190,19 +202,22 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) 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( ";" ) ) ); + name.append( (*addrIt).familyName().replace( semiExp, "\\;" ) ); + name.append( (*addrIt).givenName().replace( semiExp, "\\;" ) ); + name.append( (*addrIt).additionalName().replace( semiExp, "\\;" ) ); + name.append( (*addrIt).prefix().replace( semiExp, "\\;" ) ); + name.append( (*addrIt).suffix().replace( semiExp, "\\;" ) ); + + VCardLine nLine( "N", name.join( ";" ) ); + if ( version == VCard::v2_1 ) { + nLine.addParameter( "CHARSET", "UTF-8" ); + nLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( nLine ); + + // NAME + VCardLine nameLine( "NAME", (*addrIt).name() ); + if ( version == VCard::v2_1 ) { + nameLine.addParameter( "CHARSET", "UTF-8" ); + nameLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( nameLine ); @@ -213,6 +228,16 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // NOTE - card.addLine( VCardLine( "NOTE", (*addrIt).note() ) ); + VCardLine noteLine( "NOTE", (*addrIt).note() ); + if ( version == VCard::v2_1 ) { + noteLine.addParameter( "CHARSET", "UTF-8" ); + noteLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( noteLine ); // ORG - card.addLine( VCardLine( "ORG", (*addrIt).organization() ) ); + VCardLine orgLine( "ORG", (*addrIt).organization() ); + if ( version == VCard::v2_1 ) { + orgLine.addParameter( "CHARSET", "UTF-8" ); + orgLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( orgLine ); @@ -229,3 +254,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // ROLE - card.addLine( VCardLine( "ROLE", (*addrIt).role() ) ); + VCardLine roleLine( "ROLE", (*addrIt).role() ); + if ( version == VCard::v2_1 ) { + roleLine.addParameter( "CHARSET", "UTF-8" ); + roleLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( roleLine ); @@ -239,3 +269,3 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // TEL - PhoneNumber::List phoneNumbers = (*addrIt).phoneNumbers(); + const PhoneNumber::List phoneNumbers = (*addrIt).phoneNumbers(); PhoneNumber::List::ConstIterator phoneIt; @@ -244,9 +274,6 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) - QMap<QString, int>::Iterator typeIt; + QMap<QString, int>::ConstIterator 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() ); + line.addParameter( "TYPE", typeIt.key() ); } @@ -257,3 +284,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // TITLE - card.addLine( VCardLine( "TITLE", (*addrIt).title() ) ); + VCardLine titleLine( "TITLE", (*addrIt).title() ); + if ( version == VCard::v2_1 ) { + titleLine.addParameter( "CHARSET", "UTF-8" ); + titleLine.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( titleLine ); @@ -288,3 +320,3 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) // X- - QStringList customs = (*addrIt).customs(); + const QStringList customs = (*addrIt).customs(); for ( strIt = customs.begin(); strIt != customs.end(); ++strIt ) { @@ -295,3 +327,8 @@ QString VCardTool::createVCards( Addressee::List list, VCard::Version version ) - card.addLine( VCardLine( identifier, value ) ); + VCardLine line( identifier, value ); + if ( version == VCard::v2_1 ) { + line.addParameter( "CHARSET", "UTF-8" ); + line.addParameter( "ENCODING", "8BIT" ); + } + card.addLine( line ); } @@ -306,4 +343,4 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) { - QChar semicolonSep( ';' ); - QChar commaSep( ',' ); + static const QChar semicolonSep( ';' ); + static const QChar commaSep( ',' ); QString identifier; @@ -311,12 +348,15 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) Addressee::List addrList; - VCard::List vCardList = VCardParser::parseVCards( vcard ); - VCard::List::Iterator cardIt; - for ( cardIt = vCardList.begin(); cardIt != vCardList.end(); ++cardIt ) { + 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; - QStringList idents = (*cardIt).identifiers(); + + const 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; + QStringList::ConstIterator identEnd( idents.end() ); + for ( identIt = idents.begin(); identIt != identEnd; ++identIt ) { + const VCardLine::List lines = (*cardIt).lines( (*identIt) ); + VCardLine::List::ConstIterator lineIt; @@ -324,4 +364,2 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) for ( lineIt = lines.begin(); lineIt != lines.end(); ++lineIt ) { - QStringList params = (*lineIt).parameterList(); - identifier = (*lineIt).identifier().lower(); @@ -330,3 +368,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) Address address; - QStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() ); + const QStringList addrParts = splitString( semicolonSep, (*lineIt).value().asString() ); if ( addrParts.count() > 0 ) @@ -336,3 +374,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) if ( addrParts.count() > 2 ) - address.setStreet( addrParts[ 2 ].replace ( QRegExp("\\\\n") , "\n") ); + address.setStreet( addrParts[ 2 ] ); if ( addrParts.count() > 3 ) @@ -348,9 +386,6 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) - QStringList types = (*lineIt).parameters( "type" ); - for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) + const QStringList types = (*lineIt).parameters( "type" ); + for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) type += mAddressTypeMap[ (*it).lower() ]; - if ( !type ) - type = Address::Home; // default - address.setType( type ); @@ -360,3 +395,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // AGENT - if ( identifier == "agent" ) + else if ( identifier == "agent" ) addr.setAgent( parseAgent( *lineIt ) ); @@ -364,3 +399,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // BDAY - if ( identifier == "bday" ) + else if ( identifier == "bday" ) addr.setBirthday( parseDateTime( (*lineIt).value().asString() ) ); @@ -368,4 +403,4 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // CATEGORIES - if ( identifier == "categories" ) { - QStringList categories = splitString( commaSep, (*lineIt).value().asString() ); + else if ( identifier == "categories" ) { + const QStringList categories = splitString( commaSep, (*lineIt).value().asString() ); addr.setCategories( categories ); @@ -374,3 +409,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // CLASS - if ( identifier == "class" ) + else if ( identifier == "class" ) addr.setSecrecy( parseSecrecy( *lineIt ) ); @@ -378,5 +413,5 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // EMAIL - if ( identifier == "email" ) { - QStringList types = (*lineIt).parameters( "type" ); - addr.insertEmail( (*lineIt).value().asString(), types.contains( "PREF" ) ); + else if ( identifier == "email" ) { + const QStringList types = (*lineIt).parameters( "type" ); + addr.insertEmail( (*lineIt).value().asString(), types.findIndex( "PREF" ) != -1 ); } @@ -384,3 +419,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // FN - if ( identifier == "fn" ) + else if ( identifier == "fn" ) addr.setFormattedName( (*lineIt).value().asString() ); @@ -388,6 +423,6 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // GEO - if ( identifier == "geo" ) { + else if ( identifier == "geo" ) { Geo geo; - QStringList geoParts = QStringList::split( ';', (*lineIt).value().asString(), true ); + const QStringList geoParts = QStringList::split( ';', (*lineIt).value().asString(), true ); geo.setLatitude( geoParts[ 0 ].toFloat() ); @@ -399,3 +434,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // KEY - if ( identifier == "key" ) + else if ( identifier == "key" ) addr.insertKey( parseKey( *lineIt ) ); @@ -403,12 +438,10 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // LABEL - if ( identifier == "label" ) { + else if ( identifier == "label" ) { int type = 0; - QStringList types = (*lineIt).parameters( "type" ); - for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) + const QStringList types = (*lineIt).parameters( "type" ); + for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) type += mAddressTypeMap[ (*it).lower() ]; - if ( !type ) - type = Address::Home; - + bool available = false; KABC::Address::List addressList = addr.addresses(); @@ -419,4 +452,12 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) addr.insertAddress( *it ); + available = true; + break; } } + + if ( !available ) { // a standalone LABEL tag + KABC::Address address( type ); + address.setLabel( (*lineIt).value().asString() ); + addr.insertAddress( address ); + } } @@ -424,3 +465,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // LOGO - if ( identifier == "logo" ) + else if ( identifier == "logo" ) addr.setLogo( parsePicture( *lineIt ) ); @@ -428,3 +469,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // MAILER - if ( identifier == "mailer" ) + else if ( identifier == "mailer" ) addr.setMailer( (*lineIt).value().asString() ); @@ -432,4 +473,4 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // N - if ( identifier == "n" ) { - QStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() ); + else if ( identifier == "n" ) { + const QStringList nameParts = splitString( semicolonSep, (*lineIt).value().asString() ); if ( nameParts.count() > 0 ) @@ -446,4 +487,8 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) + // NAME + else if ( identifier == "name" ) + addr.setName( (*lineIt).value().asString() ); + // NICKNAME - if ( identifier == "nickname" ) + else if ( identifier == "nickname" ) addr.setNickName( (*lineIt).value().asString() ); @@ -451,16 +496,7 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // 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 - } + else if ( identifier == "note" ) + addr.setNote( (*lineIt).value().asString() ); // ORGANIZATION - if ( identifier == "org" ) + else if ( identifier == "org" ) addr.setOrganization( (*lineIt).value().asString() ); @@ -468,3 +504,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // PHOTO - if ( identifier == "photo" ) + else if ( identifier == "photo" ) addr.setPhoto( parsePicture( *lineIt ) ); @@ -472,3 +508,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // PROID - if ( identifier == "prodid" ) + else if ( identifier == "prodid" ) addr.setProductId( (*lineIt).value().asString() ); @@ -476,3 +512,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // REV - if ( identifier == "rev" ) + else if ( identifier == "rev" ) addr.setRevision( parseDateTime( (*lineIt).value().asString() ) ); @@ -480,3 +516,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // ROLE - if ( identifier == "role" ) + else if ( identifier == "role" ) addr.setRole( (*lineIt).value().asString() ); @@ -484,3 +520,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // SORT-STRING - if ( identifier == "sort-string" ) + else if ( identifier == "sort-string" ) addr.setSortString( (*lineIt).value().asString() ); @@ -488,3 +524,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // SOUND - if ( identifier == "sound" ) + else if ( identifier == "sound" ) addr.setSound( parseSound( *lineIt ) ); @@ -492,3 +528,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // TEL - if ( identifier == "tel" ) { + else if ( identifier == "tel" ) { PhoneNumber phone; @@ -498,9 +534,6 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) - QStringList types = (*lineIt).parameters( "type" ); - for ( QStringList::Iterator it = types.begin(); it != types.end(); ++it ) + const QStringList types = (*lineIt).parameters( "type" ); + for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) type += mPhoneTypeMap[(*it).upper()]; - if ( !type ) - type = PhoneNumber::Home; // default - phone.setType( type ); @@ -511,3 +544,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // TITLE - if ( identifier == "title" ) + else if ( identifier == "title" ) addr.setTitle( (*lineIt).value().asString() ); @@ -515,5 +548,5 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // TZ - if ( identifier == "tz" ) { + else if ( identifier == "tz" ) { TimeZone tz; - QString date = (*lineIt).value().asString(); + const QString date = (*lineIt).value().asString(); @@ -529,3 +562,3 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // UID - if ( identifier == "uid" ) + else if ( identifier == "uid" ) addr.setUid( (*lineIt).value().asString() ); @@ -533,8 +566,8 @@ Addressee::List VCardTool::parseVCards( const QString& vcard ) // URL - if ( identifier == "url" ) - addr.setUrl( (*lineIt).value().asString() ); + else if ( identifier == "url" ) + addr.setUrl( KURL( (*lineIt).value().asString() ) ); // X- - if ( identifier.startsWith( "x-" ) ) { - QString key = (*lineIt).identifier().mid( 2 ); + else if ( identifier.startsWith( "x-" ) ) { + const QString key = (*lineIt).identifier().mid( 2 ); int dash = key.find( "-" ); @@ -595,27 +628,18 @@ 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; + 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.value().asString() ); + } + + if ( params.findIndex( "type" ) != -1 ) + pic.setType( line.parameter( "type" ) ); + + return pic; } @@ -624,3 +648,2 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi { - // LR fixed VCardLine line( identifier ); @@ -629,3 +652,2 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi if ( !pic.data().isNull() ) { -#if 0 QByteArray input; @@ -635,12 +657,2 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi 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" ); @@ -649,2 +661,3 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi } else if ( !pic.url().isEmpty() ) { + QByteArray ba; line.setValue( pic.url() ); @@ -652,3 +665,3 @@ VCardLine VCardTool::createPicture( const QString &identifier, const Picture &pi } - + return line; @@ -660,11 +673,6 @@ Sound VCardTool::parseSound( const VCardLine &line ) - 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" ) ) { + 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" ) @@ -687,10 +695,3 @@ VCardLine VCardTool::createSound( const Sound &snd ) 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.setValue( snd.data() ); line.addParameter( "encoding", "b" ); @@ -710,11 +711,5 @@ Key VCardTool::parseKey( const VCardLine &line ) - 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 ); - } + const QStringList params = line.parameterList(); + if ( params.findIndex( "encoding" ) != -1 ) + key.setBinaryData( line.valueBytes() ); else @@ -722,3 +717,3 @@ Key VCardTool::parseKey( const VCardLine &line ) - if ( params.contains( "type" ) ) { + if ( params.findIndex( "type" ) != -1 ) { if ( line.parameter( "type" ).lower() == "x509" ) @@ -742,9 +737,3 @@ VCardLine VCardTool::createKey( const Key &key ) 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.setValue( key.binaryData() ); line.addParameter( "encoding", "b" ); @@ -798,4 +787,4 @@ Agent VCardTool::parseAgent( const VCardLine &line ) - QStringList params = line.parameterList(); - if ( params.contains( "value" ) ) { + const QStringList params = line.parameterList(); + if ( params.findIndex( "value" ) != -1 ) { if ( line.parameter( "value" ).lower() == "uri" ) @@ -804,19 +793,9 @@ Agent VCardTool::parseAgent( const VCardLine &line ) 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("\\\\,") , "," ); - - Addressee::List list = parseVCards( str ); + 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 ) { @@ -841,12 +820,3 @@ VCardLine VCardTool::createAgent( VCard::Version version, const Agent &agent ) 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("\\r\\n"), "\\n" ); str.replace( QRegExp(";"), "\\;" ); @@ -885,3 +855,3 @@ QStringList VCardTool::splitString( const QChar &sep, const QString &str ) pos = value.find( sep, pos ); - } else + } else pos = value.find( sep, pos + 1 ); |