flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 23:25:53 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #140, changed CValueObject classes to tupel concept

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

38
src/blackmisc/aviomodulator.cpp
View File

@@ -41,9 +41,8 @@ namespace BlackMisc
template <class AVIO> bool CModulator<AVIO>::operator ==(const CModulator<AVIO> &other) const
{
if (this == &other) return true;
return (this->getName() == other.getName() &&
this->m_frequencyActive == other.m_frequencyActive &&
this->m_frequencyStandby == other.m_frequencyStandby);
if (!CAvionicsBase::operator ==(other)) return false;
return TupleConverter<CModulator>::toTuple(*this) == TupleConverter<CModulator>::toTuple(other);
}
/*
@@ -59,13 +58,8 @@ namespace BlackMisc
*/
template <class AVIO> void CModulator<AVIO>::marshallToDbus(QDBusArgument &argument) const
{
this->CAvionicsBase::marshallToDbus(argument);
argument << this->m_frequencyActive;
argument << this->m_frequencyStandby;
argument << this->m_digits;
argument << this->m_volumeInput;
argument << this->m_volumeOutput;
argument << this->m_enabled;
CAvionicsBase::marshallToDbus(argument);
argument << TupleConverter<CModulator>::toTuple(*this);
}
/*
@@ -73,13 +67,18 @@ namespace BlackMisc
*/
template <class AVIO> void CModulator<AVIO>::unmarshallFromDbus(const QDBusArgument &argument)
{
this->CAvionicsBase::unmarshallFromDbus(argument);
argument >> this->m_frequencyActive;
argument >> this->m_frequencyStandby;
argument >> this->m_digits;
argument >> this->m_volumeInput;
argument >> this->m_volumeOutput;
argument >> this->m_enabled;
CAvionicsBase::unmarshallFromDbus(argument);
argument >> TupleConverter<CModulator>::toTuple(*this);
}
/*
* Compare
*/
template <class AVIO> int CModulator<AVIO>::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CModulator &>(otherBase);
int result = compare(TupleConverter<CModulator>::toTuple(*this), TupleConverter<CModulator>::toTuple(other));
return result == 0 ? CAvionicsBase::compareImpl(otherBase) : result;
}
/*
@@ -88,9 +87,8 @@ namespace BlackMisc
template <class AVIO> uint CModulator<AVIO>::getValueHash() const
{
QList<uint> hashs;
hashs << this->m_frequencyActive.getValueHash();
hashs << this->m_frequencyStandby.getValueHash();
hashs << qHash(this->m_digits);
hashs << CAvionicsBase::getValueHash();
hashs << qHash(TupleConverter<CModulator>::toTuple(*this));
return BlackMisc::calculateHash(hashs, "CModulator");
}