summaryrefslogtreecommitdiffstats
path: root/kmail/kmaddrbook.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kmail/kmaddrbook.cpp')
-rw-r--r--kmail/kmaddrbook.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/kmail/kmaddrbook.cpp b/kmail/kmaddrbook.cpp
index 055b29fcc..8fdc5554c 100644
--- a/kmail/kmaddrbook.cpp
+++ b/kmail/kmaddrbook.cpp
@@ -56,18 +56,18 @@ void KabcBridge::addresses(TQStringList& result) // includes lists
for ( mit = emails.begin(); mit != emails.end(); ++mit ) {
email = *mit;
if (!email.isEmpty()) {
- if (n.isEmpty() || (email.find( '<' ) != -1))
- addr = TQString::null;
+ if (n.isEmpty() || (email.tqfind( '<' ) != -1))
+ addr = TQString();
else { // do we really need quotes around this name ?
- if (n.find(needQuotes) != -1)
+ if (n.tqfind(needQuotes) != -1)
addr = '"' + n + endQuote;
else
addr = n + ' ';
}
- if (!addr.isEmpty() && (email.find( '<' ) == -1)
- && (email.find( '>' ) == -1)
- && (email.find( ',' ) == -1))
+ if (!addr.isEmpty() && (email.tqfind( '<' ) == -1)
+ && (email.tqfind( '>' ) == -1)
+ && (email.tqfind( ',' ) == -1))
addr += '<' + email + '>';
else
addr += email;
@@ -99,7 +99,7 @@ TQStringList KabcBridge::addresses()
TQString KabcBridge::expandNickName( const TQString& nickName )
{
if ( nickName.isEmpty() )
- return TQString::null;
+ return TQString();
const TQString lowerNickName = nickName.lower();
const KABC::AddressBook *addressBook = KABC::StdAddressBook::self( true );
@@ -108,7 +108,7 @@ TQString KabcBridge::expandNickName( const TQString& nickName )
if ( (*it).nickName().lower() == lowerNickName )
return (*it).fullEmail();
}
- return TQString::null;
+ return TQString();
}
@@ -126,7 +126,7 @@ TQStringList KabcBridge::categories()
for ( TQStringList::ConstIterator itAux = aux.begin();
itAux != aux.end(); ++itAux ) {
// don't have duplicates in allcategories
- if ( allcategories.find( *itAux ) == allcategories.end() )
+ if ( allcategories.tqfind( *itAux ) == allcategories.end() )
allcategories += *itAux;
}
}