Changeset 349 for trunk/src

Timestamp:

Nov 26, 2009, 12:34:37 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/codec: Implemented the "System" text codec which is always used as the default codec for the locale and uses the OS/2 ULS API to perform conversions from the process codepage to Unicode and back. The encoding part of the LANG variable is no longer recognized (#46).

File:

• trunk/src/corelib/codecs/qtextcodec.cpp (modified) (5 diffs)

trunk/src/corelib/codecs/qtextcodec.cpp

@@ -59 +59 @@
 #endif
 
+
+
+
+
+
+
 #include "qutfcodec_p.h"
 #include "qsimplecodec_p.h"
@@ -392 +398 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 #else
 
@@ -509 +749 @@
 #endif
 
-#if !defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)
+#if !defined(Q_OS_WIN32) && !defined(Q_OS_WINCE)
 static QTextCodec *checkForCodec(const char *name) {
     QTextCodec *c = QTextCodec::codecForName(name);
@@ -529 +769 @@
 {
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
+
+
     localeMapper = QTextCodec::codecForName("System");
 #else
@@ -712 +954 @@
     (void) new QWindowsLocalCodec;
 #endif // Q_OS_WIN32
+
+
+
+
 
     (void)new QUtf16Codec;