From 9514138a5ca68341122cff4be2744c995c8ba2c4 Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Tue, 18 Oct 2011 19:12:21 +0200 Subject: optimize QString::toLower()/toUpper() for special cases, step 2 from now, QUnicodeTables::specialCaseMap[] starts with a placeholder; so, if somethingCaseSpecial is true, then somethingCaseDiff is always greater than 0 Change-Id: Ibb1870512836eee71b1521564c0745096c05b2f9 Merge-request: 70 Reviewed-by: Oswald Buddenhagen Reviewed-by: Olivier Reviewed-by: Olivier Goffart --- src/corelib/tools/qstring.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index b0c259272e..704545667c 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -4906,7 +4906,7 @@ QString QString::toLower() const } else { prop = qGetProp(*p); } - if (prop->lowerCaseDiff || prop->lowerCaseSpecial) { + if (prop->lowerCaseDiff) { if (QChar::isLowSurrogate(*p)) --p; // safe; diff is 0 for surrogates QString s(d->size, Qt::Uninitialized); @@ -4967,7 +4967,7 @@ QString QString::toCaseFolded() const } else { prop = qGetProp(*p); } - if (prop->caseFoldDiff || prop->caseFoldSpecial) { + if (prop->caseFoldDiff) { if (QChar::isLowSurrogate(*p)) --p; // safe; diff is 0 for surrogates QString s(d->size, Qt::Uninitialized); @@ -5028,7 +5028,7 @@ QString QString::toUpper() const } else { prop = qGetProp(*p); } - if (prop->upperCaseDiff || prop->upperCaseSpecial) { + if (prop->upperCaseDiff) { if (QChar::isLowSurrogate(*p)) --p; // safe; diff is 0 for surrogates QString s(d->size, Qt::Uninitialized); -- cgit v1.2.3