From 3ecb7b1f94d7aecd9156cc915b63e9abf2f97093 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 6 May 2018 08:47:28 +0200 Subject: [PATCH] Ref T261, cppcheck "scope" warning --- src/blackmisc/aviation/aircraftparts.cpp | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/blackmisc/aviation/aircraftparts.cpp b/src/blackmisc/aviation/aircraftparts.cpp index 81542dab7..15179753d 100644 --- a/src/blackmisc/aviation/aircraftparts.cpp +++ b/src/blackmisc/aviation/aircraftparts.cpp @@ -127,18 +127,13 @@ namespace BlackMisc const bool isLikelyTakeOffOrClimbing = change.isNull() ? pitchDeg > 20 : (change.isRotatingUp() || change.isConstAscending()); const bool isLikelyLanding = change.isNull() ? false : change.isConstDescending(); - double nearGround1Ft = 300; - double nearGround2Ft = 1000; - if (isLikelyTakeOffOrClimbing) - { - // likely starting - nearGround2Ft = 500; - } - if (situation.hasGroundElevation()) { + const double nearGround1Ft = 300; + const double nearGround2Ft = isLikelyTakeOffOrClimbing ? 500 : 1000; const double aGroundFt = situation.getHeightAboveGround().value(CLengthUnit::ft()); static const QString detailsInfo("above ground: %1ft near grounds: %2ft %3ft likely takeoff: %4 likely landing: %5"); + if (details) { *details = detailsInfo.arg(aGroundFt).arg(nearGround1Ft).arg(nearGround2Ft).arg(boolToYesNo(isLikelyTakeOffOrClimbing), boolToYesNo(isLikelyLanding)); } if (aGroundFt < nearGround1Ft) {