summaryrefslogtreecommitdiffstats
path: root/kabc/vcardparser
diff options
context:
space:
mode:
Diffstat (limited to 'kabc/vcardparser')
-rw-r--r--kabc/vcardparser/vcardline.cpp2
-rw-r--r--kabc/vcardparser/vcardparser.cpp8
2 files changed, 5 insertions, 5 deletions
diff --git a/kabc/vcardparser/vcardline.cpp b/kabc/vcardparser/vcardline.cpp
index dc43056cd..50e9fa53e 100644
--- a/kabc/vcardparser/vcardline.cpp
+++ b/kabc/vcardparser/vcardline.cpp
@@ -124,7 +124,7 @@ TQStringList VCardLine::parameterList() const
void VCardLine::addParameter( const TQString& param, const TQString& value )
{
TQStringList &list = mParamMap[ param ];
- if ( list.findIndex( value ) == -1 ) // not included yet
+ if ( list.tqfindIndex( value ) == -1 ) // not included yet
list.append( value );
}
diff --git a/kabc/vcardparser/vcardparser.cpp b/kabc/vcardparser/vcardparser.cpp
index 5fe6b3154..35d48f77c 100644
--- a/kabc/vcardparser/vcardparser.cpp
+++ b/kabc/vcardparser/vcardparser.cpp
@@ -134,7 +134,7 @@ VCard::List VCardParser::parseVCards( const TQString& text )
bool wasBase64Encoded = false;
params = vCardLine.parameterList();
- if ( params.findIndex( "encoding" ) != -1 ) { // have to decode the data
+ if ( params.tqfindIndex( "encoding" ) != -1 ) { // have to decode the data
TQByteArray input;
input = TQCString(value.latin1());
if ( vCardLine.parameter( "encoding" ).lower() == "b" ||
@@ -155,18 +155,18 @@ VCard::List VCardParser::parseVCards( const TQString& text )
output = TQCString(value.latin1());
}
- if ( params.findIndex( "charset" ) != -1 ) { // have to convert the data
+ if ( params.tqfindIndex( "charset" ) != -1 ) { // have to convert the data
TQTextCodec *codec =
TQTextCodec::codecForName( vCardLine.parameter( "charset" ).latin1() );
if ( codec ) {
vCardLine.setValue( codec->toUnicode( output ) );
} else {
- vCardLine.setValue( TQString::fromUtf8( output ) );
+ vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
}
} else if ( wasBase64Encoded ) {
vCardLine.setValue( output );
} else { // if charset not given, assume it's in UTF-8 (as used in previous KDE versions)
- vCardLine.setValue( TQString::fromUtf8( output ) );
+ vCardLine.setValue( TQString(TQString::fromUtf8( output )) );
}
currentVCard.addLine( vCardLine );