Skip to content

string utils: fix deprecation warnings with Qt6 #4302

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
uklotzde merged 1 commit into from
Sep 18, 2021
Merged

string utils: fix deprecation warnings with Qt6 #4302

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/util/string.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@ inline QString convertWCStringToQString(
DEBUG_ASSERT(ilen >= 0); // unsigned -> signed
switch (sizeof(wchar_t)) {
case sizeof(ushort):
return QString::fromUtf16(reinterpret_cast<const ushort*>(wcs), ilen);
return QString::fromUtf16(reinterpret_cast<const char16_t*>(wcs), ilen);
case sizeof(uint):
return QString::fromUcs4(reinterpret_cast<const uint*>(wcs), ilen);
return QString::fromUcs4(reinterpret_cast<const char32_t*>(wcs), ilen);
Copy link
Copy Markdown
Member

@daschuer daschuer Sep 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would also be nice to adjust the case targets.

Copy link
Copy Markdown
Contributor

@uklotzde uklotzde Sep 19, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#4305

default:
DEBUG_ASSERT(!"unsupported character type");
return QString();
Expand Down