Undo prior accidental commit

13 files changed, 156 insertions, 156 deletions

diff --git a/src/codecs/qbig5codec.cpp b/src/codecs/qbig5codec.cpp
index dd71604..d961dbf 100644
--- a/src/codecs/qbig5codec.cpp
+++ b/src/codecs/qbig5codec.cpp
@@ -531,7 +531,7 @@ static int qt_UnicodeToBig5(ushort ch, uchar *buf)
 int QBig5Codec::mibEnum() const
 {
     /* See http://www.iana.org/assignments/character-sets */
-    //tqDebug("QBig5Codec::mibEnum() = 2026");
+    //qDebug("QBig5Codec::mibEnum() = 2026");
     return 2026;
 }
 
@@ -539,7 +539,7 @@ int QBig5Codec::mibEnum() const
 /*! \reimp */
 const char* QBig5Codec::name() const
 {
-    //tqDebug("QBig5Codec::name() = \"Big5\"");
+    //qDebug("QBig5Codec::name() = \"Big5\"");
     return "Big5";
 }
 
@@ -554,7 +554,7 @@ public:
 
     QString toUnicode(const char* chars, int len)
     {
-	//tqDebug("QBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QBig5Decoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	QString result;
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
@@ -599,7 +599,7 @@ public:
 /*! \reimp */
 QTextDecoder* QBig5Codec::makeDecoder() const
 {
-    //tqDebug("QBig5Codec::makeDecoder()");
+    //qDebug("QBig5Codec::makeDecoder()");
     return new QBig5Decoder();
 }
 
@@ -607,7 +607,7 @@ QTextDecoder* QBig5Codec::makeDecoder() const
 /*! \reimp */
 QCString QBig5Codec::fromUnicode(const QString& uc, int& lenInOut) const
 {
-    //tqDebug("QBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     int l = QMIN((int)uc.length(),lenInOut);
     int rlen = l*3+1;
     QCString rstr(rlen);
@@ -639,7 +639,7 @@ QCString QBig5Codec::fromUnicode(const QString& uc, int& lenInOut) const
 /*! \reimp */
 QString QBig5Codec::toUnicode(const char* chars, int len) const
 {
-    //tqDebug("QBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len);
+    //qDebug("QBig5Codec::toUnicode(const char* chars \"%s\", int len = %d)", chars, len);
     QString result;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -677,7 +677,7 @@ QString QBig5Codec::toUnicode(const char* chars, int len) const
 /*! \reimp */
 int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 {
-    //tqDebug("QBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QBig5Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
     int score = 0;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -705,7 +705,7 @@ int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 	    return -1;
 	}
     }
-    //tqDebug("QBig5Codec::heuristicContentMatch() score = %d", score);
+    //qDebug("QBig5Codec::heuristicContentMatch() score = %d", score);
     return score;
 }
 
@@ -713,15 +713,15 @@ int QBig5Codec::heuristicContentMatch(const char* chars, int len) const
 /*! \reimp */
 int QBig5Codec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    //qDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
     int score = 0;
     bool zh = FALSE;
-    if (tqstrnicmp(hint, "zh_TW", 5) == 0) {
+    if (qstrnicmp(hint, "zh_TW", 5) == 0) {
 	score += 16;
 	zh = TRUE;
     }
-    else if ( tqstrnicmp(hint, "zh", 2) == 0     ||
-	      tqstrnicmp(hint, "chinese", 7) == 0) {
+    else if ( qstrnicmp(hint, "zh", 2) == 0     ||
+	      qstrnicmp(hint, "chinese", 7) == 0) {
 	score += 2;
 	zh = TRUE;
     }
@@ -735,11 +735,11 @@ int QBig5Codec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ( tqstricmp(p, "Big5") == 0    ||
-	     tqstricmp(p, "TW-Big5") == 0 ) {
+	if ( qstricmp(p, "Big5") == 0    ||
+	     qstricmp(p, "TW-Big5") == 0 ) {
 	    return score + 10;
         }
-	else if ( tqstrnicmp(p, "Big5", 4) == 0 )
+	else if ( qstrnicmp(p, "Big5", 4) == 0 )
 	    return score + 2;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -817,7 +817,7 @@ int QBig5hkscsCodec::mibEnum() const
 {
     /* See http://www.iana.org/assignments/character-sets         */
     /*     http://www.iana.org/assignments/charset-reg/Big5-HKSCS */
-    //tqDebug("QBig5hkscsCodec::mibEnum() = 2101");
+    //qDebug("QBig5hkscsCodec::mibEnum() = 2101");
     return 2101;
 }
 
@@ -825,7 +825,7 @@ int QBig5hkscsCodec::mibEnum() const
 /*! \reimp */
 const char* QBig5hkscsCodec::name() const
 {
-    //tqDebug("QBig5hkscsCodec::name() = \"Big5-HKSCS\"");
+    //qDebug("QBig5hkscsCodec::name() = \"Big5-HKSCS\"");
     return "Big5-HKSCS";
 }
 
@@ -840,7 +840,7 @@ public:
 
     QString toUnicode(const char* chars, int len)
     {
-	//tqDebug("QBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QBig5hkscsDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	QString result;
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
@@ -885,7 +885,7 @@ public:
 /*! \reimp */
 QTextDecoder* QBig5hkscsCodec::makeDecoder() const
 {
-    //tqDebug("QBig5hkscsCodec::makeDecoder()");
+    //qDebug("QBig5hkscsCodec::makeDecoder()");
     return new QBig5hkscsDecoder();
 }
 
@@ -893,7 +893,7 @@ QTextDecoder* QBig5hkscsCodec::makeDecoder() const
 /*! \reimp */
 QCString QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut) const
 {
-    //tqDebug("QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     int l = QMIN((int)uc.length(),lenInOut);
     int rlen = l*3+1;
     QCString rstr(rlen);
@@ -922,7 +922,7 @@ QCString QBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut) const
 /*! \reimp */
 QString QBig5hkscsCodec::toUnicode(const char* chars, int len) const
 {
-    //tqDebug("QBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+    //qDebug("QBig5hkscsCodec::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
     QString result;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -960,15 +960,15 @@ QString QBig5hkscsCodec::toUnicode(const char* chars, int len) const
 /*! \reimp */
 int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    //qDebug("QBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
     int score = 0;
     bool zh = FALSE;
-    if (tqstrnicmp(hint, "zh_HK", 5) == 0) {
+    if (qstrnicmp(hint, "zh_HK", 5) == 0) {
 	score += 16;
 	zh = TRUE;
     }
-    else if ( tqstrnicmp(hint, "zh", 2) == 0     ||
-	      tqstrnicmp(hint, "chinese", 7) == 0) {
+    else if ( qstrnicmp(hint, "zh", 2) == 0     ||
+	      qstrnicmp(hint, "chinese", 7) == 0) {
 	score += 2;
 	zh = TRUE;
     }
@@ -982,13 +982,13 @@ int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ( tqstricmp(p, "Big5-HKSCS") == 0 ||
-	     tqstricmp(p, "HKSCS-Big5") == 0 ||
-	     tqstricmp(p, "Big5HKSCS")  == 0 ||
-	     tqstricmp(p, "hkbig5")     == 0 ) {
+	if ( qstricmp(p, "Big5-HKSCS") == 0 ||
+	     qstricmp(p, "HKSCS-Big5") == 0 ||
+	     qstricmp(p, "Big5HKSCS")  == 0 ||
+	     qstricmp(p, "hkbig5")     == 0 ) {
 	    return score + 10;
         }
-	else if (tqstrnicmp(p, "Big5", 4) == 0) {
+	else if (qstrnicmp(p, "Big5", 4) == 0) {
 	    return score + 2;
         }
     }
@@ -999,7 +999,7 @@ int QBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const
 {
-    //tqDebug("QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len = %d)", len);
     int score = 0;
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
@@ -1027,7 +1027,7 @@ int QBig5hkscsCodec::heuristicContentMatch(const char* chars, int len) const
 	    return -1;
 	}
     }
-    //tqDebug("QBig5hkscsCodec::heuristicContentMatch() score = %d", score);
+    //qDebug("QBig5hkscsCodec::heuristicContentMatch() score = %d", score);
     return score;
 }
 
diff --git a/src/codecs/qeucjpcodec.cpp b/src/codecs/qeucjpcodec.cpp
index 7d9ab92..ca3d465 100644
--- a/src/codecs/qeucjpcodec.cpp
+++ b/src/codecs/qeucjpcodec.cpp
@@ -302,10 +302,10 @@ int QEucJpCodec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -320,16 +320,16 @@ int QEucJpCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "AJEC") == 0) ||
-	    (tqstricmp(p, "eucJP") == 0) ||
-	    (tqstricmp(p, "ujis") == 0) ||
+	if ((qstricmp(p, "AJEC") == 0) ||
+	    (qstricmp(p, "eucJP") == 0) ||
+	    (qstricmp(p, "ujis") == 0) ||
 	    (simpleHeuristicNameMatch(p, "eucJP") > 0) ||
 	    (simpleHeuristicNameMatch(p, "x-euc-jp") > 0)) {
 	    return score + 4;
 	}
 	// there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC
 	// so "euc" may or may not be Japanese EUC.
-	if (tqstricmp(p, "euc") == 0 && ja) {
+	if (qstricmp(p, "euc") == 0 && ja) {
 	    return score + 4;
 	}
     }
diff --git a/src/codecs/qeuckrcodec.cpp b/src/codecs/qeuckrcodec.cpp
index 18efec7..fe06159 100644
--- a/src/codecs/qeuckrcodec.cpp
+++ b/src/codecs/qeuckrcodec.cpp
@@ -212,11 +212,11 @@ int QEucKrCodec::heuristicNameMatch(const char* hint) const
 {
   int score = 0;
   bool ko = FALSE;
-  if (tqstrnicmp(hint, "ko_KR", 5) == 0 ||
-      tqstrnicmp(hint, "korean", 5) == 0) {
+  if (qstrnicmp(hint, "ko_KR", 5) == 0 ||
+      qstrnicmp(hint, "korean", 5) == 0) {
     score += 3;
     ko = TRUE;
-  } else if (tqstrnicmp(hint, "ko", 2) == 0) {
+  } else if (qstrnicmp(hint, "ko", 2) == 0) {
     score += 2;
     ko = TRUE;
   }
@@ -231,10 +231,10 @@ int QEucKrCodec::heuristicNameMatch(const char* hint) const
     p = hint;
   }
   if (p) {
-    if (tqstricmp(p, "eucKR") == 0) {
+    if (qstricmp(p, "eucKR") == 0) {
       return score + 4;
     }
-    else if (tqstricmp(p, "euc") == 0 && ko) {
+    else if (qstricmp(p, "euc") == 0 && ko) {
       return score + 4;
     }
   }
diff --git a/src/codecs/qfontcncodec.cpp b/src/codecs/qfontcncodec.cpp
index 70cb846..0dca8bb 100644
--- a/src/codecs/qfontcncodec.cpp
+++ b/src/codecs/qfontcncodec.cpp
@@ -55,20 +55,20 @@ int QFontGb2312Codec::heuristicContentMatch(const char *, int) const
 
 QFontGb2312Codec::QFontGb2312Codec()
 {
-    //tqDebug("QFontGb2312Codec::QFontGb2312Codec()");
+    //qDebug("QFontGb2312Codec::QFontGb2312Codec()");
 }
 
 
 const char* QFontGb2312Codec::name() const
 {
-    //tqDebug("QFontGb2312Codec::name() = \"gb2312.1980-0\"");
+    //qDebug("QFontGb2312Codec::name() = \"gb2312.1980-0\"");
     return "gb2312.1980-0";
 }
 
 
 int QFontGb2312Codec::mibEnum() const
 {
-    //tqDebug("QFontGb2312Codec::mibEnum() = 57");
+    //qDebug("QFontGb2312Codec::mibEnum() = 57");
     return 57;
 }
 
@@ -93,7 +93,7 @@ QCString QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut ) const
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	uchar buf[8];
@@ -137,7 +137,7 @@ bool QFontGb2312Codec::canEncode( QChar ch ) const
 {
     uchar buf[4];
     int len = qt_UnicodeToGbk( ch.unicode(), buf );
-    //tqDebug("QFontGb2312Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGb2312Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return ( len == 2 && buf[0] > 0xa0 && buf[1] > 0xa0 );
 }
 
@@ -152,29 +152,29 @@ int QFontGbkCodec::heuristicContentMatch(const char *, int) const
 
 int QFontGbkCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "gbk-0") == 0 ||
-	     tqstricmp(hint, "gb18030.2000-0") == 0 )
+    //qDebug("QFontGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "gbk-0") == 0 ||
+	     qstricmp(hint, "gb18030.2000-0") == 0 )
         ? 13 : 0;
 }
 
 
 QFontGbkCodec::QFontGbkCodec()
 {
-    //tqDebug("QFontGbkCodec::QFontGbkCodec()");
+    //qDebug("QFontGbkCodec::QFontGbkCodec()");
 }
 
 
 const char* QFontGbkCodec::name() const
 {
-    //tqDebug("QFontGbkCodec::name() = \"gbk-0\"");
+    //qDebug("QFontGbkCodec::name() = \"gbk-0\"");
     return "gbk-0";
 }
 
 
 int QFontGbkCodec::mibEnum() const
 {
-    //tqDebug("QFontGbkCodec::mibEnum() = -113");
+    //qDebug("QFontGbkCodec::mibEnum() = -113");
     return -113;
 }
 
@@ -199,7 +199,7 @@ QCString QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut ) const
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	uchar buf[8];
@@ -236,7 +236,7 @@ bool QFontGbkCodec::canEncode( QChar ch ) const
         return TRUE;
     uchar buf[4];
     int len = qt_UnicodeToGbk( ch.unicode(), buf );
-    //tqDebug("QFontGbkCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGbkCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return ( len == 2 );
 }
 
@@ -250,20 +250,20 @@ int QFontGb18030_0Codec::heuristicContentMatch(const char *, int) const
 
 QFontGb18030_0Codec::QFontGb18030_0Codec()
 {
-    //tqDebug("QFontGb18030_0Codec::QFontGb18030_0Codec()");
+    //qDebug("QFontGb18030_0Codec::QFontGb18030_0Codec()");
 }
 
 
 const char* QFontGb18030_0Codec::name() const
 {
-    //tqDebug("QFontGb18030_0Codec::name() = \"gb18030-0\"");
+    //qDebug("QFontGb18030_0Codec::name() = \"gb18030-0\"");
     return "gb18030-0";
 }
 
 
 int QFontGb18030_0Codec::mibEnum() const
 {
-    //tqDebug("QFontGb18030_0Codec::mibEnum() = -114");
+    //qDebug("QFontGb18030_0Codec::mibEnum() = -114");
     return -114;
 }
 
@@ -288,7 +288,7 @@ QCString QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut ) con
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
 
-    //tqDebug("QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontGb18030_0Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for ( int i = 0; i < lenInOut; i++ ) {
 	QChar ch(*ucp++);
 	if (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0)) {
@@ -317,7 +317,7 @@ void QFontGb18030_0Codec::fromUnicode(const QChar *in, unsigned short *out, int
 
 bool QFontGb18030_0Codec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontGb18030_0Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontGb18030_0Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     return (ch.row () > 0 && !(ch.row () >= 0xd8 && ch.row () < 0xe0));
 }
 
diff --git a/src/codecs/qfonthkcodec.cpp b/src/codecs/qfonthkcodec.cpp
index 9a229db..a0d32dd 100644
--- a/src/codecs/qfonthkcodec.cpp
+++ b/src/codecs/qfonthkcodec.cpp
@@ -54,29 +54,29 @@ int QFontBig5hkscsCodec::heuristicContentMatch(const char *, int) const
 
 int QFontBig5hkscsCodec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "big5hkscs-0") == 0 ||
-	     tqstricmp(hint, "hkscs-1") == 0 )
+    //qDebug("QFontBig5hkscsCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "big5hkscs-0") == 0 ||
+	     qstricmp(hint, "hkscs-1") == 0 )
 	? 13 : 0;
 }
 
 
 QFontBig5hkscsCodec::QFontBig5hkscsCodec()
 {
-    //tqDebug("QFontBig5hkscsCodec::QFontBig5hkscsCodec()");
+    //qDebug("QFontBig5hkscsCodec::QFontBig5hkscsCodec()");
 }
 
 
 const char* QFontBig5hkscsCodec::name() const
 {
-    //tqDebug("QFontBig5hkscsCodec::name() = \"big5hkscs-0\"");
+    //qDebug("QFontBig5hkscsCodec::name() = \"big5hkscs-0\"");
     return "big5hkscs-0";
 }
 
 
 int QFontBig5hkscsCodec::mibEnum() const
 {
-    //tqDebug("QFontBig5hkscsCodec::mibEnum() = -2101");
+    //qDebug("QFontBig5hkscsCodec::mibEnum() = -2101");
     return -2101;
 }
 
@@ -97,7 +97,7 @@ QFontBig5hkscsCodec::characterFromUnicode(const QString &str, int pos) const
 
 QCString QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut ) const
 {
-    //tqDebug("QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontBig5hkscsCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     QCString result(lenInOut * 2 + 1);
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
@@ -151,7 +151,7 @@ void QFontBig5hkscsCodec::fromUnicode(const QChar *in, unsigned short *out, int
 
 bool QFontBig5hkscsCodec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontBig5hkscsCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontBig5hkscsCodec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     uchar c[2];
     return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 );
 }
diff --git a/src/codecs/qfonttwcodec.cpp b/src/codecs/qfonttwcodec.cpp
index 1ffa161..050930d 100644
--- a/src/codecs/qfonttwcodec.cpp
+++ b/src/codecs/qfonttwcodec.cpp
@@ -54,29 +54,29 @@ int QFontBig5Codec::heuristicContentMatch(const char *, int) const
 
 int QFontBig5Codec::heuristicNameMatch(const char* hint) const
 {
-    //tqDebug("QFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    return ( tqstricmp(hint, "big5-0") == 0 ||
-	     tqstricmp(hint, "big5.eten-0") == 0 )
+    //qDebug("QFontBig5Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    return ( qstricmp(hint, "big5-0") == 0 ||
+	     qstricmp(hint, "big5.eten-0") == 0 )
 	? 13 : 0;
 }
 
 
 QFontBig5Codec::QFontBig5Codec()
 {
-    //tqDebug("QFontBig5Codec::QFontBig5Codec()");
+    //qDebug("QFontBig5Codec::QFontBig5Codec()");
 }
 
 
 const char* QFontBig5Codec::name() const
 {
-    //tqDebug("QFontBig5Codec::name() = \"big5-0\"");
+    //qDebug("QFontBig5Codec::name() = \"big5-0\"");
     return "big5-0";
 }
 
 
 int QFontBig5Codec::mibEnum() const
 {
-    //tqDebug("QFontBig5Codec::mibEnum() = -2026");
+    //qDebug("QFontBig5Codec::mibEnum() = -2026");
     return -2026;
 }
 
@@ -97,7 +97,7 @@ unsigned short QFontBig5Codec::characterFromUnicode(const QString &str, int pos)
 
 QCString QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut ) const
 {
-    //tqDebug("QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QFontBig5Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     QCString result(lenInOut * 2 + 1);
     uchar *rdata = (uchar *) result.data();
     const QChar *ucp = uc.unicode();
@@ -152,7 +152,7 @@ void QFontBig5Codec::fromUnicode(const QChar *in, unsigned short *out, int lengt
 
 bool QFontBig5Codec::canEncode( QChar ch ) const
 {
-    //tqDebug("QFontBig5Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
+    //qDebug("QFontBig5Codec::canEncode( QChar ch = %02X%02X )", ch.row(), ch.cell());
     uchar c[2];
     return ( qt_UnicodeToBig5hkscs( ch.unicode(), c ) == 2 &&
 	 c[0] >= 0xa1 && c[0] <= 0xf9 );
diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index ee99916..fe7b1e5 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -161,7 +161,7 @@ QGb18030Codec::QGb18030Codec()
 /*! \reimp */
 const char* QGb18030Codec::name() const
 {
-    //tqDebug("QGb18030Codec::name() = \"GB18030\"");
+    //qDebug("QGb18030Codec::name() = \"GB18030\"");
     return "GB18030";
 }
 
@@ -179,7 +179,7 @@ QCString QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QGb18030Codec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	int len;
@@ -231,7 +231,7 @@ QString QGb18030Codec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGb18030Codec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGb18030Codec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
@@ -274,8 +274,8 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGb18030Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -289,7 +289,7 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-    	if (tqstricmp(p, "GB18030") == 0)
+    	if (qstricmp(p, "GB18030") == 0)
       	    return score + 14;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -299,7 +299,7 @@ int QGb18030Codec::heuristicNameMatch(const char* hint) const
 int QGb18030Codec::heuristicContentMatch(const char* chars, int len) const
 {
     int score = 0;
-    //tqDebug("QGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
+    //qDebug("QGb18030Codec::heuristicContentMatch(const char* chars, int len = %d)", len);
     for (int i=0; i<len; i++) {
 	uchar ch = chars[i];
 	// No nulls allowed.
@@ -351,7 +351,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	//tqDebug("QGb18030Decoder::toUnicode(const char* chars, int len = %d)", len);
+	//qDebug("QGb18030Decoder::toUnicode(const char* chars, int len = %d)", len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -433,7 +433,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGb18030Codec::makeDecoder() const
 {
-    //tqDebug("QGb18030Codec::makeDecoder()");
+    //qDebug("QGb18030Codec::makeDecoder()");
     return new QGb18030Decoder();
 }
 
@@ -480,15 +480,15 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
 {
 #if 0
     // these are needed so that the X11 fonts behave correctly.
-    if (tqstricmp (hint, "gbk-0") == 0 ||
-	tqstricmp (hint, "gb18030.2000-0") == 0)
+    if (qstricmp (hint, "gbk-0") == 0 ||
+	qstricmp (hint, "gb18030.2000-0") == 0)
         return 13;
 #endif
 
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGbkCodec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -502,7 +502,7 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-    	if (tqstricmp(p, "GBK") == 0)
+    	if (qstricmp(p, "GBK") == 0)
       	    return score + 6;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -511,7 +511,7 @@ int QGbkCodec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const
 {
-    //tqDebug("QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
+    //qDebug("QGbkCodec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
     return 0;
 }
 
@@ -526,7 +526,7 @@ public:
     {
 	QString result;
 
-	//tqDebug("QGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
+	//qDebug("QGbkDecoder::toUnicode(const char* chars = \"%s\", int len = %d)", chars, len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -570,7 +570,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGbkCodec::makeDecoder() const
 {
-    //tqDebug("QGbkCodec::makeDecoder()");
+    //qDebug("QGbkCodec::makeDecoder()");
     return new QGbkDecoder();
 }
 
@@ -582,7 +582,7 @@ QCString QGbkCodec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
+    //qDebug("QGbkCodec::fromUnicode(const QString& uc, int& lenInOut = %d)", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	uchar buf[2];
@@ -610,7 +610,7 @@ QString QGbkCodec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGbkCodec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGbkCodec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
@@ -681,8 +681,8 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool zh = FALSE;
-    //tqDebug("QGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
-    if (tqstrnicmp(hint, "zh_CN", 5) == 0){
+    //qDebug("QGb2312Codec::heuristicNameMatch(const char* hint = \"%s\")", hint);
+    if (qstrnicmp(hint, "zh_CN", 5) == 0){
 	score += 10;
 	zh = TRUE;
     }
@@ -696,13 +696,13 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
     	p = hint;
     }
     if (p) {
-	if (tqstricmp(p, "GB2312") == 0 ||
-	    tqstricmp(p, "hp15cn") == 0)
+	if (qstricmp(p, "GB2312") == 0 ||
+	    qstricmp(p, "hp15cn") == 0)
 	    return score + 7;
-	else if (tqstricmp(p, "eucCN") == 0)
+	else if (qstricmp(p, "eucCN") == 0)
 	    return score + 4;
 	// there exists ja_JP.EUC, ko_KR.EUC, zh_CN.EUC and zh_TW.EUC
-	else if (tqstricmp(p, "euc") == 0 && zh)
+	else if (qstricmp(p, "euc") == 0 && zh)
 	    return score + 4;
     }
     return QTextCodec::heuristicNameMatch(hint);
@@ -711,7 +711,7 @@ int QGb2312Codec::heuristicNameMatch(const char* hint) const
 /*! \reimp */
 int QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/) const
 {
-    //tqDebug("QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
+    //qDebug("QGb2312Codec::heuristicContentMatch(const char* /*chars*/, int /*len*/)");
     return 0;
 }
 
@@ -725,7 +725,7 @@ public:
     QString toUnicode(const char* chars, int len)
     {
 	QString result;
-	//tqDebug("QGb2312Decoder::toUnicode(const char* chars, int len = %d)", len);
+	//qDebug("QGb2312Decoder::toUnicode(const char* chars, int len = %d)", len);
 	for (int i=0; i<len; i++) {
 	    uchar ch = chars[i];
 	    switch (nbuf) {
@@ -769,7 +769,7 @@ public:
 /*! \reimp */
 QTextDecoder* QGb2312Codec::makeDecoder() const
 {
-    //tqDebug("QGb2312Codec::makeDecoder()");
+    //qDebug("QGb2312Codec::makeDecoder()");
     return new QGb2312Decoder();
 }
 
@@ -781,7 +781,7 @@ QCString QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut) const
     QCString rstr(rlen);
     uchar* cursor = (uchar*)rstr.data();
 
-    //tqDebug("QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d) const", lenInOut);
+    //qDebug("QGb2312Codec::fromUnicode(const QString& uc, int& lenInOut = %d) const", lenInOut);
     for (int i=0; i<l; i++) {
 	QChar ch = uc[i];
 	uchar buf[2];
@@ -810,7 +810,7 @@ QString QGb2312Codec::toUnicode(const char* chars, int len) const
     QString result;
     int clen;
 
-    //tqDebug("QGb2312Codec::toUnicode(const char* chars, int len = %d)", len);
+    //qDebug("QGb2312Codec::toUnicode(const char* chars, int len = %d)", len);
     for (int i=0; i<len; ) {
 	uchar ch = chars[i];
 
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp
index e685ab3..19cc94e 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/qjiscodec.cpp
@@ -387,17 +387,17 @@ const char* QJisCodec::mimeName() const
 /*! \internal */
 int QJisCodec::heuristicNameMatch(const char* hint) const
 {
-    if ( tqstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
+    if ( qstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
 	return 10000;
     if ( simpleHeuristicNameMatch( "ISO-2022-JP-2", hint ) > 0 )
 	return 10;
 
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -412,8 +412,8 @@ int QJisCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "JIS") == 0) ||
-	    (tqstricmp(p, "JIS7") == 0) ||
+	if ((qstricmp(p, "JIS") == 0) ||
+	    (qstricmp(p, "JIS7") == 0) ||
 	    (simpleHeuristicNameMatch("ISO-2022-JP", p) > 0)) {
 	    return score + 4;
 	}
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp
index 3071dea..2d9033f 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/qjpunicode.cpp
@@ -778,32 +778,32 @@ QJpUnicodeConv *QJpUnicodeConv::newConverter(int rule)
 		s = env.mid(i, j - i).stripWhiteSpace();
 		i = j + 1;
 	    }
-	    if (tqstricmp(s, "unicode-0.9") == 0) {
+	    if (qstricmp(s, "unicode-0.9") == 0) {
 		rule = (rule & 0xff00) | Unicode;
-	    } else if (tqstricmp(s, "unicode-0201") == 0) {
+	    } else if (qstricmp(s, "unicode-0201") == 0) {
 		rule = (rule & 0xff00) | Unicode_JISX0201;
-	    } else if (tqstricmp(s, "unicode-ascii") == 0) {
+	    } else if (qstricmp(s, "unicode-ascii") == 0) {
 		rule = (rule & 0xff00) | Unicode_ASCII;
-	    } else if (tqstricmp(s, "jisx0221-1995") == 0) {
+	    } else if (qstricmp(s, "jisx0221-1995") == 0) {
 		rule = (rule & 0xff00) | JISX0221_JISX0201;
-	    } else if ((tqstricmp(s, "open-0201") == 0) ||
-		       (tqstricmp(s, "open-19970715-0201") == 0)) {
+	    } else if ((qstricmp(s, "open-0201") == 0) ||
+		       (qstricmp(s, "open-19970715-0201") == 0)) {
 		rule = (rule & 0xff00) | JISX0221_JISX0201;
-	    } else if ((tqstricmp(s, "open-ascii") == 0) ||
-		       (tqstricmp(s, "open-19970715-ascii") == 0)) {
+	    } else if ((qstricmp(s, "open-ascii") == 0) ||
+		       (qstricmp(s, "open-19970715-ascii") == 0)) {
 		rule = (rule & 0xff00) | JISX0221_ASCII;
-	    } else if ((tqstricmp(s, "open-ms") == 0) ||
-		       (tqstricmp(s, "open-19970715-ms") == 0)) {
+	    } else if ((qstricmp(s, "open-ms") == 0) ||
+		       (qstricmp(s, "open-19970715-ms") == 0)) {
 		rule = (rule & 0xff00) | Microsoft_CP932;
-	    } else if (tqstricmp(s, "cp932") == 0) {
+	    } else if (qstricmp(s, "cp932") == 0) {
 		rule = (rule & 0xff00) | Microsoft_CP932;
-	    } else if (tqstricmp(s, "jdk1.1.7") == 0) {
+	    } else if (qstricmp(s, "jdk1.1.7") == 0) {
 		rule = (rule & 0xff00) | Sun_JDK117;
-	    } else if (tqstricmp(s, "nec-vdc") == 0) {
+	    } else if (qstricmp(s, "nec-vdc") == 0) {
 		rule = rule | NEC_VDC;
-	    } else if (tqstricmp(s, "ibm-vdc") == 0) {
+	    } else if (qstricmp(s, "ibm-vdc") == 0) {
 		rule = rule | IBM_VDC;
-	    } else if (tqstricmp(s, "udc") == 0) {
+	    } else if (qstricmp(s, "udc") == 0) {
 		rule = rule | UDC;
 	    }
 	}
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 1d99edd..f77b0e6 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -217,7 +217,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirL:
 		    if ( runDir != QChar::DirL && runDir != QChar::DirON ) {
 			out += run( str, from, pos, runDir );
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirL;
@@ -233,7 +233,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirEN:
 		    if ( runDir != QChar::DirR && runDir != QChar::DirON ) {
 			out += run( str, from, pos, runDir );
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirR;
@@ -243,7 +243,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 	    pos++;
 	}
 	out += run( str, from, pos, runDir );
-	tqDebug( "out = %s", out.latin1() );
+	qDebug( "out = %s", out.latin1() );
 	// second reversing for numbers
 	QString in = out;
 	out = "";
@@ -259,7 +259,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirR:
 		    if ( runDir == QChar::DirEN && runDir != QChar::DirON ) {
 			out += run( in, from, pos, QChar::DirR ); //DirR ensures reversing
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			runDir = QChar::DirR;
 			from = pos;
 		    }
@@ -269,7 +269,7 @@ static QString reverseLine(const QString &str, unsigned int from, unsigned int t
 		case QChar::DirEN:
 		    if ( runDir != QChar::DirEN && runDir != QChar::DirON ) {
 			out += in.mid(from, pos-from+1);
-			tqDebug( "out = %s", out.latin1() );
+			qDebug( "out = %s", out.latin1() );
 			from = pos;
 		    }
 		    runDir = QChar::DirEN;
@@ -437,7 +437,7 @@ static QString visualOrder(QString logical, QChar::Direction basicDir)
     }
     int i;
     for (i = 0; i < nitems; ++i) {
-	//tqDebug("item %d bidiLevel=%d", i,  e.items[i].analysis.bidiLevel);
+	//qDebug("item %d bidiLevel=%d", i,  e.items[i].analysis.bidiLevel);
 	levels[i] = e.items[i].analysis.bidiLevel;
     }
     e.bidiReorder(nitems, levels, visualOrder);
diff --git a/src/codecs/qsjiscodec.cpp b/src/codecs/qsjiscodec.cpp
index 581971d..d6c1102 100644
--- a/src/codecs/qsjiscodec.cpp
+++ b/src/codecs/qsjiscodec.cpp
@@ -249,10 +249,10 @@ int QSjisCodec::heuristicNameMatch(const char* hint) const
 {
     int score = 0;
     bool ja = FALSE;
-    if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+    if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
 	score += 3;
 	ja = TRUE;
-    } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+    } else if (qstrnicmp(hint, "ja", 2) == 0) {
 	score += 2;
 	ja = TRUE;
     }
@@ -267,9 +267,9 @@ int QSjisCodec::heuristicNameMatch(const char* hint) const
 	p = hint;
     }
     if (p) {
-	if ((tqstricmp(p, "mscode") == 0) ||
-	    (tqstricmp(p, "PCK") == 0) ||
-	    (tqstricmp(p, "SJIS") == 0) ||
+	if ((qstricmp(p, "mscode") == 0) ||
+	    (qstricmp(p, "PCK") == 0) ||
+	    (qstricmp(p, "SJIS") == 0) ||
 	    (simpleHeuristicNameMatch(p, "ShiftJIS") > 0) ||
 	    (simpleHeuristicNameMatch(p, "x-sjis") > 0)) {
 	    return score + 4;
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 7e6b67e..1a4fb32 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -443,7 +443,7 @@ QTextCodec::QTextCodec()
 QTextCodec::~QTextCodec()
 {
     if ( !destroying_is_ok )
-	tqWarning("QTextCodec::~QTextCodec() called by application");
+	qWarning("QTextCodec::~QTextCodec() called by application");
     if ( all )
 	all->remove( this );
 }
@@ -503,7 +503,7 @@ static QString lettersAndNumbers( const char * input )
 int QTextCodec::simpleHeuristicNameMatch(const char* name, const char* hint)
 {
     // if they're the same, return a perfect score.
-    if ( name && hint && *name && *hint && tqstricmp( name, hint ) == 0 )
+    if ( name && hint && *name && *hint && qstricmp( name, hint ) == 0 )
 	return qstrlen( hint );
 
     // if the letters and numbers are the same, we have an "almost"
@@ -667,7 +667,7 @@ public:
                 // character
                 buf[nbuf++] = *chars;
                 if (nbuf + 1 == sizeof buf) {
-                    tqWarning("QWindowsLocalDecoder: exceeded max internal buffer size");
+                    qWarning("QWindowsLocalDecoder: exceeded max internal buffer size");
                     nbuf = 0;
                 }
             }
@@ -793,7 +793,7 @@ static QTextCodec * ru_RU_hack( const char * i ) {
     } else {
 	// something else again... let's assume... *throws dice*
 	ru_RU_codec = QTextCodec::codecForName( "KOI8-R" );
-	tqWarning( "QTextCodec: using KOI8-R, probe failed (%02x %02x %s)",
+	qWarning( "QTextCodec: using KOI8-R, probe failed (%02x %02x %s)",
 		  koi8r, latin5, i );
     }
     setlocale( LC_CTYPE, origlocale.data() );
@@ -1297,15 +1297,15 @@ public:
 	char comm='%';
 	bool incmap = FALSE;
 	while (iod->readLine(line,maxlen) > 0) {
-	    if (0==tqstrnicmp(line,"<code_set_name>",15))
+	    if (0==qstrnicmp(line,"<code_set_name>",15))
 		n = line+15;
-	    else if (0==tqstrnicmp(line,"<escape_char> ",14))
+	    else if (0==qstrnicmp(line,"<escape_char> ",14))
 		esc = line[14];
-	    else if (0==tqstrnicmp(line,"<comment_char> ",15))
+	    else if (0==qstrnicmp(line,"<comment_char> ",15))
 		comm = line[15];
-	    else if (line[0]==comm && 0==tqstrnicmp(line+1," alias ",7)) {
+	    else if (line[0]==comm && 0==qstrnicmp(line+1," alias ",7)) {
 		aliases.append(line+8);
-	    } else if (0==tqstrnicmp(line,"CHARMAP",7)) {
+	    } else if (0==qstrnicmp(line,"CHARMAP",7)) {
 		if (!from_unicode_page) {
 		    from_unicode_page = new char*[256];
 		    for (int i=0; i<256; i++)
@@ -1315,7 +1315,7 @@ public:
 		    to_unicode = new ushort[256];
 		}
 		incmap = TRUE;
-	    } else if (0==tqstrnicmp(line,"END CHARMAP",11))
+	    } else if (0==qstrnicmp(line,"END CHARMAP",11))
 		break;
 	    else if (incmap) {
 		char* cursor = line;
@@ -1395,7 +1395,7 @@ public:
 			}
 			mb[nmb++] = 0;
 			from_unicode_page_multiByte[ch.row()][ch.cell()]
-			    = tqstrdup(mb);
+			    = qstrdup(mb);
 			*mb_unicode = unicode;
 		    } else {
 			from_unicode_page[ch.row()][ch.cell()] = (char)byte;
@@ -2442,7 +2442,7 @@ int QSimpleTextCodec::mibEnum() const
 
 int QSimpleTextCodec::heuristicNameMatch(const char* hint) const
 {
-    if ( tqstricmp( hint, mimeName() ) == 0 )
+    if ( qstricmp( hint, mimeName() ) == 0 )
 	return 10000; // return a large value
     if ( hint[0]=='k' ) {
 	QCString lhint = QCString(hint).lower();
@@ -2802,18 +2802,18 @@ static void setupLocaleMapper()
 	// First part is getting that locale name.  First try setlocale() which
 	// definitely knows it, but since we cannot fully trust it, get ready
 	// to fall back to environment variables.
-	char * ctype = tqstrdup( setlocale( LC_CTYPE, 0 ) );
+	char * ctype = qstrdup( setlocale( LC_CTYPE, 0 ) );
 
 	// Get the first nonempty value from $LC_ALL, $LC_CTYPE, and $LANG
 	// environment variables.
-	char * lang = tqstrdup( getenv("LC_ALL") );
+	char * lang = qstrdup( getenv("LC_ALL") );
 	if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) {
 	    if ( lang ) delete [] lang;
-	    lang = tqstrdup( getenv("LC_CTYPE") );
+	    lang = qstrdup( getenv("LC_CTYPE") );
 	}
 	if ( !lang || lang[0] == 0 || strcmp( lang, "C" ) == 0 ) {
 	    if ( lang ) delete [] lang;
-	    lang = tqstrdup( getenv("LANG") );
+	    lang = qstrdup( getenv("LANG") );
 	}
 
 	// Now try these in order:
@@ -2905,7 +2905,7 @@ static void realSetup()
 {
 #if defined(QT_CHECK_STATE)
     if ( destroying_is_ok )
-	tqWarning( "QTextCodec: creating new codec during codec cleanup!" );
+	qWarning( "QTextCodec: creating new codec during codec cleanup!" );
 #endif
     all = new QValueList<QTextCodec*>;
 
diff --git a/src/codecs/qtsciicodec.cpp b/src/codecs/qtsciicodec.cpp
index 71a0c83..ad6a6ee 100644
--- a/src/codecs/qtsciicodec.cpp
+++ b/src/codecs/qtsciicodec.cpp
@@ -183,7 +183,7 @@ int QTsciiCodec::heuristicNameMatch(const char* hint) const
         p++;
     else
         p = hint;
-    if (tqstricmp(p, "TSCII") == 0)
+    if (qstricmp(p, "TSCII") == 0)
       	return 4;
     return QTextCodec::heuristicNameMatch(hint);
 }