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

Fixed -Wdelete-non-virtual-dtor warnings arising out of the removal of CAvionicsBase.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2015-05-13 00:30:36 +01:00
parent b1c5717746
commit 560b36040d
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/blackmisc/aviation/modulator.cpp
View File

@@ -165,6 +165,9 @@ namespace BlackMisc
CModulator<AVIO>::CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) : CModulator<AVIO>::CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
m_name(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {} m_name(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
template <class AVIO>
CModulator<AVIO>::~CModulator() {}
template <class AVIO> template <class AVIO>
QString CModulator<AVIO>::convertToQString(bool i18n) const QString CModulator<AVIO>::convertToQString(bool i18n) const
{ {

3
src/blackmisc/aviation/modulator.h
View File

@@ -95,6 +95,9 @@ namespace BlackMisc
//! Constructor //! Constructor
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency); CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency);
//! Destructor
virtual ~CModulator();
//! Set active frequency //! Set active frequency
void setFrequencyActiveKHz(double frequencyKHz); void setFrequencyActiveKHz(double frequencyKHz);

7
src/blackmisc/aviation/transponder.h
View File

@@ -166,11 +166,10 @@ namespace BlackMisc
//! \copydoc CValueObject::convertToQString //! \copydoc CValueObject::convertToQString
QString convertToQString(bool i18n = false) const; QString convertToQString(bool i18n = false) const;
protected:
//! Default value?
virtual bool isDefaultValue() const { return this->m_transponderCode == 0; }
private: private:
//! Default value?
bool isDefaultValue() const { return this->m_transponderCode == 0; }
BLACK_ENABLE_TUPLE_CONVERSION(CTransponder) BLACK_ENABLE_TUPLE_CONVERSION(CTransponder)
int m_transponderCode; //!< Transponder code int m_transponderCode; //!< Transponder code
TransponderMode m_transponderMode; //!< Transponder mode TransponderMode m_transponderMode; //!< Transponder mode