diff --git a/src/blackgui/models/countrylistmodel.h b/src/blackgui/models/countrylistmodel.h index 53e420eba..61fec4427 100644 --- a/src/blackgui/models/countrylistmodel.h +++ b/src/blackgui/models/countrylistmodel.h @@ -14,7 +14,6 @@ #include "blackgui/blackguiexport.h" #include "blackgui/models/listmodeldbobjects.h" - #include class QObject; diff --git a/src/blackmisc/aviation/aircraftsituation.cpp b/src/blackmisc/aviation/aircraftsituation.cpp index e2feae4d1..e2413c352 100644 --- a/src/blackmisc/aviation/aircraftsituation.cpp +++ b/src/blackmisc/aviation/aircraftsituation.cpp @@ -535,7 +535,7 @@ namespace BlackMisc return false; } - const CLength &CAircraftSituation::getGroundElevationDistance() const + const CLength &CAircraftSituation::getGroundElevationRadius() const { if (!this->hasGroundElevation()) { return CLength::null(); } return m_groundElevationPlane.getRadius(); diff --git a/src/blackmisc/aviation/aircraftsituation.h b/src/blackmisc/aviation/aircraftsituation.h index defaeb683..e86194050 100644 --- a/src/blackmisc/aviation/aircraftsituation.h +++ b/src/blackmisc/aviation/aircraftsituation.h @@ -260,7 +260,7 @@ namespace BlackMisc bool setGroundElevationChecked(const Geo::CElevationPlane &elevationPlane); //! Distance of ground elevation - const PhysicalQuantities::CLength &getGroundElevationDistance() const; + const PhysicalQuantities::CLength &getGroundElevationRadius() const; //! Height above ground. PhysicalQuantities::CLength getHeightAboveGround() const; diff --git a/src/blackmisc/aviation/altitude.h b/src/blackmisc/aviation/altitude.h index 42891b964..d3c9798ca 100644 --- a/src/blackmisc/aviation/altitude.h +++ b/src/blackmisc/aviation/altitude.h @@ -191,7 +191,7 @@ namespace BlackMisc private: ReferenceDatum m_datum; //!< MSL or AGL? - AltitudeType m_altitudeType = TrueAltitude; + AltitudeType m_altitudeType = TrueAltitude; //!< type BLACK_METACLASS( CAltitude, diff --git a/src/blackmisc/pq/physicalquantity.h b/src/blackmisc/pq/physicalquantity.h index 8ed95af18..7d914002a 100644 --- a/src/blackmisc/pq/physicalquantity.h +++ b/src/blackmisc/pq/physicalquantity.h @@ -47,11 +47,11 @@ namespace BlackMisc */ template class CPhysicalQuantity : public Mixin::DBusOperators>, - public Mixin::JsonOperators>, - public Mixin::Index, - public Mixin::MetaType, - public Mixin::String, - public Mixin::Icon> + public Mixin::JsonOperators>, + public Mixin::Index, + public Mixin::MetaType, + public Mixin::String, + public Mixin::Icon> { //! \copydoc CValueObject::compare friend int compare(const PQ &a, const PQ &b) { return compareImpl(a, b); } diff --git a/src/blackmisc/simulation/simulatorinfo.cpp b/src/blackmisc/simulation/simulatorinfo.cpp index 513fe6dd0..28eed1fd0 100644 --- a/src/blackmisc/simulation/simulatorinfo.cpp +++ b/src/blackmisc/simulation/simulatorinfo.cpp @@ -203,18 +203,9 @@ namespace BlackMisc if (i.isEmpty()) { return None; } Simulator s = None; - if (i.contains("fsx") || i.contains("fs10")) - { - s |= FSX; - } - if (i.contains("fs9") || i.contains("2004")) - { - s |= FS9; - } - if (i.contains("plane") || i.contains("xp")) - { - s |= XPLANE; - } + if (i.contains("fsx") || i.contains("fs10")) { s |= FSX; } + if (i.contains("fs9") || i.contains("2004")) { s |= FS9; } + if (i.contains("plane") || i.contains("xp")) { s |= XPLANE; } if (i.contains("3d") || i.contains("prepar") || i.contains("martin") || i.contains("lm") || i.contains("lock")) { s |= P3D;