diff options
Diffstat (limited to 'src/corelib/text/qcollator_win.cpp')
| -rw-r--r-- | src/corelib/text/qcollator_win.cpp | 73 |
1 files changed, 7 insertions, 66 deletions
diff --git a/src/corelib/text/qcollator_win.cpp b/src/corelib/text/qcollator_win.cpp index 54f57f1d24..b588f5ff46 100644 --- a/src/corelib/text/qcollator_win.cpp +++ b/src/corelib/text/qcollator_win.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" @@ -63,11 +27,7 @@ void QCollatorPrivate::init() if (isC()) return; -#ifndef USE_COMPARESTRINGEX localeID = qt_inIsoNametoLCID(QLocalePrivate::get(locale)->bcp47Name().constData()); -#else - localeName = locale.bcp47Name(); -#endif if (caseSensitivity == Qt::CaseInsensitive) collator |= NORM_IGNORECASE; @@ -97,8 +57,7 @@ int QCollator::compare(QStringView s1, QStringView s2) const if (d->isC()) return s1.compare(s2, d->caseSensitivity); - if (d->dirty) - d->init(); + d->ensureInitialized(); //* from Windows documentation * // Returns one of the following values if successful. To maintain the C @@ -108,16 +67,9 @@ int QCollator::compare(QStringView s1, QStringView s2) const // [...] The function returns 0 if it does not succeed. // https://docs.microsoft.com/en-us/windows/desktop/api/stringapiset/nf-stringapiset-comparestringex#return-value -#ifndef USE_COMPARESTRINGEX const int ret = CompareString(d->localeID, d->collator, reinterpret_cast<const wchar_t *>(s1.data()), s1.size(), reinterpret_cast<const wchar_t *>(s2.data()), s2.size()); -#else - const int ret = CompareStringEx(LPCWSTR(d->localeName.utf16()), d->collator, - reinterpret_cast<LPCWSTR>(s1.data()), s1.size(), - reinterpret_cast<LPCWSTR>(s2.data()), s2.size(), - nullptr, nullptr, 0); -#endif if (Q_LIKELY(ret)) return ret - 2; @@ -139,31 +91,20 @@ int QCollator::compare(QStringView s1, QStringView s2) const QCollatorSortKey QCollator::sortKey(const QString &string) const { - if (d->dirty) - d->init(); + d->ensureInitialized(); + if (d->isC()) return QCollatorSortKey(new QCollatorSortKeyPrivate(string)); -#ifndef USE_COMPARESTRINGEX + // truncating sizes (QTBUG-105038) int size = LCMapStringW(d->localeID, LCMAP_SORTKEY | d->collator, reinterpret_cast<const wchar_t*>(string.constData()), string.size(), 0, 0); -#else - int size = LCMapStringEx(LPCWSTR(d->localeName.utf16()), LCMAP_SORTKEY | d->collator, - reinterpret_cast<LPCWSTR>(string.constData()), string.size(), - 0, 0, NULL, NULL, 0); -#endif + QString ret(size, Qt::Uninitialized); -#ifndef USE_COMPARESTRINGEX int finalSize = LCMapStringW(d->localeID, LCMAP_SORTKEY | d->collator, reinterpret_cast<const wchar_t*>(string.constData()), string.size(), reinterpret_cast<wchar_t*>(ret.data()), ret.size()); -#else - int finalSize = LCMapStringEx(LPCWSTR(d->localeName.utf16()), LCMAP_SORTKEY | d->collator, - reinterpret_cast<LPCWSTR>(string.constData()), string.size(), - reinterpret_cast<LPWSTR>(ret.data()), ret.size(), - NULL, NULL, 0); -#endif if (finalSize == 0) { qWarning() << "there were problems when generating the ::sortKey by LCMapStringW with error:" |