diff options
Diffstat (limited to 'kabc/kab2kabc.cpp')
-rw-r--r-- | kabc/kab2kabc.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/kabc/kab2kabc.cpp b/kabc/kab2kabc.cpp index f350371b5..2a3683597 100644 --- a/kabc/kab2kabc.cpp +++ b/kabc/kab2kabc.cpp @@ -19,7 +19,7 @@ */ #include <tqfile.h> -#include <textstream.h> +#include <tqtextstream.h> #include <kabapi.h> #include <kaboutdata.h> @@ -57,12 +57,12 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) TQString name; TQString comment; - if ( entry.at( entry.length() -1 ) == ')' ) { + if ( entry.tqat( entry.length() -1 ) == ')' ) { int br = entry.findRev( '(' ); if ( br >= 0 ) { comment = entry.mid( br + 1, entry.length() - br - 2 ); entry.truncate( br ); - if ( entry.at( entry.length() - 1 ).isSpace() ) { + if ( entry.tqat( entry.length() - 1 ).isSpace() ) { entry.truncate( br - 1 ); } } @@ -80,22 +80,22 @@ void readKMailEntry( const TQString &kmailEntry, KABC::AddressBook *ab ) name = entry.left( posSpace ); } - if ( email.at( 0 ) == '<' && email.at( email.length() - 1) == '>' ) { + if ( email.tqat( 0 ) == '<' && email.tqat( email.length() - 1) == '>' ) { email = email.mid( 1, email.length() - 2 ); } - if ( name.at( 0 ) == '"' && name.at( name.length() - 1) == '"' ) { + if ( name.tqat( 0 ) == '"' && name.tqat( name.length() - 1) == '"' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.at( 0 ) == '\'' && name.at( name.length() - 1) == '\'' ) { + if ( name.tqat( 0 ) == '\'' && name.tqat( name.length() - 1) == '\'' ) { name = name.mid( 1, name.length() - 2 ); } - if ( name.at( name.length() -1 ) == ')' ) { + if ( name.tqat( name.length() -1 ) == ')' ) { int br = name.findRev( '(' ); if ( br >= 0 ) { comment = name.mid( br + 1, name.length() - br - 2 ) + " " + comment; name.truncate( br ); - if ( name.at( name.length() - 1 ).isSpace() ) { + if ( name.tqat( name.length() - 1 ).isSpace() ) { name.truncate( br - 1 ); } } @@ -148,16 +148,16 @@ void importKMailAddressBook( KABC::AddressBook *ab ) TQStringList::ConstIterator it; for ( it = kmailEntries.begin(); it != kmailEntries.end(); ++it ) { - if ( (*it).at( 0 ) == '#' ) continue; + if ( (*it).tqat( 0 ) == '#' ) continue; bool insideQuote = false; int end = (*it).length() - 1; for ( int i = end; i; i-- ) { - if ( (*it).at( i ) == '"' ) { + if ( (*it).tqat( i ) == '"' ) { if ( insideQuote ) insideQuote = false; else insideQuote = true; - } else if ( (*it).at( i ) == ',' && !insideQuote ) { + } else if ( (*it).tqat( i ) == ',' && !insideQuote ) { readKMailEntry( (*it).mid( i + 1, end - i ), ab ); end = i - 1; } |