Changeset 419 for trunk/src

Timestamp:

Dec 11, 2009, 6:51:58 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

Use UniStrcoll for QString::localeAwareCompare() (closes #115).

File:

• trunk/src/corelib/tools/qstring.cpp (modified) (3 diffs)

trunk/src/corelib/tools/qstring.cpp

@@ -60 +60 @@
 #endif
 
+#ifdef Q_OS_OS2
+#include "qatomic.h"
+#include <unidef.h>
+#endif
+
 #include <private/qfunctions_p.h>
 
@@ -3331 +3336 @@
 }
 
-#ifndef Q_WS_MAC
+#if !defined(Q_WS_MAC) && !defined(Q_OS_OS2)
 static QByteArray toLocal8Bit_helper(const QChar *data, int length)
 {
@@ -4569 +4574 @@
     default:
         return 0;
+    }
+#elif defined(Q_OS_OS2)
+    static QAtomicPointer<void> localeObj;
+    if (!localeObj) {
+        LocaleObject lo = 0;
+        UniCreateLocaleObject(UNI_UCS_STRING_POINTER, (UniChar *)L"", &lo);
+        if (!localeObj.testAndSetRelaxed(0, lo))
+            UniFreeLocaleObject(lo); // we are too late
+    }
+    if (localeObj) {
+        // note: we assume that data1 and data2 are zero-terminated (to avoid
+        // creation of dumb deep copies) which is at least true for 4.5.1.
+#if QT_VERSION == 0x040501
+        return UniStrcoll(localeObj, (UniChar*)data1, (UniChar *)data2);
+#else
+# error "Check me!"
+#endif
+    } else {
+        return ucstrcmp(data1, length1, data2, length2);
     }
 #elif defined (Q_OS_MAC)