From 01f81fa4dca0c9e2fdfed7da3e71a505bf940bf1 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Fri, 6 Oct 2017 17:06:59 +0200 Subject: [PATCH] QbsProjectManager: Get rid of redundant code Change-Id: I44c5058161312c832bf1e74c417007d02f2f4f7b Reviewed-by: Jake Petroules --- src/plugins/qbsprojectmanager/qbsbuildstep.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp index a212ae8567f..6dc69eb6582 100644 --- a/src/plugins/qbsprojectmanager/qbsbuildstep.cpp +++ b/src/plugins/qbsprojectmanager/qbsbuildstep.cpp @@ -774,15 +774,14 @@ void QbsBuildStepConfigWidget::applyCachedProperties() tmp.value(Constants::QBS_CONFIG_PROFILE_KEY)); data.insert(Constants::QBS_CONFIG_VARIANT_KEY, tmp.value(Constants::QBS_CONFIG_VARIANT_KEY)); - if (tmp.contains(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)) - data.insert(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY, - tmp.value(Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY)); - if (tmp.contains(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)) - data.insert(Constants::QBS_CONFIG_QUICK_DEBUG_KEY, - tmp.value(Constants::QBS_CONFIG_QUICK_DEBUG_KEY)); - if (tmp.contains(Constants::QBS_INSTALL_ROOT_KEY)) - data.insert(Constants::QBS_INSTALL_ROOT_KEY, - tmp.value(Constants::QBS_INSTALL_ROOT_KEY)); + const QStringList additionalSpecialKeys({Constants::QBS_CONFIG_DECLARATIVE_DEBUG_KEY, + Constants::QBS_CONFIG_QUICK_DEBUG_KEY, + Constants::QBS_INSTALL_ROOT_KEY}); + for (const QString &key : additionalSpecialKeys) { + const auto it = tmp.constFind(key); + if (it != tmp.cend()) + data.insert(key, it.value()); + } for (int i = 0; i < m_propertyCache.count(); ++i) { const Property &property = m_propertyCache.at(i);