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

refs #314, fromQVariant / location of toQVariant

Browse Source 
* renamed fromQVariant to convertFromQVariant, the "from" methods imply the object is changed (fromJson, fromString ..)
* implemented fromQVariant - changing the object by QVariant
* moved toQVariant into PQ template
* free function setFromQVariant
This commit is contained in:
Klaus Basan
2014-08-19 01:55:15 +02:00
parent c21a0bb0e4
commit 290abe3693
84 changed files with 478 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/blackmisc/nwclient.h
View File

@@ -60,8 +60,6 @@ namespace BlackMisc
//! Constructor.
CClient(const CUser &user) : m_user(user) {}
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! Equal operator ==
bool operator ==(const CClient &other) const;
@@ -75,12 +73,18 @@ namespace BlackMisc
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! Callsign used with other client
const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_user.getCallsign(); }
//! \copydoc CValueObject::fromJson
void fromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::fromQVariant
virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! Callsign used with other client
const BlackMisc::Aviation::CCallsign &getCallsign() const { return this->m_user.getCallsign(); }
//! Get capabilities
CIndexVariantMap getCapabilities() const { return this->m_capabilities; }