summaryrefslogtreecommitdiffstats
path: root/opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch
diff options
context:
space:
mode:
Diffstat (limited to 'opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch')
-rw-r--r--opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch330
1 files changed, 165 insertions, 165 deletions
diff --git a/opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch b/opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch
index f7c3ee78d..543545f29 100644
--- a/opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch
+++ b/opensuse/core/tdelibs/bug-382959_kabc_fix_vcardparser.patch
@@ -2,11 +2,11 @@ Index: kabc/vcardconverter.cpp
===================================================================
--- kabc/vcardconverter.cpp.orig
+++ kabc/vcardconverter.cpp
-@@ -51,6 +51,14 @@ QString VCardConverter::createVCard( con
+@@ -51,6 +51,14 @@ TQString VCardConverter::createVCard( co
return createVCards( list, version );
}
-+QCString VCardConverter::createVCardRaw( const Addressee &addr, Version version )
++TQCString VCardConverter::createVCardRaw( const Addressee &addr, Version version )
+{
+ Addressee::List list;
+ list.append( addr );
@@ -14,42 +14,42 @@ Index: kabc/vcardconverter.cpp
+ return createVCardsRaw( list, version );
+}
+
- QString VCardConverter::createVCards( Addressee::List list, Version version )
+ TQString VCardConverter::createVCards( Addressee::List list, Version version )
{
VCardTool tool;
-@@ -58,6 +66,13 @@ QString VCardConverter::createVCards( Ad
+@@ -58,6 +66,13 @@ TQString VCardConverter::createVCards( A
return tool.createVCards( list, ( version == v3_0 ? VCard::v3_0 : VCard::v2_1 ) );
}
-+QCString VCardConverter::createVCardsRaw( Addressee::List list, Version version )
++TQCString VCardConverter::createVCardsRaw( Addressee::List list, Version version )
+{
+ VCardTool tool;
+
+ return tool.createVCardsRaw( list, ( version == v3_0 ? VCard::v3_0 : VCard::v2_1 ) );
+}
+
- Addressee VCardConverter::parseVCard( const QString& vcard )
+ Addressee VCardConverter::parseVCard( const TQString& vcard )
{
Addressee::List list = parseVCards( vcard );
@@ -65,6 +80,13 @@ Addressee VCardConverter::parseVCard( co
return list[ 0 ];
}
-+Addressee VCardConverter::parseVCardRaw( const QCString& vcard )
++Addressee VCardConverter::parseVCardRaw( const TQCString& vcard )
+{
+ Addressee::List list = parseVCardsRaw( vcard );
+
+ return list[ 0 ];
+}
+
- Addressee::List VCardConverter::parseVCards( const QString& vcard )
+ Addressee::List VCardConverter::parseVCards( const TQString& vcard )
{
VCardTool tool;
@@ -72,6 +94,13 @@ Addressee::List VCardConverter::parseVCa
return tool.parseVCards( vcard );
}
-+Addressee::List VCardConverter::parseVCardsRaw( const QCString& vcard )
++Addressee::List VCardConverter::parseVCardsRaw( const TQCString& vcard )
+{
+ VCardTool tool;
+
@@ -58,7 +58,7 @@ Index: kabc/vcardconverter.cpp
+
// ---------------------------- deprecated stuff ---------------------------- //
- bool VCardConverter::vCardToAddressee( const QString &str, Addressee &addr, Version version )
+ bool VCardConverter::vCardToAddressee( const TQString &str, Addressee &addr, Version version )
Index: kabc/vcardconverter.h
===================================================================
--- kabc/vcardconverter.h.orig
@@ -66,33 +66,33 @@ Index: kabc/vcardconverter.h
@@ -82,6 +82,7 @@ class KABC_EXPORT VCardConverter
@param version The version of the generated vCard format
*/
- QString createVCard( const Addressee &addr, Version version = v3_0 );
-+ QCString createVCardRaw( const Addressee &addr, Version version = v3_0 );
+ TQString createVCard( const Addressee &addr, Version version = v3_0 );
++ TQCString createVCardRaw( const Addressee &addr, Version version = v3_0 );
/**
Creates a string in vCard format which contains the given
@@ -92,6 +93,7 @@ class KABC_EXPORT VCardConverter
*/
// FIXME: Add error handling
- QString createVCards( Addressee::List list, Version version = v3_0 );
-+ QCString createVCardsRaw( Addressee::List list, Version version = v3_0 );
+ TQString createVCards( Addressee::List list, Version version = v3_0 );
++ TQCString createVCardsRaw( Addressee::List list, Version version = v3_0 );
// FIXME: Add "createVCards( AddressBook * )"
@@ -99,12 +101,14 @@ class KABC_EXPORT VCardConverter
Parses a string in vCard format and returns the first contact.
*/
- Addressee parseVCard( const QString& vcard );
-+ Addressee parseVCardRaw( const QCString& vcard );
+ Addressee parseVCard( const TQString& vcard );
++ Addressee parseVCardRaw( const TQCString& vcard );
/**
Parses a string in vCard format and returns a list of contact objects.
*/
// FIXME: Add error handling
- Addressee::List parseVCards( const QString& vcard );
-+ Addressee::List parseVCardsRaw( const QCString& vcard );
+ Addressee::List parseVCards( const TQString& vcard );
++ Addressee::List parseVCardsRaw( const TQCString& vcard );
- // FIXME: Add "bool parseVCards( AddressBook *, const QString &vcard )"
+ // FIXME: Add "bool parseVCards( AddressBook *, const TQString &vcard )"
Index: kabc/vcardformatplugin.cpp
===================================================================
@@ -100,15 +100,15 @@ Index: kabc/vcardformatplugin.cpp
+++ kabc/vcardformatplugin.cpp
@@ -38,14 +38,11 @@ VCardFormatPlugin::~VCardFormatPlugin()
- bool VCardFormatPlugin::load( Addressee &addressee, QFile *file )
+ bool VCardFormatPlugin::load( Addressee &addressee, TQFile *file )
{
-- QString data;
+- TQString data;
-
-- QTextStream t( file );
-- t.setEncoding( QTextStream::Latin1 );
+- TQTextStream t( file );
+- t.setEncoding( TQTextStream::Latin1 );
- data = t.read();
-+ const QByteArray rawData = file->readAll();
-+ const QCString data( rawData.data(), rawData.size() );
++ const TQByteArray rawData = file->readAll();
++ const TQCString data( rawData.data(), rawData.size() );
VCardConverter converter;
- Addressee::List l = converter.parseVCards( data );
@@ -118,15 +118,15 @@ Index: kabc/vcardformatplugin.cpp
addressee = l.first();
@@ -57,15 +54,11 @@ bool VCardFormatPlugin::load( Addressee
- bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, QFile *file )
+ bool VCardFormatPlugin::loadAll( AddressBook*, Resource *resource, TQFile *file )
{
-- QString data;
+- TQString data;
-
-- QTextStream t( file );
-- t.setEncoding( QTextStream::Latin1 );
+- TQTextStream t( file );
+- t.setEncoding( TQTextStream::Latin1 );
- data = t.read();
-+ const QByteArray rawData = file->readAll();
-+ const QCString data( rawData.data(), rawData.size() );
++ const TQByteArray rawData = file->readAll();
++ const TQCString data( rawData.data(), rawData.size() );
VCardConverter converter;
-
@@ -139,26 +139,26 @@ Index: kabc/vcardformatplugin.cpp
vcardlist.append( addressee );
-- QTextStream t( file );
-- t.setEncoding( QTextStream::UnicodeUTF8 );
+- TQTextStream t( file );
+- t.setEncoding( TQTextStream::UnicodeUTF8 );
- t << converter.createVCards( vcardlist );
-+ const QCString data = converter.createVCardsRaw( vcardlist );
++ const TQCString data = converter.createVCardsRaw( vcardlist );
+ file->writeBlock( data, data.length() );
}
- void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, QFile *file )
+ void VCardFormatPlugin::saveAll( AddressBook*, Resource *resource, TQFile *file )
@@ -102,9 +94,8 @@ void VCardFormatPlugin::saveAll( Address
vcardlist.append( *it );
}
-- QTextStream t( file );
-- t.setEncoding( QTextStream::UnicodeUTF8 );
+- TQTextStream t( file );
+- t.setEncoding( TQTextStream::UnicodeUTF8 );
- t << converter.createVCards( vcardlist );
-+ const QCString data = converter.createVCardsRaw( vcardlist );
++ const TQCString data = converter.createVCardsRaw( vcardlist );
+ file->writeBlock( data, data.length() );
}
- bool VCardFormatPlugin::checkFormat( QFile *file ) const
+ bool VCardFormatPlugin::checkFormat( TQFile *file ) const
Index: kabc/vcardparser/vcardparser.cpp
===================================================================
--- kabc/vcardparser/vcardparser.cpp.orig
@@ -167,10 +167,10 @@ Index: kabc/vcardparser/vcardparser.cpp
Boston, MA 02110-1301, USA.
*/
-+#include <qcstring.h>
- #include <qregexp.h>
- #include <qtextcodec.h>
-+#include <qvaluelist.h>
++#include <tqcstring.h>
+ #include <tqregexp.h>
+ #include <tqtextcodec.h>
++#include <tqvaluelist.h>
#include <kmdcodec.h>
+#include <kdebug.h>
@@ -181,20 +181,20 @@ Index: kabc/vcardparser/vcardparser.cpp
using namespace KABC;
--static QString backslash( "\\\\" );
--static QString comma( "\\," );
--static QString newline( "\\n" );
--static QString cr( "\\r" );
-+typedef QValueList<QCString> QCStringList;
+-static TQString backslash( "\\\\" );
+-static TQString comma( "\\," );
+-static TQString newline( "\\n" );
+-static TQString cr( "\\r" );
++typedef TQValueList<TQCString> TQCStringList;
--static void addEscapes( QString &str )
-+QValueList<QCString> splitCString( const QCString &str, char sep )
+-static void addEscapes( TQString &str )
++QValueList<TQCString> splitCString( const TQCString &str, char sep )
{
- str.replace( '\\', backslash );
- str.replace( ',', comma );
- str.replace( '\r', cr );
- str.replace( '\n', newline );
-+ QValueList<QCString> list;
++ TQValueList<TQCString> list;
+ int start = 0;
+ int end;
+ while ((end = str.find(sep, start)) != -1) {
@@ -206,9 +206,9 @@ Index: kabc/vcardparser/vcardparser.cpp
+ return list;
+}
+
-+QValueList<QCString> splitCString( const QCString &str, const QRegExp &exp )
++TQValueList<TQCString> splitCString( const TQCString &str, const TQRegExp &exp )
+{
-+ QValueList<QCString> list;
++ TQValueList<TQCString> list;
+ int start = 0;
+ int end;
+ while ((end = str.find(exp, start)) != -1) {
@@ -220,18 +220,18 @@ Index: kabc/vcardparser/vcardparser.cpp
+ return list;
+}
+
-+bool cStringStartsWith( const QCString &str, const QCString &pattern )
++bool cStringStartsWith( const TQCString &str, const TQCString &pattern )
+{
+ const int length = pattern.length();
+ if ( length == 0 )
+ return true;
+
-+ const QCString part = str.left( length );
++ const TQCString part = str.left( length );
+ return (pattern == part);
}
--static void removeEscapes( QString &str )
-+static void addEscapes( QCString &str )
+-static void removeEscapes( TQString &str )
++static void addEscapes( TQCString &str )
{
- str.replace( cr, "\\r" );
- str.replace( newline, "\n" );
@@ -243,7 +243,7 @@ Index: kabc/vcardparser/vcardparser.cpp
+ str.replace( '\n', "\\n" );
+}
+
-+static void removeEscapes( QCString &str )
++static void removeEscapes( TQCString &str )
+{
+ str.replace( "\\r", "\r" );
+ str.replace( "\\n", "\n" );
@@ -254,35 +254,35 @@ Index: kabc/vcardparser/vcardparser.cpp
VCardParser::VCardParser()
@@ -60,24 +98,29 @@ VCardParser::~VCardParser()
- VCard::List VCardParser::parseVCards( const QString& text )
+ VCard::List VCardParser::parseVCards( const TQString& text )
{
+ return parseVCardsRaw( text.utf8() );
+}
+
-+VCard::List VCardParser::parseVCardsRaw( const QCString& text )
++VCard::List VCardParser::parseVCardsRaw( const TQCString& text )
+{
- static QRegExp sep( "[\x0d\x0a]" );
+ static TQRegExp sep( "[\x0d\x0a]" );
VCard currentVCard;
VCard::List vCardList;
-- QString currentLine;
-+ QCString currentLine;
+- TQString currentLine;
++ TQCString currentLine;
-- const QStringList lines = QStringList::split( sep, text );
-- QStringList::ConstIterator it;
-+ const QCStringList lines = splitCString( text, sep );
-+ QCStringList::ConstIterator it;
+- const TQStringList lines = TQStringList::split( sep, text );
+- TQStringList::ConstIterator it;
++ const TQCStringList lines = splitCString( text, sep );
++ TQCStringList::ConstIterator it;
bool inVCard = false;
-- QStringList::ConstIterator linesEnd( lines.end() );
-+ QCStringList::ConstIterator linesEnd( lines.end() );
+- TQStringList::ConstIterator linesEnd( lines.end() );
++ TQCStringList::ConstIterator linesEnd( lines.end() );
for ( it = lines.begin(); it != linesEnd; ++it ) {
if ( (*it).isEmpty() ) // empty line
continue;
if ( (*it)[ 0 ] == ' ' || (*it)[ 0 ] == '\t' ) { // folded line => append to previous
-- currentLine += QString( *it ).remove( 0, 1 );
+- currentLine += TQString( *it ).remove( 0, 1 );
+ currentLine.append( (*it).mid( 1 ) );
continue;
} else {
@@ -291,32 +291,32 @@ Index: kabc/vcardparser/vcardparser.cpp
}
VCardLine vCardLine;
-- const QString key = currentLine.left( colon ).stripWhiteSpace();
-- QString value = currentLine.mid( colon + 1 );
-+ const QCString key = currentLine.left( colon ).stripWhiteSpace();
-+ QCString value = currentLine.mid( colon + 1 );
+- const TQString key = currentLine.left( colon ).stripWhiteSpace();
+- TQString value = currentLine.mid( colon + 1 );
++ const TQCString key = currentLine.left( colon ).stripWhiteSpace();
++ TQCString value = currentLine.mid( colon + 1 );
-- QStringList params = QStringList::split( ';', key );
-+ QCStringList params = splitCString( key, ';' );
+- TQStringList params = TQStringList::split( ';', key );
++ TQCStringList params = splitCString( key, ';' );
// check for group
if ( params[0].find( '.' ) != -1 ) {
-- const QStringList groupList = QStringList::split( '.', params[0] );
+- const TQStringList groupList = TQStringList::split( '.', params[0] );
- vCardLine.setGroup( groupList[0] );
- vCardLine.setIdentifier( groupList[1] );
-+ const QCStringList groupList = splitCString( params[0], '.' );
-+ vCardLine.setGroup( QString::fromLatin1( groupList[0] ) );
-+ vCardLine.setIdentifier( QString::fromLatin1( groupList[1] ) );
++ const TQCStringList groupList = splitCString( params[0], '.' );
++ vCardLine.setGroup( TQString::tqfromLatin1( groupList[0] ) );
++ vCardLine.setIdentifier( TQString::tqfromLatin1( groupList[1] ) );
} else
- vCardLine.setIdentifier( params[0] );
-+ vCardLine.setIdentifier( QString::fromLatin1( params[0] ) );
++ vCardLine.setIdentifier( TQString::tqfromLatin1( params[0] ) );
if ( params.count() > 1 ) { // find all parameters
-- QStringList::ConstIterator paramIt = params.begin();
-+ QCStringList::ConstIterator paramIt = params.begin();
+- TQStringList::ConstIterator paramIt = params.begin();
++ TQCStringList::ConstIterator paramIt = params.begin();
for ( ++paramIt; paramIt != params.end(); ++paramIt ) {
-- QStringList pair = QStringList::split( '=', *paramIt );
-+ QCStringList pair = splitCString( *paramIt, '=' );
+- TQStringList pair = TQStringList::split( '=', *paramIt );
++ TQCStringList pair = splitCString( *paramIt, '=' );
if ( pair.size() == 1 ) {
// correct the fucking 2.1 'standard'
if ( pair[0].lower() == "quoted-printable" ) {
@@ -324,29 +324,29 @@ Index: kabc/vcardparser/vcardparser.cpp
}
// 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;
-+ const QCStringList args = splitCString( pair[ 1 ], ',' );
-+ QCStringList::ConstIterator argIt;
+- const TQStringList args = TQStringList::split( ',', pair[ 1 ] );
+- TQStringList::ConstIterator argIt;
++ const TQCStringList args = splitCString( pair[ 1 ], ',' );
++ TQCStringList::ConstIterator argIt;
for ( argIt = args.begin(); argIt != args.end(); ++argIt )
- vCardLine.addParameter( pair[0].lower(), *argIt );
-+ vCardLine.addParameter( QString::fromLatin1( pair[0].lower() ), QString::fromLatin1( *argIt ) );
++ vCardLine.addParameter( TQString::tqfromLatin1( pair[0].lower() ), TQString::tqfromLatin1( *argIt ) );
} else
- vCardLine.addParameter( pair[0].lower(), pair[1] );
-+ vCardLine.addParameter( QString::fromLatin1( pair[0].lower() ), QString::fromLatin1( pair[1] ) );
++ vCardLine.addParameter( TQString::tqfromLatin1( pair[0].lower() ), TQString::tqfromLatin1( pair[1] ) );
}
}
@@ -133,10 +176,8 @@ VCard::List VCardParser::parseVCards( co
- QByteArray output;
+ TQByteArray output;
bool wasBase64Encoded = false;
- params = vCardLine.parameterList();
- if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
-- QByteArray input;
-- input = QCString(value.latin1());
+- TQByteArray input;
+- input = TQCString(value.latin1());
+ if ( vCardLine.parameterList().findIndex( "encoding" ) != -1 ) { // have to decode the data
-+ QByteArray input = value;
++ TQByteArray input = value;
if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
vCardLine.parameter( "encoding" ).lower() == "base64" ) {
KCodecs::base64Decode( input, output );
@@ -354,59 +354,59 @@ Index: kabc/vcardparser/vcardparser.cpp
value = value.remove( value.length() - 1, 1 ) + (*it);
++it;
}
-- input = QCString(value.latin1());
+- input = TQCString(value.latin1());
+ input = value;
KCodecs::quotedPrintableDecode( input, output );
}
} else {
-- output = QCString(value.latin1());
+- output = TQCString(value.latin1());
+ output = value;
}
- if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
+ if ( vCardLine.parameterList().findIndex( "charset" ) != -1 ) { // have to convert the data
- QTextCodec *codec =
- QTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
+ TQTextCodec *codec =
+ TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
if ( codec ) {
@@ -173,17 +214,17 @@ VCard::List VCardParser::parseVCards( co
}
// we do not save the start and end tag as vcardline
- if ( (*it).lower().startsWith( "begin:vcard" ) ) {
-+ if ( cStringStartsWith( (*it).lower(), QCString( "begin:vcard" ) ) ) {
++ if ( cStringStartsWith( (*it).lower(), TQCString( "begin:vcard" ) ) ) {
inVCard = true;
- currentLine.setLength( 0 );
-+ currentLine = QCString();
++ currentLine = TQCString();
currentVCard.clear(); // flush vcard
continue;
}
- if ( (*it).lower().startsWith( "end:vcard" ) ) {
-+ if ( cStringStartsWith( (*it).lower(), QCString( "end:vcard" ) ) ) {
++ if ( cStringStartsWith( (*it).lower(), TQCString( "end:vcard" ) ) ) {
inVCard = false;
vCardList.append( currentVCard );
- currentLine.setLength( 0 );
-+ currentLine = QCString();
++ currentLine = TQCString();
currentVCard.clear(); // flush vcard
continue;
}
@@ -197,8 +238,13 @@ VCard::List VCardParser::parseVCards( co
- QString VCardParser::createVCards( const VCard::List& list )
+ TQString VCardParser::createVCards( const VCard::List& list )
{
-- QString text;
-- QString textLine;
-+ return QString::fromUtf8( createVCardsRaw( list ) );
+- TQString text;
+- TQString textLine;
++ return TQString::fromUtf8( createVCardsRaw( list ) );
+}
+
-+QCString VCardParser::createVCardsRaw( const VCard::List& list )
++TQCString VCardParser::createVCardsRaw( const VCard::List& list )
+{
-+ QCString text;
-+ QCString textLine;
- QString encodingType;
- QStringList idents;
- QStringList params;
-@@ -213,7 +259,7 @@ QString VCardParser::createVCards( const
++ TQCString text;
++ TQCString textLine;
+ TQString encodingType;
+ TQStringList idents;
+ TQStringList params;
+@@ -213,7 +259,7 @@ TQString VCardParser::createVCards( cons
bool hasEncoding;
@@ -415,54 +415,54 @@ Index: kabc/vcardparser/vcardparser.cpp
// iterate over the cards
VCard::List::ConstIterator listEnd( list.end() );
-@@ -228,9 +274,9 @@ QString VCardParser::createVCards( const
- for ( lineIt = lines.constBegin(); lineIt != lines.constEnd(); ++lineIt ) {
+@@ -229,9 +275,9 @@ TQString VCardParser::createVCards( cons
if ( !(*lineIt).value().asString().isEmpty() ) {
- if ( (*lineIt).hasGroup() )
-- textLine = (*lineIt).group() + "." + (*lineIt).identifier();
-+ textLine = (*lineIt).group().latin1() + QCString( "." ) + (*lineIt).identifier().latin1();
- else
-- textLine = (*lineIt).identifier();
-+ textLine = (*lineIt).identifier().latin1();
-
- params = (*lineIt).parameterList();
- hasEncoding = false;
-@@ -243,9 +289,9 @@ QString VCardParser::createVCards( const
-
- values = (*lineIt).parameters( *paramIt );
- for ( valueIt = values.constBegin(); valueIt != values.constEnd(); ++valueIt ) {
-- textLine.append( ";" + (*paramIt).upper() );
-+ textLine.append( QCString( ";" ) + (*paramIt).upper().latin1() );
- if ( !(*valueIt).isEmpty() )
-- textLine.append( "=" + (*valueIt) );
-+ textLine.append( QCString( "=" ) + (*valueIt).latin1() );
+ if ((*lineIt).identifier() != TQString("URI")) {
+ if ( (*lineIt).hasGroup() )
+- textLine = (*lineIt).group() + "." + (*lineIt).identifier();
++ textLine = (*lineIt).group().latin1() + TQCString( "." ) + (*lineIt).identifier().latin1();
+ else
+- textLine = (*lineIt).identifier();
++ textLine = (*lineIt).identifier().latin1();
+
+ params = (*lineIt).parameterList();
+ hasEncoding = false;
+@@ -244,9 +290,9 @@ TQString VCardParser::createVCards( cons
+
+ values = (*lineIt).parameters( *paramIt );
+ for ( valueIt = values.constBegin(); valueIt != values.constEnd(); ++valueIt ) {
+- textLine.append( ";" + (*paramIt).upper() );
++ textLine.append( TQCString( ";" ) + (*paramIt).upper().latin1() );
+ if ( !(*valueIt).isEmpty() )
+- textLine.append( "=" + (*valueIt) );
++ textLine.append( TQCString( "=" ) + (*valueIt).latin1() );
+ }
}
}
- }
-@@ -261,11 +307,11 @@ QString VCardParser::createVCards( const
- KCodecs::quotedPrintableEncode( input, output, false );
- }
+@@ -262,11 +308,11 @@ TQString VCardParser::createVCards( cons
+ KCodecs::quotedPrintableEncode( input, output, false );
+ }
-- QString value( output );
-+ QCString value( output );
- addEscapes( value );
- textLine.append( ":" + value );
- } else {
-- QString value( (*lineIt).value().asString() );
-+ QCString value( (*lineIt).value().toString().utf8() );
- addEscapes( value );
- textLine.append( ":" + value );
- }
+- TQString value( output );
++ TQCString value( output );
+ addEscapes( value );
+ textLine.append( ":" + value );
+ } else {
+- TQString value( (*lineIt).value().asString() );
++ TQCString value( (*lineIt).value().toString().utf8() );
+ addEscapes( value );
+ textLine.append( ":" + value );
+ }
Index: kabc/vcardparser/vcardparser.h
===================================================================
--- kabc/vcardparser/vcardparser.h.orig
+++ kabc/vcardparser/vcardparser.h
@@ -34,6 +34,9 @@ class VCardParser
- static VCard::List parseVCards( const QString& text );
- static QString createVCards( const VCard::List& list );
+ static VCard::List parseVCards( const TQString& text );
+ static TQString createVCards( const VCard::List& list );
-+ static VCard::List parseVCardsRaw( const QCString& text );
-+ static QCString createVCardsRaw( const VCard::List& list );
++ static VCard::List parseVCardsRaw( const TQCString& text );
++ static TQCString createVCardsRaw( const VCard::List& list );
+
private:
class VCardParserPrivate;
@@ -476,14 +476,14 @@ Index: kabc/vcardtool.cpp
}
-// TODO: make list a const&
-+QCString VCardTool::createVCardsRaw( Addressee::List list, VCard::Version version )
++TQCString VCardTool::createVCardsRaw( Addressee::List list, VCard::Version version )
+{
+ const VCard::List vCardList = createVCardsInternal( list, version );
+
+ return VCardParser::createVCardsRaw( vCardList );
+}
+
- QString VCardTool::createVCards( Addressee::List list, VCard::Version version )
+ TQString VCardTool::createVCards( Addressee::List list, VCard::Version version )
{
- VCard::List vCardList;
+ const VCard::List vCardList = createVCardsInternal( list, version );
@@ -500,10 +500,10 @@ Index: kabc/vcardtool.cpp
for ( addrIt = list.constBegin(); addrIt != listEnd; ++addrIt ) {
- VCard card;
+ KABC::VCard card;
- QStringList::ConstIterator strIt;
+ TQStringList::ConstIterator strIt;
// ADR + LABEL
-@@ -348,17 +361,30 @@ QString VCardTool::createVCards( Address
+@@ -351,17 +364,30 @@ QString VCardTool::createVCards( Address
vCardList.append( card );
}
@@ -511,14 +511,14 @@ Index: kabc/vcardtool.cpp
+ return vCardList;
+}
+
-+Addressee::List VCardTool::parseVCardsRaw( const QCString& vcard )
++Addressee::List VCardTool::parseVCardsRaw( const TQCString& vcard )
+{
+ const VCard::List vCardList = VCardParser::parseVCardsRaw( vcard );
+
+ return parseVCardsInternal( vCardList );
}
- Addressee::List VCardTool::parseVCards( const QString& vcard )
+ Addressee::List VCardTool::parseVCards( const TQString& vcard )
{
+ const VCard::List vCardList = VCardParser::parseVCards( vcard );
+
@@ -527,9 +527,9 @@ Index: kabc/vcardtool.cpp
+
+Addressee::List VCardTool::parseVCardsInternal( const VCard::List &vCardList )
+{
- static const QChar semicolonSep( ';' );
- static const QChar commaSep( ',' );
- QString identifier;
+ static const TQChar semicolonSep( ';' );
+ static const TQChar commaSep( ',' );
+ TQString identifier;
Addressee::List addrList;
- const VCard::List vCardList = VCardParser::parseVCards( vcard );
@@ -542,16 +542,16 @@ Index: kabc/vcardtool.h
+++ kabc/vcardtool.h
@@ -46,12 +46,19 @@ class KABC_EXPORT VCardTool
*/
- QString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 );
+ TQString createVCards( Addressee::List list, VCard::Version version = VCard::v3_0 );
-+ QCString createVCardsRaw( Addressee::List list, VCard::Version version = VCard::v3_0 );
++ TQCString createVCardsRaw( Addressee::List list, VCard::Version version = VCard::v3_0 );
+
/**
Parses the string and returns a list of addressee objects.
*/
- Addressee::List parseVCards( const QString& vcard );
+ Addressee::List parseVCards( const TQString& vcard );
-+ Addressee::List parseVCardsRaw( const QCString& vcard );
++ Addressee::List parseVCardsRaw( const TQCString& vcard );
+
private:
+ VCard::List createVCardsInternal( Addressee::List list, VCard::Version version );