3 files changed, 15 insertions, 15 deletions

diff --git a/src/codecs/qgb18030codec.cpp b/src/codecs/qgb18030codec.cpp
index 8ed96fc74..e6aca7966 100644
--- a/src/codecs/qgb18030codec.cpp
+++ b/src/codecs/qgb18030codec.cpp
@@ -143,10 +143,10 @@
 #define IsUDA3(a, b)	(InRange((a), 0xA1, 0xA7) && InRange((b), 0x40, 0xA0) && ((b) != 0x7F))
 
 typedef struct {
-    Q_UINT8	tblBegin;
-    Q_UINT8	tblEnd;
-    Q_UINT16	tblOffset;
-    Q_UINT16	algOffset;
+    TQ_UINT8	tblBegin;
+    TQ_UINT8	tblEnd;
+    TQ_UINT16	tblOffset;
+    TQ_UINT16	algOffset;
 } indexTbl_t;
 
 static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len);
@@ -1055,7 +1055,7 @@ static const indexTbl_t ucs_to_gb18030_index[256] = {
   /* 0xFE__ */	{0x30, 0xFF, 0x8F3F, 0x9894},	{0x00, 0xE5, 0x8F3F, 0x98FC},
 };
 
-static Q_UINT16 const ucs_to_gb18030[28839] = {
+static TQ_UINT16 const ucs_to_gb18030[28839] = {
   /* Contiguous area: U+0080 .. U+0451 */
   /* U+0080 */	0x0000,	0x0001,	0x0002,	0x0003,	0x0004,	0x0005,	0x0006,	0x0007,
   /* U+0088 */	0x0008,	0x0009,	0x0010,	0x0011,	0x0012,	0x0013,	0x0014,	0x0015,
@@ -4685,7 +4685,7 @@ static Q_UINT16 const ucs_to_gb18030[28839] = {
   /* U+FFE0 */	0xA1E9,	0xA1EA,	0xA956,	0xA3FE,	0xA957,	0xA3A4,
 };
 
-static Q_UINT16 const gb18030_2byte_to_ucs[22046] = {
+static TQ_UINT16 const gb18030_2byte_to_ucs[22046] = {
 	/* GB 0x8140..0x817E */
 	0x4E02,	0x4E04,	0x4E05,	0x4E06,	0x4E0F,	0x4E12,	0x4E17,	0x4E1F,
 	0x4E20,	0x4E21,	0x4E23,	0x4E26,	0x4E29,	0x4E2E,	0x4E2F,	0x4E31,
@@ -7737,7 +7737,7 @@ static Q_UINT16 const gb18030_2byte_to_ucs[22046] = {
 	0xE864,			/* Skip: GB 0xFEA1..0xFEFE (UDA 2) */
 };
 
-static Q_UINT16 const gb18030_4byte_to_ucs[6793] = {
+static TQ_UINT16 const gb18030_4byte_to_ucs[6793] = {
   /* Contiguous area: GB+81 30 81 30 .. GB+81 30 D2 39 */
   /* GB+81 30 81 30 */	0x0080,	0x0081,	0x0082,	0x0083,	0x0084,
   /* GB+81 30 81 35 */	0x0085,	0x0086,	0x0087,	0x0088,	0x0089,
@@ -9190,8 +9190,8 @@ static uint qt_Gb18030ToUnicode(const uchar *gbstr, int& len) {
 		    /* GB+81308130 - GB+8431A439 */
 		    g2u = gb18030_to_ucs_index[gb4lin >> 8];
 
-		    if ((Q_UINT8)(gb4lin & 0xFF) >= g2u.tblBegin &&
-			(Q_UINT8)(gb4lin & 0xFF) <= g2u.tblEnd) {
+		    if ((TQ_UINT8)(gb4lin & 0xFF) >= g2u.tblBegin &&
+			(TQ_UINT8)(gb4lin & 0xFF) <= g2u.tblEnd) {
 
 			uni = (uint)gb18030_4byte_to_ucs[gb4lin - g2u.tblOffset];
 		    }
@@ -9237,7 +9237,7 @@ int qt_UnicodeToGb18030(uint uni, uchar *gbchar) {
     else if (uni <= 0xD7FF || InRange(uni, 0xE766, 0xFFFF)) {
 	u2g = ucs_to_gb18030_index[uni >> 8];
 
-	if ((Q_UINT8)(uni & 0xFF) >= u2g.tblBegin && (Q_UINT8)(uni & 0xFF) <= u2g.tblEnd) {
+	if ((TQ_UINT8)(uni & 0xFF) >= u2g.tblBegin && (TQ_UINT8)(uni & 0xFF) <= u2g.tblEnd) {
 	    // Use mapping table (2-byte or 4-byte GB18030)
 	    uint tblEntry;
 
@@ -9331,7 +9331,7 @@ int qt_UnicodeToGbk(uint uni, uchar *gbchar) {
     else if (uni <= 0xD7FF || InRange(uni, 0xE766, 0xFFFF)) {
 	u2g = ucs_to_gb18030_index[uni >> 8];
 
-	if ( (Q_UINT8)(uni & 0xFF) >= u2g.tblBegin && (Q_UINT8)(uni & 0xFF) <= u2g.tblEnd ) {
+	if ( (TQ_UINT8)(uni & 0xFF) >= u2g.tblBegin && (TQ_UINT8)(uni & 0xFF) <= u2g.tblEnd ) {
 	    // Use mapping table (2-byte GBK or 4-byte GB18030)
 	    uint tblEntry;
 
diff --git a/src/codecs/qrtlcodec.cpp b/src/codecs/qrtlcodec.cpp
index 42917b286..bf2a94be6 100644
--- a/src/codecs/qrtlcodec.cpp
+++ b/src/codecs/qrtlcodec.cpp
@@ -426,13 +426,13 @@ static TQString visualOrder(TQString logical, TQChar::Direction basicDir)
     TQTextEngine e(logical, 0);
     e.direction = basicDir;
     e.itemize();
-    Q_UINT8 l[256];
-    Q_UINT8 *levels = l;
+    TQ_UINT8 l[256];
+    TQ_UINT8 *levels = l;
     int vo[256];
     int *visualOrder = vo;
     int nitems = e.items.size();
     if (nitems > 255) {
-	levels = new Q_UINT8[nitems];
+	levels = new TQ_UINT8[nitems];
 	visualOrder = new int[nitems];
     }
     int i;
diff --git a/src/codecs/qtextcodec.cpp b/src/codecs/qtextcodec.cpp
index 5f962118f..331688da7 100644
--- a/src/codecs/qtextcodec.cpp
+++ b/src/codecs/qtextcodec.cpp
@@ -1682,7 +1682,7 @@ static const struct {
     const char *mime;
     const char * cs;
     int mib;
-    Q_UINT16 values[128];
+    TQ_UINT16 values[128];
 } unicodevalues[] = {
     // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt
     { "KOI8-R", "KOI8-R", 2084,