diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-01-30 10:15:46 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-17 14:55:42 +0100 |
| commit | c8e00e4f7333ada3cd47282efc3c47eee32e7160 (patch) | |
| tree | dcf28a5aca563c5e8853838b885d6a9cdb27f3b8 /src/corelib/text/qlocale_p.h | |
| parent | ed2b110b6add650954dc102a0317c14ff826c677 (diff) | |
Use char16_t in favor of ushort for locale data tables
Change-Id: I890dd2b52c1b786db1081744c8ca343baba93de4
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qlocale_p.h')
| -rw-r--r-- | src/corelib/text/qlocale_p.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/corelib/text/qlocale_p.h b/src/corelib/text/qlocale_p.h index a9164c264e..42d434eac4 100644 --- a/src/corelib/text/qlocale_p.h +++ b/src/corelib/text/qlocale_p.h @@ -300,25 +300,25 @@ public: { quint16 offset; quint16 size; - QString getData(const ushort *table) const + QString getData(const char16_t *table) const { return size > 0 ? QString::fromRawData(reinterpret_cast<const QChar *>(table + offset), size) : QString(); } - QStringView viewData(const ushort *table) const + QStringView viewData(const char16_t *table) const { return { reinterpret_cast<const QChar *>(table + offset), size }; } - QString getListEntry(const ushort *table, int index) const + QString getListEntry(const char16_t *table, int index) const { return listEntry(table, index).getData(table); } - QStringView viewListEntry(const ushort *table, int index) const + QStringView viewListEntry(const char16_t *table, int index) const { return listEntry(table, index).viewData(table); } - uint ucsFirst(const ushort *table) const + uint ucsFirst(const char16_t *table) const { if (size && !QChar::isSurrogate(table[offset])) return table[offset]; @@ -327,9 +327,9 @@ public: return 0; } private: - DataRange listEntry(const ushort *table, int index) const + DataRange listEntry(const char16_t *table, int index) const { - const ushort separator = ';'; + const char16_t separator = ';'; quint16 i = 0; while (index > 0 && i < size) { if (table[offset + i] == separator) |