Clean-up the Unicode tables generator code and the generated header

This fixes the blocks and memory consumption reports, the whitespace issues
and makes the code a bit cleaner.

Since I'm the only one who does change this code, such a no-op commit
could not hurt anyone or even git blame ;)

Change-Id: Ib069f925a3791c82e16c368c8392bcffbfd68c53
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>

src/corelib/tools/qunicodetables_p.h

@@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE
 
 namespace QUnicodeTables {
 
-    struct Properties {
+struct Properties {
     ushort category            : 8; /* 5 used */
     ushort direction           : 8; /* 5 used */
     ushort combiningClass      : 8;
@@ -84,12 +84,13 @@ namespace QUnicodeTables {
     ushort sentenceBreak       : 8; /* 4 used */
     ushort line_break_class    : 8; /* 6 used */
     ushort script              : 8; /* 5 used */
-    };
+};
-    Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4);
-    Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2);
 
-    // See http://www.unicode.org/reports/tr24/tr24-5.html
+Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4);
-    enum Script {
+Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2);
+
+// See http://www.unicode.org/reports/tr24/tr24-5.html
+enum Script {
     Common,
     Greek,
     Cyrillic,
@@ -193,10 +194,9 @@ namespace QUnicodeTables {
     Sharada = Common,
     SoraSompeng = Common,
     Takri = Common
-    };
+};
 
-
+enum GraphemeBreak {
-    enum GraphemeBreak {
     GraphemeBreakOther,
     GraphemeBreakCR,
     GraphemeBreakLF,
@@ -209,10 +209,9 @@ namespace QUnicodeTables {
     GraphemeBreakT,
     GraphemeBreakLV,
     GraphemeBreakLVT
-    };
+};
 
-
+enum WordBreak {
-    enum WordBreak {
     WordBreakOther,
     WordBreakCR,
     WordBreakLF,
@@ -225,10 +224,9 @@ namespace QUnicodeTables {
     WordBreakMidNum,
     WordBreakNumeric,
     WordBreakExtendNumLet
-    };
+};
 
-
+enum SentenceBreak {
-    enum SentenceBreak {
     SentenceBreakOther,
     SentenceBreakCR,
     SentenceBreakLF,
@@ -243,12 +241,11 @@ namespace QUnicodeTables {
     SentenceBreakSContinue,
     SentenceBreakSTerm,
     SentenceBreakClose
-    };
+};
 
-
+// see http://www.unicode.org/reports/tr14/tr14-28.html
-    // see http://www.unicode.org/reports/tr14/tr14-28.html
+// we don't use the XX and AI classes and map them to AL instead.
-    // we don't use the XX and AI classes and map them to AL instead.
+enum LineBreakClass {
-    enum LineBreakClass {
     LineBreak_OP, LineBreak_CL, LineBreak_CP, LineBreak_QU, LineBreak_GL,
     LineBreak_NS, LineBreak_EX, LineBreak_SY, LineBreak_IS, LineBreak_PR,
     LineBreak_PO, LineBreak_NU, LineBreak_AL, LineBreak_HL, LineBreak_ID,
@@ -256,28 +253,27 @@ namespace QUnicodeTables {
     LineBreak_ZW, LineBreak_CM, LineBreak_WJ, LineBreak_H2, LineBreak_H3,
     LineBreak_JL, LineBreak_JV, LineBreak_JT, LineBreak_CB, LineBreak_SA,
     LineBreak_SG, LineBreak_SP, LineBreak_CR, LineBreak_LF, LineBreak_BK
-    };
+};
 
+Q_CORE_EXPORT GraphemeBreak QT_FASTCALL graphemeBreakClass(uint ucs4);
+inline GraphemeBreak graphemeBreakClass(QChar ch)
+{ return graphemeBreakClass(ch.unicode()); }
 
-    Q_CORE_EXPORT GraphemeBreak QT_FASTCALL graphemeBreakClass(uint ucs4);
+Q_CORE_EXPORT WordBreak QT_FASTCALL wordBreakClass(uint ucs4);
-    inline GraphemeBreak graphemeBreakClass(QChar ch)
+inline WordBreak wordBreakClass(QChar ch)
-    { return graphemeBreakClass(ch.unicode()); }
+{ return wordBreakClass(ch.unicode()); }
 
-    Q_CORE_EXPORT WordBreak QT_FASTCALL wordBreakClass(uint ucs4);
+Q_CORE_EXPORT SentenceBreak QT_FASTCALL sentenceBreakClass(uint ucs4);
-    inline WordBreak wordBreakClass(QChar ch)
+inline SentenceBreak sentenceBreakClass(QChar ch)
-    { return wordBreakClass(ch.unicode()); }
+{ return sentenceBreakClass(ch.unicode()); }
 
-    Q_CORE_EXPORT SentenceBreak QT_FASTCALL sentenceBreakClass(uint ucs4);
+Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4);
-    inline SentenceBreak sentenceBreakClass(QChar ch)
+inline LineBreakClass lineBreakClass(QChar ch)
-    { return sentenceBreakClass(ch.unicode()); }
+{ return lineBreakClass(ch.unicode()); }
 
-    Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4);
+Q_CORE_EXPORT Script QT_FASTCALL script(uint ucs4);
-    inline LineBreakClass lineBreakClass(QChar ch)
+inline Script script(QChar ch)
-    { return lineBreakClass(ch.unicode()); }
+{ return script(ch.unicode()); }
-
-    Q_CORE_EXPORT Script QT_FASTCALL script(uint ucs4);
-    inline Script script(QChar ch)
-    { return script(ch.unicode()); }
 
 } // namespace QUnicodeTables