diff options
Diffstat (limited to 'src/corelib/text/qcollator_macx.cpp')
-rw-r--r-- | src/corelib/text/qcollator_macx.cpp | 64 |
1 files changed, 15 insertions, 49 deletions
diff --git a/src/corelib/text/qcollator_macx.cpp b/src/corelib/text/qcollator_macx.cpp index 62b3a904a0..23c23bd53a 100644 --- a/src/corelib/text/qcollator_macx.cpp +++ b/src/corelib/text/qcollator_macx.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org> -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/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 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2020 Aleix Pol Gonzalez <aleixpol@kde.org> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qcollator_p.h" #include "qlocale_p.h" @@ -99,8 +63,8 @@ int QCollator::compare(QStringView s1, QStringView s2) const if (!s2.size()) return +1; - if (d->dirty) - d->init(); + d->ensureInitialized(); + if (!d->collator) return s1.compare(s2, caseSensitivity()); @@ -118,25 +82,27 @@ int QCollator::compare(QStringView s1, QStringView s2) const QCollatorSortKey QCollator::sortKey(const QString &string) const { - if (d->dirty) - d->init(); + d->ensureInitialized(); + if (!d->collator) { // What should (or even *can*) we do here ? (See init()'s comment.) qWarning("QCollator doesn't support sort keys for the C locale on Darwin"); return QCollatorSortKey(nullptr); } - //Documentation recommends having it 5 times as big as the input + auto text = reinterpret_cast<const UniChar *>(string.constData()); + // Documentation recommends having it 5 times as big as the input QList<UCCollationValue> ret(string.size() * 5); ItemCount actualSize; - int status = UCGetCollationKey(d->collator, - reinterpret_cast<const UniChar *>(string.constData()), - string.count(), ret.size(), &actualSize, ret.data()); + int status = UCGetCollationKey(d->collator, text, string.size(), + ret.size(), &actualSize, ret.data()); ret.resize(actualSize + 1); if (status == kUCOutputBufferTooSmall) { - UCGetCollationKey(d->collator, reinterpret_cast<const UniChar *>(string.constData()), - string.count(), ret.size(), &actualSize, ret.data()); + status = UCGetCollationKey(d->collator, text, string.size(), + ret.size(), &actualSize, ret.data()); + Q_ASSERT(status != kUCOutputBufferTooSmall); + Q_ASSERT(ret.size() == qsizetype(actualSize + 1)); } ret[actualSize] = 0; return QCollatorSortKey(new QCollatorSortKeyPrivate(std::move(ret))); @@ -150,7 +116,7 @@ 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); + nullptr, &order); return order; } |