flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-02 15:15:50 +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

119
src/blackmisc/avatcstation.cpp
View File

@@ -1,12 +1,12 @@
#include "avatcstation.h"
#include "aviocomsystem.h"
#include "vvoiceroom.h"
#include "voiceroom.h"
#include "blackmiscfreefunctions.h"
using namespace BlackMisc::PhysicalQuantities;
using namespace BlackMisc::Geo;
using namespace BlackMisc::Network;
using namespace BlackMisc::Voice;
using namespace BlackMisc::Audio;
namespace BlackMisc
{
@@ -147,44 +147,6 @@ namespace BlackMisc
(void)QT_TRANSLATE_NOOP("Network", "voiceroom");
}
/*
* Marshall to DBus
*/
void CAtcStation::marshallToDbus(QDBusArgument &argument) const
{
argument << this->m_callsign;
argument << this->m_frequency;
argument << this->m_controller;
argument << this->m_position;
argument << this->m_range;
argument << this->m_distanceToPlane;
argument << this->m_isOnline;
argument << this->m_bookedFromUtc;
argument << this->m_bookedUntilUtc;
argument << this->m_atis;
argument << this->m_metar;
argument << this->m_voiceRoom;
}
/*
* Unmarshall from DBus
*/
void CAtcStation::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> this->m_callsign;
argument >> this->m_frequency;
argument >> this->m_controller;
argument >> this->m_position;
argument >> this->m_range;
argument >> this->m_distanceToPlane;
argument >> this->m_isOnline;
argument >> this->m_bookedFromUtc;
argument >> this->m_bookedUntilUtc;
argument >> this->m_atis;
argument >> this->m_metar;
argument >> this->m_voiceRoom;
}
/*
* Register metadata
*/
@@ -194,25 +156,47 @@ namespace BlackMisc
qDBusRegisterMetaType<CAtcStation>();
}
/*
* Compare
*/
int CAtcStation::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAtcStation &>(otherBase);
return compare(TupleConverter<CAtcStation>::toTuple(*this), TupleConverter<CAtcStation>::toTuple(other));
}
/*
* Marshall to DBus
*/
void CAtcStation::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CAtcStation>::toTuple(*this);
}
/*
* Unmarshall from DBus
*/
void CAtcStation::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CAtcStation>::toTuple(*this);
}
/*
* Equal?
*/
bool CAtcStation::operator ==(const CAtcStation &other) const
{
if (this == &other) return true;
return TupleConverter<CAtcStation>::toTuple(*this) == TupleConverter<CAtcStation>::toTuple(other);
}
if (other.getCallsign() != this->getCallsign() ||
other.getRange() != this->getRange() ||
other.getFrequency() != this->getFrequency() ||
other.getPosition() != this->getPosition()) return false;
if (other.getController() != this->getController()) return false;
if (other.getAtis() != this->getAtis()) return false;
if (other.getMetar() != this->getMetar()) return false;
if (other.getVoiceRoom() != this->getVoiceRoom()) return false;
return this->getBookedFromUtc() == other.getBookedFromUtc() &&
this->getBookedUntilUtc() == other.getBookedUntilUtc();
/*
* Hash
*/
uint CAtcStation::getValueHash() const
{
return qHash(TupleConverter<CAtcStation>::toTuple(*this));
}
/*
@@ -283,27 +267,6 @@ namespace BlackMisc
}
}
/*
* Hash
*/
uint CAtcStation::getValueHash() const
{
QList<uint> hashs;
hashs << this->m_callsign.getValueHash();
hashs << this->m_frequency.getValueHash();
hashs << this->m_controller.getValueHash();
hashs << this->m_position.getValueHash();
hashs << this->m_range.getValueHash();
hashs << this->m_distanceToPlane.getValueHash();
hashs << this->m_metar.getValueHash();
hashs << this->m_atis.getValueHash();
hashs << this->m_voiceRoom.getValueHash();
hashs << qHash(this->m_isOnline ? 1 : 3);
hashs << qHash(this->m_bookedFromUtc);
hashs << qHash(this->m_bookedUntilUtc);
return BlackMisc::calculateHash(hashs, "CAtcStation");
}
/*
* Property by index
*/
@@ -447,16 +410,6 @@ namespace BlackMisc
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CAtcStation::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAtcStation &>(otherBase);
return this->getCallsign().asString().compare(other.getCallsign().asString(), Qt::CaseInsensitive);
}
/*
* Property as string by index
*/