From 0117558ea70541eadf2c34ec07a4dd83597a4c1c Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Tue, 8 Aug 2017 18:36:06 +0200 Subject: [PATCH] Formatting --- src/blackcore/context/contextownaircraft.h | 2 +- src/blackmisc/aviation/airportlist.h | 6 +++--- src/blackmisc/aviation/altitude.h | 2 +- src/blackmisc/geo/coordinategeodetic.cpp | 16 ++++++++-------- src/blackmisc/simulation/ownaircraftprovider.h | 1 - 5 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/blackcore/context/contextownaircraft.h b/src/blackcore/context/contextownaircraft.h index ec1f712a9..184bb98b3 100644 --- a/src/blackcore/context/contextownaircraft.h +++ b/src/blackcore/context/contextownaircraft.h @@ -113,7 +113,7 @@ namespace BlackCore //! Update own cockpit virtual bool updateCockpit(const BlackMisc::Aviation::CComSystem &com1, const BlackMisc::Aviation::CComSystem &com2, const BlackMisc::Aviation::CTransponder &transponder, const BlackMisc::CIdentifier &originator) = 0; - //! Tune in a com frequency + //! Tune in a COM frequency virtual bool updateActiveComFrequency(const BlackMisc::PhysicalQuantities::CFrequency &frequency, BlackMisc::Aviation::CComSystem::ComUnit comUnit, const BlackMisc::CIdentifier &originator) = 0; //! Set current pilot diff --git a/src/blackmisc/aviation/airportlist.h b/src/blackmisc/aviation/airportlist.h index ed4bec716..95d966a68 100644 --- a/src/blackmisc/aviation/airportlist.h +++ b/src/blackmisc/aviation/airportlist.h @@ -46,6 +46,9 @@ namespace BlackMisc //! Find 0..n airports by ICAO code CAirportList findByIcao(const CAirportIcaoCode &icao) const; + //! Find first station by callsign, if not return given value / default + CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const; + //! Containing an airport with given ICAO code? bool containsAirportWithIcaoCode(const CAirportIcaoCode &icao) const; @@ -55,9 +58,6 @@ namespace BlackMisc //! Update this list from the other list void updateMissingParts(const CAirportList &updateFromList); - //! Find first station by callsign, if not return given value / default - CAirport findFirstByIcao(const CAirportIcaoCode &icao, const CAirport &ifNotFound = CAirport()) const; - //! All ICAO codes QStringList allIcaoCodes(bool sorted) const; diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index 350021ffe..1ea8b3367 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -78,7 +78,7 @@ namespace BlackMisc //! Constructor CAltitude(double value, ReferenceDatum datum, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CLength(value, unit), m_datum(datum) {} - //! Constructor + //! Constructor, value as CAltitude::MeanSeaLevel CAltitude(double value, const BlackMisc::PhysicalQuantities::CLengthUnit &unit) : CLength(value, unit), m_datum(MeanSeaLevel) {} //! Altitude as string diff --git a/src/blackmisc/geo/coordinategeodetic.cpp b/src/blackmisc/geo/coordinategeodetic.cpp index 00001a424..fd2a25c39 100644 --- a/src/blackmisc/geo/coordinategeodetic.cpp +++ b/src/blackmisc/geo/coordinategeodetic.cpp @@ -27,14 +27,14 @@ namespace BlackMisc { QString CCoordinateGeodetic::convertToQString(bool i18n) const { - QString s = "Geodetic: {%1, %2, %3}"; + static const QString s = "Geodetic: {%1, %2, %3}"; return s.arg(this->latitude().valueRoundedWithUnit(6, i18n), this->longitude().valueRoundedWithUnit(6, i18n), this->m_geodeticHeight.valueRoundedWithUnit(6, i18n)); } CCoordinateGeodetic CCoordinateGeodetic::fromWgs84(const QString &latitudeWgs84, const QString &longitudeWgs84, const CAltitude &geodeticHeight) { - CLatitude lat = CLatitude::fromWgs84(latitudeWgs84); - CLongitude lon = CLongitude::fromWgs84(longitudeWgs84); + const CLatitude lat = CLatitude::fromWgs84(latitudeWgs84); + const CLongitude lon = CLongitude::fromWgs84(longitudeWgs84); return CCoordinateGeodetic(lat, lon, geodeticHeight); } @@ -89,7 +89,7 @@ namespace BlackMisc { if (!index.isMyself()) { - ColumnIndex i = index.frontCasted(); + const ColumnIndex i = index.frontCasted(); switch (i) { case IndexLatitude: @@ -120,7 +120,7 @@ namespace BlackMisc { if (!index.isMyself()) { - ColumnIndex i = index.frontCasted(); + const ColumnIndex i = index.frontCasted(); switch (i) { case IndexLatitude: @@ -285,7 +285,7 @@ namespace BlackMisc if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::propertyByIndex(index); } if (!index.isMyself()) { - ColumnIndex i = index.frontCasted(); + const ColumnIndex i = index.frontCasted(); switch (i) { case IndexRelativeBearing: @@ -306,7 +306,7 @@ namespace BlackMisc if (ICoordinateGeodetic::canHandleIndex(index)) { return; } if (!index.isMyself()) { - ColumnIndex i = index.frontCasted(); + const ColumnIndex i = index.frontCasted(); switch (i) { case IndexRelativeBearing: @@ -328,7 +328,7 @@ namespace BlackMisc if (ICoordinateGeodetic::canHandleIndex(index)) { return ICoordinateGeodetic::comparePropertyByIndex(index, compareValue); } if (!index.isMyself()) { - ColumnIndex i = index.frontCasted(); + const ColumnIndex i = index.frontCasted(); switch (i) { case IndexRelativeBearing: diff --git a/src/blackmisc/simulation/ownaircraftprovider.h b/src/blackmisc/simulation/ownaircraftprovider.h index a3abccaa4..456260348 100644 --- a/src/blackmisc/simulation/ownaircraftprovider.h +++ b/src/blackmisc/simulation/ownaircraftprovider.h @@ -43,7 +43,6 @@ namespace BlackMisc class BLACKMISC_EXPORT IOwnAircraftProvider { public: - //! Own aircraft //! \threadsafe virtual CSimulatedAircraft getOwnAircraft() const = 0;