Changeset 561 for trunk/src/corelib/codecs/qiconvcodec.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/corelib/codecs/qiconvcodec.cpp (modified) (11 diffs)

trunk/src/corelib/codecs/qiconvcodec.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -53 +53 @@
 // unistd.h is needed for the _XOPEN_UNIX macro
 #include <unistd.h>
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
 #  include <langinfo.h>
 #endif
@@ -63 +63 @@
 #  define NO_BOM
 #  define UTF16 "UCS-2"
-#elif defined(Q_OS_MAC)
+#elif defined(Q_OS_MAC)
 #  define NO_BOM
 #  if Q_BYTE_ORDER == Q_BIG_ENDIAN
@@ -239 +239 @@
     }
 
-    QByteArray ba;
     size_t outBytesLeft = len * 2 + 2;
-    ba.resize(outBytesLeft);
+    );
     char *outBytes = ba.data();
     do {
@@ -329 +328 @@
         if (state->cd != reinterpret_cast<iconv_t>(-1)) {
             size_t outBytesLeft = len + 3; // +3 for the BOM
-            QByteArray ba;
-            ba.resize(outBytesLeft);
+            QByteArray ba(outBytesLeft, Qt::Uninitialized);
             outBytes = ba.data();
 
@@ -359 +357 @@
  
     size_t outBytesLeft = len;
-    QByteArray ba;
-    ba.resize(outBytesLeft);
+    QByteArray ba(outBytesLeft, Qt::Uninitialized);
     outBytes = ba.data();
 
@@ -382 +379 @@
 
     int invalidCount = 0;
-    do {
+     {
         if (iconv(state->cd, inBytesPtr, &inBytesLeft, &outBytes, &outBytesLeft) == (size_t) -1) {
             if (errno == EINVAL && convState) {
@@ -422 +419 @@
             }
         }
-    } while (inBytesLeft != 0);
+    }
 
     // reset to initial state
@@ -459 +456 @@
 #endif
 
-#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX6) && !defined(Q_OS_OSF)
+#if defined(_XOPEN_UNIX) && !defined(Q_OS_QNX) && !defined(Q_OS_OSF)
     if (cd == (iconv_t) -1) {
         codeset = nl_langinfo(CODESET);