From 5e19431d2be68710130170dbde746ec66a8d451c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sat, 4 Mar 2017 19:29:11 +0100 Subject: [PATCH] Formatting, comments #895 --- src/blackcore/aircraftmatcher.cpp | 2 +- src/blackmisc/simulation/interpolator.cpp | 4 ++-- src/blackmisc/simulation/interpolator.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/blackcore/aircraftmatcher.cpp b/src/blackcore/aircraftmatcher.cpp index 372aec44d..6f085dace 100644 --- a/src/blackcore/aircraftmatcher.cpp +++ b/src/blackcore/aircraftmatcher.cpp @@ -590,7 +590,7 @@ namespace BlackCore { const int maxScore = map.lastKey(); const CAircraftModelList maxScoreAircraft(map.values(maxScore)); - CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scores:
%1").arg(scoresToString(map).replace("\n", "
")), getLogCategories()); + CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scores: %1").arg(scoresToString(map).replace("\n", "
")), getLogCategories()); CMatchingUtils::addLogDetailsToList(log, remoteAircraft, QString("Scoring with score %1 out of %2 models yielded %3 models").arg(maxScore).arg(map.size()).arg(maxScoreAircraft.size()), getLogCategories()); const CAircraftModel pickedModel = (maxScoreAircraft.size() > 1) ? diff --git a/src/blackmisc/simulation/interpolator.cpp b/src/blackmisc/simulation/interpolator.cpp index eaaa0177d..af9fca36e 100644 --- a/src/blackmisc/simulation/interpolator.cpp +++ b/src/blackmisc/simulation/interpolator.cpp @@ -45,7 +45,7 @@ namespace BlackMisc template CAircraftSituation CInterpolator::getInterpolatedSituation(qint64 currentTimeMsSinceEpoc, - const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status) + const CInterpolationAndRenderingSetup &setup, const CInterpolationHints &hints, CInterpolationStatus &status) { status.reset(); CInterpolationLogger::SituationLog log; @@ -176,7 +176,7 @@ namespace BlackMisc template CAircraftParts CInterpolator::getInterpolatedParts(qint64 currentTimeMsSinceEpoch, - const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log) + const CInterpolationAndRenderingSetup &setup, CPartsStatus &partsStatus, bool log) { Q_UNUSED(setup); partsStatus.reset(); diff --git a/src/blackmisc/simulation/interpolator.h b/src/blackmisc/simulation/interpolator.h index 6f0179f38..acdf18fbd 100644 --- a/src/blackmisc/simulation/interpolator.h +++ b/src/blackmisc/simulation/interpolator.h @@ -71,8 +71,8 @@ namespace BlackMisc void attachLogger(CInterpolationLogger *logger) { m_logger = logger; } protected: - BlackMisc::Aviation::CAircraftSituationList m_aircraftSituations; //!< recent situations - BlackMisc::Aviation::CAircraftPartsList m_aircraftParts; //!< recent parts + BlackMisc::Aviation::CAircraftSituationList m_aircraftSituations; //!< recent situations for one aircraft + BlackMisc::Aviation::CAircraftPartsList m_aircraftParts; //!< recent parts for one aircraft BlackMisc::Aviation::CCallsign m_callsign; //!< callsign bool m_isFirstInterpolation = true; //!< set to false after the first successful interpolation