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

refs #192, enable value objects for JSON:

Browse Source 
* from/toJson methods
* jsonMembers where applicable
This commit is contained in:
Klaus Basan
2014-03-26 18:44:17 +01:00
parent 586e1e4053
commit 88fb9e8832
47 changed files with 910 additions and 276 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/blackmisc/avatcstation.cpp
View File

@@ -40,7 +40,9 @@ namespace BlackMisc
m_range(range), m_distanceToPlane(0, CLengthUnit::nullUnit()), m_isOnline(isOnline),
m_bookedFromUtc(bookedFromUtc), m_bookedUntilUtc(bookedUntilUtc), m_atis(atis), m_metar(metar)
{
// void
// sync callsigns
if (!this->m_controller.hasValidCallsign() && !callsign.isEmpty())
this->m_controller.setCallsign(callsign);
}
/*
@@ -156,13 +158,36 @@ namespace BlackMisc
qDBusRegisterMetaType<CAtcStation>();
}
/*
* Members
*/
const QStringList &CAtcStation::jsonMembers()
{
return TupleConverter<CAtcStation>::jsonMembers();
}
/*
* To JSON
*/
QJsonObject CAtcStation::toJson() const
{
return BlackMisc::serializeJson(CAtcStation::jsonMembers(), TupleConverter<CAtcStation>::toTuple(*this));
}
/*
* From Json
*/
void CAtcStation::fromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CAtcStation::jsonMembers(), TupleConverter<CAtcStation>::toTuple(*this));
}
/*
* 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));
}