From 51da24014949868bbaffe2d98f8500eb5fcb9795 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Sep 2013 15:20:34 +0200 Subject: Don't use Mac OS X QCollator backend on iOS We don't have CoreServices on iOS, which hosts the UC* APIs. Change-Id: I95b1b173e57665c2fc2cdc1701f8ad57cdc0e567 Reviewed-by: James Turner Reviewed-by: Aleix Pol Gonzalez Reviewed-by: Lars Knoll --- src/corelib/tools/qcollator_mac.cpp | 179 ----------------------------------- src/corelib/tools/qcollator_macx.cpp | 179 +++++++++++++++++++++++++++++++++++ src/corelib/tools/qcollator_p.h | 4 +- src/corelib/tools/tools.pri | 4 +- 4 files changed, 183 insertions(+), 183 deletions(-) delete mode 100644 src/corelib/tools/qcollator_mac.cpp create mode 100644 src/corelib/tools/qcollator_macx.cpp (limited to 'src/corelib/tools') diff --git a/src/corelib/tools/qcollator_mac.cpp b/src/corelib/tools/qcollator_mac.cpp deleted file mode 100644 index 8edd190fbe..0000000000 --- a/src/corelib/tools/qcollator_mac.cpp +++ /dev/null @@ -1,179 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Aleix Pol Gonzalez -** 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$ -** -****************************************************************************/ - -#include "qcollator_p.h" -#include "qstringlist.h" -#include "qstring.h" -#include -#include -#include - -#include -#include - -QT_BEGIN_NAMESPACE - -void QCollatorPrivate::init() -{ - cleanup(); - LocaleRef localeRef; - int rc = LocaleRefFromLocaleString(locale.name().toLocal8Bit(), &localeRef); - if (rc != 0) - qWarning() << "couldn't initialize the locale"; - - OSStatus status = UCCreateCollator( - localeRef, - 0, - collator.options, - &collator.collator - ); - if (status != 0) - qWarning() << "Couldn't initialize the collator"; -} - -void QCollatorPrivate::cleanup() -{ - UCDisposeCollator(&collator.collator); - collator.collator = 0; -} - -void QCollator::setCaseSensitivity(Qt::CaseSensitivity cs) -{ - detach(); - - if (cs == Qt::CaseSensitive) - d->collator.options &= ~kUCCollateCaseInsensitiveMask; - else - d->collator.options |= kUCCollateCaseInsensitiveMask; - d->init(); -} - -Qt::CaseSensitivity QCollator::caseSensitivity() const -{ - return !(d->collator.options & kUCCollateCaseInsensitiveMask) ? Qt::CaseInsensitive : Qt::CaseSensitive; -} - -void QCollator::setNumericMode(bool on) -{ - detach(); - - if (on) - d->collator.options |= kUCCollateDigitsAsNumberMask; - else - d->collator.options &= ~kUCCollateDigitsAsNumberMask; - - d->init(); -} - -bool QCollator::numericMode() const -{ - return bool(d->collator.options & kUCCollateDigitsAsNumberMask); -} - -void QCollator::setIgnorePunctuation(bool on) -{ - detach(); - - if (on) - d->collator.options |= kUCCollatePunctuationSignificantMask; - else - d->collator.options &= ~kUCCollatePunctuationSignificantMask; - - d->init(); -} - -bool QCollator::ignorePunctuation() const -{ - return bool(d->collator.options & kUCCollatePunctuationSignificantMask); -} - -int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const -{ - SInt32 result; - return UCCompareText(d->collator.collator, - reinterpret_cast(s1), len1, - reinterpret_cast(s2), len2, - NULL, - &result); - return result; -} -int QCollator::compare(const QString &str1, const QString &str2) const -{ - return compare(str1.constData(), str1.size(), str2.constData(), str2.size()); -} - -int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const -{ - return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); -} - -QCollatorSortKey QCollator::sortKey(const QString &string) const -{ - //Documentation recommends having it 5 times as big as the input - QVector ret(string.size() * 5); - ItemCount actualSize; - int status = UCGetCollationKey(d->collator.collator, reinterpret_cast(string.constData()), string.count(), - ret.size(), &actualSize, ret.data()); - - ret.resize(actualSize+1); - if (status == kUCOutputBufferTooSmall) { - UCGetCollationKey(d->collator.collator, reinterpret_cast(string.constData()), string.count(), - ret.size(), &actualSize, ret.data()); - } - ret[actualSize] = 0; - return QCollatorSortKey(new QCollatorSortKeyPrivate(ret)); -} - -bool QCollatorSortKey::operator<(const QCollatorSortKey &key) const -{ - return compare(key) < 0; -} - -int QCollatorSortKey::compare(const QCollatorSortKey &key) const -{ - SInt32 order; - UCCompareCollationKeys(d->m_key.data(), d->m_key.size(), - key.d->m_key.data(), key.d->m_key.size(), - 0, &order); - return order; -} - -QT_END_NAMESPACE diff --git a/src/corelib/tools/qcollator_macx.cpp b/src/corelib/tools/qcollator_macx.cpp new file mode 100644 index 0000000000..8edd190fbe --- /dev/null +++ b/src/corelib/tools/qcollator_macx.cpp @@ -0,0 +1,179 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Aleix Pol Gonzalez +** 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$ +** +****************************************************************************/ + +#include "qcollator_p.h" +#include "qstringlist.h" +#include "qstring.h" +#include +#include +#include + +#include +#include + +QT_BEGIN_NAMESPACE + +void QCollatorPrivate::init() +{ + cleanup(); + LocaleRef localeRef; + int rc = LocaleRefFromLocaleString(locale.name().toLocal8Bit(), &localeRef); + if (rc != 0) + qWarning() << "couldn't initialize the locale"; + + OSStatus status = UCCreateCollator( + localeRef, + 0, + collator.options, + &collator.collator + ); + if (status != 0) + qWarning() << "Couldn't initialize the collator"; +} + +void QCollatorPrivate::cleanup() +{ + UCDisposeCollator(&collator.collator); + collator.collator = 0; +} + +void QCollator::setCaseSensitivity(Qt::CaseSensitivity cs) +{ + detach(); + + if (cs == Qt::CaseSensitive) + d->collator.options &= ~kUCCollateCaseInsensitiveMask; + else + d->collator.options |= kUCCollateCaseInsensitiveMask; + d->init(); +} + +Qt::CaseSensitivity QCollator::caseSensitivity() const +{ + return !(d->collator.options & kUCCollateCaseInsensitiveMask) ? Qt::CaseInsensitive : Qt::CaseSensitive; +} + +void QCollator::setNumericMode(bool on) +{ + detach(); + + if (on) + d->collator.options |= kUCCollateDigitsAsNumberMask; + else + d->collator.options &= ~kUCCollateDigitsAsNumberMask; + + d->init(); +} + +bool QCollator::numericMode() const +{ + return bool(d->collator.options & kUCCollateDigitsAsNumberMask); +} + +void QCollator::setIgnorePunctuation(bool on) +{ + detach(); + + if (on) + d->collator.options |= kUCCollatePunctuationSignificantMask; + else + d->collator.options &= ~kUCCollatePunctuationSignificantMask; + + d->init(); +} + +bool QCollator::ignorePunctuation() const +{ + return bool(d->collator.options & kUCCollatePunctuationSignificantMask); +} + +int QCollator::compare(const QChar *s1, int len1, const QChar *s2, int len2) const +{ + SInt32 result; + return UCCompareText(d->collator.collator, + reinterpret_cast(s1), len1, + reinterpret_cast(s2), len2, + NULL, + &result); + return result; +} +int QCollator::compare(const QString &str1, const QString &str2) const +{ + return compare(str1.constData(), str1.size(), str2.constData(), str2.size()); +} + +int QCollator::compare(const QStringRef &s1, const QStringRef &s2) const +{ + return compare(s1.constData(), s1.size(), s2.constData(), s2.size()); +} + +QCollatorSortKey QCollator::sortKey(const QString &string) const +{ + //Documentation recommends having it 5 times as big as the input + QVector ret(string.size() * 5); + ItemCount actualSize; + int status = UCGetCollationKey(d->collator.collator, reinterpret_cast(string.constData()), string.count(), + ret.size(), &actualSize, ret.data()); + + ret.resize(actualSize+1); + if (status == kUCOutputBufferTooSmall) { + UCGetCollationKey(d->collator.collator, reinterpret_cast(string.constData()), string.count(), + ret.size(), &actualSize, ret.data()); + } + ret[actualSize] = 0; + return QCollatorSortKey(new QCollatorSortKeyPrivate(ret)); +} + +bool QCollatorSortKey::operator<(const QCollatorSortKey &key) const +{ + return compare(key) < 0; +} + +int QCollatorSortKey::compare(const QCollatorSortKey &key) const +{ + SInt32 order; + UCCompareCollationKeys(d->m_key.data(), d->m_key.size(), + key.d->m_key.data(), key.d->m_key.size(), + 0, &order); + return order; +} + +QT_END_NAMESPACE diff --git a/src/corelib/tools/qcollator_p.h b/src/corelib/tools/qcollator_p.h index 7c5f18c5b2..50e1a01f82 100644 --- a/src/corelib/tools/qcollator_p.h +++ b/src/corelib/tools/qcollator_p.h @@ -47,7 +47,7 @@ #include #ifdef QT_USE_ICU #include -#elif defined(Q_OS_DARWIN) +#elif defined(Q_OS_OSX) #include #endif @@ -57,7 +57,7 @@ QT_BEGIN_NAMESPACE typedef UCollator *CollatorType; typedef QByteArray CollatorKeyType; -#elif defined(Q_OS_DARWIN) +#elif defined(Q_OS_OSX) typedef QVector CollatorKeyType; struct CollatorType { diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 01f16dc2ad..318f84d78e 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -150,8 +150,8 @@ contains(QT_CONFIG,icu) { } } else: win32 { SOURCES += tools/qcollator_win.cpp -} else: mac { - SOURCES += tools/qcollator_mac.cpp +} else: macx { + SOURCES += tools/qcollator_macx.cpp } else { SOURCES += tools/qcollator_posix.cpp } -- cgit v1.2.3