From 61282db95605345b405caee1827dabfcf6f1381a Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Thu, 4 Jan 2024 22:45:59 +0100 Subject: [PATCH] refactor: Simplify CInterpolator::getInterpolation() Avoid requiring a do {} while(false) with nested if & break by using a simple if() --- src/blackmisc/simulation/interpolator.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index 8530bdae4..7b03a980d 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -215,17 +215,16 @@ namespace BlackMisc::Simulation CInterpolationResult CInterpolator::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) { CInterpolationResult result; - do + + const bool init = this->initIniterpolationStepData(currentTimeSinceEpoc, setup, aircraftNumber); + Q_ASSERT_X(!m_currentInterpolationStatus.isInterpolated(), Q_FUNC_INFO, "Expect reset status"); + if (init || m_unitTest) // ignore failure in unittest { - const bool init = this->initIniterpolationStepData(currentTimeSinceEpoc, setup, aircraftNumber); - Q_ASSERT_X(!m_currentInterpolationStatus.isInterpolated(), Q_FUNC_INFO, "Expect reset status"); - if (!m_unitTest && !init) { break; } // failure in real scenarios, unit tests move on Q_ASSERT_X(m_currentTimeMsSinceEpoch > 0, Q_FUNC_INFO, "No valid timestamp, interpolator initialized?"); const CAircraftSituation interpolatedSituation = this->getInterpolatedSituation(); const CAircraftParts interpolatedParts = this->getInterpolatedOrGuessedParts(aircraftNumber); result.setValues(interpolatedSituation, interpolatedParts); } - while (false); result.setStatus(m_currentInterpolationStatus, m_currentPartsStatus); return result;