diff options
Diffstat (limited to 'src/corelib/tools/qunicodetools_p.h')
| -rw-r--r-- | src/corelib/tools/qunicodetools_p.h | 24 |
1 files changed, 21 insertions, 3 deletions
diff --git a/src/corelib/tools/qunicodetools_p.h b/src/corelib/tools/qunicodetools_p.h index ea407e7ddc..3396c33230 100644 --- a/src/corelib/tools/qunicodetools_p.h +++ b/src/corelib/tools/qunicodetools_p.h @@ -53,12 +53,30 @@ // We mean it. // -#include <private/qharfbuzz_p.h> +#include <QtCore/qchar.h> QT_BEGIN_NAMESPACE +struct Q_PACKED QCharAttributes +{ + uchar graphemeBoundary : 1; + uchar wordBreak : 1; + uchar sentenceBoundary : 1; + uchar lineBreak : 1; + uchar whiteSpace : 1; + uchar unused : 3; +}; +Q_DECLARE_TYPEINFO(QCharAttributes, Q_PRIMITIVE_TYPE); + namespace QUnicodeTools { +// ### temporary +struct ScriptItem +{ + int position; + int script; +}; + enum CharAttributeOption { GraphemeBreaks = 0x01, WordBreaks = 0x02, @@ -72,8 +90,8 @@ enum CharAttributeOption { Q_DECLARE_FLAGS(CharAttributeOptions, CharAttributeOption) Q_CORE_EXPORT void initCharAttributes(const ushort *string, int length, - const HB_ScriptItem *items, int numItems, - HB_CharAttributes *attributes, CharAttributeOptions options = DefaultOptionsCompat); + const ScriptItem *items, int numItems, + QCharAttributes *attributes, CharAttributeOptions options = DefaultOptionsCompat); } // namespace QUnicodeTools |