Changeset 846 for trunk/src/corelib/codecs

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

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

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/codecs/codecs.pri (modified) (2 diffs)
• src/corelib/codecs/codecs.qdoc (modified) (2 diffs)
• src/corelib/codecs/qfontlaocodec.cpp (modified) (1 diff)
• src/corelib/codecs/qfontlaocodec_p.h (modified) (1 diff)
• src/corelib/codecs/qiconvcodec.cpp (modified) (1 diff)
• src/corelib/codecs/qiconvcodec_p.h (modified) (1 diff)
• src/corelib/codecs/qisciicodec.cpp (modified) (1 diff)
• src/corelib/codecs/qisciicodec_p.h (modified) (1 diff)
• src/corelib/codecs/qlatincodec.cpp (modified) (1 diff)
• src/corelib/codecs/qlatincodec_p.h (modified) (1 diff)
• src/corelib/codecs/qsimplecodec.cpp (modified) (10 diffs)
• src/corelib/codecs/qsimplecodec_p.h (modified) (2 diffs)
• src/corelib/codecs/qtextcodec.cpp (modified) (28 diffs)
• src/corelib/codecs/qtextcodec.h (modified) (6 diffs)
• src/corelib/codecs/qtextcodec_p.h (modified) (1 diff)
• src/corelib/codecs/qtextcodec_symbian.cpp (copied) (copied from branches/vendor/nokia/qt/4.7.2/src/corelib/codecs/qtextcodec_symbian.cpp )
• src/corelib/codecs/qtextcodecplugin.cpp (modified) (1 diff)
• src/corelib/codecs/qtextcodecplugin.h (modified) (1 diff)
• src/corelib/codecs/qtsciicodec.cpp (modified) (1 diff)
• src/corelib/codecs/qtsciicodec_p.h (modified) (1 diff)
• src/corelib/codecs/qutfcodec.cpp (modified) (4 diffs)
• src/corelib/codecs/qutfcodec_p.h (modified) (1 diff)

trunk/src/corelib/codecs/codecs.pri

@@ -32 +32 @@
                 DEFINES += GNU_LIBICONV
                 !mac:LIBS_PRIVATE *= -liconv
-        } else {
+        } else:contains(QT_CONFIG,sun-libiconv) {
+                HEADERS += codecs/qiconvcodec_p.h
+                SOURCES += codecs/qiconvcodec.cpp
+                DEFINES += GNU_LIBICONV
+        } else:!symbian {
                 # no iconv, so we put all plugins in the library
                 HEADERS += \
@@ -53 +57 @@
         }
 }
+

trunk/src/corelib/codecs/codecs.qdoc

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -7 +7 @@
 ** This file is part of the documentation of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:L$
 ** Commercial Usage
 ** Licensees holding valid Qt Commercial licenses may use this file in
 ** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
+** Software or, alternatively, in accordance with the terms contained in
+** written agreement between you and Nokia.
 **
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Nokia gives you certain additional
-** rights.  These rights are described in the Nokia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
+** GNU Free Documentation License
+** Alternatively, this file may be used under the terms of the GNU Free
+** Documentation License version 1.3 as published by the Free Software
+** Foundation and appearing in the file included in the packaging of this
+** file.
 **
 ** If you have questions regarding the use of this file, please contact

trunk/src/corelib/codecs/qfontlaocodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qfontlaocodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qiconvcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qiconvcodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qisciicodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qisciicodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qlatincodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qlatincodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qsimplecodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -55 +55 @@
     quint16 values[128];
 } unicodevalues[QSimpleTextCodec::numSimpleCodecs] = {
+
     // from RFC 1489, ftp://ftp.isi.edu/in-notes/rfc1489.txt
     { "KOI8-R", { "csKOI8R", 0 }, 2084,
@@ -289 +290 @@
         0x0175, 0x00F1, 0x00F2, 0x00F3, 0x00F4, 0x00F5, 0x00F6, 0x1E6B,
         0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x0177, 0x00FF} },
+
     { "ISO-8859-16", { "iso-ir-226", "latin10", 0 }, 112,
       { 0x0080, 0x0081, 0x0082, 0x0083, 0x0084, 0x0085, 0x0086, 0x0087,
@@ -310 +312 @@
 
     // $ for a in CP* ; do (awk '/^0x[89ABCDEF]/{ print $1, $2 }' < $a) | sort | sed -e 's/#UNDEF.*$/0xFFFD/' | cut -c6- | paste '-d ' - - - - - - - - | sed -e 's/ /, /g' -e 's/$/,/' -e '$ s/,$/} },/' -e '1 s/^/{ /' > ~/tmp/$a ; done
-
+#ifndef Q_OS_SYMBIAN
     { "IBM850", { "CP850", "csPC850Multilingual", 0 }, 2009,
       { 0x00C7, 0x00FC, 0x00E9, 0x00E2, 0x00E4, 0x00E0, 0x00E5, 0x00E7,
@@ -345 +347 @@
         0x0E50, 0x0E51, 0x0E52, 0x0E53, 0x0E54, 0x0E55, 0x0E56, 0x0E57,
         0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD} },
+
     { "IBM866", { "CP866", "csIBM866", 0 }, 2086,
       { 0x0410, 0x0411, 0x0412, 0x0413, 0x0414, 0x0415, 0x0416, 0x0417,
@@ -363 +366 @@
         0x00B0, 0x2219, 0x00B7, 0x221A, 0x2116, 0x00A4, 0x25A0, 0x00A0} },
 
+
     { "windows-1250", { "CP1250", 0 }, 2250,
       { 0x20AC, 0xFFFD, 0x201A, 0xFFFD, 0x201E, 0x2026, 0x2020, 0x2021,
@@ -517 +521 @@
         0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x01B0, 0x20AB, 0x00FF} },
 
+
     { "Apple Roman", { "macintosh", "MacRoman", 0 }, -168,
       { 0x00C4, 0x00C5, 0x00C7, 0x00C9, 0x00D1, 0x00D6, 0x00DC, 0x00E1,
@@ -535 +540 @@
         0x00AF, 0x02D8, 0x02D9, 0x02DA, 0x00B8, 0x02DD, 0x02DB, 0x02C7} },
 
-
-
     // This one is based on the charmap file
     // /usr/share/i18n/charmaps/SAMI-WS2.gz, which is manually adapted
@@ -558 +561 @@
         0x00F8, 0x00F9, 0x00FA, 0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF} },
 
-
+#ifndef Q_OS_SYMBIAN
     // this one is generated from the charmap file located in /usr/share/i18n/charmaps
     // on most Linux distributions. The thai character set tis620 is byte by byte equivalent
@@ -582 +585 @@
         0x0E58, 0x0E59, 0x0E5A, 0x0E5B, 0xFFFD, 0xFFFD, 0xFFFD, 0xFFFD } },
 
+
     /*
       Name: hp-roman8                                  [HP-PCL5,RFC1345,KXS2]

trunk/src/corelib/codecs/qsimplecodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -65 +65 @@
 {
 public:
+
+
+
     enum { numSimpleCodecs = 30 };
+
     explicit QSimpleTextCodec(int);
     ~QSimpleTextCodec();

trunk/src/corelib/codecs/qtextcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -71 +71 @@
 #  include "qtsciicodec_p.h"
 #  include "qisciicodec_p.h"
+
 #  if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
 // no iconv(3) support, must build all codecs into the library
@@ -84 +85 @@
 #    include "../../plugins/codecs/jp/qfontjpcodec.h"
 #  endif
+
 #endif // QT_NO_CODECS
 #include "qlocale.h"
@@ -100 +102 @@
 #endif
 
+
+
+
+
+
 // enabling this is not exception safe!
 // #define Q_DEBUG_TEXTCODEC
@@ -105 +112 @@
 QT_BEGIN_NAMESPACE
 
-#ifndef QT_NO_TEXTCODECPLUGIN
+#if
 Q_GLOBAL_STATIC_WITH_ARGS(QFactoryLoader, loader,
     (QTextCodecFactoryInterface_iid, QLatin1String("/codecs")))
 #endif
+
+
+
+
 
 
@@ -149 +160 @@
 static QTextCodec *createForName(const QByteArray &name)
 {
-#ifndef QT_NO_TEXTCODECPLUGIN
+#if
     QFactoryLoader *l = loader();
     QStringList keys = l->keys();
@@ -181 +192 @@
 
 static QList<QTextCodec*> *all = 0;
-static int clearCaches = 0;  // flags specifying if caches should be invalided: 0x1 codecForName, 0x2 codecForMib
 #ifdef Q_DEBUG_TEXTCODEC
 static bool destroying_is_ok = false;
@@ -413 +423 @@
 }
 
-QByteArray QWindowsLocalCodec::convertFromUnicode(const QChar *uc, int len, ConverterState *) const
-{
-    return qt_winQString2MB(uc, len);
+QByteArray QWindowsLocalCodec::convertFromUnicode(const QChar *ch, int uclen, ConverterState *) const
+{
+    if (!ch)
+        return QByteArray();
+    if (uclen == 0)
+        return QByteArray("");
+    BOOL used_def;
+    QByteArray mb(4096, 0);
+    int len;
+    while (!(len=WideCharToMultiByte(CP_ACP, 0, (const wchar_t*)ch, uclen,
+                mb.data(), mb.size()-1, 0, &used_def)))
+    {
+        int r = GetLastError();
+        if (r == ERROR_INSUFFICIENT_BUFFER) {
+            mb.resize(1+WideCharToMultiByte(CP_ACP, 0,
+                                (const wchar_t*)ch, uclen,
+                                0, 0, 0, &used_def));
+                // and try again...
+        } else {
+#ifndef QT_NO_DEBUG
+            // Fail.
+            qWarning("WideCharToMultiByte: Cannot convert multibyte text (error %d): %s (UTF-8)",
+                r, QString(ch, uclen).toLocal8Bit().data());
+#endif
+            break;
+        }
+    }
+    mb.resize(len);
+    return mb;
 }
 
@@ -796 +832 @@
 static void setupLocaleMapper()
 {
+
+
+
+
+
+
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
     localeMapper = QTextCodec::codecForName("System");
@@ -949 +991 @@
 
 #ifndef QT_NO_CODECS
+
+
+
+
+
+
+
+
+
+
+
 #  if defined(Q_WS_X11) && !defined(QT_BOOTSTRAPPED)
     // no font codecs when bootstrapping
@@ -965 +1018 @@
 #  endif // Q_WS_X11
 
-    (void)new QTsciiCodec;
-
-    for (int i = 0; i < 9; ++i)
-        (void)new QIsciiCodec(i);
-
-
+
+#ifndef Q_OS_SYMBIAN
 #  if defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
     // no asian codecs when bootstrapping, sorry
@@ -984 +1033 @@
     (void)new QBig5hkscsCodec;
 #  endif // QT_NO_ICONV && !QT_BOOTSTRAPPED
+
 #endif // QT_NO_CODECS
 
@@ -1000 +1050 @@
     (void)new QUtf32BECodec;
     (void)new QUtf32LECodec;
+
     (void)new QLatin15Codec;
+
     (void)new QLatin1Codec;
     (void)new QUtf8Codec;
 
-    for (int i = 0; i < QSimpleTextCodec::numSimpleCodecs; ++i)
-        (void)new QSimpleTextCodec(i);
-
+#ifndef Q_OS_SYMBIAN
 #if defined(Q_OS_UNIX) && !defined(QT_NO_ICONV) && !defined(QT_BOOTSTRAPPED)
     // QIconvCodec depends on the UTF-16 codec, so it needs to be created last
     (void) new QIconvCodec();
+
 #endif
 
@@ -1047 +1098 @@
 void qt_resetCodecForLocale()
 {
+
+
+
     // if QTextCodec::codecForLocale() was called, we assume that the user has
     // explicitly set the codec he wants for the locale and don't attempt to
@@ -1220 +1274 @@
 #endif
         all->removeAll(this);
-        clearCaches = 0x1 | 0x2;
+        QTextCodecCache *cache = qTextCodecCache();
+        if (cache)
+            cache->clear();
     }
 }
@@ -1250 +1306 @@
         return 0;
 
-    static QHash <QByteArray, QTextCodec *> cache;
-    if (clearCaches & 0x1) {
-        cache.clear();
-        clearCaches &= ~0x1;
-    }
-    QTextCodec *codec = cache.value(name);
-    if (codec)
-        return codec;
+    QTextCodecCache *cache = qTextCodecCache();
+    QTextCodec *codec;
+    if (cache) {
+        codec = cache->value(name);
+        if (codec)
+            return codec;
+    }
 
     for (int i = 0; i < all->size(); ++i) {
         QTextCodec *cursor = all->at(i);
         if (nameMatch(cursor->name(), name)) {
-            cache.insert(name, cursor);
+            if (cache)
+                cache->insert(name, cursor);
             return cursor;
         }
@@ -1268 +1324 @@
         for (int y = 0; y < aliases.size(); ++y)
             if (nameMatch(aliases.at(y), name)) {
-                cache.insert(name, cursor);
+                if (cache)
+                    cache->insert(name, cursor);
                 return cursor;
             }
@@ -1274 +1331 @@
 
     codec = createForName(name);
-    if (codec)
-        cache.insert(name, codec);
+    if (codec)
+        cacheinsert(name, codec);
     return codec;
 }
@@ -1294 +1351 @@
         return 0;
 
-    static QHash <int, QTextCodec *> cache;
-    if (clearCaches & 0x2) {
-        cache.clear();
-        clearCaches &= ~0x2;
-    }
-    QTextCodec *codec = cache.value(mib);
-    if (codec)
-        return codec;
+    QByteArray key = "MIB: " + QByteArray::number(mib);
+    QTextCodecCache *cache = qTextCodecCache();
+    QTextCodec *codec;
+    if (cache)
+        codec = cache->value(key);
 
     QList<QTextCodec*>::ConstIterator i;
@@ -1307 +1361 @@
         QTextCodec *cursor = all->at(i);
         if (cursor->mibEnum() == mib) {
-            cache.insert(mib, cursor);
+            if (cache)
+                cache->insert(key, cursor);
             return cursor;
         }
@@ -1319 +1374 @@
         return codecForMib(1015);
 
-    if (codec)
-        cache.insert(mib, codec);
+    if (codec)
+        cache, codec);
     return codec;
 }
@@ -1354 +1409 @@
 #endif
 
-#ifndef QT_NO_TEXTCODECPLUGIN
+#if
     QFactoryLoader *l = loader();
     QStringList keys = l->keys();
@@ -1394 +1449 @@
 #endif
 
-#ifndef QT_NO_TEXTCODECPLUGIN
+#if
     QFactoryLoader *l = loader();
     QStringList keys = l->keys();
@@ -1421 +1476 @@
 void QTextCodec::setCodecForLocale(QTextCodec *c)
 {
+
+
+
     codecForLocaleSet = true;
     localeMapper = c;
@@ -1528 +1586 @@
 }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -1538 +1609 @@
 {
     return new QTextEncoder(this);
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 
@@ -1679 +1763 @@
     Constructs a text encoder for the given \a codec.
 */
+
+
+
+
+
+
+
+
+
+
+
 
 /*!
@@ -1755 +1850 @@
     Constructs a text decoder for the given \a codec.
 */
+
+
+
+
+
+
+
+
+
+
+
+
 
 /*!

trunk/src/corelib/codecs/qtextcodec.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -86 +86 @@
     static QTextCodec *codecForUtfText(const QByteArray &ba, QTextCodec *defaultCodec);
 
-    QTextDecoder* makeDecoder() const;
-    QTextEncoder* makeEncoder() const;
-
     bool canEncode(QChar) const;
     bool canEncode(const QString&) const;
@@ -120 +117 @@
     QByteArray fromUnicode(const QChar *in, int length, ConverterState *state = 0) const
         { return convertFromUnicode(in, length, state); }
+
+
+
+
+
+
 
     virtual QByteArray name() const = 0;
@@ -159 +162 @@
 public:
     explicit QTextEncoder(const QTextCodec *codec) : c(codec), state() {}
+
     ~QTextEncoder();
     QByteArray fromUnicode(const QString& str);
@@ -169 +173 @@
     const QTextCodec *c;
     QTextCodec::ConverterState state;
-
-    friend class QXmlStreamWriter;
-    friend class QXmlStreamWriterPrivate;
-#if defined(Q_OS_MAC32) || defined(Q_OS_AIX)
-    friend class QCoreXmlStreamWriter;
-    friend class QCoreXmlStreamWriterPrivate;
-#endif
 };
 
@@ -182 +179 @@
 public:
     explicit QTextDecoder(const QTextCodec *codec) : c(codec), state() {}
+
     ~QTextDecoder();
     QString toUnicode(const char* chars, int len);

trunk/src/corelib/codecs/qtextcodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qtextcodecplugin.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qtextcodecplugin.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qtsciicodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qtsciicodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])

trunk/src/corelib/codecs/qutfcodec.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -48 +48 @@
 
 enum { Endian = 0, Data = 1 };
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 QByteArray QUtf8::convertFromUnicode(const QChar *uc, int len, QTextCodec::ConverterState *state)
@@ -107 +120 @@
                 *cursor++ = 0xc0 | ((uchar) (u >> 6));
             } else {
+
+
+
+
+
+
+
+
                 if (u > 0xffff) {
-                    // see QString::fromUtf8() and QString::utf8() for explanations
-                    if (u > 0x10fe00 && u < 0x10ff00) {
-                        *cursor++ = (u - 0x10fe00);
-                        ++ch;
-                        continue;
-                    } else {
-                        *cursor++ = 0xf0 | ((uchar) (u >> 18));
-                        *cursor++ = 0x80 | (((uchar) (u >> 12)) & 0x3f);
-                    }
+                    *cursor++ = 0xf0 | ((uchar) (u >> 18));
+                    *cursor++ = 0x80 | (((uchar) (u >> 12)) & 0x3f);
                 } else {
                     *cursor++ = 0xe0 | (((uchar) (u >> 12)) & 0x3f);
@@ -180 +194 @@
                 if (!need) {
                     // utf-8 bom composes into 0xfeff code point
+
                     if (!headerdone && uc == 0xfeff) {
-                        // dont do anything, just skip the BOM
-                    } else if (uc > 0xffff && uc < 0x110000) {
+                        // dont do anything, just skip the BOM
+                    } else if (uc > 0xffff && uc < 0x110000) {
                         // surrogate pair
                         Q_ASSERT((qch - (ushort*)result.unicode()) + 2 < result.length());
                         *qch++ = QChar::highSurrogate(uc);
                         *qch++ = QChar::lowSurrogate(uc);
-                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
-                        // error: overlong sequence, UTF16 surrogate or BOM
+                    } else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || ) {
+                        // error: overlong sequence, UTF16 surrogate or 
                         *qch++ = replacement;
                         ++invalid;

trunk/src/corelib/codecs/qutfcodec_p.h

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])