AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add QLocale::toUpper/Lower

Browse Source 
The toUpper/Lower() methods in QString should not
be locale dependent, as this can lead to rather
hard to find bugs in at least a turkish locale.

Rather have explicit, locale dependend case conversions
available in QLocale.

Reviewed-by: Denis Dzyubenko
(cherry picked from commit da0e1e101bb4c44c25b6523357fa81ad1b2d6539)

Change-Id: I1cc3f341bef17ad573a736dc94c9c5d514ace54e
Reviewed-on: http://codereview.qt.nokia.com/3259
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
This commit is contained in:
Lars Knoll 2011-08-19 12:17:06 +02:00 committed by Qt by Nokia
parent 46ff3a4b1f
commit 3526560d60
4 changed files with 62 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/corelib/tools/qlocale.cpp
View File

@ -88,6 +88,8 @@ Q_GLOBAL_STATIC(QLocalePrivate, globalLocalePrivate)
#ifdef QT_USE_ICU
extern bool qt_initIcu(const QString &localeName);
extern bool qt_u_strToUpper(const QString &str, QString *out, const QLocale &locale);
extern bool qt_u_strToLower(const QString &str, QString *out, const QLocale &locale);
#endif
/******************************************************************************
@ -2170,6 +2172,42 @@ Qt::LayoutDirection QLocale::textDirection() const
return Qt::LeftToRight;
}
/*!
\since 4.8
Returns an uppercase copy of \a str.
*/
QString QLocale::toUpper(const QString &str) const
{
#ifdef QT_USE_ICU
{
QString result;
if (qt_u_strToUpper(str, &result, *this))
return result;
// else fall through and use Qt's toUpper
}
#endif
return str.toUpper();
}
/*!
\since 4.8
Returns a lowercase copy of \a str.
*/
QString QLocale::toLower(const QString &str) const
{
#ifdef QT_USE_ICU
{
QString result;
if (qt_u_strToLower(str, &result, *this))
return result;
// else fall through and use Qt's toUpper
}
#endif
return str.toLower();
}
/*!
\since 4.5

3
src/corelib/tools/qlocale.h
View File

@ -724,6 +724,9 @@ public:
Qt::LayoutDirection textDirection() const;
QString toUpper(const QString &str) const;
QString toLower(const QString &str) const;
QString currencySymbol(CurrencySymbolFormat = CurrencySymbol) const;
QString toCurrencyString(qlonglong, const QString &symbol = QString()) const;
QString toCurrencyString(qulonglong, const QString &symbol = QString()) const;

30
src/corelib/tools/qstring.cpp
View File

@ -105,8 +105,6 @@ QTextCodec *QString::codecForCStrings;
#ifdef QT_USE_ICU
// qlocale_icu.cpp
extern bool qt_ucol_strcoll(const QChar *source, int sourceLength, const QChar *target, int targetLength, int *result);
extern bool qt_u_strToUpper(const QString &str, QString *out, const QLocale &locale);
extern bool qt_u_strToLower(const QString &str, QString *out, const QLocale &locale);
#endif
@ -4878,7 +4876,10 @@ QString QString::rightJustified(int width, QChar fill, bool truncate) const
\snippet doc/src/snippets/qstring/main.cpp 75
\sa toUpper()
The case conversion will always happen in the 'C' locale. For locale dependent
case folding use QLocale::toLower()
\sa toUpper(), QLocale::toLower()
*/
QString QString::toLower() const
@ -4889,15 +4890,6 @@ QString QString::toLower() const
if (!d->size)
return *this;
#ifdef QT_USE_ICU
{
QString result;
if (qt_u_strToLower(*this, &result, QLocale()))
return result;
// else fall through and use Qt's toUpper
}
#endif
const ushort *e = d->data() + d->size;
// this avoids one out of bounds check in the loop
@ -4978,7 +4970,10 @@ QString QString::toCaseFolded() const
\snippet doc/src/snippets/qstring/main.cpp 81
\sa toLower()
The case conversion will always happen in the 'C' locale. For locale dependent
case folding use QLocale::toUpper()
\sa toLower(), QLocale::toLower()
*/
QString QString::toUpper() const
@ -4989,15 +4984,6 @@ QString QString::toUpper() const
if (!d->size)
return *this;
#ifdef QT_USE_ICU
{
QString result;
if (qt_u_strToUpper(*this, &result, QLocale()))
return result;
// else fall through and use Qt's toUpper
}
#endif
const ushort *e = d->data() + d->size;
// this avoids one out of bounds check in the loop

22
tests/auto/qstring/tst_qstring.cpp
View File

@ -5086,24 +5086,28 @@ void tst_QString::toUpperLower_icu()
QLocale::setDefault(QLocale(QLocale::Turkish, QLocale::Turkey));
// turkish locale has a capital I with a dot (U+0130, utf8 c4b0)
QCOMPARE(s.toUpper(), QString::fromLatin1("I"));
QCOMPARE(s.toLower(), QString::fromLatin1("i"));
QCOMPARE(s.toUpper(), QString::fromUtf8("\xc4\xb0"));
QCOMPARE(QString::fromUtf8("\xc4\xb0").toLower(), s);
// turkish locale has a capital I with a dot (U+0130, utf8 c4b0)
QLocale l;
QCOMPARE(l.toUpper(s), QString::fromUtf8("\xc4\xb0"));
QCOMPARE(l.toLower(QString::fromUtf8("\xc4\xb0")), s);
// nothing should happen here
QCOMPARE(s.toLower(), s);
QCOMPARE(QString::fromLatin1("I").toUpper(), QString::fromLatin1("I"));
QCOMPARE(l.toLower(s), s);
QCOMPARE(l.toUpper(QString::fromLatin1("I")), QString::fromLatin1("I"));
// U+0131, utf8 c4b1 is the lower-case i without a dot
QString sup = QString::fromUtf8("\xc4\xb1");
QCOMPARE(sup.toUpper(), QString::fromLatin1("I"));
QCOMPARE(QString::fromLatin1("I").toLower(), sup);
QCOMPARE(l.toUpper(sup), QString::fromLatin1("I"));
QCOMPARE(l.toLower(QString::fromLatin1("I")), sup);
// nothing should happen here
QCOMPARE(sup.toLower(), sup);
QCOMPARE(QString::fromLatin1("i").toLower(), QString::fromLatin1("i"));
QCOMPARE(l.toLower(sup), sup);
QCOMPARE(l.toLower(QString::fromLatin1("i")), QString::fromLatin1("i"));
// the cleanup function will restore the default locale
}