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

11
src/blackmisc/simulation/fscommon/aircraftcfgentries.h
View File

@@ -157,7 +157,6 @@ namespace BlackMisc
QString convertToQString(bool i18n = false) const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftCfgEntries)
int m_index; //!< current index in given config
QString m_fileName; //!< file name of .cfg
QString m_title; //!< Title in .cfg
@@ -172,12 +171,20 @@ namespace BlackMisc
QString m_simName; //!< name in simulator
QString m_createdBy; //!< created by, "distributor"
bool m_rotorcraft = false; //!< hint if rotorcraft
BLACK_METACLASS(CAircraftCfgEntries,
BLACK_METAMEMBER(index),
BLACK_METAMEMBER(fileName),
BLACK_METAMEMBER(title),
BLACK_METAMEMBER(atcType),
BLACK_METAMEMBER(atcModel),
BLACK_METAMEMBER(atcParkingCode)
);
};
} // ns
} // ns
} // ns
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Simulation::FsCommon::CAircraftCfgEntries, (o.m_index, o.m_fileName, o.m_title, o.m_atcType, o.m_atcModel, o.m_atcParkingCode))
Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CAircraftCfgEntries)
#endif // guard

17
src/blackmisc/simulation/fscommon/vpilotmodelrule.h
View File

@@ -86,12 +86,19 @@ namespace BlackMisc
CAircraftModel toAircraftModel() const;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CVPilotModelRule)
QString m_modelName; //!< model name
QString m_folder; //!< folder
QString m_typeCode; //!< type code, aka aircraft ICAO
QString m_callsignPrefix; //!< callsign prefix, aka airline ICAO
qint64 m_updatedMsSinceEpoch; //!< updated when
BLACK_METACLASS(CVPilotModelRule,
BLACK_METAMEMBER(typeCode, 0, CaseInsensitiveComparison),
BLACK_METAMEMBER(callsignPrefix, 0, CaseInsensitiveComparison),
BLACK_METAMEMBER(modelName, 0, CaseInsensitiveComparison),
BLACK_METAMEMBER(folder, 0, CaseInsensitiveComparison),
BLACK_METAMEMBER(updatedMsSinceEpoch)
);
};
} // namespace
@@ -99,11 +106,5 @@ namespace BlackMisc
} // namespace
Q_DECLARE_METATYPE(BlackMisc::Simulation::FsCommon::CVPilotModelRule)
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Simulation::FsCommon::CVPilotModelRule, (
attr(o.m_typeCode, flags <CaseInsensitiveComparison> ()),
attr(o.m_callsignPrefix, flags <CaseInsensitiveComparison> ()),
attr(o.m_modelName, flags <CaseInsensitiveComparison> ()),
attr(o.m_folder, flags <CaseInsensitiveComparison> ()),
attr(o.m_updatedMsSinceEpoch)
))
#endif // guard