From 3ca10fd9a2dc631429d3b5d5c5e42a7d211d5a12 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:50:21 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 libkmime/kmime_header_parsing.cpp | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'libkmime/kmime_header_parsing.cpp')

diff --git a/libkmime/kmime_header_parsing.cpp b/libkmime/kmime_header_parsing.cpp
index 59957f10b..adbf72fc1 100644
--- a/libkmime/kmime_header_parsing.cpp
+++ b/libkmime/kmime_header_parsing.cpp
@@ -39,7 +39,7 @@
 #include <kglobal.h>
 #include <kcharsets.h>
 
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqmap.h>
 #include <tqcstring.h>
 #include <tqstringlist.h>
@@ -256,7 +256,7 @@ bool parseAtom( const char * & scursor, const char * const send,
   TQPair<const char*,int> maybeResult;
 
   if ( parseAtom( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -296,7 +296,7 @@ bool parseToken( const char * & scursor, const char * const send,
   TQPair<const char*,int> maybeResult;
 
   if ( parseToken( scursor, send, maybeResult, allow8Bit ) ) {
-    result += TQString::tqfromLatin1( maybeResult.first, maybeResult.second );
+    result += TQString::fromLatin1( maybeResult.first, maybeResult.second );
     return true;
   }
 
@@ -1065,9 +1065,9 @@ bool parseAddressList( const char* & scursor, const char * const send,
 }
 
 
-static TQString asterisk = TQString::tqfromLatin1("*0*",1);
-static TQString asteriskZero = TQString::tqfromLatin1("*0*",2);
-//static TQString asteriskZeroAsterisk = TQString::tqfromLatin1("*0*",3);
+static TQString asterisk = TQString::fromLatin1("*0*",1);
+static TQString asteriskZero = TQString::fromLatin1("*0*",2);
+//static TQString asteriskZeroAsterisk = TQString::fromLatin1("*0*",3);
 
 bool parseParameter( const char* & scursor, const char * const send,
 		     TQPair<TQString,TQStringOrTQPair> & result, bool isCRLF ) {
@@ -1223,7 +1223,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
       // take the whole value to be in latin-1:
       KMIME_WARN << "No charset in extended-initial-value. "
 	"Assuming \"iso-8859-1\"." << endl;
-      value += TQString::tqfromLatin1( decBegin, source.second );
+      value += TQString::fromLatin1( decBegin, source.second );
       return;
     }
 
@@ -1263,7 +1263,7 @@ static void decodeRFC2231Value( Codec* & rfc2231Codec,
   }
 
   if ( !textcodec ) {
-    value += TQString::tqfromLatin1( decCursor, decEnd - decCursor );
+    value += TQString::fromLatin1( decCursor, decEnd - decCursor );
     return;
   }
 
@@ -1348,7 +1348,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded.
 	if ( (*it).qpair.first )
-	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
@@ -1377,7 +1377,7 @@ bool parseParameterList( const char* & scursor,	const char * const send,
       } else {
 	// not encoded
 	if ( (*it).qpair.first )
-	  value += TQString::tqfromLatin1( (*it).qpair.first, (*it).qpair.second );
+	  value += TQString::fromLatin1( (*it).qpair.first, (*it).qpair.second );
 	else
 	  value += (*it).qstring;
       }
-- 
cgit v1.2.1