From ec64d514fbf7bc6a6ccf5ee2342734a4719fc634 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@digia.com>
Date: Mon, 11 Mar 2013 01:33:07 -0400
Subject: Make the QCollator class public

The class missed the feature freeze for Qt 5.0, but has been ready
for quite a while. So make it public in time for Qt 5.2.

Change-Id: I9ac3f579ff5e371925fad40684762fff7ee4abd8
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
 src/corelib/tools/qcollator.h | 120 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 120 insertions(+)
 create mode 100644 src/corelib/tools/qcollator.h

(limited to 'src/corelib/tools/qcollator.h')

diff --git a/src/corelib/tools/qcollator.h b/src/corelib/tools/qcollator.h
new file mode 100644
index 0000000000..02470c331f
--- /dev/null
+++ b/src/corelib/tools/qcollator.h
@@ -0,0 +1,120 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtCore module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** 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
+** 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.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** 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$
+**
+****************************************************************************/
+
+#ifndef QCOLLATOR_P_H
+#define QCOLLATOR_P_H
+
+#include <QtCore/qstring.h>
+#include <QtCore/qlocale.h>
+
+QT_BEGIN_NAMESPACE
+
+class QCollatorPrivate;
+
+class Q_CORE_EXPORT QCollator
+{
+public:
+    enum Collation {
+        Default,
+        Big5Han,
+        Dictionary,
+        Direct,
+        GB2312Han,
+        PhoneBook,
+        Pinyin,
+        Phonetic,
+        Reformed,
+        Standard,
+        Stroke,
+        Traditional,
+        UniHan
+    };
+
+    QCollator(const QLocale &locale = QLocale(), QCollator::Collation collation = QCollator::Default);
+    QCollator(const QCollator &);
+    ~QCollator();
+    QCollator &operator=(const QCollator &);
+
+    void setLocale(const QLocale &locale);
+    QLocale locale() const;
+
+    void setCollation(Collation collation);
+    Collation collation() const;
+
+    QString identifier() const;
+    static QCollator fromIdentifier(const QString &identifier);
+
+    enum CasePreference {
+        CasePreferenceOff = 0x0,
+        CasePreferenceUpper  = 0x1,
+        CasePreferenceLower  = 0x2
+    };
+
+    CasePreference casePreference() const;
+    void setCasePreference(CasePreference preference);
+
+    void setNumericMode(bool on);
+    bool numericMode() const;
+
+    void setIgnorePunctuation(bool on);
+    bool ignorePunctuation() const;
+
+    int compare(const QString &s1, const QString &s2) const;
+    int compare(const QStringRef &s1, const QStringRef &s2) const;
+    int compare(const QChar *s1, int len1, const QChar *s2, int len2) const;
+
+    bool operator()(const QString &s1, const QString &s2) const
+    { return compare(s1, s2) < 0; }
+
+    QByteArray sortKey(const QString &string) const;
+
+    QStringList indexCharacters() const;
+
+private:
+    QCollatorPrivate *d;
+
+    void detach();
+    void init();
+};
+
+QT_END_NAMESPACE
+
+#endif // QCOLLATOR_P_H
-- 
cgit v1.2.3