1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace uses of QString::fromUtf16(ushort*) with (char16_t*)

Browse Source 
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>
This commit is contained in:
Marc Mutz 2020-05-10 09:18:55 +02:00
parent 90ad722fb2
commit c3d2e0e60a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/io/qdir.cpp
View File

@ -2193,9 +2193,9 @@ QString qt_normalizePathSegments(const QString &name, QDirPrivate::PathNormaliza
return name; return name;
int i = len - 1; int i = len - 1;
QVarLengthArray<ushort> outVector(len); QVarLengthArray<char16_t> outVector(len);
int used = len; int used = len;
ushort *out = outVector.data(); char16_t *out = outVector.data();
const ushort *p = name.utf16(); const ushort *p = name.utf16();
const ushort *prefix = p; const ushort *prefix = p;
int up = 0; int up = 0;

4
src/corelib/text/qregularexpression.cpp
View File

@ -1492,8 +1492,8 @@ QStringList QRegularExpression::namedCaptureGroups() const
result.append(QString()); result.append(QString());
for (unsigned int i = 0; i < namedCapturingTableEntryCount; ++i) { for (unsigned int i = 0; i < namedCapturingTableEntryCount; ++i) {
const ushort * const currentNamedCapturingTableRow = const auto currentNamedCapturingTableRow =
reinterpret_cast<const ushort *>(namedCapturingTable) + namedCapturingTableEntrySize * i; reinterpret_cast<const char16_t *>(namedCapturingTable) + namedCapturingTableEntrySize * i;
const int index = *currentNamedCapturingTableRow; const int index = *currentNamedCapturingTableRow;
result[index] = QString::fromUtf16(currentNamedCapturingTableRow + 1); result[index] = QString::fromUtf16(currentNamedCapturingTableRow + 1);

4
src/corelib/text/qstring.h
View File

@ -1168,8 +1168,8 @@ QT_WARNING_POP
inline QString QString::fromWCharArray(const wchar_t *string, int size) inline QString QString::fromWCharArray(const wchar_t *string, int size)
{ {
return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16(reinterpret_cast<const ushort *>(string), size) return sizeof(wchar_t) == sizeof(QChar) ? fromUtf16(reinterpret_cast<const char16_t *>(string), size)
: fromUcs4(reinterpret_cast<const uint *>(string), size); : fromUcs4(reinterpret_cast<const char32_t *>(string), size);
} }
inline QString::QString() noexcept {} inline QString::QString() noexcept {}