From 1fe1055277d4efc3eecd8e9d727fdad3f6c00686 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 4 Jan 2024 15:00:45 +0100 Subject: [PATCH] KitAspects: Avoid using keys() Instead, iterate directly over the container. Change-Id: Ie42136f29e5ddab8cd8da76e09616547187a2635 Reviewed-by: Reviewed-by: hjk --- src/plugins/projectexplorer/kitaspects.cpp | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index dc1388cbd8c..b73d38a8501 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -249,12 +249,11 @@ private: IDeviceConstPtr device = BuildDeviceKitAspect::device(kit()); const GuardLocker locker(m_ignoreChanges); - // TODO: Get rid of keys, iterate directly on hash. - const QList keys = m_languageComboboxMap.keys(); - for (const Id l : keys) { + for (auto it = m_languageComboboxMap.cbegin(); it != m_languageComboboxMap.cend(); ++it) { + const Id l = it.key(); const Toolchains ltcList = ToolchainManager::toolchains(equal(&Toolchain::language, l)); - QComboBox *cb = m_languageComboboxMap.value(l); + QComboBox *cb = *it; cb->clear(); cb->addItem(Tr::tr(""), QByteArray()); @@ -283,10 +282,8 @@ private: void makeReadOnly() override { m_isReadOnly = true; - const QList keys = m_languageComboboxMap.keys(); - for (const Id l : keys) { - m_languageComboboxMap.value(l)->setEnabled(false); - } + for (QComboBox *cb : std::as_const(m_languageComboboxMap)) + cb->setEnabled(false); } void currentToolChainChanged(Id language, int idx)