From 639943ddea8836f75052f13c4569867fb0a0be58 Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Thu, 14 Jul 2011 16:21:21 +0200 Subject: Revert "make QChar::Unicode_Unassigned a constantly big value" This reverts commit ebfd24a20b1acdced5fe032eedb2737efdc6eb92. Breaks QChar and QString autotests Change-Id: If1e915520ea491262c5f7753368be98c02ddac5e Reviewed-by: Ritt Konstantin Reviewed-on: http://codereview.qt.nokia.com/1672 Reviewed-by: Qt Sanity Bot Reviewed-by: Olivier Goffart --- src/corelib/io/qurl.cpp | 3 ++- src/corelib/tools/qchar.h | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index ef58e90dba..b948a43080 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -2973,7 +2973,8 @@ void qt_nameprep(QString *source, int from) } } if (!isUnassignedAllowed) { - if (QChar::unicodeVersion(uc) > QChar::Unicode_3_2) { + QChar::UnicodeVersion version = QChar::unicodeVersion(uc); + if (version == QChar::Unicode_Unassigned || version > QChar::Unicode_3_2) { source->resize(from); // not allowed, clear the label return; } diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index 9047b6a9da..af50f6dde7 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -190,6 +190,7 @@ public: }; enum UnicodeVersion { + Unicode_Unassigned, // ### Qt 5: assign with some constantly big value Unicode_1_1, Unicode_2_0, Unicode_2_1_2, @@ -198,8 +199,7 @@ public: Unicode_3_2, Unicode_4_0, Unicode_4_1, - Unicode_5_0, - Unicode_Unassigned = 0xff + Unicode_5_0 }; // ****** WHEN ADDING FUNCTIONS, CONSIDER ADDING TO QCharRef TOO -- cgit v1.2.3