From e1adb6df750a84897b12a334747e68a2aa961fa8 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Tue, 6 Jul 2021 01:48:38 +0300 Subject: [PATCH] kdecore: avoid temporaries in KLocalizedStringPrivate::selectForEnglish() Signed-off-by: Ivailo Monev --- kdecore/localization/klocalizedstring.cpp | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/kdecore/localization/klocalizedstring.cpp b/kdecore/localization/klocalizedstring.cpp index 64dc39c3..c993ec32 100644 --- a/kdecore/localization/klocalizedstring.cpp +++ b/kdecore/localization/klocalizedstring.cpp @@ -89,7 +89,7 @@ public: } }; K_GLOBAL_STATIC(KLocalizedStringPrivateStatics, staticsKLSP) -Q_GLOBAL_STATIC(QMutex, staticsKLSPLock) +Q_GLOBAL_STATIC(QMutex, staticsKLSPMutex) KLocalizedString::KLocalizedString () : d(new KLocalizedStringPrivate) @@ -212,21 +212,13 @@ QString KLocalizedStringPrivate::toString (const KLocale *locale, QString KLocalizedStringPrivate::selectForEnglish () const { - QString trans; - if (!plural.isEmpty()) { if (number == 1) { - trans = QString::fromUtf8(msg); - } - else { - trans = QString::fromUtf8(plural); + return QString::fromUtf8(msg); } + return QString::fromUtf8(plural); } - else { - trans = QString::fromUtf8(msg); - } - - return trans; + return QString::fromUtf8(msg); } QString KLocalizedStringPrivate::substituteSimple (const QString &trans, @@ -357,7 +349,7 @@ QString KLocalizedStringPrivate::postFormat (const QString &text, const QString &lang, const QString &ctxt) const { - QMutexLocker lock(staticsKLSPLock()); + QMutexLocker lock(staticsKLSPMutex()); const KLocalizedStringPrivateStatics *s = staticsKLSP; // Transform any semantic markup into visual formatting. if (s->formatters.contains(lang)) { @@ -537,7 +529,7 @@ KLocalizedString ki18ncp (const char* ctxt, void KLocalizedString::notifyCatalogsUpdated (const QStringList &languages, const QList &catalogs) { - QMutexLocker lock(staticsKLSPLock()); + QMutexLocker lock(staticsKLSPMutex()); if (staticsKLSP.isDestroyed()) { return; }