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

Aircraft ICAO data should use ICAO code as attribute, this somehow got lost in the merge session, re-applied

Browse Source
This commit is contained in:
Klaus Basan
2015-05-16 18:31:30 +02:00
parent 257430bbbe
commit 104122023c
19 changed files with 170 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/blackmisc/network/client.h
View File

@@ -23,9 +23,7 @@ namespace BlackMisc
{
namespace Network
{
/*!
* Another client software.
*/
//! Another client software.
class BLACKMISC_EXPORT CClient : public CValueObject<CClient>
{
public:
@@ -133,11 +131,11 @@ namespace BlackMisc
private:
BLACK_ENABLE_TUPLE_CONVERSION(CClient)
CUser m_user;
BlackMisc::Simulation::CAircraftModel m_model;
CPropertyIndexVariantMap m_capabilities;
QString m_server;
CVoiceCapabilities m_voiceCapabilities;
BlackMisc::Network::CUser m_user;
BlackMisc::Simulation::CAircraftModel m_model;
BlackMisc::CPropertyIndexVariantMap m_capabilities;
QString m_server;
BlackMisc::Network::CVoiceCapabilities m_voiceCapabilities;
};
} // namespace
} // namespace
@@ -145,7 +143,7 @@ namespace BlackMisc
BLACK_DECLARE_TUPLE_CONVERSION(BlackMisc::Network::CClient, (
o.m_user,
o.m_model,
attr(o.m_capabilities, flags<DisabledForComparison | DisabledForJson>()),
attr(o.m_capabilities, flags < DisabledForComparison | DisabledForJson > ()),
o.m_server,
o.m_voiceCapabilities
))