diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 09:18:55 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2020-05-10 12:46:23 +0200 |
| commit | c3d2e0e60adbe436a1c3f7a5b7501cad5af7fc82 (patch) | |
| tree | 5899ddbc9a8109f66af7fd8ccacb6df8573e83b6 /src/corelib/text/qregularexpression.cpp | |
| parent | 90ad722fb294b9c8bc7bb83d507b9b47d4d09367 (diff) | |
Replace uses of QString::fromUtf16(ushort*) with (char16_t*)
Ditto fromUcs4(uint*) with fromUcs4(char32_t*).
The ushort/uint forms will be deprecated.
Change-Id: Ia4ce45ed8679951b24af13109e3e498f51fc3c89
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/corelib/text/qregularexpression.cpp')
| -rw-r--r-- | src/corelib/text/qregularexpression.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/corelib/text/qregularexpression.cpp b/src/corelib/text/qregularexpression.cpp index 25e2169b06..9d21da4277 100644 --- a/src/corelib/text/qregularexpression.cpp +++ b/src/corelib/text/qregularexpression.cpp @@ -1492,8 +1492,8 @@ QStringList QRegularExpression::namedCaptureGroups() const result.append(QString()); for (unsigned int i = 0; i < namedCapturingTableEntryCount; ++i) { - const ushort * const currentNamedCapturingTableRow = - reinterpret_cast<const ushort *>(namedCapturingTable) + namedCapturingTableEntrySize * i; + const auto currentNamedCapturingTableRow = + reinterpret_cast<const char16_t *>(namedCapturingTable) + namedCapturingTableEntrySize * i; const int index = *currentNamedCapturingTableRow; result[index] = QString::fromUtf16(currentNamedCapturingTableRow + 1); |