From 4c6f8d69e2d1501837affb472c4eb8fec4462240 Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 10 Aug 2011 06:08:18 +0000
Subject: rename the following methods: tqfind find tqreplace replace
 tqcontains contains

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1246075 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 libemailfunctions/email.cpp    | 12 ++++++------
 libemailfunctions/idmapper.cpp | 10 +++++-----
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'libemailfunctions')

diff --git a/libemailfunctions/email.cpp b/libemailfunctions/email.cpp
index 78de8f8d..cf3e4196 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 ) + "\"";
   }
 
diff --git a/libemailfunctions/idmapper.cpp b/libemailfunctions/idmapper.cpp
index d90ad817..52cfeed8 100644
--- a/libemailfunctions/idmapper.cpp
+++ b/libemailfunctions/idmapper.cpp
@@ -98,7 +98,7 @@ bool IdMapper::save()
   TQMap<TQString, TQVariant>::Iterator it;
   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {
     TQString fingerprint( "" );
-    if ( mFingerprintMap.tqcontains( it.key() ) )
+    if ( mFingerprintMap.contains( it.key() ) )
       fingerprint = mFingerprintMap[ it.key() ];
     content += it.key() + "\x02\x02" + it.data().toString() + "\x02\x02" + fingerprint + "\r\n";
   }
@@ -117,7 +117,7 @@ void IdMapper::clear()
 
 void IdMapper::setRemoteId( const TQString &localId, const TQString &remoteId )
 {
-  mIdMap.tqreplace( localId, remoteId );
+  mIdMap.replace( localId, remoteId );
 }
 
 void IdMapper::removeRemoteId( const TQString &remoteId )
@@ -134,7 +134,7 @@ void IdMapper::removeRemoteId( const TQString &remoteId )
 TQString IdMapper::remoteId( const TQString &localId ) const
 {
   TQMap<TQString, TQVariant>::ConstIterator it;
-  it = mIdMap.tqfind( localId );
+  it = mIdMap.find( localId );
 
   if ( it != mIdMap.end() )
     return it.data().toString();
@@ -159,7 +159,7 @@ TQString IdMapper::asString() const
   TQMap<TQString, TQVariant>::ConstIterator it;
   for ( it = mIdMap.begin(); it != mIdMap.end(); ++it ) {
     TQString fp;
-    if ( mFingerprintMap.tqcontains( it.key() ) )
+    if ( mFingerprintMap.contains( it.key() ) )
       fp = mFingerprintMap[ it.key() ];
     content += it.key() + "\t" + it.data().toString() + "\t" + fp + "\r\n";
   }
@@ -174,7 +174,7 @@ void IdMapper::setFingerprint( const TQString &localId, const TQString &fingerpr
 
 const TQString& IdMapper::fingerprint( const TQString &localId ) const
 {
-  if ( mFingerprintMap.tqcontains( localId ) )
+  if ( mFingerprintMap.contains( localId ) )
     return mFingerprintMap[ localId ];
   else 
     return TQString();
-- 
cgit v1.2.3