diff options
| author | Ritt Konstantin <ritt.ks@gmail.com> | 2011-07-08 18:24:57 +0400 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-07-13 13:31:13 +0200 |
| commit | d17c76feee9eece4f7d9d1c5cec254842bb0a639 (patch) | |
| tree | b2ddf87c707d5dbc2946c64c561d1b83dfe3ef12 /util/unicode/main.cpp | |
| parent | 4a8d8055b45119207880f7f343728f15bf960bba (diff) | |
drop an obsolete QChar::NoCategory enum value
there is no such category in the Unicode specs. the QChar::NoCategory
was a subject of bugs since it was introduced. int 4.6 it's meaning was
limited to mention ucs4 > UNICODE_LAST_CODEPOINT only (which is useless anyways)
in order to preserve the old (wrong) behavior.
fix it now for qtbase
Change-Id: I630534824e071090b39772881e747c1fdb758719
Reviewed-on: http://codereview.qt.nokia.com/1584
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'util/unicode/main.cpp')
| -rw-r--r-- | util/unicode/main.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/util/unicode/main.cpp b/util/unicode/main.cpp index 4d43464455..e2596c799f 100644 --- a/util/unicode/main.cpp +++ b/util/unicode/main.cpp @@ -615,7 +615,7 @@ static void initCategoryMap() { QChar::Symbol_Currency, "Sc" }, { QChar::Symbol_Modifier, "Sk" }, { QChar::Symbol_Other, "So" }, - { QChar::NoCategory, 0 } + { QChar::Other_NotAssigned, 0 } }; Cat *c = categories; while (c->name) { @@ -763,10 +763,7 @@ static void readUnicodeData() } UnicodeData data(codepoint); - data.p.category = categoryMap.value(properties[UD_Category], QChar::NoCategory); - if (data.p.category == QChar::NoCategory) - qFatal("unassigned char category: %s", properties[UD_Category].constData()); - + data.p.category = categoryMap.value(properties[UD_Category], QChar::Other_NotAssigned); data.p.combiningClass = properties[UD_CombiningClass].toInt(); if (!combiningClassUsage.contains(data.p.combiningClass)) combiningClassUsage[data.p.combiningClass] = 1; |