summaryrefslogtreecommitdiffstats
path: root/src/corelib/codecs/qeuckrcodec.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib/codecs/qeuckrcodec.cpp')
-rw-r--r--src/corelib/codecs/qeuckrcodec.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/corelib/codecs/qeuckrcodec.cpp b/src/corelib/codecs/qeuckrcodec.cpp
index 1764d3a6c2..7097636538 100644
--- a/src/corelib/codecs/qeuckrcodec.cpp
+++ b/src/corelib/codecs/qeuckrcodec.cpp
@@ -137,8 +137,6 @@ QString QEucKrCodec::convertToUnicode(const char* chars, int len, ConverterState
QString result;
for (int i=0; i<len; i++) {
uchar ch = chars[i];
- if (ch == 0)
- break;
switch (nbuf) {
case 0:
if (ch < 0x80) {
@@ -3346,7 +3344,14 @@ int QCP949Codec::_mibEnum()
QByteArray QCP949Codec::_name()
{
- return "cp949";
+ return "windows-949";
+}
+
+QList<QByteArray> QCP949Codec::_aliases()
+{
+ QList<QByteArray> aliases;
+ aliases += "CP949";
+ return aliases;
}
/*!
@@ -3448,8 +3453,6 @@ QString QCP949Codec::convertToUnicode(const char* chars, int len, ConverterState
QString result;
for (int i=0; i<len; i++) {
uchar ch = chars[i];
- if (ch == 0)
- break;
switch (nbuf) {
case 0:
if (ch < 0x80) {