1 files changed, 15 insertions, 15 deletions

diff --git a/kmail/templateparser.cpp b/kmail/templateparser.cpp
index 26355ac5b..d497f1846 100644
--- a/kmail/templateparser.cpp
+++ b/kmail/templateparser.cpp
@@ -126,7 +126,7 @@ TQString TemplateParser::getFName( const TQString &str )
   // last resort -- return 'name' from 'name@domain'
   int sep_pos;
   TQString res;
-  if ( ( sep_pos = str.find( '@' ) ) > 0 ) {
+  if ( ( sep_pos = str.tqfind( '@' ) ) > 0 ) {
     int i;
     for ( i = (sep_pos - 1); i >= 0; --i ) {
       TQChar c = str[i];
@@ -136,7 +136,7 @@ TQString TemplateParser::getFName( const TQString &str )
         break;
       }
     }
-  } else if ( ( sep_pos = str.find(',') ) > 0 ) {
+  } else if ( ( sep_pos = str.tqfind(',') ) > 0 ) {
     unsigned int i;
     bool begin = false;
     for ( i = sep_pos; i < str.length(); ++i ) {
@@ -169,7 +169,7 @@ TQString TemplateParser::getLName( const TQString &str )
   // else format is 'First Last'
   int sep_pos;
   TQString res;
-  if ( ( sep_pos = str.find(',') ) > 0 ) {
+  if ( ( sep_pos = str.tqfind(',') ) > 0 ) {
     int i;
     for ( i = sep_pos; i >= 0; --i ) {
       TQChar c = str[i];
@@ -180,7 +180,7 @@ TQString TemplateParser::getLName( const TQString &str )
       }
     }
   } else {
-    if ( ( sep_pos = str.find( ' ' ) ) > 0 ) {
+    if ( ( sep_pos = str.tqfind( ' ' ) ) > 0 ) {
       unsigned int i;
       bool begin = false;
       for ( i = sep_pos; i < str.length(); ++i ) {
@@ -297,11 +297,11 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
                               arg( path ).arg(file.errorString() ));
         }
 
-      } else if ( cmd.startsWith( "QUOTEPIPE=" ) ) {
+      } else if ( cmd.startsWith( "TQUOTEPIPE=" ) ) {
         // pipe message body throw command and insert it as quotation
-        kdDebug() << "Command: QUOTEPIPE=" << endl;
+        kdDebug() << "Command: TQUOTEPIPE=" << endl;
         TQString q;
-        int len = parseQuotes( "QUOTEPIPE=", cmd, q );
+        int len = parseQuotes( "TQUOTEPIPE=", cmd, q );
         i += len;
         TQString pipe_cmd = q;
         if ( mOrigMsg ) {
@@ -311,18 +311,18 @@ void TemplateParser::processWithTemplate( const TQString &tmpl )
           body.append( quote );
         }
 
-      } else if ( cmd.startsWith( "QUOTE" ) ) {
-        kdDebug() << "Command: QUOTE" << endl;
-        i += strlen( "QUOTE" );
+      } else if ( cmd.startsWith( "TQUOTE" ) ) {
+        kdDebug() << "Command: TQUOTE" << endl;
+        i += strlen( "TQUOTE" );
         if ( mOrigMsg ) {
           TQString quote = mOrigMsg->asQuotedString( "", mQuoteString, messageText( true ),
                                                     shouldStripSignature(), mAllowDecryption );
           body.append( quote );
         }
 
-      } else if ( cmd.startsWith( "QHEADERS" ) ) {
-        kdDebug() << "Command: QHEADERS" << endl;
-        i += strlen( "QHEADERS" );
+      } else if ( cmd.startsWith( "TQHEADERS" ) ) {
+        kdDebug() << "Command: TQHEADERS" << endl;
+        i += strlen( "TQHEADERS" );
         if ( mOrigMsg ) {
           TQString quote = mOrigMsg->asQuotedString( "", mQuoteString,
                                                     mOrigMsg->headerAsSendableString(),
@@ -1004,10 +1004,10 @@ TQString TemplateParser::findTemplate()
   TQString tmpl;
 
   if ( !mFolder ) { // find folder message belongs to
-    mFolder = mMsg->parent();
+    mFolder = mMsg->tqparent();
     if ( !mFolder ) {
       if ( mOrigMsg ) {
-        mFolder = mOrigMsg->parent();
+        mFolder = mOrigMsg->tqparent();
       }
       if ( !mFolder ) {
         kdDebug(5006) << "Oops! No folder for message" << endl;