summaryrefslogtreecommitdiffstats
path: root/src/codecs/qjpunicode.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <[email protected]>2012-08-03 08:49:35 -0500
committerDarrell Anderson <[email protected]>2012-08-03 08:49:35 -0500
commit92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (patch)
tree3de07468347367bdef8e6c0d765bdb209585a189 /src/codecs/qjpunicode.cpp
parentda067173fd2ab6bca5943294a439c4992323227a (diff)
parentebcb1d80bf517aceb69778e1e9f67e5f4da8c484 (diff)
downloadqt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.tar.gz
qt3-92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/codecs/qjpunicode.cpp')
-rw-r--r--src/codecs/qjpunicode.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/codecs/qjpunicode.cpp b/src/codecs/qjpunicode.cpp
index 2d9033f..4b3beaf 100644
--- a/src/codecs/qjpunicode.cpp
+++ b/src/codecs/qjpunicode.cpp
@@ -10555,7 +10555,7 @@ uint QJpUnicodeConv::unicodeToSjisibmvdc(uint h, uint l) const
if (!sjis208ibmvdc_unicode[i])
return 0;
if (u==sjis208ibmvdc_unicode[i]){
- return ((0x00fa +(i/189))<<8 | 0x0040+(i%189));
+ return ((0x00fa +(i/189))<<8 | (0x0040+(i%189)));
}
}
}
@@ -10660,7 +10660,7 @@ uint QJpUnicodeConv::unicodeToCp932(uint h, uint l) const
if (!cp932_ed_ee_unicode[j])
return 0;
if (u==cp932_ed_ee_unicode[j]){
- return ((0x00ed +(j/189))<<8 | 0x0040+(j%189));
+ return ((0x00ed +(j/189))<<8 | (0x0040+(j%189)));
}
}
}