summaryrefslogtreecommitdiffstats
path: root/src/codecs/qtextcodec.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-06-18 00:09:52 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-06-18 00:09:52 -0500
commitd1096751ddb25cdef23919c17389fc268c31edaf (patch)
treeb910be3588cb706defc00c31aefa850bb2312784 /src/codecs/qtextcodec.cpp
parentaf8fdcf1ca7bdbda6f0c1afecd8c2d8ffa23bebb (diff)
parent6dec101d43dcbd4195c47d54bd388db1a8d7230e (diff)
downloadtqt3-d1096751ddb25cdef23919c17389fc268c31edaf.tar.gz
tqt3-d1096751ddb25cdef23919c17389fc268c31edaf.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3
Diffstat (limited to 'src/codecs/qtextcodec.cpp')
-rw-r--r--src/codecs/qtextcodec.cpp2
1 files changed, 1 insertions, 1 deletions
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,