From 56db6d25a4aa49a7de15ae1ab81f43adcd806194 Mon Sep 17 00:00:00 2001 From: Axel Spoerl Date: Tue, 18 Mar 2025 08:29:47 +0100 Subject: [PATCH] qguiapplication.cpp / init_platform() - optimize ranged loop and style MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Use std::as_const() for a QStringList in a ranged for-loop. Use auto * for a pointer. Pick-to: 6.8 6.5 Fixes: QTBUG-134702 Change-Id: Ia092933fe959afdd6b6e0a9743e3603c29b291d8 Reviewed-by: Tor Arne Vestbø Reviewed-by: Liang Qi (cherry picked from commit 22e05d74b2d01cc49c2893f66824d6e229558320) Reviewed-by: Qt Cherry-pick Bot --- src/gui/kernel/qguiapplication.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 46712099d0d..4c1e0626bf6 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1291,7 +1291,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString QStringList plugins = pluginNamesWithArguments.split(u';', Qt::SkipEmptyParts); QStringList platformArguments; QStringList availablePlugins = QPlatformIntegrationFactory::keys(platformPluginPath); - for (const auto &pluginArgument : plugins) { + for (const auto &pluginArgument : std::as_const(plugins)) { // Split into platform name and arguments QStringList arguments = pluginArgument.split(u':', Qt::SkipEmptyParts); if (arguments.isEmpty()) @@ -1411,7 +1411,7 @@ static void init_platform(const QString &pluginNamesWithArguments, const QString } } - const auto platformIntegration = QGuiApplicationPrivate::platformIntegration(); + const auto *platformIntegration = QGuiApplicationPrivate::platformIntegration(); fontSmoothingGamma = platformIntegration->styleHint(QPlatformIntegration::FontSmoothingGamma).toReal(); QCoreApplication::setAttribute(Qt::AA_DontShowShortcutsInContextMenus, !QGuiApplication::styleHints()->showShortcutsInContextMenus());