1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Konstantin Ritt 2012-06-17 04:20:59 +03:00 committed by Qt by Nokia
parent 57ca02b1d2
commit c1329fba13
2 changed files with 637 additions and 638 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/corelib/tools/qunicodetables_p.h
View File

@ -85,6 +85,7 @@ namespace QUnicodeTables {
ushort line_break_class : 8; /* 6 used */ ushort line_break_class : 8; /* 6 used */
ushort script : 8; /* 5 used */ ushort script : 8; /* 5 used */
}; };
Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4); Q_CORE_EXPORT const Properties * QT_FASTCALL properties(uint ucs4);
Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2); Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2);
@ -195,7 +196,6 @@ namespace QUnicodeTables {
Takri = Common Takri = Common
}; };
enum GraphemeBreak { enum GraphemeBreak {
GraphemeBreakOther, GraphemeBreakOther,
GraphemeBreakCR, GraphemeBreakCR,
@ -211,7 +211,6 @@ namespace QUnicodeTables {
GraphemeBreakLVT GraphemeBreakLVT
}; };
enum WordBreak { enum WordBreak {
WordBreakOther, WordBreakOther,
WordBreakCR, WordBreakCR,
@ -227,7 +226,6 @@ namespace QUnicodeTables {
WordBreakExtendNumLet WordBreakExtendNumLet
}; };
enum SentenceBreak { enum SentenceBreak {
SentenceBreakOther, SentenceBreakOther,
SentenceBreakCR, SentenceBreakCR,
@ -245,7 +243,6 @@ namespace QUnicodeTables {
SentenceBreakClose 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 {
@ -258,7 +255,6 @@ namespace QUnicodeTables {
LineBreak_SG, LineBreak_SP, LineBreak_CR, LineBreak_LF, LineBreak_BK LineBreak_SG, LineBreak_SP, LineBreak_CR, LineBreak_LF, LineBreak_BK
}; };
Q_CORE_EXPORT GraphemeBreak QT_FASTCALL graphemeBreakClass(uint ucs4); Q_CORE_EXPORT GraphemeBreak QT_FASTCALL graphemeBreakClass(uint ucs4);
inline GraphemeBreak graphemeBreakClass(QChar ch) inline GraphemeBreak graphemeBreakClass(QChar ch)
{ return graphemeBreakClass(ch.unicode()); } { return graphemeBreakClass(ch.unicode()); }

647
util/unicode/main.cpp
View File

File diff suppressed because it is too large Load Diff