mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-03-30 20:15:35 +08:00
Conflicts: src/blackmisc/aviation/avionicsbase.h
This commit is contained in:
@@ -37,11 +37,6 @@ namespace BlackMisc
|
||||
template <class MU, class PQ>
|
||||
QString CPhysicalQuantity<MU, PQ>::getUnitSymbol() const { return this->m_unit.getSymbol(true); }
|
||||
|
||||
template <class MU, class PQ>
|
||||
CPhysicalQuantity<MU, PQ>::CPhysicalQuantity() :
|
||||
m_value(0.0), m_unit(MU::nullUnit())
|
||||
{ }
|
||||
|
||||
template <class MU, class PQ>
|
||||
CPhysicalQuantity<MU, PQ>::CPhysicalQuantity(double value, const MU &unit) :
|
||||
m_value(unit.isNull() ? 0.0 : value), m_unit(unit)
|
||||
|
||||
@@ -217,10 +217,6 @@ namespace BlackMisc
|
||||
QString convertToQString(bool i18n = false) const;
|
||||
|
||||
protected:
|
||||
//! Default constructor
|
||||
//! \todo Remove as part of MS' CValueObject refactoring
|
||||
CPhysicalQuantity();
|
||||
|
||||
//! Constructor with double
|
||||
CPhysicalQuantity(double value, const MU &unit);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user