add some more widely-used QChar::SpecialCharacter enum values

Change-Id: Iad58f4366ba6cd6da29a268c56c8a4bc4cf0329c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>

diff --git a/src/corelib/tools/qchar.cpp b/src/corelib/tools/qchar.cpp
index 9c5a515..cb5db97 100644 (file)
--- a/src/corelib/tools/qchar.cpp
+++ b/src/corelib/tools/qchar.cpp
@@ -366,6 +366,10 @@ QT_BEGIN_NAMESPACE
     \enum QChar::SpecialCharacter
 
     \value Null A QChar with this value isNull().
+    \value Tabulation Character tabulation.
+    \value LineFeed
+    \value CarriageReturn
+    \value Space
     \value Nbsp Non-breaking space.
     \value ReplacementCharacter The character shown when a font has no glyph
            for a certain codepoint. A special question mark character is often

diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h
index 6c42385..63a8df3 100644 (file)
--- a/src/corelib/tools/qchar.h
+++ b/src/corelib/tools/qchar.h
@@ -67,6 +67,10 @@ class Q_CORE_EXPORT QChar {
 public:
     enum SpecialCharacter {
         Null = 0x0000,
+        Tabulation = 0x0009,
+        LineFeed = 0x000a,
+        CarriageReturn = 0x000d,
+        Space = 0x0020,
         Nbsp = 0x00a0,
         ReplacementCharacter = 0xfffd,
         ObjectReplacementCharacter = 0xfffc,

diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 1bbadfb..1694dd5 100644 (file)
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -1352,12 +1352,12 @@ void QTextEngine::itemize() const
             if (option.flags() & QTextOption::ShowLineAndParagraphSeparators)
                 *const_cast<ushort*>(uc) = 0x21B5; // visual line separator
             break;
-        case 9: // Tab
+        case QChar::Tabulation:
             analysis->script = QUnicodeTables::Common;
             analysis->flags = QScriptAnalysis::Tab;
             analysis->bidiLevel = control.baseLevel();
             break;
-        case 32: // Space
+        case QChar::Space:
         case QChar::Nbsp:
             if (option.flags() & QTextOption::ShowTabsAndSpaces) {
                 analysis->script = QUnicodeTables::Common;