From 5795dc24c70ea10a622a2a98d4778aad405984af Mon Sep 17 00:00:00 2001 From: hjk Date: Thu, 21 Nov 2019 15:37:48 +0100 Subject: [PATCH] Valgrind: Minor code simplification Change-Id: I64b218d76f4c65686a346bf884ceb8323b62f9f1 Reviewed-by: Christian Kandeler --- src/plugins/valgrind/memchecktool.cpp | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/src/plugins/valgrind/memchecktool.cpp b/src/plugins/valgrind/memchecktool.cpp index 72d33d719b4..21219108ffd 100644 --- a/src/plugins/valgrind/memchecktool.cpp +++ b/src/plugins/valgrind/memchecktool.cpp @@ -709,20 +709,18 @@ void MemcheckToolPrivate::heobAction() Abi abi; bool hasLocalRc = false; Kit *kit = nullptr; - if (Project *project = SessionManager::startupProject()) { - if (Target *target = project->activeTarget()) { - if (RunConfiguration *rc = target->activeRunConfiguration()) { - kit = target->kit(); - if (kit) { - abi = ToolChainKitAspect::targetAbi(kit); + if (Target *target = SessionManager::startupTarget()) { + if (RunConfiguration *rc = target->activeRunConfiguration()) { + kit = target->kit(); + if (kit) { + abi = ToolChainKitAspect::targetAbi(kit); - const Runnable runnable = rc->runnable(); - sr = runnable; - const IDevice::ConstPtr device = sr.device; - hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; - if (!hasLocalRc) - hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; - } + const Runnable runnable = rc->runnable(); + sr = runnable; + const IDevice::ConstPtr device = sr.device; + hasLocalRc = device && device->type() == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; + if (!hasLocalRc) + hasLocalRc = DeviceTypeKitAspect::deviceTypeId(kit) == ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE; } } }