diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-06-17 04:55:07 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-22 09:47:59 +0200 |
| commit | b57e2162ef632d7fb8e595fad86a2f26f1737e72 (patch) | |
| tree | da0010b9c65c99921bb79bb476e29e9fc22db419 /src/corelib/tools/qunicodetables.cpp | |
| parent | c1329fba135b86df22f3f99e9334cea11c7a2db9 (diff) | |
QUnicodeTables: some internal API renamings
enums GraphemeBreak, WordBreak, and SentenceBreak has been renamed to
GraphemeBreakClass, WordBreakClass, and SentenceBreakClass respectively,
their values has been renamed to contain a '_' as logical enum-value separator
(just like many other nums in Qt, e.g. LineBreakClass);
*BreakFormat has been replaced with *Break_Extend (some format characters are
kind of subtype of the extender characters, not vice versa).
Change-Id: I9ddbcf8848da87409736c2d6d1798a62fa28cab8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qunicodetables.cpp')
| -rw-r--r-- | src/corelib/tools/qunicodetables.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/tools/qunicodetables.cpp b/src/corelib/tools/qunicodetables.cpp index 945eadd03f..04d4b0212e 100644 --- a/src/corelib/tools/qunicodetables.cpp +++ b/src/corelib/tools/qunicodetables.cpp @@ -6339,24 +6339,24 @@ Q_CORE_EXPORT const Properties * QT_FASTCALL properties(ushort ucs2) return qGetProp(ucs2); } -Q_CORE_EXPORT GraphemeBreak QT_FASTCALL graphemeBreakClass(uint ucs4) +Q_CORE_EXPORT GraphemeBreakClass QT_FASTCALL graphemeBreakClass(uint ucs4) { - return (GraphemeBreak)qGetProp(ucs4)->graphemeBreak; + return (GraphemeBreakClass)qGetProp(ucs4)->graphemeBreakClass; } -Q_CORE_EXPORT WordBreak QT_FASTCALL wordBreakClass(uint ucs4) +Q_CORE_EXPORT WordBreakClass QT_FASTCALL wordBreakClass(uint ucs4) { - return (WordBreak)qGetProp(ucs4)->wordBreak; + return (WordBreakClass)qGetProp(ucs4)->wordBreakClass; } -Q_CORE_EXPORT SentenceBreak QT_FASTCALL sentenceBreakClass(uint ucs4) +Q_CORE_EXPORT SentenceBreakClass QT_FASTCALL sentenceBreakClass(uint ucs4) { - return (SentenceBreak)qGetProp(ucs4)->sentenceBreak; + return (SentenceBreakClass)qGetProp(ucs4)->sentenceBreakClass; } Q_CORE_EXPORT LineBreakClass QT_FASTCALL lineBreakClass(uint ucs4) { - return (LineBreakClass)qGetProp(ucs4)->line_break_class; + return (LineBreakClass)qGetProp(ucs4)->lineBreakClass; } Q_CORE_EXPORT Script QT_FASTCALL script(uint ucs4) |