From 2ea5361e0a28eead214f3ddc9851c15faf86c5b1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 18 Nov 2024 17:34:36 +0100 Subject: [PATCH] ProjectExplorer: Improve code readability in EnvironmentKitAspect Change-Id: I6f19f8616b940457893ed065ae81646ae64f57a8 Reviewed-by: David Schulz --- src/plugins/projectexplorer/kitaspects.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/plugins/projectexplorer/kitaspects.cpp b/src/plugins/projectexplorer/kitaspects.cpp index c0b7e772716..a37c172f17e 100644 --- a/src/plugins/projectexplorer/kitaspects.cpp +++ b/src/plugins/projectexplorer/kitaspects.cpp @@ -263,14 +263,15 @@ private: m_vslangCheckbox->setToolTip(Tr::tr("Either switches MSVC to English or keeps the language and " "just forces UTF-8 output (may vary depending on the used MSVC " "compiler).")); - if (enforcesMSVCEnglish(EnvironmentKitAspect::environmentChanges(kit()))) - m_vslangCheckbox->setChecked(true); + m_vslangCheckbox->setChecked( + enforcesMSVCEnglish(EnvironmentKitAspect::environmentChanges(kit()))); connect(m_vslangCheckbox, &QCheckBox::clicked, this, [this](bool checked) { EnvironmentItems changes = EnvironmentKitAspect::environmentChanges(kit()); - if (!checked && changes.indexOf(forceMSVCEnglishItem()) >= 0) - changes.removeAll(forceMSVCEnglishItem()); - if (checked && changes.indexOf(forceMSVCEnglishItem()) < 0) + const bool hasVsLangEntry = enforcesMSVCEnglish(changes); + if (checked && !hasVsLangEntry) changes.append(forceMSVCEnglishItem()); + else if (!checked && hasVsLangEntry) + changes.removeAll(forceMSVCEnglishItem()); EnvironmentKitAspect::setEnvironmentChanges(kit(), changes); }); }