AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Align the CP949 codec name with ICU

Browse Source 
It's name is windows-949 according to ICU. Keep
CP949 as an alias for compatibility with Qt 4.

Change-Id: I115ba2593da6f7b47e25136c3fadb19c7f798ff0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2012-07-30 09:27:19 +02:00 committed by Qt by Nokia
parent 1ee272568b
commit 4970fa366b
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/corelib/codecs/qeuckrcodec.cpp
View File

@ -137,8 +137,6 @@ QString QEucKrCodec::convertToUnicode(const char* chars, int len, ConverterState
QString result; QString result;
for (int i=0; i<len; i++) { for (int i=0; i<len; i++) {
uchar ch = chars[i]; uchar ch = chars[i];
if (ch == 0)
break;
switch (nbuf) { switch (nbuf) {
case 0: case 0:
if (ch < 0x80) { if (ch < 0x80) {
@ -3346,7 +3344,14 @@ int QCP949Codec::_mibEnum()
QByteArray QCP949Codec::_name() 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; QString result;
for (int i=0; i<len; i++) { for (int i=0; i<len; i++) {
uchar ch = chars[i]; uchar ch = chars[i];
if (ch == 0)
break;
switch (nbuf) { switch (nbuf) {
case 0: case 0:
if (ch < 0x80) { if (ch < 0x80) {

2
src/corelib/codecs/qeuckrcodec_p.h
View File

@ -102,7 +102,7 @@ public:
class QCP949Codec : public QTextCodec { class QCP949Codec : public QTextCodec {
public: public:
static QByteArray _name(); static QByteArray _name();
static QList<QByteArray> _aliases() { return QList<QByteArray>(); } static QList<QByteArray> _aliases();
static int _mibEnum(); static int _mibEnum();
QByteArray name() const { return _name(); } QByteArray name() const { return _name(); }