diff options
Diffstat (limited to 'kabc/addresslineedit.cpp')
| -rw-r--r-- | kabc/addresslineedit.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/kabc/addresslineedit.cpp b/kabc/addresslineedit.cpp index 8ac43081d..fe9d1f602 100644 --- a/kabc/addresslineedit.cpp +++ b/kabc/addresslineedit.cpp @@ -219,13 +219,13 @@ void AddressLineEdit::insert(const TQString &t) KURL u(newText); newText = u.path(); } - else if (newText.tqfind(" at ") != -1) + else if (newText.find(" at ") != -1) { // Anti-spam stuff newText.replace( " at ", "@" ); newText.replace( " dot ", "." ); } - else if (newText.tqfind("(at)") != -1) + else if (newText.find("(at)") != -1) { newText.replace( TQRegExp("\\s*\\(at\\)\\s*"), "@" ); } @@ -293,7 +293,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) TQString prevAddr; TQString s(text()); - int n = s.tqfindRev(','); + int n = s.findRev(','); if (n >= 0) { @@ -343,7 +343,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) items += s_completion->substringCompletion( '<' + s ); uint beforeDollarCompletionCount = items.count(); - if( s.tqfind( ' ' ) == -1 ) // one word, possibly given name + if( s.find( ' ' ) == -1 ) // one word, possibly given name items += s_completion->allMatches( "$$" + s ); if ( !items.isEmpty() ) @@ -355,7 +355,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) it != items.end(); ++it ) { - int pos = (*it).tqfind( '$', 2 ); + int pos = (*it).find( '$', 2 ); if( pos < 0 ) // ??? continue; (*it)=(*it).mid( pos + 1 ); @@ -373,7 +373,7 @@ void AddressLineEdit::doCompletion(bool ctrlT) if (!autoSuggest) { - int index = items.first().tqfind( s ); + int index = items.first().find( s ); TQString newText = prevAddr + items.first().mid( index ); //kdDebug() << "OLD TEXT: " << text() << endl; //kdDebug() << "NEW TEXT: " << newText << endl; @@ -437,11 +437,11 @@ void AddressLineEdit::loadAddresses() void AddressLineEdit::addAddress( const TQString& adr ) { s_completion->addItem( adr ); - int pos = adr.tqfind( '<' ); + int pos = adr.find( '<' ); if( pos >= 0 ) { ++pos; - int pos2 = adr.tqfind( pos, '>' ); + int pos2 = adr.find( pos, '>' ); if( pos2 >= 0 ) s_completion->addItem( adr.mid( pos, pos2 - pos )); } @@ -465,7 +465,7 @@ void AddressLineEdit::startLoadingLDAPEntries() TQString s( *s_LDAPText ); // TODO cache last? TQString prevAddr; - int n = s.tqfindRev(','); + int n = s.findRev(','); if (n>= 0) { prevAddr = s.left(n+1) + ' '; @@ -484,8 +484,8 @@ void AddressLineEdit::slotLDAPSearchData( const TQStringList& adrs ) return; for( TQStringList::ConstIterator it = adrs.begin(); it != adrs.end(); ++it ) { TQString name(*it); - int pos = name.tqfind( " <" ); - int pos_comma = name.tqfind( ',' ); + int pos = name.find( " <" ); + int pos_comma = name.find( ',' ); // put name in quotes, if we have a comma in the name if (pos>0 && pos_comma>0 && pos_comma<pos) { name.insert(pos, '\"'); @@ -577,18 +577,18 @@ TQStringList AddressLineEdit::addresses() for ( mit = emails.begin(); mit != emails.end(); ++mit ) { email = *mit; if (!email.isEmpty()) { - if (n.isEmpty() || (email.tqfind( '<' ) != -1)) + if (n.isEmpty() || (email.find( '<' ) != -1)) addr = TQString::null; else { /* do we really need quotes around this name ? */ - if (n.tqfind(needQuotes) != -1) + if (n.find(needQuotes) != -1) addr = '"' + n + endQuote; else addr = n + space; } - if (!addr.isEmpty() && (email.tqfind( '<' ) == -1) - && (email.tqfind( '>' ) == -1) - && (email.tqfind( ',' ) == -1)) + if (!addr.isEmpty() && (email.find( '<' ) == -1) + && (email.find( '>' ) == -1) + && (email.find( ',' ) == -1)) addr += '<' + email + '>'; else addr += email; |