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

refs #628 Use the metaclass mixins in all value classes.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2016-04-02 17:34:18 +01:00
parent 4f3637a046
commit 4bd4baa535
82 changed files with 629 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/blackmisc/simulation/airspaceaircraftsnapshot.h
View File

@@ -88,7 +88,6 @@ namespace BlackMisc
const QString &generatingThreadName() const { return m_threadName; }
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAirspaceAircraftSnapshot)
qint64 m_timestampMsSinceEpoch = -1;
bool m_restricted = false;
bool m_renderingEnabled = true;
@@ -103,19 +102,19 @@ namespace BlackMisc
BlackMisc::Aviation::CCallsignSet m_vtolAircraftCallsignsByDistance;
BlackMisc::Aviation::CCallsignSet m_enabledVtolAircraftCallsignsByDistance;
BLACK_METACLASS(CAirspaceAircraftSnapshot,
BLACK_METAMEMBER(timestampMsSinceEpoch),
BLACK_METAMEMBER(aircraftCallsignsByDistance, 0, DisabledForComparison),
BLACK_METAMEMBER(enabledAircraftCallsignsByDistance, 0, DisabledForComparison),
BLACK_METAMEMBER(disabledAircraftCallsignsByDistance, 0, DisabledForComparison),
BLACK_METAMEMBER(vtolAircraftCallsignsByDistance, 0, DisabledForComparison),
BLACK_METAMEMBER(enabledVtolAircraftCallsignsByDistance, 0, DisabledForComparison)
);
};
} // namespace
} // namespace
BLACK_DECLARE_TUPLE_CONVERSION(
BlackMisc::Simulation::CAirspaceAircraftSnapshot, (
attr(o.m_timestampMsSinceEpoch),
attr(o.m_aircraftCallsignsByDistance, flags<DisabledForComparison>()),
attr(o.m_enabledAircraftCallsignsByDistance, flags <DisabledForComparison> ()),
attr(o.m_disabledAircraftCallsignsByDistance, flags<DisabledForComparison>()),
attr(o.m_vtolAircraftCallsignsByDistance, flags <DisabledForComparison> ()),
attr(o.m_enabledVtolAircraftCallsignsByDistance, flags<DisabledForComparison>())
))
Q_DECLARE_METATYPE(BlackMisc::Simulation::CAirspaceAircraftSnapshot)
#endif