From 7f628f95f64607e399dccadb56504e23c1672390 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Wed, 30 Aug 2023 21:23:50 +0300 Subject: [PATCH] kdecore: pass the QByteArray objects size to QString constructors in KCmdLineOptions and KLocalizedString Signed-off-by: Ivailo Monev --- kdecore/kernel/kcmdlineargs.cpp | 2 +- kdecore/localization/klocalizedstring.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kdecore/kernel/kcmdlineargs.cpp b/kdecore/kernel/kcmdlineargs.cpp index 1d57680a..03134a80 100644 --- a/kdecore/kernel/kcmdlineargs.cpp +++ b/kdecore/kernel/kcmdlineargs.cpp @@ -135,7 +135,7 @@ KCmdLineOptions &KCmdLineOptions::add (const QByteArray &name, { d->names.append(name); d->descriptions.append(description); - d->defaults.append(QString::fromUtf8(defaultValue)); + d->defaults.append(QString::fromUtf8(defaultValue.constData(), defaultValue.size())); return *this; } diff --git a/kdecore/localization/klocalizedstring.cpp b/kdecore/localization/klocalizedstring.cpp index c076af86..86e26c44 100644 --- a/kdecore/localization/klocalizedstring.cpp +++ b/kdecore/localization/klocalizedstring.cpp @@ -154,7 +154,7 @@ QString KLocalizedStringPrivate::toString(const KLocale *locale) const // Check whether plural argument has been supplied, if message has plural. if (!plural.isEmpty() && !numberSet) kDebug(173) << QString::fromLatin1("Plural argument to message {%1} not supplied before conversion.") - .arg(shortenMessage(QString::fromUtf8(msg))); + .arg(shortenMessage(QString::fromUtf8(msg.constData(), msg.size()))); // Get raw translation. QString rawtrans, lang; @@ -176,18 +176,18 @@ QString KLocalizedStringPrivate::toString(const KLocale *locale) const // Substitute placeholders in ordinary translation. QString finalstr = substituteSimple(rawtrans); // Post-format ordinary translation. - return postFormat(finalstr, lang, QString::fromLatin1(ctxt)); + return postFormat(finalstr, lang, QString::fromLatin1(ctxt.constData(), ctxt.size())); } QString KLocalizedStringPrivate::selectForEnglish () const { if (!plural.isEmpty()) { if (number == 1) { - return QString::fromUtf8(msg); + return QString::fromUtf8(msg.constData(), msg.size()); } - return QString::fromUtf8(plural); + return QString::fromUtf8(plural.constData(), plural.size()); } - return QString::fromUtf8(msg); + return QString::fromUtf8(msg.constData(), msg.size()); } QString KLocalizedStringPrivate::substituteSimple(const QString &trans,