refs #140, changed CValueObject classes to tupel concept

Remarks: Changes looking like an added file result from the shift of namespace voice -> audio
This commit is contained in:
Klaus Basan
2014-03-10 14:48:56 +01:00
parent 8f6a22e833
commit 34320ad3e1
43 changed files with 1293 additions and 768 deletions

View File

@@ -23,6 +23,7 @@ namespace BlackMisc
template <class AVIO> class CModulator : public CAvionicsBase
{
private:
BLACK_ENABLE_TUPLE_CONVERSION(CModulator)
BlackMisc::PhysicalQuantities::CFrequency m_frequencyActive; //!< active frequency
BlackMisc::PhysicalQuantities::CFrequency m_frequencyStandby; //!< standby frequency
qint32 m_volumeInput; //!< volume input
@@ -112,6 +113,11 @@ namespace BlackMisc
*/
bool operator !=(const CModulator &other) const;
/*!
* \copydoc CValueObject::compareImpl(otherBase)
*/
virtual int compareImpl(const CValueObject &otherBase) const override;
/*!
* \brief COM1
* \return
@@ -314,4 +320,6 @@ namespace BlackMisc
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION_TEMPLATE(BlackMisc::Aviation::CModulator, (o.m_frequencyActive, o.m_frequencyStandby, o.m_volumeInput , o.m_volumeOutput, o.m_enabled))
#endif // guard