diff options
Diffstat (limited to 'src/corelib/text/qunicodetools_p.h')
-rw-r--r-- | src/corelib/text/qunicodetools_p.h | 51 |
1 files changed, 7 insertions, 44 deletions
diff --git a/src/corelib/text/qunicodetools_p.h b/src/corelib/text/qunicodetools_p.h index 5715444025..06f31a5511 100644 --- a/src/corelib/text/qunicodetools_p.h +++ b/src/corelib/text/qunicodetools_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2020 The Qt Company Ltd. -** 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 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #ifndef QUNICODETOOLS_P_H #define QUNICODETOOLS_P_H @@ -74,7 +38,7 @@ namespace QUnicodeTools { struct ScriptItem { - int position; + qsizetype position; QChar::Script script; }; @@ -91,19 +55,18 @@ enum CharAttributeOption { LineBreaks = 0x08, WhiteSpaces = 0x10, HangulLineBreakTailoring = 0x20, - DefaultOptionsCompat = GraphemeBreaks | LineBreaks | WhiteSpaces, // ### remove DontClearAttributes = 0x1000 }; Q_DECLARE_FLAGS(CharAttributeOptions, CharAttributeOption) // attributes buffer has to have a length of string length + 1 -Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length, - const ScriptItem *items, int numItems, - QCharAttributes *attributes, CharAttributeOptions options = DefaultOptionsCompat); +Q_CORE_EXPORT void initCharAttributes(QStringView str, + const ScriptItem *items, qsizetype numItems, + QCharAttributes *attributes, CharAttributeOptions options); -Q_CORE_EXPORT void initScripts(const ushort *string, int length, ScriptItemArray *scripts); +Q_CORE_EXPORT void initScripts(QStringView str, ScriptItemArray *scripts); } // namespace QUnicodeTools |