From f71cb04cd22887d431a0e59726c3b9f0d7973e6e Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 12 Feb 2017 22:28:55 +0100 Subject: [PATCH] Formatting (#879) --- src/blackmisc/aviation/atcstation.cpp | 4 +- src/blackmisc/aviation/callsignset.cpp | 2 - src/blackmisc/aviation/callsignset.h | 1 - src/blackmisc/aviation/flightplan.cpp | 56 ++++++++++++++-------- src/blackmisc/aviation/flightplan.h | 19 +++----- src/blackmisc/json.h | 7 ++- src/blackmisc/metadatautils.cpp | 2 +- src/blackmisc/network/userlist.cpp | 2 - src/blackmisc/network/userlist.h | 2 - src/blackmisc/simulation/aircraftmodel.cpp | 8 ++-- tests/blackmisc/testcontainers.h | 9 +--- tests/blackmisc/testgeo.cpp | 4 -- tests/blackmisc/testgeo.h | 2 - 13 files changed, 55 insertions(+), 63 deletions(-) diff --git a/src/blackmisc/aviation/atcstation.cpp b/src/blackmisc/aviation/atcstation.cpp index 2301339bc..b18d68728 100644 --- a/src/blackmisc/aviation/atcstation.cpp +++ b/src/blackmisc/aviation/atcstation.cpp @@ -185,8 +185,8 @@ namespace BlackMisc { // we already have some booking dates, we will verify those now // and will set the most appropriate booking dates - CTime timeDiffBooking(bookedStation.bookedWhen()); - CTime timeDiffOnline(this->bookedWhen()); // diff to now + const CTime timeDiffBooking(bookedStation.bookedWhen()); + const CTime timeDiffOnline(this->bookedWhen()); // diff to now if (timeDiffBooking.isNegativeWithEpsilonConsidered() && timeDiffOnline.isNegativeWithEpsilonConsidered()) { // both in past diff --git a/src/blackmisc/aviation/callsignset.cpp b/src/blackmisc/aviation/callsignset.cpp index e92b064d0..e94b951ba 100644 --- a/src/blackmisc/aviation/callsignset.cpp +++ b/src/blackmisc/aviation/callsignset.cpp @@ -20,7 +20,6 @@ namespace BlackMisc { namespace Aviation { - CCallsignSet::CCallsignSet() { } CCallsignSet::CCallsignSet(const CCollection &other) : @@ -37,6 +36,5 @@ namespace BlackMisc qDBusRegisterMetaType(); registerMetaValueType(); } - } // namespace } // namespace diff --git a/src/blackmisc/aviation/callsignset.h b/src/blackmisc/aviation/callsignset.h index ad18bb7c3..669f79aac 100644 --- a/src/blackmisc/aviation/callsignset.h +++ b/src/blackmisc/aviation/callsignset.h @@ -41,7 +41,6 @@ namespace BlackMisc //! Register metadata static void registerMetadata(); - }; } //namespace } // namespace diff --git a/src/blackmisc/aviation/flightplan.cpp b/src/blackmisc/aviation/flightplan.cpp index f5fb0e94a..8f514231b 100644 --- a/src/blackmisc/aviation/flightplan.cpp +++ b/src/blackmisc/aviation/flightplan.cpp @@ -10,36 +10,52 @@ #include "blackmisc/aviation/flightplan.h" #include "blackmisc/iconlist.h" #include "blackmisc/icons.h" +#include namespace BlackMisc { namespace Aviation { + CFlightPlan::CFlightPlan() { } + + CFlightPlan::CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, QDateTime takeoffTimePlanned, QDateTime takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime, const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, CFlightPlan::FlightRules flightRules, const QString &route, const QString &remarks) + : m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao), + m_takeoffTimePlanned(takeoffTimePlanned), m_takeoffTimeActual(takeoffTimeActual), m_enrouteTime(enrouteTime), m_fuelTime(fuelTime), + m_cruiseAltitude(cruiseAltitude), m_cruiseTrueAirspeed(cruiseTrueAirspeed), m_flightRules(flightRules), + m_route(route.trimmed().left(MaxRouteLength).toUpper()), m_remarks(remarks.trimmed().left(MaxRemarksLength).toUpper()) + { + m_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); + m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); + } + QString CFlightPlan::convertToQString(bool i18n) const { - QString s; - s.append(m_equipmentIcao); - s.append(" ").append(m_originAirportIcao.toQString(i18n)); - s.append(" ").append(m_destinationAirportIcao.toQString(i18n)); - s.append(" ").append(m_alternateAirportIcao.toQString(i18n)); - s.append(" ").append(m_takeoffTimePlanned.toString("ddhhmm")); - s.append(" ").append(m_takeoffTimeActual.toString("ddhhmm")); - s.append(" ").append(m_enrouteTime.toQString(i18n)); - s.append(" ").append(m_fuelTime.toQString(i18n)); - s.append(" ").append(m_cruiseAltitude.toQString(i18n)); - s.append(" ").append(m_cruiseTrueAirspeed.toQString(i18n)); - switch (m_flightRules) - { - case VFR: s.append(" VFR"); break; - case IFR: s.append(" IFR"); break; - case SVFR: s.append(" SVFR"); break; - default: s.append(" ???"); break; - } - s.append(" ").append(m_route); - s.append(" / ").append(m_remarks); + const QString s = m_equipmentIcao + % QLatin1Char(' ') % m_originAirportIcao.toQString(i18n) + % QLatin1Char(' ') % m_destinationAirportIcao.toQString(i18n) + % QLatin1Char(' ') % m_alternateAirportIcao.toQString(i18n) + % QLatin1Char(' ') % m_takeoffTimePlanned.toString("ddhhmm") + % QLatin1Char(' ') % m_takeoffTimeActual.toString("ddhhmm") + % QLatin1Char(' ') % m_enrouteTime.toQString(i18n) + % QLatin1Char(' ') % m_fuelTime.toQString(i18n) + % QLatin1Char(' ') % m_cruiseAltitude.toQString(i18n) + % QLatin1Char(' ') % m_cruiseTrueAirspeed.toQString(i18n) + % QLatin1Char(' ') % m_route + % QLatin1Char(' ') % m_remarks; return s; } + const QString CFlightPlan::flightruleToString(CFlightPlan::FlightRules rule) + { + switch (rule) + { + case VFR: return QLatin1Literal("VFR"); + case IFR: return QLatin1Literal("IFR"); + case SVFR: return QLatin1Literal("SVFR"); + default: return QLatin1Literal("???"); + } + } + BlackMisc::CIcon CFlightPlan::toIcon() const { return BlackMisc::CIcon::iconByIndex(CIcons::StandardIconAppFlightPlan16); diff --git a/src/blackmisc/aviation/flightplan.h b/src/blackmisc/aviation/flightplan.h index 8caa025d3..6d5dd1862 100644 --- a/src/blackmisc/aviation/flightplan.h +++ b/src/blackmisc/aviation/flightplan.h @@ -49,20 +49,12 @@ namespace BlackMisc static constexpr int MaxRouteLength = 150; //!< Max route length //! Default constructor - CFlightPlan() = default; + CFlightPlan(); //! Constructor CFlightPlan(const QString &equipmentIcao, const CAirportIcaoCode &originAirportIcao, const CAirportIcaoCode &destinationAirportIcao, const CAirportIcaoCode &alternateAirportIcao, QDateTime takeoffTimePlanned, QDateTime takeoffTimeActual, const PhysicalQuantities::CTime &enrouteTime, const PhysicalQuantities::CTime &fuelTime, - const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks) - : m_equipmentIcao(equipmentIcao), m_originAirportIcao(originAirportIcao), m_destinationAirportIcao(destinationAirportIcao), m_alternateAirportIcao(alternateAirportIcao), - m_takeoffTimePlanned(takeoffTimePlanned), m_takeoffTimeActual(takeoffTimeActual), m_enrouteTime(enrouteTime), m_fuelTime(fuelTime), - m_cruiseAltitude(cruiseAltitude), m_cruiseTrueAirspeed(cruiseTrueAirspeed), m_flightRules(flightRules), - m_route(route.trimmed().left(MaxRouteLength).toUpper()), m_remarks(remarks.trimmed().left(MaxRemarksLength).toUpper()) - { - m_enrouteTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); - m_fuelTime.switchUnit(BlackMisc::PhysicalQuantities::CTimeUnit::hrmin()); - } + const CAltitude &cruiseAltitude, const PhysicalQuantities::CSpeed &cruiseTrueAirspeed, FlightRules flightRules, const QString &route, const QString &remarks); //! Set ICAO aircraft equipment code string (e.g. "T/A320/F") void setEquipmentIcao(const QString &equipmentIcao) { m_equipmentIcao = equipmentIcao; } @@ -178,7 +170,7 @@ namespace BlackMisc //! Flight plan already sent bool wasSentOrLoaded() const { return m_lastSentOrLoaded.isValid() && !m_lastSentOrLoaded.isNull(); } - //! \brief Received before n ms + //! Received before n ms qint64 timeDiffSentOrLoadedMs() const { return this->m_lastSentOrLoaded.msecsTo(QDateTime::currentDateTimeUtc()); @@ -193,8 +185,11 @@ namespace BlackMisc //! \copydoc BlackMisc::Mixin::String::toQString() QString convertToQString(bool i18n = false) const; + //! Rules to string + static const QString flightruleToString(FlightRules rule); + private: - QString m_equipmentIcao; + QString m_equipmentIcao; //!< e.g. "T/A320/F" CAirportIcaoCode m_originAirportIcao; CAirportIcaoCode m_destinationAirportIcao; CAirportIcaoCode m_alternateAirportIcao; diff --git a/src/blackmisc/json.h b/src/blackmisc/json.h index e01934635..a12a71f2b 100644 --- a/src/blackmisc/json.h +++ b/src/blackmisc/json.h @@ -412,11 +412,10 @@ namespace BlackMisc * When a derived class and a base class both inherit from Mixin::JsonByTuple, * the derived class uses this macro to disambiguate the inherited members. */ -# define BLACKMISC_DECLARE_USING_MIXIN_JSON(DERIVED) \ - using ::BlackMisc::Mixin::JsonByMetaClass::toJson; \ +#define BLACKMISC_DECLARE_USING_MIXIN_JSON(DERIVED) \ + using ::BlackMisc::Mixin::JsonByMetaClass::toJson; \ using ::BlackMisc::Mixin::JsonByMetaClass::convertFromJson; - } // Mixin -} // BlackMisc +} // guard #endif // guard diff --git a/src/blackmisc/metadatautils.cpp b/src/blackmisc/metadatautils.cpp index e16066659..a6fd98429 100644 --- a/src/blackmisc/metadatautils.cpp +++ b/src/blackmisc/metadatautils.cpp @@ -30,7 +30,7 @@ namespace BlackMisc { fails++; // normally a consecutive order of metatypes, we allow a space before we break - if (fails > 3) { return meta; } + if (fails > 3) { break; } continue; } QMetaType metaType(mt); diff --git a/src/blackmisc/network/userlist.cpp b/src/blackmisc/network/userlist.cpp index 489ea0464..8a3d6d5cc 100644 --- a/src/blackmisc/network/userlist.cpp +++ b/src/blackmisc/network/userlist.cpp @@ -17,11 +17,9 @@ namespace BlackMisc { namespace Network { - CUserList::CUserList() { } CUserList::CUserList(const CSequence &other) : CSequence(other) { } - } // namespace } // namespace diff --git a/src/blackmisc/network/userlist.h b/src/blackmisc/network/userlist.h index d3a7c4468..05fdff7d8 100644 --- a/src/blackmisc/network/userlist.h +++ b/src/blackmisc/network/userlist.h @@ -17,7 +17,6 @@ #include "blackmisc/network/user.h" #include "blackmisc/sequence.h" #include "blackmisc/variant.h" - #include namespace BlackMisc @@ -38,7 +37,6 @@ namespace BlackMisc //! Construct from a base class object. CUserList(const CSequence &other); }; - } //namespace } // namespace diff --git a/src/blackmisc/simulation/aircraftmodel.cpp b/src/blackmisc/simulation/aircraftmodel.cpp index b920e86ad..5005f76c6 100644 --- a/src/blackmisc/simulation/aircraftmodel.cpp +++ b/src/blackmisc/simulation/aircraftmodel.cpp @@ -693,10 +693,10 @@ namespace BlackMisc CAircraftModel CAircraftModel::fromDatabaseJson(const QJsonObject &json, const QString prefix) { - QString modelString(json.value(prefix + "modelstring").toString()); - QString modelDescription(json.value(prefix + "description").toString()); - QString modelName(json.value(prefix + "name").toString()); - QString modelMode(json.value(prefix + "mode").toString()); + const QString modelString(json.value(prefix + "modelstring").toString()); + const QString modelDescription(json.value(prefix + "description").toString()); + const QString modelName(json.value(prefix + "name").toString()); + const QString modelMode(json.value(prefix + "mode").toString()); const CSimulatorInfo simInfo = CSimulatorInfo::fromDatabaseJson(json, prefix); const CAircraftIcaoCode aircraftIcao(CAircraftIcaoCode::fromDatabaseJson(json, "ac_")); diff --git a/tests/blackmisc/testcontainers.h b/tests/blackmisc/testcontainers.h index 1831c8e1f..0ac58e916 100644 --- a/tests/blackmisc/testcontainers.h +++ b/tests/blackmisc/testcontainers.h @@ -11,17 +11,13 @@ #define BLACKMISCTEST_TESTCONTAINERS_H //! \cond PRIVATE_TESTS - -/*! - * \file - * \ingroup testblackmisc - */ +//! \file +//! \ingroup testblackmisc #include namespace BlackMiscTest { - //! Testing containers class CTestContainers : public QObject { @@ -39,7 +35,6 @@ namespace BlackMiscTest void dictionaryBasics(); void timestampList(); }; - } // namespace //! \endcond diff --git a/tests/blackmisc/testgeo.cpp b/tests/blackmisc/testgeo.cpp index 7ee4e64e7..1dffc7e78 100644 --- a/tests/blackmisc/testgeo.cpp +++ b/tests/blackmisc/testgeo.cpp @@ -29,9 +29,6 @@ using namespace BlackMisc::Math; namespace BlackMiscTest { - /* - * Geo classes tests - */ void CTestGeo::geoBasics() { CLatitude lati(10, CAngleUnit::deg()); @@ -48,7 +45,6 @@ namespace BlackMiscTest CCoordinateGeodetic equator = { 0.0, 70.354683 }; QCOMPARE(calculateEuclideanDistance(northPole, equator), std::sqrt(2.0f)); } - } // namespace //! \endcond diff --git a/tests/blackmisc/testgeo.h b/tests/blackmisc/testgeo.h index 8b945bd0f..0b36e363d 100644 --- a/tests/blackmisc/testgeo.h +++ b/tests/blackmisc/testgeo.h @@ -21,7 +21,6 @@ namespace BlackMiscTest { - //! Geo classes tests class CTestGeo : public QObject { @@ -38,7 +37,6 @@ namespace BlackMiscTest //! CCoordinateGeodetic unit tests void coordinateGeodetic(); }; - } // namespace //! \endcond