1 files changed, 6 insertions, 6 deletions
diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index 78de8f8de..cf3e4196b 100644
--- a/libemailfunctions/email.cpp
+++ b/libemailfunctions/email.cpp
@@ -300,7 +300,7 @@ KPIM::EmailParseResult KPIM::isValidEmailAddress( const TQString& aStr )
 
   bool tooManyAtsFlag = false;
 
-  int atCount = aStr.tqcontains('@');
+  int atCount = aStr.contains('@');
   if ( atCount > 1 ) {
     tooManyAtsFlag = true;;
   } else if ( atCount == 0 ) {
@@ -524,12 +524,12 @@ bool KPIM::isValidSimpleEmailAddress( const TQString& aStr )
     return false;
   }
 
-  int atChar = aStr.tqfindRev( '@' );
+  int atChar = aStr.findRev( '@' );
   TQString domainPart = aStr.mid( atChar + 1);
   TQString localPart = aStr.left( atChar );
   bool tooManyAtsFlag = false;
   bool inQuotedString = false;
-  int atCount = localPart.tqcontains( '@' );
+  int atCount = localPart.contains( '@' );
 
   unsigned int strlen = localPart.length();
   for ( unsigned int index=0; index < strlen; index++ ) {
@@ -832,7 +832,7 @@ TQString KPIM::normalizedAddress( const TQString & displayName,
 //-----------------------------------------------------------------------------
 TQString KPIM::decodeIDN( const TQString & addrSpec )
 {
-  const int atPos = addrSpec.tqfindRev( '@' );
+  const int atPos = addrSpec.findRev( '@' );
   if ( atPos == -1 )
     return addrSpec;
 
@@ -847,7 +847,7 @@ TQString KPIM::decodeIDN( const TQString & addrSpec )
 //-----------------------------------------------------------------------------
 TQString KPIM::encodeIDN( const TQString & addrSpec )
 {
-  const int atPos = addrSpec.tqfindRev( '@' );
+  const int atPos = addrSpec.findRev( '@' );
   if ( atPos == -1 )
     return addrSpec;
 
@@ -979,7 +979,7 @@ TQString KPIM::quoteNameIfNecessary( const TQString &str )
   if ( ( quoted[0] == '"' ) && ( quoted[quoted.length() - 1] == '"' ) ) {
     quoted = "\"" + escapeQuotes( quoted.mid( 1, quoted.length() - 2 ) ) + "\"";
   }
-  else if ( quoted.tqfind( needQuotes ) != -1 ) {
+  else if ( quoted.find( needQuotes ) != -1 ) {
     quoted = "\"" + escapeQuotes( quoted ) + "\"";
   }