Changeset 561 for trunk/src/corelib/codecs/qtsciicodec.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/qtsciicodec.cpp (modified) (6 diffs)

trunk/src/corelib/codecs/qtsciicodec.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$
 **
@@ -42 +42 @@
 // Most of the code here was originally written by Hans Petter Bieker,
 // and is included in Qt with the author's permission, and the grateful
-// thanks of the Trolltech team.
+// thanks of the  team.
 
 #include "qtsciicodec_p.h"
@@ -83 +83 @@
     int invalid = 0;
 
-    QByteArray rstr;
-    rstr.resize(len);
+    QByteArray rstr(len, Qt::Uninitialized);
     uchar* cursor = (uchar*)rstr.data();
     for (int i = 0; i < len; i++) {
@@ -181 +180 @@
 int QTsciiCodec::mibEnum() const
 {
-  /* There is no MIBEnum for TSCII now */
-  return -3197;
+  return 2107;
 }