From ec44c100b7f83fec4ea245dee9496135bb79d5c3 Mon Sep 17 00:00:00 2001 From: Mathew Sutcliffe Date: Sun, 8 Jan 2017 03:37:22 +0000 Subject: [PATCH] refs #852 Const-correctness. --- src/blackmisc/simulation/interpolatorlinear.cpp | 12 ++++++------ src/blackmisc/simulation/simulatorplugininfolist.cpp | 3 +-- src/blackmisc/simulation/simulatorplugininfolist.h | 2 +- src/xbus/traffic.cpp | 2 +- 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/blackmisc/simulation/interpolatorlinear.cpp b/src/blackmisc/simulation/interpolatorlinear.cpp index 6b7ac12bc..729fb0a3a 100644 --- a/src/blackmisc/simulation/interpolatorlinear.cpp +++ b/src/blackmisc/simulation/interpolatorlinear.cpp @@ -53,13 +53,13 @@ namespace BlackMisc if (currentTimeMsSinceEpoc < 0) { currentTimeMsSinceEpoc = QDateTime::currentMSecsSinceEpoch(); } // find the first situation not in the correct order, keep only the situations before that one - auto end = std::is_sorted_until(situations.begin(), situations.end(), [](auto && a, auto && b) { return b.getAdjustedMSecsSinceEpoch() < a.getAdjustedMSecsSinceEpoch(); }); - auto validSituations = makeRange(situations.begin(), end); + const auto end = std::is_sorted_until(situations.begin(), situations.end(), [](auto && a, auto && b) { return b.getAdjustedMSecsSinceEpoch() < a.getAdjustedMSecsSinceEpoch(); }); + const auto validSituations = makeRange(situations.begin(), end); // find the first situation earlier than the current time - auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto && s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); - auto situationsNewer = makeRange(validSituations.begin(), pivot); - auto situationsOlder = makeRange(pivot, validSituations.end()); + const auto pivot = std::partition_point(validSituations.begin(), validSituations.end(), [ = ](auto && s) { return s.getAdjustedMSecsSinceEpoch() > currentTimeMsSinceEpoc; }); + const auto situationsNewer = makeRange(validSituations.begin(), pivot); + const auto situationsOlder = makeRange(pivot, validSituations.end()); // interpolation situations CAircraftSituation oldSituation; @@ -108,7 +108,7 @@ namespace BlackMisc CCoordinateGeodetic currentPosition; // Time between start and end packet - double deltaTime = std::abs(oldSituation.getAdjustedMSecsSinceEpoch() - newSituation.getAdjustedMSecsSinceEpoch()); + const double deltaTime = std::abs(oldSituation.getAdjustedMSecsSinceEpoch() - newSituation.getAdjustedMSecsSinceEpoch()); // Fraction of the deltaTime, ideally [0.0 - 1.0] // < 0 should not happen due to the split, > 1 can happen if new values are delayed beyond split time diff --git a/src/blackmisc/simulation/simulatorplugininfolist.cpp b/src/blackmisc/simulation/simulatorplugininfolist.cpp index dc21cb454..3c2d775bb 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.cpp +++ b/src/blackmisc/simulation/simulatorplugininfolist.cpp @@ -8,7 +8,6 @@ */ #include "blackmisc/iterator.h" -#include "blackmisc/metaclassprivate.h" #include "blackmisc/range.h" #include "blackmisc/simulation/simulatorplugininfo.h" #include "blackmisc/simulation/simulatorplugininfolist.h" @@ -23,7 +22,7 @@ namespace BlackMisc CSimulatorPluginInfoList::CSimulatorPluginInfoList() { } - bool CSimulatorPluginInfoList::supportsSimulator(const QString &simulator) + bool CSimulatorPluginInfoList::supportsSimulator(const QString &simulator) const { return std::find_if(begin(), end(), [&simulator](const CSimulatorPluginInfo & info) { diff --git a/src/blackmisc/simulation/simulatorplugininfolist.h b/src/blackmisc/simulation/simulatorplugininfolist.h index 70a14a056..18a31fd6d 100644 --- a/src/blackmisc/simulation/simulatorplugininfolist.h +++ b/src/blackmisc/simulation/simulatorplugininfolist.h @@ -43,7 +43,7 @@ namespace BlackMisc CSimulatorPluginInfoList(const CSequence &other); //! Is simulator supported - bool supportsSimulator(const QString &simulator); + bool supportsSimulator(const QString &simulator) const; //! String list with meaningful representations QStringList toStringList(bool i18n = false) const; diff --git a/src/xbus/traffic.cpp b/src/xbus/traffic.cpp index 2e2861d73..c1a05f431 100644 --- a/src/xbus/traffic.cpp +++ b/src/xbus/traffic.cpp @@ -307,7 +307,7 @@ namespace XBus { BlackMisc::Simulation::IInterpolator::InterpolationStatus status; const BlackMisc::Simulation::CInterpolationHints hints; - auto situation = m_interpolator->getInterpolatedSituation(plane->situations, -1, hints, status); + const auto situation = m_interpolator->getInterpolatedSituation(plane->situations, -1, hints, status); if (! status.didInterpolationSucceed()) { return xpmpData_Unavailable; } if (! status.hasChangedPosition()) { return xpmpData_Unchanged; }