Changeset 561 for trunk/src/corelib/tools/qchar.h

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/tools/qchar.h (modified) (6 diffs)

trunk/src/corelib/tools/qchar.h

@@ -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$
 **
@@ -293 +293 @@
     }
     static inline ushort highSurrogate(uint ucs4) {
-        return (ucs4>>10) + 0xd7c0;
+        return ;
     }
     static inline ushort lowSurrogate(uint ucs4) {
-        return ucs4%0x400 + 0xdc00;
+        return u;
     }
 
@@ -367 +367 @@
 inline QChar QChar::fromLatin1(char c) { return QChar(ushort(uchar(c))); }
 
-inline QChar::QChar(uchar c, uchar r) : ucs((r << 8) | c){}
+inline QChar::QChar(uchar c, uchar r) : ucs(){}
 inline QChar::QChar(short rc) : ucs(ushort(rc)){}
 inline QChar::QChar(uint rc) : ucs(ushort(rc & 0xffff)){}
@@ -375 +375 @@
 
 inline void QChar::setCell(uchar acell)
-{ ucs = (ucs & 0xff00) + acell; }
+{ ucs = ; }
 inline void QChar::setRow(uchar arow)
-{ ucs = (ushort(arow)<<8) + (ucs&0xff); }
+{ ucs = ); }
 
 inline bool operator==(QChar c1, QChar c2) { return c1.unicode() == c2.unicode(); }