qt6: nglcompression, widgets, dialog fixes: remove QTextCodec, QStringRef/splitRef, QDesktopWidget, use QMultiMap and Qt6 APIs; adjust QtConcurrent::run wrappers; replace endl with newline
This commit is contained in:
1 parent
17f1c61c9e
commit
f744a8c37a
328 files changed
+53567
-112
No files matched your search
@@ -66,7 +66,9 @@ bool Translator::setTranslationDataJson(const QByteArray &jsonData, const QByteA
|
||||
if (m_md5Sum == md5Sum)
|
||||
return true;
|
||||
|
||||
const QJsonObject jObj = QJsonDocument::fromBinaryData(bCompressed ? qUncompress(jsonData) : jsonData).object();
|
||||
// Use fromJson; fromBinaryData is not available in this Qt build
|
||||
const QByteArray jsonRaw = bCompressed ? qUncompress(jsonData) : jsonData;
|
||||
const QJsonObject jObj = QJsonDocument::fromJson(jsonRaw).object();
|
||||
const QString translationKey(QStringLiteral("translations"));
|
||||
if (jObj.empty() ||
|
||||
!jObj.contains(translationKey) ||
|
||||
@@ -124,7 +126,7 @@ QString Translator::translate(const char *context,
|
||||
void Translator::isoCodeChanged(const QByteArray &isoCode)
|
||||
{
|
||||
m_translationLookup.clear();
|
||||
for (const TranslationEntry &te : qAsConst(m_catalog))
|
||||
for (const TranslationEntry &te : std::as_const(m_catalog))
|
||||
{
|
||||
if (te.isoCode != isoCode)
|
||||
continue;
|
||||
|
||||
Reference in new issue
Block a user