Changeset 769 for trunk/src/corelib/codecs

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/codecs/qiconvcodec.cpp (modified) (9 diffs)
• src/corelib/codecs/qsimplecodec.cpp (modified) (1 diff)
• src/corelib/codecs/qtextcodec.cpp (modified) (13 diffs)
• src/corelib/codecs/qtextcodec.h (modified) (2 diffs)
• src/corelib/codecs/qutfcodec.cpp (modified) (2 diffs)

trunk/src/corelib/codecs/qiconvcodec.cpp

@@ -169 +169 @@
 {
     if (utf16Codec == reinterpret_cast<QTextCodec *>(~0))
-        return QString::fromAscii(chars, len);
+        return QString::from(chars, len);
 
     int invalidCount = 0;
@@ -208 +208 @@
             if (!reported++) {
                 fprintf(stderr,
-                        "QIconvCodec::convertToUnicode: using ASCII for conversion, iconv_open failed\n");
-            }
-            return QString::fromAscii(chars, len);
+                        "QIconvCodec::convertToUnicode: using  for conversion, iconv_open failed\n");
+            }
+            return QString::from(chars, len);
         }
 
@@ -274 +274 @@
             // some other error
             // note, cannot use qWarning() since we are implementing the codecForLocale :)
-            perror("QIconvCodec::convertToUnicode: using ASCII for conversion, iconv failed");
+            perror("QIconvCodec::convertToUnicode: using  for conversion, iconv failed");
 
             if (!convState) {
@@ -281 +281 @@
             }
 
-            return QString::fromAscii(chars, len);
+            return QString::from(chars, len);
         }
     } while (inBytesLeft != 0);
@@ -299 +299 @@
 
 Q_GLOBAL_STATIC(QThreadStorage<QIconvCodec::IconvState *>, fromUnicodeState)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QByteArray QIconvCodec::convertFromUnicode(const QChar *uc, int len, ConverterState *convState) const
@@ -326 +352 @@
     if (!state) {
         state = new IconvState(QIconvCodec::createIconv_t(0, UTF16));
-        if (state->cd != reinterpret_cast<iconv_t>(-1)) {
-            size_t outBytesLeft = len + 3; // +3 for the BOM
-            QByteArray ba(outBytesLeft, Qt::Uninitialized);
-            outBytes = ba.data();
-
-#if !defined(NO_BOM)
-            // give iconv() a BOM
-            QChar bom[] = { QChar(QChar::ByteOrderMark) };
-            inBytes = reinterpret_cast<char *>(bom);
-            inBytesLeft = sizeof(bom);
-            if (iconv(state->cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
-                perror("QIconvCodec::convertFromUnicode: using ASCII for conversion, iconv failed for BOM");
+        if (state->cd == reinterpret_cast<iconv_t>(-1)) {
+            if (!setByteOrder(state->cd)) {
+                perror("QIconvCodec::convertFromUnicode: using Latin-1 for conversion, iconv failed for BOM");
 
                 iconv_close(state->cd);
                 state->cd = reinterpret_cast<iconv_t>(-1);
 
-                return QString(uc, len).toAscii();
-            }
-#endif // NO_BOM
+                return QString(uc, len).toLatin1();
+            }
         }
     }
@@ -351 +367 @@
         if (!reported++) {
             fprintf(stderr,
-                    "QIconvCodec::convertFromUnicode: using ASCII for conversion, iconv_open failed\n");
-        }
-        return QString(uc, len).toAscii();
+                    "QIconvCodec::convertFromUnicode: using  for conversion, iconv_open failed\n");
+        }
+        return QString(uc, len).to();
     }
  
@@ -410 +426 @@
                 {
                     // note, cannot use qWarning() since we are implementing the codecForLocale :)
-                    perror("QIconvCodec::convertFromUnicode: using ASCII for conversion, iconv failed");
+                    perror("QIconvCodec::convertFromUnicode: using  for conversion, iconv failed");
 
                     // reset to initial state
                     iconv(state->cd, 0, &inBytesLeft, 0, &outBytesLeft);
 
-                    return QString(uc, len).toAscii();
+                    return QString(uc, len).to();
                 }
             }
@@ -423 +439 @@
     // reset to initial state
     iconv(state->cd, 0, &inBytesLeft, 0, &outBytesLeft);
+
 
     ba.resize(ba.size() - outBytesLeft);

trunk/src/corelib/codecs/qsimplecodec.cpp

@@ -682 +682 @@
     const QChar* ucp = in;
     unsigned char* rp = (unsigned char *)r.data();
-    const unsigned char* rmp = (const unsigned char *)reverseMap->data();
+    const unsigned char* rmp = (const unsigned char *)reverseMap->ata();
     int rmsize = (int) reverseMap->size();
     while(i--)

trunk/src/corelib/codecs/qtextcodec.cpp

@@ -86 +86 @@
 #endif // QT_NO_CODECS
 #include "qlocale.h"
-#include "private/qmutexpool_p.h"
+#include "qmutex.h"
+#include "qhash.h"
 
 #include <stdlib.h>
@@ -108 +109 @@
     (QTextCodecFactoryInterface_iid, QLatin1String("/codecs")))
 #endif
+
 
 static char qtolower(register char c)
@@ -179 +181 @@
 
 static QList<QTextCodec*> *all = 0;
+
 #ifdef Q_DEBUG_TEXTCODEC
 static bool destroying_is_ok = false;
@@ -221 +224 @@
 
 Q_GLOBAL_STATIC(QTextCodecCleanup, createQTextCodecCleanup)
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
@@ -906 +922 @@
 }
 
-
+#ifndef QT_NO_THREAD
+Q_GLOBAL_STATIC_WITH_ARGS(QMutex, textCodecsMutex, (QMutex::Recursive));
+#endif
+
+// textCodecsMutex need to be locked to enter this function
 static void setup()
 {
-#ifndef QT_NO_THREAD
-    QMutexLocker locker(QMutexPool::globalInstanceGet(&all));
-#endif
-
     if (all)
         return;
+
+
+
+
+
+
+
+
 
 #ifdef Q_DEBUG_TEXTCODEC
@@ -1164 +1188 @@
 
 /*!
-    \nonreentrant
-
     Constructs a QTextCodec, and gives it the highest precedence. The
     QTextCodec should always be constructed on the heap (i.e. with \c
@@ -1173 +1195 @@
 QTextCodec::QTextCodec()
 {
+
+
+
     setup();
     all->prepend(this);
@@ -1190 +1215 @@
         qWarning("QTextCodec::~QTextCodec: Called by application");
 #endif
-    if (all)
+    if (all) {
+#ifndef QT_NO_THREAD
+        QMutexLocker locker(textCodecsMutex());
+#endif
         all->removeAll(this);
+
+
 }
 
@@ -1212 +1242 @@
         return 0;
 
+
+
+
     setup();
+
+
+
+
+
+
+
+
+
+
+
+
 
     for (int i = 0; i < all->size(); ++i) {
         QTextCodec *cursor = all->at(i);
-        if (nameMatch(cursor->name(), name))
+        if (nameMatch(cursor->name(), name)) {
+            cache.insert(name, cursor);
             return cursor;
+
         QList<QByteArray> aliases = cursor->aliases();
-        for (int i = 0; i < aliases.size(); ++i)
-            if (nameMatch(aliases.at(i), name))
+        for (int y = 0; y < aliases.size(); ++y)
+            if (nameMatch(aliases.at(y), name)) {
+                cache.insert(name, cursor);
                 return cursor;
-    }
-
-    return createForName(name);
+            }
+    }
+
+    codec = createForName(name);
+    if (codec)
+        cache.insert(name, codec);
+    return codec;
 }
 
@@ -1234 +1286 @@
 QTextCodec* QTextCodec::codecForMib(int mib)
 {
+
+
+
     setup();
 
-    // Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map
-    // this correctly for compatibility.
-    if (mib == 1000)
-        mib = 1015;
+    if (!validCodecs())
+        return 0;
+
+    static QHash <int, QTextCodec *> cache;
+    if (clearCaches & 0x2) {
+        cache.clear();
+        clearCaches &= ~0x2;
+    }
+    QTextCodec *codec = cache.value(mib);
+    if (codec)
+        return codec;
 
     QList<QTextCodec*>::ConstIterator i;
     for (int i = 0; i < all->size(); ++i) {
         QTextCodec *cursor = all->at(i);
-        if (cursor->mibEnum() == mib)
+        if (cursor->mibEnum() == mib) {
+            cache.insert(mib, cursor);
             return cursor;
-    }
-
-    return createForMib(mib);
+        }
+    }
+
+    codec = createForMib(mib);
+
+    // Qt 3 used 1000 (mib for UCS2) as its identifier for the utf16 codec. Map
+    // this correctly for compatibility.
+    if (!codec && mib == 1000)
+        return codecForMib(1015);
+
+    if (codec)
+        cache.insert(mib, codec);
+    return codec;
 }
 
@@ -1262 +1335 @@
 QList<QByteArray> QTextCodec::availableCodecs()
 {
+
+
+
     setup();
 
     QList<QByteArray> codecs;
+
+
+
+
     for (int i = 0; i < all->size(); ++i) {
         codecs += all->at(i)->name();
         codecs += all->at(i)->aliases();
     }
+
+
+
+
+
 #ifndef QT_NO_TEXTCODECPLUGIN
     QFactoryLoader *l = loader();
@@ -1292 +1377 @@
 QList<int> QTextCodec::availableMibs()
 {
+
+
+
     setup();
 
     QList<int> codecs;
+
+
+
+
     for (int i = 0; i < all->size(); ++i)
         codecs += all->at(i)->mibEnum();
+
+
+
+
+
 #ifndef QT_NO_TEXTCODECPLUGIN
     QFactoryLoader *l = loader();
@@ -1341 +1438 @@
 QTextCodec* QTextCodec::codecForLocale()
 {
+
+
+
     if (localeMapper)
         return localeMapper;
 
+
+
+
     setup();
 

trunk/src/corelib/codecs/qtextcodec.h

@@ -146 +146 @@
     friend class QTextCodecCleanup;
     static QTextCodec *cftr;
+
 };
 Q_DECLARE_OPERATORS_FOR_FLAGS(QTextCodec::ConversionFlags)
 
-inline QTextCodec* QTextCodec::codecForTr() { return cftr; }
+; }
 inline void QTextCodec::setCodecForTr(QTextCodec *c) { cftr = c; }
-inline QTextCodec* QTextCodec::codecForCStrings() { return QString::codecForCStrings; }
+inline QTextCodec* QTextCodec::codecForCStrings() { return ; }
 inline void QTextCodec::setCodecForCStrings(QTextCodec *c) { QString::codecForCStrings = c; }
 
@@ -171 +172 @@
     friend class QXmlStreamWriter;
     friend class QXmlStreamWriterPrivate;
+
     friend class QCoreXmlStreamWriter;
     friend class QCoreXmlStreamWriterPrivate;
+
 };
 

trunk/src/corelib/codecs/qutfcodec.cpp

@@ -327 +327 @@
             }
             if (!headerdone) {
+
                 if (endian == DetectEndianness) {
-                    if (ch == QChar::ByteOrderSwapped && endian != BigEndianness) {
+                    if (ch == QChar::ByteOrderSwapped) {
                         endian = LittleEndianness;
-                    } else if (ch == QChar::ByteOrderMark && endian != LittleEndianness) {
-                        // ignore BOM
+                    } else if (ch == QChar::ByteOrderMark) {
                         endian = BigEndianness;
                     } else {
@@ -345 +345 @@
                     *qch++ = ch;
                 }
-                headerdone = true;
             } else {
                 *qch++ = ch;