Changeset 561 for trunk/src/corelib/tools/qchar.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/tools/qchar.cpp (modified) (12 diffs)

trunk/src/corelib/tools/qchar.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$
 **
@@ -71 +71 @@
     \brief The QLatin1Char class provides an 8-bit ASCII/Latin-1 character.
 
-    \ingroup text
+    \ingroup 
 
     This class is only useful to avoid the codec for C strings business
@@ -105 +105 @@
     \brief The QChar class provides a 16-bit Unicode character.
 
-    \ingroup text
+    \ingroup 
     \reentrant
 
@@ -1322 +1322 @@
     return in;
 }
-#endif
+#endif
 
 /*!
@@ -1422 +1422 @@
 
 
-static QString decomposeHelper
-    (const QString &str, bool canonical, QChar::UnicodeVersion version)
+static void decomposeHelper(QString *str, bool canonical, QChar::UnicodeVersion version, int from)
 {
     unsigned short buffer[3];
 
-    QString s = str;
-
-    const unsigned short *utf16 = s.utf16();
+    QString str;
+
+    const unsigned short *utf16 = );
     const unsigned short *uc = utf16 + s.length();
-    while (uc != utf16) {
+    while (uc != utf16) {
         uint ucs4 = *(--uc);
         if (QChar(ucs4).isLowSurrogate() && uc != utf16) {
@@ -1451 +1450 @@
         // since the insert invalidates the pointers and we do decomposition recursive
         int pos = uc - utf16;
-        utf16 = s.utf16();
+        utf16 = );
         uc = utf16 + pos + length;
     }
-
-    return s;
 }
 
@@ -1490 +1487 @@
 }
 
-static QString composeHelper(const QString &str)
-{
-    QString s = str;
-
-    if (s.length() < 2)
-        return s;
+static )
+{
+    QString str;
+
+    if (s.length() < 2)
+        return;
 
     // the loop can partly ignore high Unicode as all ligatures are in the BMP
     int starter = 0;
     int lastCombining = 0;
-    int pos = 0;
+    int pos = ;
     while (pos < s.length()) {
-        uint uc = s.utf16()[pos];
+        uint uc = s.;
         if (QChar(uc).isHighSurrogate() && pos < s.length()-1) {
-            ushort low = s.utf16()[pos+1];
+            ushort low = s.;
             if (QChar(low).isLowSurrogate()) {
                 uc = QChar::surrogateToUcs4(uc, low);
@@ -1513 +1510 @@
         if (starter == pos - 1 || combining > lastCombining) {
             // allowed to form ligature with S
-            QChar ligature = ligatureHelper(s.utf16()[starter], uc);
+            QChar ligature = ligatureHelper(s., uc);
             if (ligature.unicode()) {
                 s[starter] = ligature;
@@ -1525 +1522 @@
         ++pos;
     }
-    return s;
-}
-
-
-static QString canonicalOrderHelper
-    (const QString &str, QChar::UnicodeVersion version)
-{
-    QString s = str;
+}
+
+
+static void canonicalOrderHelper(QString *str, QChar::UnicodeVersion version, int from)
+{
+    QString &s = *str;
     const int l = s.length()-1;
-    int pos = 0;
+    int pos = ;
     while (pos < l) {
         int p2 = pos+1;
@@ -1594 +1589 @@
         }
     }
-    return s;
 }