flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-27 11:05:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Formatting and minor tweaks/renamings

Browse Source
This commit is contained in:
Klaus Basan
2018-05-07 11:44:13 +02:00
committed by Roland Winklmeier
parent 6d105b9665
commit 7aef1dcbbc
6 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/blackgui/models/countrylistmodel.h
View File

@@ -14,7 +14,6 @@
#include "blackgui/blackguiexport.h" #include "blackgui/blackguiexport.h"
#include "blackgui/models/listmodeldbobjects.h" #include "blackgui/models/listmodeldbobjects.h"
#include <QString> #include <QString>
class QObject; class QObject;

2
src/blackmisc/aviation/aircraftsituation.cpp
View File

@@ -535,7 +535,7 @@ namespace BlackMisc
return false; return false;
} }
const CLength &CAircraftSituation::getGroundElevationDistance() const const CLength &CAircraftSituation::getGroundElevationRadius() const
{ {
if (!this->hasGroundElevation()) { return CLength::null(); } if (!this->hasGroundElevation()) { return CLength::null(); }
return m_groundElevationPlane.getRadius(); return m_groundElevationPlane.getRadius();

2
src/blackmisc/aviation/aircraftsituation.h
View File

@@ -260,7 +260,7 @@ namespace BlackMisc
bool setGroundElevationChecked(const Geo::CElevationPlane &elevationPlane); bool setGroundElevationChecked(const Geo::CElevationPlane &elevationPlane);
//! Distance of ground elevation //! Distance of ground elevation
const PhysicalQuantities::CLength &getGroundElevationDistance() const; const PhysicalQuantities::CLength &getGroundElevationRadius() const;
//! Height above ground. //! Height above ground.
PhysicalQuantities::CLength getHeightAboveGround() const; PhysicalQuantities::CLength getHeightAboveGround() const;

2
src/blackmisc/aviation/altitude.h
View File

@@ -191,7 +191,7 @@ namespace BlackMisc
private: private:
ReferenceDatum m_datum; //!< MSL or AGL? ReferenceDatum m_datum; //!< MSL or AGL?
AltitudeType m_altitudeType = TrueAltitude; AltitudeType m_altitudeType = TrueAltitude; //!< type
BLACK_METACLASS( BLACK_METACLASS(
CAltitude, CAltitude,

10
src/blackmisc/pq/physicalquantity.h
View File

@@ -47,11 +47,11 @@ namespace BlackMisc
*/ */
template <class MU, class PQ> class CPhysicalQuantity : template <class MU, class PQ> class CPhysicalQuantity :
public Mixin::DBusOperators<CPhysicalQuantity<MU, PQ>>, public Mixin::DBusOperators<CPhysicalQuantity<MU, PQ>>,
public Mixin::JsonOperators<CPhysicalQuantity<MU, PQ>>, public Mixin::JsonOperators<CPhysicalQuantity<MU, PQ>>,
public Mixin::Index<PQ>, public Mixin::Index<PQ>,
public Mixin::MetaType<PQ>, public Mixin::MetaType<PQ>,
public Mixin::String<PQ>, public Mixin::String<PQ>,
public Mixin::Icon<CPhysicalQuantity<MU, PQ>> public Mixin::Icon<CPhysicalQuantity<MU, PQ>>
{ {
//! \copydoc CValueObject::compare //! \copydoc CValueObject::compare
friend int compare(const PQ &a, const PQ &b) { return compareImpl(a, b); } friend int compare(const PQ &a, const PQ &b) { return compareImpl(a, b); }

15
src/blackmisc/simulation/simulatorinfo.cpp
View File

@@ -203,18 +203,9 @@ namespace BlackMisc
if (i.isEmpty()) { return None; } if (i.isEmpty()) { return None; }
Simulator s = None; Simulator s = None;
if (i.contains("fsx") || i.contains("fs10")) if (i.contains("fsx") || i.contains("fs10")) { s |= FSX; }
{ if (i.contains("fs9") || i.contains("2004")) { s |= FS9; }
s |= FSX; if (i.contains("plane") || i.contains("xp")) { s |= XPLANE; }
}
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")) if (i.contains("3d") || i.contains("prepar") || i.contains("martin") || i.contains("lm") || i.contains("lock"))
{ {
s |= P3D; s |= P3D;