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

refs #273, fixed missing JSON serialization

Browse Source
This commit is contained in:
Klaus Basan
2014-06-28 01:55:48 +02:00
parent 4694c23f87
commit 43a6ec66e0
2 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/blacksim/simulatorinfo.h
View File

@@ -17,13 +17,10 @@ namespace BlackSim
CSimulatorInfo(const QString &shortname, const QString &fullname);
//! Unspecified simulator
bool isUnspecified() const { return this->m_shortname.isEmpty() || this->m_shortname.startsWith("Unspecified", Qt::CaseInsensitive); }
bool isUnspecified() const { return this->m_shortName.isEmpty() || this->m_shortName.startsWith("Unspecified", Qt::CaseInsensitive); }
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override
{
return QVariant::fromValue(*this);
}
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! Equal operator ==
bool operator ==(const CSimulatorInfo &other) const;
@@ -43,6 +40,24 @@ namespace BlackSim
//! Set single settings
void setSimulatorSetup(const BlackMisc::CIndexVariantMap &setup);
//! Short name
const QString &getShortName() const { return m_shortName; }
//! Short name
const QString &getFullName() const { return m_fullName; }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::fromJson
virtual void fromJson(const QJsonObject &json) override;
//! Members
static const QStringList &jsonMembers();
//! Register the metatypes
static void registerMetadata();
//! Simulator is FS9 - Microsoft Flight Simulator 2004
static const CSimulatorInfo &FS9()
{
@@ -71,9 +86,6 @@ namespace BlackSim
return sim;
}
//! Register the metatypes
static void registerMetadata();
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
@@ -92,13 +104,13 @@ namespace BlackSim
private:
BLACK_ENABLE_TUPLE_CONVERSION(CSimulatorInfo)
QString m_fullname;
QString m_shortname;
QString m_fullName;
QString m_shortName;
BlackMisc::CIndexVariantMap m_simsetup; //!< allows to access simulator keys requried on remote side
};
}
BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::CSimulatorInfo, (o.m_fullname, o.m_shortname, o.m_simsetup))
BLACK_DECLARE_TUPLE_CONVERSION(BlackSim::CSimulatorInfo, (o.m_fullName, o.m_shortName, o.m_simsetup))
Q_DECLARE_METATYPE(BlackSim::CSimulatorInfo)
#endif // guard