diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-16 17:21:41 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-20 16:06:28 +0200 |
| commit | 996a7fc6f154cc6cd81b9f2af0899e4a8acac812 (patch) | |
| tree | 1f173b9c30b0bac003880defb2a2b9d665ed788e /src/corelib/text/qchar.cpp | |
| parent | 21d9384800f8579f2f76cc1230c0bcd0e240e1c7 (diff) | |
QChar: purge deprecated API
Since 5.3 joining() and old Joining type
Replaced by JoiningType joiningType()
Change-Id: Iefee50aaf94cec6d67b5fc004b3e68357b2015c5
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Diffstat (limited to 'src/corelib/text/qchar.cpp')
| -rw-r--r-- | src/corelib/text/qchar.cpp | 52 |
1 files changed, 1 insertions, 51 deletions
diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index a816e01b68..df9ab17174 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2019 The Qt Company Ltd. +** 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. @@ -538,24 +538,6 @@ QT_BEGIN_NAMESPACE \sa joiningType() */ -#if QT_DEPRECATED_SINCE(5, 3) -/*! - \enum QChar::Joining - \deprecated in 5.3, use JoiningType instead. - - This enum type defines the Unicode joining attributes. See the - \l{http://www.unicode.org/}{Unicode Standard} for a description - of the values. - - \value Center - \value Dual - \value OtherJoining - \value Right - - \sa joining() -*/ -#endif - /*! \enum QChar::CombiningClass @@ -1270,38 +1252,6 @@ QChar::JoiningType QChar::joiningType(char32_t ucs4) noexcept return QChar::JoiningType(qGetProp(ucs4)->joining); } -#if QT_DEPRECATED_SINCE(5, 3) -/*! - \fn QChar::Joining QChar::joining() const - \deprecated in 5.3, use joiningType() instead. - - Returns information about the joining properties of the character - (needed for certain languages such as Arabic). -*/ - -/*! - \overload - \deprecated in 5.3, use joiningType() instead. - - Returns information about the joining properties of the UCS-4-encoded - character specified by \a ucs4 (needed for certain languages such as Arabic). - - \note Before Qt 6, this function took a \c uint argument. -*/ -QChar::Joining QChar::joining(char32_t ucs4) noexcept -{ - if (ucs4 > LastValidCodePoint) - return QChar::OtherJoining; - switch (qGetProp(ucs4)->joining) { - case QChar::Joining_Causing: return QChar::Center; - case QChar::Joining_Dual: return QChar::Dual; - case QChar::Joining_Right: return QChar::Right; - default: break; - } - return QChar::OtherJoining; -} -#endif - /*! \fn bool QChar::hasMirrored() const |