flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-07 02:35:33 +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

6
src/blacksim/fscommon/aircraftcfgentries.h
View File

@@ -13,7 +13,6 @@
#define BLACKSIM_FSCOMMON_AIRCRAFTCFGENTRY_H
#include "blackmisc/propertyindex.h"
#include <QVariant>
namespace BlackSim
@@ -103,9 +102,12 @@ namespace BlackSim
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const override;
//! \copydoc CValueObject::toQVariant()
//! \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); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;

7
src/blacksim/fscommon/aircraftcfgentrieslist.h
View File

@@ -77,7 +77,12 @@ namespace BlackSim
//! Contains model with title?
bool containsModeWithTitle(const QString &title, Qt::CaseSensitivity caseSensitivity = Qt::CaseInsensitive);
//! \brief Unknown entries
//! \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); }
//! Unknown entries
static const CAircraftCfgEntries &UnknownCfgEntries()
{

9
src/blacksim/fscommon/aircraftmapping.h
View File

@@ -189,12 +189,15 @@ namespace BlackSim
//! \copydoc CValueObject::setPropertyByIndex()
void setPropertyByIndex(const QVariant &value, const BlackMisc::CPropertyIndex &index) override;
//! \copydoc CValueObject::toQVariant()
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const 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); }
//! Current UTC timestamp
static QString currentUtcTimestamp()
{

7
src/blacksim/fscommon/aircraftmappinglist.h
View File

@@ -35,7 +35,12 @@ namespace BlackSim
//! Virtual destructor
virtual ~CAircraftMappingList() {}
//! \brief Unknown mapping
//! \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); }
//! Unknown mapping
static const CAircraftMapping &UnknownMapping()
{