diff options
Diffstat (limited to 'src/corelib/text/qchar.cpp')
| -rw-r--r-- | src/corelib/text/qchar.cpp | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/src/corelib/text/qchar.cpp b/src/corelib/text/qchar.cpp index 4a7af8971f..6e0bb3c10e 100644 --- a/src/corelib/text/qchar.cpp +++ b/src/corelib/text/qchar.cpp @@ -159,7 +159,7 @@ QT_BEGIN_NAMESPACE call toLatin1() to get the 8-bit value back. For more information see - \l{http://www.unicode.org/ucd/}{"About the Unicode Character Database"}. + \l{https://www.unicode.org/ucd/}{"About the Unicode Character Database"}. \sa Unicode, QString, QLatin1Char */ @@ -167,8 +167,8 @@ QT_BEGIN_NAMESPACE /*! \enum QChar::UnicodeVersion - Specifies which version of the \l{http://www.unicode.org/}{Unicode standard} - introduced a certain character. + Specifies which version of the \l{Unicode standard} introduced a certain + character. \value Unicode_1_1 Version 1.1 \value Unicode_2_0 Version 2.0 @@ -279,7 +279,7 @@ QT_BEGIN_NAMESPACE This enum type defines the Unicode script property values. For details about the Unicode script property values see - \l{http://www.unicode.org/reports/tr24/}{Unicode Standard Annex #24}. + \l{https://www.unicode.org/reports/tr24/}{Unicode Standard Annex #24}. In order to conform to C/C++ naming conventions "Script_" is prepended to the codes used in the Unicode Standard. @@ -456,8 +456,8 @@ QT_BEGIN_NAMESPACE \enum QChar::Direction This enum type defines the Unicode direction attributes. See the - \l{http://www.unicode.org/reports/tr9/tr9-35.html#Table_Bidirectional_Character_Types}{Unicode Standard} for a description - of the values. + \l{https://www.unicode.org/reports/tr9/tr9-35.html#Table_Bidirectional_Character_Types}{Unicode + Standard} for a description of the values. In order to conform to C/C++ naming conventions "Dir" is prepended to the codes used in the Unicode Standard. @@ -493,8 +493,7 @@ QT_BEGIN_NAMESPACE \enum QChar::Decomposition This enum type defines the Unicode decomposition attributes. See - the \l{http://www.unicode.org/}{Unicode Standard} for a - description of the values. + the \l{Unicode Standard} for a description of the values. \value NoDecomposition \value Canonical @@ -523,7 +522,7 @@ QT_BEGIN_NAMESPACE since 5.3 This enum type defines the Unicode joining type attributes. See the - \l{http://www.unicode.org/}{Unicode Standard} for a description of the values. + \l{Unicode Standard} for a description of the values. In order to conform to C/C++ naming conventions "Joining_" is prepended to the codes used in the Unicode Standard. @@ -562,8 +561,7 @@ QT_BEGIN_NAMESPACE \internal This enum type defines names for some of the Unicode combining - classes. See the \l{http://www.unicode.org/}{Unicode Standard} - for a description of the values. + classes. See the \l{Unicode Standard} for a description of the values. \value Combining_Above \value Combining_AboveAttached @@ -1826,7 +1824,7 @@ inline bool operator<(const UCS2SurrogatePair &ligature, uint u1) static uint inline ligatureHelper(uint u1, uint u2) { - if (u1 >= Hangul_LBase && u1 <= Hangul_SBase + Hangul_SCount) { + if (u1 >= Hangul_LBase && u1 < Hangul_SBase + Hangul_SCount) { // compute Hangul syllable composition as per UAX #15 // hangul L-V pair const uint LIndex = u1 - Hangul_LBase; @@ -1839,7 +1837,7 @@ static uint inline ligatureHelper(uint u1, uint u2) const uint SIndex = u1 - Hangul_SBase; if (SIndex < Hangul_SCount && (SIndex % Hangul_TCount) == 0) { const uint TIndex = u2 - Hangul_TBase; - if (TIndex <= Hangul_TCount) + if (TIndex < Hangul_TCount && TIndex) return u1 + TIndex; } } |