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

refs #314, gcc warning fixes, as a result removed m_digits (not used anymore)

Browse Source
This commit is contained in:
Klaus Basan
2014-08-20 02:00:30 +02:00
parent 407a1409da
commit 5df96c576b
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/blackmisc/avioadfsystem.h
View File

@@ -31,8 +31,8 @@ namespace BlackMisc
CAdfSystem() : CModulator() {} CAdfSystem() : CModulator() {}
//! Constructor //! Constructor
CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3): CAdfSystem(const QString &name, const PhysicalQuantities::CFrequency &activeFrequency, const PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits) CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency)
{ } { }
//! Valid aviation frequency? //! Valid aviation frequency?

4
src/blackmisc/aviocomsystem.h
View File

@@ -35,8 +35,8 @@ namespace BlackMisc
CComSystem() : CModulator(), m_channelSpacing(ChannelSpacing25KHz) {} CComSystem() : CModulator(), m_channelSpacing(ChannelSpacing25KHz) {}
//! Constructor //! Constructor
CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet(), int digits = 3): CComSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency = CModulator::FrequencyNotSet()):
CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency, digits), m_channelSpacing(ChannelSpacing25KHz) CModulator(name, activeFrequency, standbyFrequency == CModulator::FrequencyNotSet() ? activeFrequency : standbyFrequency), m_channelSpacing(ChannelSpacing25KHz)
{ } { }
//! Set active frequency //! Set active frequency

14
src/blackmisc/aviomodulator.h
View File

@@ -121,15 +121,13 @@ namespace BlackMisc
static const QStringList &jsonMembers(); static const QStringList &jsonMembers();
protected: protected:
int m_digits; //!< digits used
//! Default constructor //! Default constructor
CModulator() : CModulator() :
CAvionicsBase("default"), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(2) {} CAvionicsBase("default") {}
//! Constructor //! Constructor
CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits) : CModulator(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency) :
CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency), m_volumeInput(0), m_volumeOutput(0), m_enabled(true), m_digits(digits) {} CAvionicsBase(name), m_frequencyActive(activeFrequency), m_frequencyStandby(standbyFrequency) {}
//! \copydoc CValueObject::convertToQString //! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override virtual QString convertToQString(bool i18n = false) const override
@@ -251,9 +249,9 @@ namespace BlackMisc
BLACK_ENABLE_TUPLE_CONVERSION(CModulator) BLACK_ENABLE_TUPLE_CONVERSION(CModulator)
BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency
BlackMisc::PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency BlackMisc::PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency
qint32 m_volumeInput; //!< volume input qint32 m_volumeInput = 0; //!< volume input
qint32 m_volumeOutput; //!< volume output qint32 m_volumeOutput = 0; //!< volume output
bool m_enabled; //!< is enabled, used e.g. for mute etc. bool m_enabled = true; //!< is enabled, used e.g. for mute etc.
//! Easy access to derived class (CRTP template parameter) //! Easy access to derived class (CRTP template parameter)
AVIO const *derived() const { return static_cast<AVIO const *>(this); } AVIO const *derived() const { return static_cast<AVIO const *>(this); }

4
src/blackmisc/avionavsystem.h
View File

@@ -26,8 +26,8 @@ namespace BlackMisc
CNavSystem() : CModulator() {} CNavSystem() : CModulator() {}
//! Constructor //! Constructor
CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency, int digits = 3): CNavSystem(const QString &name, const BlackMisc::PhysicalQuantities::CFrequency &activeFrequency, const BlackMisc::PhysicalQuantities::CFrequency &standbyFrequency):
CModulator(name, activeFrequency, standbyFrequency, digits) CModulator(name, activeFrequency, standbyFrequency)
{ } { }
//! Set active frequency //! Set active frequency