chore: silence some deprecation warnings in Qt 6.8 (#5529)

This commit is contained in:
nerix
2024-08-04 11:23:29 +02:00
committed by GitHub
parent aed55ac1ba
commit 3257da1855
9 changed files with 55 additions and 30 deletions
+9 -8
View File
@@ -28,7 +28,7 @@ void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
const rapidjson::Value &unparsedEmoji,
const QString &shortCode = {})
{
std::vector<uint32_t> unicodeBytes{};
std::vector<char32_t> unicodeBytes{};
struct {
bool apple;
@@ -82,7 +82,7 @@ void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
for (const QString &unicodeCharacter : unicodeCharacters)
{
bool ok{false};
unicodeBytes.push_back(QString(unicodeCharacter).toUInt(&ok, 16));
unicodeBytes.push_back(unicodeCharacter.toUInt(&ok, 16));
if (!ok)
{
qCWarning(chatterinoEmoji)
@@ -92,14 +92,15 @@ void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
}
// We can safely do a narrowing static cast since unicodeBytes will never be a large number
emojiData->value = QString::fromUcs4(unicodeBytes.data(),
static_cast<int>(unicodeBytes.size()));
emojiData->value =
QString::fromUcs4(unicodeBytes.data(),
static_cast<QString::size_type>(unicodeBytes.size()));
if (!emojiData->nonQualifiedCode.isEmpty())
{
QStringList nonQualifiedCharacters =
emojiData->nonQualifiedCode.toLower().split('-');
std::vector<uint32_t> nonQualifiedBytes{};
std::vector<char32_t> nonQualifiedBytes{};
for (const QString &unicodeCharacter : nonQualifiedCharacters)
{
bool ok{false};
@@ -115,9 +116,9 @@ void parseEmoji(const std::shared_ptr<EmojiData> &emojiData,
}
// We can safely do a narrowing static cast since unicodeBytes will never be a large number
emojiData->nonQualified =
QString::fromUcs4(nonQualifiedBytes.data(),
static_cast<int>(nonQualifiedBytes.size()));
emojiData->nonQualified = QString::fromUcs4(
nonQualifiedBytes.data(),
static_cast<QString::size_type>(nonQualifiedBytes.size()));
}
}