flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-09 05:28:09 +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/avaircraftsituation.cpp
View File

@@ -48,16 +48,7 @@ namespace BlackMisc
{
const auto &other = static_cast<const CAircraftSituation &>(otherBase);
int result;
if ((result = compare(this->m_position, other.m_position))) { return result; }
if ((result = compare(this->m_altitude, other.m_altitude))) { return result; }
if ((result = compare(this->m_heading, other.m_heading))) { return result; }
if ((result = compare(this->m_pitch, other.m_pitch))) { return result; }
if ((result = compare(this->m_bank, other.m_bank))) { return result; }
if ((result = compare(this->m_groundspeed, other.m_groundspeed))) { return result; }
if (this->m_timestamp < other.m_timestamp) { return -1; }
if (this->m_timestamp > other.m_timestamp) { return 1; }
return 0;
return compare(TupleConverter<CAircraftSituation>::toTuple(*this), TupleConverter<CAircraftSituation>::toTuple(other));
}
/*
@@ -65,13 +56,7 @@ namespace BlackMisc
*/
void CAircraftSituation::marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_position;
argument << this->m_altitude;
argument << this->m_heading;
argument << this->m_pitch;
argument << this->m_bank;
argument << this->m_groundspeed;
argument << this->m_timestamp;
argument << TupleConverter<CAircraftSituation>::toTuple(*this);
}
/*
@@ -79,13 +64,7 @@ namespace BlackMisc
*/
void CAircraftSituation::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> this->m_position;
argument >> this->m_altitude;
argument >> this->m_heading;
argument >> this->m_pitch;
argument >> this->m_bank;
argument >> this->m_groundspeed;
argument >> this->m_timestamp;
argument >> TupleConverter<CAircraftSituation>::toTuple(*this);
}
/*
@@ -94,7 +73,7 @@ namespace BlackMisc
bool CAircraftSituation::operator ==(const CAircraftSituation &other) const
{
if (this == &other) return true;
return compare(*this, other) == 0;
return TupleConverter<CAircraftSituation>::toTuple(*this) == TupleConverter<CAircraftSituation>::toTuple(other);
}
/*
@@ -110,14 +89,7 @@ namespace BlackMisc
*/
uint CAircraftSituation::getValueHash() const
{
QList<uint> hashs;
hashs << qHash(this->m_position);
hashs << qHash(this->m_altitude);
hashs << qHash(this->m_heading);
hashs << qHash(this->m_groundspeed);
hashs << qHash(this->m_pitch);
hashs << qHash(this->m_bank);
return BlackMisc::calculateHash(hashs, "CAircraftSituation");
return qHash(TupleConverter<CAircraftSituation>::toTuple(*this));
}
/*