diff options
| author | Konstantin Ritt <ritt.ks@gmail.com> | 2012-05-29 05:15:53 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-30 01:54:45 +0200 |
| commit | 32c39330ef3b7a7adc00ab955549ab3a4742352c (patch) | |
| tree | 6361b872d9c4f8dfa5eef9f4484374c7734392c6 /src/corelib/tools/qunicodetools_p.h | |
| parent | c16455dbcf7aae140524b391c99b97a7b10b41dc (diff) | |
Introduce QUnicodeTools
Add QUnicodeTools namespace and rename qGetCharAttributes to initCharAttributes;
Make it possible to disable tailoring globally by overriding
qt_initcharattributes_default_algorithm_only value
(useful for i.e. running the specification conformance tests);
This is mostly a preparation step for the upcoming patches.
Change-Id: I783879fd17b63b52d7983e25dad5b820f0515e7f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/corelib/tools/qunicodetools_p.h')
| -rw-r--r-- | src/corelib/tools/qunicodetools_p.h | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/tools/qunicodetools_p.h index f546481aa9..ea407e7ddc 100644 --- a/src/corelib/tools/qunicodetools_p.h +++ b/src/corelib/tools/qunicodetools_p.h @@ -53,23 +53,29 @@ // We mean it. // -#include <QtCore/qglobal.h> -#include <harfbuzz-shaper.h> +#include <private/qharfbuzz_p.h> QT_BEGIN_NAMESPACE -Q_DECLARE_TYPEINFO(HB_CharAttributes, Q_PRIMITIVE_TYPE); -Q_DECLARE_TYPEINFO(HB_ScriptItem, Q_PRIMITIVE_TYPE); +namespace QUnicodeTools { -enum QCharAttributeOption { - GetWordBreaks = 1, - GetSentenceBreaks = 2 +enum CharAttributeOption { + GraphemeBreaks = 0x01, + WordBreaks = 0x02, + SentenceBreaks = 0x04, + LineBreaks = 0x08, + WhiteSpaces = 0x10, + DefaultOptionsCompat = GraphemeBreaks | LineBreaks | WhiteSpaces, // ### remove + + DontClearAttributes = 0x1000 }; -Q_DECLARE_FLAGS(QCharAttributeOptions, QCharAttributeOption) +Q_DECLARE_FLAGS(CharAttributeOptions, CharAttributeOption) -Q_CORE_EXPORT void qGetCharAttributes(const ushort *string, int length, +Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length, const HB_ScriptItem *items, int numItems, - HB_CharAttributes *attributes, QCharAttributeOptions options = QFlag(0)); + HB_CharAttributes *attributes, CharAttributeOptions options = DefaultOptionsCompat); + +} // namespace QUnicodeTools QT_END_NAMESPACE |