1 files changed, 28 insertions, 56 deletions

diff --git a/src/corelib/tools/qcollator_posix.cpp b/src/corelib/tools/qcollator_posix.cpp
index b47b546d01..89ac4d984c 100644
--- a/src/corelib/tools/qcollator_posix.cpp
+++ b/src/corelib/tools/qcollator_posix.cpp
@@ -5,36 +5,28 @@
 **
 ** This file is part of the QtCore module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL$
+** $QT_BEGIN_LICENSE:LGPL21$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.  For licensing terms and
-** conditions see http://qt.digia.com/licensing.  For further information
+** a written agreement between you and Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
 ** use the contact form at http://qt.digia.com/contact-us.
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
 ** In addition, as a special exception, Digia gives you certain additional
-** rights.  These rights are described in the Digia Qt LGPL Exception
+** rights. These rights are described in the Digia Qt LGPL Exception
 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -50,47 +42,21 @@ QT_BEGIN_NAMESPACE
 
 void QCollatorPrivate::init()
 {
+    if (locale != QLocale())
+        qWarning("Only default locale supported with the posix collation implementation");
+    if (caseSensitivity != Qt::CaseSensitive)
+        qWarning("Case insensitive sorting unsupported in the posix collation implementation");
+    if (numericMode)
+        qWarning("Numeric mode unsupported in the posix collation implementation");
+    if (ignorePunctuation)
+        qWarning("Ignoring punctuation unsupported in the posix collation implementation");
+    dirty = false;
 }
 
 void QCollatorPrivate::cleanup()
 {
 }
 
-void QCollator::setCaseSensitivity(Qt::CaseSensitivity cs)
-{
-    Q_UNUSED(cs);
-    qWarning("unsupported in the posix collation implementation");
-}
-
-Qt::CaseSensitivity QCollator::caseSensitivity() const
-{
-    qWarning("unsupported in the posix collation implementation");
-    return Qt::CaseSensitive;
-}
-
-void QCollator::setNumericMode(bool on)
-{
-    Q_UNUSED(on);
-    qWarning("unsupported in the posix collation implementation");
-}
-
-bool QCollator::numericMode() const
-{
-    return true;
-}
-
-void QCollator::setIgnorePunctuation(bool on)
-{
-    Q_UNUSED(on);
-    qWarning("unsupported in the posix collation implementation");
-}
-
-bool QCollator::ignorePunctuation() const
-{
-    qWarning("unsupported in the posix collation implementation");
-    return false;
-}
-
 static void stringToWCharArray(QVarLengthArray<wchar_t> &ret, const QString &string)
 {
     ret.resize(string.length());
@@ -112,16 +78,23 @@ int QCollator::compare(const QString &s1, const QString &s2) const
     QVarLengthArray<wchar_t> array1, array2;
     stringToWCharArray(array1, s1);
     stringToWCharArray(array2, s2);
-    return std::wcscoll(array1.constData(), array2.constData());
+    int result = std::wcscoll(array1.constData(), array2.constData());
+    return result > 0 ? 1 : (result == 0 ? 0 : -1);
 }
 
 int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const
 {
+    if (d->dirty)
+        d->init();
+
     return compare(s1.constData(), s1.size(), s2.constData(), s2.size());
 }
 
 QCollatorSortKey QCollator::sortKey(const QString &string) const
 {
+    if (d->dirty)
+        d->init();
+
     QVarLengthArray<wchar_t> original;
     stringToWCharArray(original, string);
     QVector<wchar_t> result(string.size());
@@ -137,8 +110,7 @@ QCollatorSortKey QCollator::sortKey(const QString &string) const
 
 int QCollatorSortKey::compare(const QCollatorSortKey &otherKey) const
 {
-    return std::wcscmp(d->m_key.constData(),
-                  otherKey.d->m_key.constData());
+    return std::wcscmp(d->m_key.constData(), otherKey.d->m_key.constData());
 }
 
 QT_END_NAMESPACE