diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2010-02-24 19:13:55 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-05 15:58:10 (GMT) |
| commit | 5b05cdccda99d5889c6a3db41d5c494d25798840 (patch) | |
| tree | cc22eb105a7a558fa24b761c9f1f87e2785c72c4 /src/corelib/tools/qstring.cpp | |
| parent | 05260bc05647b77da090e3d64ca38bbdb1533c58 (diff) | |
| download | Qt-5b05cdccda99d5889c6a3db41d5c494d25798840.zip Qt-5b05cdccda99d5889c6a3db41d5c494d25798840.tar.gz Qt-5b05cdccda99d5889c6a3db41d5c494d25798840.tar.bz2 | |
add some usefull definitions to qunicodetables_p.h
* CURRENT_VERSION macro in qunicodetables.cpp was renamed
to UNICODE_DATA_VERSION and it's definition was moved to qunicodetables_p.h
* LAST_UNICODE_CHAR macro in qchar.cpp was renamed
to UNICODE_LAST_CODEPOINT and it's definition was moved to qunicodetables_p.h
Merge-request: 480
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
Diffstat (limited to 'src/corelib/tools/qstring.cpp')
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 703ec67..9ab0970 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -6191,7 +6191,7 @@ QStringList QString::split(const QRegExp &rx, SplitBehavior behavior) const */ QString QString::normalized(QString::NormalizationForm mode) const { - return normalized(mode, CURRENT_VERSION); + return normalized(mode, UNICODE_DATA_VERSION); } /*! @@ -6273,7 +6273,7 @@ void qt_string_normalize(QString *data, QString::NormalizationForm mode, QChar:: return; QString &s = *data; - if (version != CURRENT_VERSION) { + if (version != UNICODE_DATA_VERSION) { for (int i = 0; i < NumNormalizationCorrections; ++i) { const NormalizationCorrection &n = uc_normalization_corrections[i]; if (n.version > version) { |