whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QString: Use QStringIterator in QtPrivate::isRightToLeft() 

This simplifies the code. While at it, also expand default case
so changes in the QChar::Direction enum don't go unnoticed.

Change-Id: Id52140b0aaf7fd259c4b8079462811603eb3ff93
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Ievgenii Meshcheriakov 2021-10-07 17:28:32 +02:00
parent f19668ce65
commit 4682af483f
1 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/corelib/text/qstring.cpp
View File

@ -9974,20 +9974,12 @@ QDataStream &operator>>(QDataStream &in, QString &str)
*/
bool QtPrivate::isRightToLeft(QStringView string) noexcept
{
const char16_t *p = string.utf16();
const char16_t * const end = p + string.size();
int isolateLevel = 0;
while (p < end) {
uint ucs4 = *p;
if (QChar::isHighSurrogate(ucs4) && p < end - 1) {
char16_t low = p[1];
if (QChar::isLowSurrogate(low)) {
ucs4 = QChar::surrogateToUcs4(ucs4, low);
++p;
}
}
switch (QChar::direction(ucs4))
{
for (QStringIterator i(string); i.hasNext();) {
const char32_t c = i.next();
switch (QChar::direction(c)) {
case QChar::DirRLI:
case QChar::DirLRI:
case QChar::DirFSI:
@ -10006,10 +9998,24 @@ bool QtPrivate::isRightToLeft(QStringView string) noexcept
if (isolateLevel)
break;
return true;
default:
case QChar::DirEN:
case QChar::DirES:
case QChar::DirET:
case QChar::DirAN:
case QChar::DirCS:
case QChar::DirB:
case QChar::DirS:
case QChar::DirWS:
case QChar::DirON:
case QChar::DirLRE:
case QChar::DirLRO:
case QChar::DirRLE:
case QChar::DirRLO:
case QChar::DirPDF:
case QChar::DirNSM:
case QChar::DirBN:
break;
}
++p;
}
return false;
}