flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-01 13:36:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refs #292, found during debugging

Browse Source 
* const override of toQVariant
* missing getter / setters
* metaTuple
* improved toQString
* CClient::setCapability bug
* Fixed wrong ICAO check
This commit is contained in:
Klaus Basan
2014-07-08 01:14:17 +02:00
parent b949a2635b
commit 0a7d025b8d
18 changed files with 52 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/blackmisc/nwclient.cpp
View File

@@ -11,6 +11,12 @@ namespace BlackMisc
QString CClient::convertToQString(bool i18n) const
{
QString s = this->m_user.toQString(i18n);
s.append(" capabilites: ").append(this->getCapabilitiesAsString());
s.append(" model: ").append(this->m_model.toQString(i18n));
if (!this->m_server.isEmpty())
{
s.append(" server:").append(this->m_server);
}
return s;
}
@@ -103,7 +109,7 @@ namespace BlackMisc
*/
QJsonObject CClient::toJson() const
{
return BlackMisc::serializeJson(CClient::jsonMembers(), TupleConverter<CClient>::toTuple(*this));
return BlackMisc::serializeJson(TupleConverter<CClient>::toMetaTuple(*this));
}
/*
@@ -111,7 +117,7 @@ namespace BlackMisc
*/
void CClient::fromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CClient::jsonMembers(), TupleConverter<CClient>::toTuple(*this));
BlackMisc::deserializeJson(json, TupleConverter<CClient>::toMetaTuple(*this));
}
/*
@@ -119,7 +125,7 @@ namespace BlackMisc
*/
void CClient::setCapability(bool hasCapability, CClient::Capabilities capability)
{
this->m_capabilities.setPropertyByIndex(QVariant(hasCapability), capability);
this->m_capabilities.addValue(static_cast<int>(capability), hasCapability);
}
/*