From 1a9f4e8413fa803d44f5c610f376bb9a3f0d9534 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Thu, 20 Jun 2024 15:16:01 +0200 Subject: [PATCH] QFactoryLoader: Clarify how we track the prioritized library for a key Assigning to a variable named `previous` to promote a library to be the current/prioritized library is needlessly obfuscated. Amends 6675e8c942c2f9797d66269368c729c5556528c2. Change-Id: Ibdd48cbb5daba60c231f9f71133c3b58d32f7781 Reviewed-by: Marc Mutz (cherry picked from commit 67bf3f9625c50a2af2d79d85247c1eee5b727682) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/plugin/qfactoryloader.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/corelib/plugin/qfactoryloader.cpp b/src/corelib/plugin/qfactoryloader.cpp index e2d9a40cb4b..b442bb51aac 100644 --- a/src/corelib/plugin/qfactoryloader.cpp +++ b/src/corelib/plugin/qfactoryloader.cpp @@ -368,13 +368,13 @@ inline void QFactoryLoaderPrivate::updateSinglePath(const QString &path) // whereas the new one has a Qt version that fits // better constexpr int QtVersionNoPatch = QT_VERSION_CHECK(QT_VERSION_MAJOR, QT_VERSION_MINOR, 0); - QLibraryPrivate *&previous = keyMap[key]; + QLibraryPrivate *&keyMapEntry = keyMap[key]; int prev_qt_version = 0; - if (previous) - prev_qt_version = int(previous->metaData.value(QtPluginMetaDataKeys::QtVersion).toInteger()); + if (keyMapEntry) + prev_qt_version = int(keyMapEntry->metaData.value(QtPluginMetaDataKeys::QtVersion).toInteger()); int qt_version = int(library->metaData.value(QtPluginMetaDataKeys::QtVersion).toInteger()); - if (!previous || (prev_qt_version > QtVersionNoPatch && qt_version <= QtVersionNoPatch)) { - previous = library.get(); // we WILL .release() + if (!keyMapEntry || (prev_qt_version > QtVersionNoPatch && qt_version <= QtVersionNoPatch)) { + keyMapEntry = library.get(); // we WILL .release() ++keyUsageCount; } }