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

1 files changed, 16 insertions, 16 deletions

diff --git a/libkpgp/kpgp.cpp b/libkpgp/kpgp.cpp
index 3abd1d79f..6035112c8 100644
--- a/libkpgp/kpgp.cpp
+++ b/libkpgp/kpgp.cpp
@@ -1044,7 +1044,7 @@ Module::prepareMessageForDecryption( const TQCString& msg,
     start = 0;
   else
   {
-    start = msg.tqfind( "\n-----BEGIN PGP" ) + 1;
+    start = msg.find( "\n-----BEGIN PGP" ) + 1;
     if( start == 0 )
     {
       nonPgpBlocks.append( msg );
@@ -1062,20 +1062,20 @@ Module::prepareMessageForDecryption( const TQCString& msg,
     else
       pgpBlock = UnknownBlock;
 
-    nextEnd = msg.tqfind( "\n-----END PGP", start + 15 );
+    nextEnd = msg.find( "\n-----END PGP", start + 15 );
     if( nextEnd == -1 )
     {
       nonPgpBlocks.append( msg.mid( lastEnd+1 ) );
       break;
     }
-    nextStart = msg.tqfind( "\n-----BEGIN PGP", start + 15 );
+    nextStart = msg.find( "\n-----BEGIN PGP", start + 15 );
 
     if( ( nextStart == -1 ) || ( nextEnd < nextStart ) ||
         ( pgpBlock == ClearsignedBlock ) )
     { // most likely we found a PGP block (but we don't check if it's valid)
       // store the preceding non-PGP block
       nonPgpBlocks.append( msg.mid( lastEnd+1, start-lastEnd-1 ) );
-      lastEnd = msg.tqfind( "\n", nextEnd + 14 );
+      lastEnd = msg.find( "\n", nextEnd + 14 );
       if( lastEnd == -1 )
       {
         pgpBlocks.append( new Block( msg.mid( start ) ) );
@@ -1086,7 +1086,7 @@ Module::prepareMessageForDecryption( const TQCString& msg,
       {
         pgpBlocks.append( new Block( msg.mid( start, lastEnd+1-start ) ) );
         if( ( nextStart != -1 ) && ( nextEnd > nextStart ) )
-          nextStart = msg.tqfind( "\n-----BEGIN PGP", lastEnd+1 );
+          nextStart = msg.find( "\n-----BEGIN PGP", lastEnd+1 );
       }
     }
 
@@ -1333,7 +1333,7 @@ Module::checkForPGP(void)
   havePgp=FALSE;
 
   path = getenv("PATH");
-  while((index = path.tqfind(":",lastindex+1)) != -1)
+  while((index = path.find(":",lastindex+1)) != -1)
   {
     pSearchPaths.append(path.mid(lastindex+1,index-lastindex-1));
     lastindex = index;
@@ -1487,12 +1487,12 @@ Module::canonicalAddress( const TQString& _adress )
   address = address.stripWhiteSpace();
 
   // just leave pure e-mail address.
-  if((index = address.tqfind("<")) != -1)
-    if((index2 = address.tqfind("@",index+1)) != -1)
-      if((index2 = address.tqfind(">",index2+1)) != -1)
+  if((index = address.find("<")) != -1)
+    if((index2 = address.find("@",index+1)) != -1)
+      if((index2 = address.find(">",index2+1)) != -1)
 	return address.mid(index,index2-index+1);
 
-  if((index = address.tqfind("@")) == -1)
+  if((index = address.find("@")) == -1)
   {
     // local address
     //char hostname[1024];
@@ -1502,8 +1502,8 @@ Module::canonicalAddress( const TQString& _adress )
   }
   else
   {
-    int index1 = address.tqfindRev(" ",index);
-    int index2 = address.tqfind(" ",index);
+    int index1 = address.findRev(" ",index);
+    int index2 = address.find(" ",index);
     if(index2 == -1) index2 = address.length();
     return "<" + address.mid(index1+1 ,index2-index1-1) + ">";
   }
@@ -1705,7 +1705,7 @@ Module::keysForAddress( const TQString& address )
     return KeyIDList();
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.tqcontains( addr ) ) {
+  if( addressDataDict.contains( addr ) ) {
     return addressDataDict[addr].keyIds;
   }
   else {
@@ -1720,7 +1720,7 @@ Module::setKeysForAddress( const TQString& address, const KeyIDList& keyIds )
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.tqcontains( addr ) ) {
+  if( addressDataDict.contains( addr ) ) {
     addressDataDict[addr].keyIds = keyIds;
   }
   else {
@@ -1782,7 +1782,7 @@ EncryptPref
 Module::encryptionPreference( const TQString& address )
 {
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.tqcontains( addr ) ) {
+  if( addressDataDict.contains( addr ) ) {
     return addressDataDict[addr].encrPref;
   }
   else {
@@ -1798,7 +1798,7 @@ Module::setEncryptionPreference( const TQString& address,
     return;
   }
   TQString addr = canonicalAddress( address ).lower();
-  if( addressDataDict.tqcontains( addr ) ) {
+  if( addressDataDict.contains( addr ) ) {
     addressDataDict[addr].encrPref = pref;
   }
   else {