Changeset 350 for trunk/src

Timestamp:

Nov 26, 2009, 12:56:10 AM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

corelib/codec: Make sure '?' is used to replace non-convertible characters by the "System" codec on OS/2.

File:

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

trunk/src/corelib/codecs/qtextcodec.cpp

@@ -421 +421 @@
     // create the conversion object for the process code page that performs
     // substitution of invalid characters with '?'
-    UniCreateUconvObject((UniChar *)L"@sub=yes", &uoSubYes);
+    UniCreateUconvObject((UniChar *)L"@sub=yes,subchar=\\x3F,subuni=\\x003F",
+                         &uoSubYes);
+    Q_ASSERT(uoSubYes);
+
     // same as above but doesn't perform substitution
     UniCreateUconvObject((UniChar *)L"@sub=no", &uoSubNo);
+
 }
 
@@ -450 +454 @@
     if (state && (state->flags & ConvertInvalidToNull))
         uo = uoSubNo;
-    Q_ASSERT(uo);
-    if (!uo)
-        return res;
 
     int remainingChars = 0;
@@ -547 +548 @@
     if (state && (state->flags & ConvertInvalidToNull))
         uo = uoSubNo;
-    Q_ASSERT(uo);
-    if (!uo)
-        return res;
 
     const UniChar *ucPtr = reinterpret_cast<const UniChar *>(uchars);