From e8ae8358275a250382b9d339f250f2f16ea35757 Mon Sep 17 00:00:00 2001 From: Lars Toenning Date: Thu, 4 Jan 2024 22:53:08 +0100 Subject: [PATCH] refactor: Fix spelling mistake --- src/blackmisc/simulation/interpolator.cpp | 8 ++++---- src/blackmisc/simulation/interpolator.h | 6 +++--- src/blackmisc/simulation/interpolatormulti.cpp | 6 +++--- src/blackmisc/simulation/interpolatormulti.h | 2 +- src/plugins/simulator/flightgear/flightgearmpaircraft.cpp | 4 ++-- src/plugins/simulator/flightgear/flightgearmpaircraft.h | 2 +- src/plugins/simulator/fsxcommon/simconnectobject.cpp | 4 ++-- src/plugins/simulator/fsxcommon/simconnectobject.h | 2 +- src/plugins/simulator/xplane/xplanempaircraft.cpp | 4 ++-- src/plugins/simulator/xplane/xplanempaircraft.h | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index 7b03a980d..16a7eb13e 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -212,11 +212,11 @@ namespace BlackMisc::Simulation } template - CInterpolationResult CInterpolator::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) + CInterpolationResult CInterpolator::getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) { CInterpolationResult result; - const bool init = this->initIniterpolationStepData(currentTimeSinceEpoc, setup, aircraftNumber); + const bool init = this->initIniterpolationStepData(currentTimeSinceEpoch, setup, aircraftNumber); Q_ASSERT_X(!m_currentInterpolationStatus.isInterpolated(), Q_FUNC_INFO, "Expect reset status"); if (init || m_unitTest) // ignore failure in unittest { @@ -673,7 +673,7 @@ namespace BlackMisc::Simulation } template - bool CInterpolator::initIniterpolationStepData(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) + bool CInterpolator::initIniterpolationStepData(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber) { Q_ASSERT_X(!m_callsign.isEmpty(), Q_FUNC_INFO, "Missing callsign"); @@ -681,7 +681,7 @@ namespace BlackMisc::Simulation const bool slowUpdateStep = (((m_interpolatedSituationsCounter + aircraftNumber) % 25) == 0); // flag when parts are updated, which need not to be updated every time const bool changedSituations = lastModifed > m_situationsLastModified; - m_currentTimeMsSinceEpoch = currentTimeSinceEpoc; + m_currentTimeMsSinceEpoch = currentTimeSinceEpoch; m_currentInterpolationStatus.reset(); m_currentPartsStatus.reset(); m_currentSetup = setup; diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 5b99c7a67..7fc753ba1 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -193,7 +193,7 @@ namespace BlackMisc const Aviation::CAircraftSituation &getLastInterpolatedSituation() const { return m_lastSituation; } //! Parts and situation interpolated - CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber); + CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber); //! Attach an observer to read the interpolator's state for debugging //! \remark parts logging has a \c bool \c log flag @@ -232,10 +232,10 @@ namespace BlackMisc CInterpolationLogger *logger); //! Inits all data for this current interpolation step - //! \param currentTimeSinceEpoc + //! \param currentTimeSinceEpoch //! \param setup //! \param aircraftNumber passing the aircraft number allows to equally distribute among the steps and not to do it always together for all aircraft - bool initIniterpolationStepData(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber); + bool initIniterpolationStepData(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, int aircraftNumber); //! Init the interpolated situation Aviation::CAircraftSituation initInterpolatedSituation(const Aviation::CAircraftSituation &oldSituation, const Aviation::CAircraftSituation &newSituation) const; diff --git a/src/blackmisc/simulation/interpolatormulti.cpp b/src/blackmisc/simulation/interpolatormulti.cpp index e1bcadad0..1e2b26ae9 100644 --- a/src/blackmisc/simulation/interpolatormulti.cpp +++ b/src/blackmisc/simulation/interpolatormulti.cpp @@ -13,12 +13,12 @@ namespace BlackMisc::Simulation m_linear(callsign, p1, p2, p3, logger) {} - CInterpolationResult CInterpolatorMulti::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) + CInterpolationResult CInterpolatorMulti::getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) { switch (setup.getInterpolatorMode()) { - case CInterpolationAndRenderingSetupBase::Linear: return m_linear.getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber); - case CInterpolationAndRenderingSetupBase::Spline: return m_spline.getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber); + case CInterpolationAndRenderingSetupBase::Linear: return m_linear.getInterpolation(currentTimeSinceEpoch, setup, aircraftNumber); + case CInterpolationAndRenderingSetupBase::Spline: return m_spline.getInterpolation(currentTimeSinceEpoch, setup, aircraftNumber); default: break; } diff --git a/src/blackmisc/simulation/interpolatormulti.h b/src/blackmisc/simulation/interpolatormulti.h index bc3402ea4..c2edd9a6b 100644 --- a/src/blackmisc/simulation/interpolatormulti.h +++ b/src/blackmisc/simulation/interpolatormulti.h @@ -22,7 +22,7 @@ namespace BlackMisc::Simulation CInterpolationLogger *logger = nullptr); //! \copydoc CInterpolator::getInterpolation - CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber); + CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber); //! \copydoc CInterpolator::getLastInterpolatedSituation const Aviation::CAircraftSituation &getLastInterpolatedSituation(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const; diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp index a78357bfb..ef793bbff 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.cpp @@ -40,10 +40,10 @@ namespace BlackSimPlugin::Flightgear m_interpolator->attachLogger(logger); } - CInterpolationResult CFlightgearMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const + CInterpolationResult CFlightgearMPAircraft::getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const { Q_ASSERT(m_interpolator); - return m_interpolator->getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber); + return m_interpolator->getInterpolation(currentTimeSinceEpoch, setup, aircraftNumber); } CStatusMessageList CFlightgearMPAircraft::getInterpolationMessages(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const diff --git a/src/plugins/simulator/flightgear/flightgearmpaircraft.h b/src/plugins/simulator/flightgear/flightgearmpaircraft.h index 2541c001b..8b53fa4fe 100644 --- a/src/plugins/simulator/flightgear/flightgearmpaircraft.h +++ b/src/plugins/simulator/flightgear/flightgearmpaircraft.h @@ -57,7 +57,7 @@ namespace BlackSimPlugin::Flightgear void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation - BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; + BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoch, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolationMessages BlackMisc::CStatusMessageList getInterpolationMessages(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const; diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.cpp b/src/plugins/simulator/fsxcommon/simconnectobject.cpp index 37710b58f..a9e64c2f3 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.cpp +++ b/src/plugins/simulator/fsxcommon/simconnectobject.cpp @@ -205,7 +205,7 @@ namespace BlackSimPlugin::FsxCommon m_interpolator->attachLogger(logger); } - CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const + CInterpolationResult CSimConnectObject::getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const { if (!m_interpolator) { @@ -213,7 +213,7 @@ namespace BlackSimPlugin::FsxCommon result.reset(); return result; } - return m_interpolator->getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber); + return m_interpolator->getInterpolation(currentTimeSinceEpoch, setup, aircraftNumber); } const CAircraftSituation &CSimConnectObject::getLastInterpolatedSituation(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const diff --git a/src/plugins/simulator/fsxcommon/simconnectobject.h b/src/plugins/simulator/fsxcommon/simconnectobject.h index 0d9ebed3f..c8a8a7e14 100644 --- a/src/plugins/simulator/fsxcommon/simconnectobject.h +++ b/src/plugins/simulator/fsxcommon/simconnectobject.h @@ -275,7 +275,7 @@ namespace BlackSimPlugin::FsxCommon void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation - BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; + BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoch, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getLastInterpolatedSituation const BlackMisc::Aviation::CAircraftSituation &getLastInterpolatedSituation(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const; diff --git a/src/plugins/simulator/xplane/xplanempaircraft.cpp b/src/plugins/simulator/xplane/xplanempaircraft.cpp index 7de2a236a..dbd2c1952 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.cpp +++ b/src/plugins/simulator/xplane/xplanempaircraft.cpp @@ -40,10 +40,10 @@ namespace BlackSimPlugin::XPlane m_interpolator->attachLogger(logger); } - CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoc, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const + CInterpolationResult CXPlaneMPAircraft::getInterpolation(qint64 currentTimeSinceEpoch, const CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const { Q_ASSERT(m_interpolator); - return m_interpolator->getInterpolation(currentTimeSinceEpoc, setup, aircraftNumber); + return m_interpolator->getInterpolation(currentTimeSinceEpoch, setup, aircraftNumber); } CStatusMessageList CXPlaneMPAircraft::getInterpolationMessages(CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const diff --git a/src/plugins/simulator/xplane/xplanempaircraft.h b/src/plugins/simulator/xplane/xplanempaircraft.h index 8497d69b8..6dd4ae7a3 100644 --- a/src/plugins/simulator/xplane/xplanempaircraft.h +++ b/src/plugins/simulator/xplane/xplanempaircraft.h @@ -57,7 +57,7 @@ namespace BlackSimPlugin::XPlane void attachInterpolatorLogger(BlackMisc::Simulation::CInterpolationLogger *logger) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolation - BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoc, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; + BlackMisc::Simulation::CInterpolationResult getInterpolation(qint64 currentTimeSinceEpoch, const BlackMisc::Simulation::CInterpolationAndRenderingSetupPerCallsign &setup, uint32_t aircraftNumber) const; //! \copydoc BlackMisc::Simulation::CInterpolator::getInterpolationMessages BlackMisc::CStatusMessageList getInterpolationMessages(BlackMisc::Simulation::CInterpolationAndRenderingSetupBase::InterpolatorMode mode) const;