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

refs #345 First wave of value classes using the CValueObjectStdTuple CRTP class template.

Browse Source
This commit is contained in:
Mathew Sutcliffe
2014-10-30 22:08:22 +00:00
parent ecf8e6aafb
commit 4c8148acf1
68 changed files with 34 additions and 4499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
src/blacksim/fscommon/aircraftcfgentries.cpp
View File

@@ -27,24 +27,6 @@ namespace BlackSim
// void
}
/*
* Operator ==
*/
bool CAircraftCfgEntries::operator ==(const CAircraftCfgEntries &other) const
{
if (this == &other) return true;
return TupleConverter<CAircraftCfgEntries>::toTuple(*this) == TupleConverter<CAircraftCfgEntries>::toTuple(other);
}
/*
* Operator !=
*/
bool CAircraftCfgEntries::operator !=(const CAircraftCfgEntries &other) const
{
if (this == &other) return false;
return !((*this) == other);
}
/*
* String representation
*/
@@ -115,79 +97,5 @@ namespace BlackSim
}
}
/*
* Hash
*/
uint CAircraftCfgEntries::getValueHash() const
{
return qHash(TupleConverter<CAircraftCfgEntries>::toTuple(*this));
}
/*
* Register metadata
*/
void CAircraftCfgEntries::registerMetadata()
{
qRegisterMetaType<CAircraftCfgEntries>();
qDBusRegisterMetaType<CAircraftCfgEntries>();
}
/*
* Compare
*/
int CAircraftCfgEntries::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAircraftCfgEntries &>(otherBase);
return compare(TupleConverter<CAircraftCfgEntries>::toTuple(*this), TupleConverter<CAircraftCfgEntries>::toTuple(other));
}
/*
* Metatype
*/
int CAircraftCfgEntries::getMetaTypeId() const
{
return qMetaTypeId<CAircraftCfgEntries>();
}
/*
* Marshall to DBus
*/
void CAircraftCfgEntries::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CAircraftCfgEntries>::toTuple(*this);
}
/*
* Unmarshall from DBus
*/
void CAircraftCfgEntries::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CAircraftCfgEntries>::toTuple(*this);
}
/*
* To JSON
*/
QJsonObject CAircraftCfgEntries::toJson() const
{
return BlackMisc::serializeJson(CAircraftCfgEntries::jsonMembers(), TupleConverter<CAircraftCfgEntries>::toTuple(*this));
}
/*
* To JSON
*/
void CAircraftCfgEntries::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CAircraftCfgEntries::jsonMembers(), TupleConverter<CAircraftCfgEntries>::toTuple(*this));
}
/*
* Members
*/
const QStringList &CAircraftCfgEntries::jsonMembers()
{
return TupleConverter<CAircraftCfgEntries>::jsonMembers();
}
}
} // namespace

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

@@ -24,7 +24,7 @@ namespace BlackSim
* \remarks an entry in the aircraft.cfg is title, atc type, ... This class already bundles
* relevant entries, hence the class is named Entries (plural)
*/
class CAircraftCfgEntries: public BlackMisc::CValueObject
class CAircraftCfgEntries: public BlackMisc::CValueObjectStdTuple<CAircraftCfgEntries>
{
public:
//! Properties by index
@@ -52,12 +52,6 @@ namespace BlackSim
*/
CAircraftCfgEntries(const QString &filePath, qint32 index, const QString &title, const QString &atcType, const QString &atcModel, const QString &atcParkingCode);
//! operator ==
bool operator ==(const CAircraftCfgEntries &other) const;
//! operator !=
bool operator !=(const CAircraftCfgEntries &other) const;
//! Filepath
QString getFilePath() const { return this->m_filePath; }
@@ -94,49 +88,16 @@ namespace BlackSim
//! Parking code
void setAtcParkingCode(const QString &parkingCode) { this->m_atcParkingCode = parkingCode; }
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! \copydoc CValueObject::propertyByIndex
virtual QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
//! \copydoc CValueObject::setPropertyByIndex
virtual void setPropertyByIndex(const QVariant &variant, const BlackMisc::CPropertyIndex &index) override;
//! Register the metatypes
static void registerMetadata();
//! JSON member names
static const QStringList &jsonMembers();
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const override;
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &) const override;
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &) override;
//! \copydoc CValueObject::compareImpl
int compareImpl(const CValueObject &otherBase) const override;
//! \copydoc CValueObject::getMetaTypeId()
int getMetaTypeId() const override;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftCfgEntries)
qint32 m_index; //!< current index in given config

84
src/blacksim/fscommon/aircraftmapping.cpp
View File

@@ -42,24 +42,6 @@ namespace BlackSim
// void
}
/*
* Operator ==
*/
bool CAircraftMapping::operator ==(const CAircraftMapping &otherMapping) const
{
if (this == &otherMapping) return true;
return TupleConverter<CAircraftMapping>::toTuple(*this) == TupleConverter<CAircraftMapping>::toTuple(otherMapping);
}
/*
* Operator !=
*/
bool CAircraftMapping::operator !=(const CAircraftMapping &otherMapping) const
{
if (this == &otherMapping) return false;
return !((*this) == otherMapping);
}
/*
* String for converter
*/
@@ -204,71 +186,5 @@ namespace BlackSim
}
}
/*
* Marshall to Dbus
*/
void CAircraftMapping::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CAircraftMapping>::toTuple(*this);
}
/*
* Unmarshall from Dbus
*/
void CAircraftMapping::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CAircraftMapping>::toTuple(*this);
}
/*
* Metatype id
*/
int CAircraftMapping::getMetaTypeId() const
{
return qMetaTypeId<CAircraftCfgEntries>();
}
/*
* Compare
*/
int CAircraftMapping::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CAircraftMapping &>(otherBase);
return compare(TupleConverter<CAircraftMapping>::toTuple(*this), TupleConverter<CAircraftMapping>::toTuple(other));
}
/*
* Register metadata
*/
void CAircraftMapping::registerMetadata()
{
qRegisterMetaType<CAircraftMapping>();
qDBusRegisterMetaType<CAircraftMapping>();
}
/*
* To JSON
*/
QJsonObject CAircraftMapping::toJson() const
{
return BlackMisc::serializeJson(CAircraftMapping::jsonMembers(), TupleConverter<CAircraftMapping>::toTuple(*this));
}
/*
* To JSON
*/
void CAircraftMapping::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, CAircraftMapping::jsonMembers(), TupleConverter<CAircraftMapping>::toTuple(*this));
}
/*
* Members
*/
const QStringList &CAircraftMapping::jsonMembers()
{
return TupleConverter<CAircraftMapping>::jsonMembers();
}
} // namespace
} // namespace

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

@@ -23,24 +23,11 @@ namespace BlackSim
namespace FsCommon
{
//! Aircraft mapping class, represents one particular mapping
class CAircraftMapping : public BlackMisc::CValueObject
class CAircraftMapping : public BlackMisc::CValueObjectStdTuple<CAircraftMapping>
{
public:
static const qint32 InvalidId = -1; //!< Invalid mapping id
//! \copydoc CValueObject::marshallToDbus
virtual void marshallToDbus(QDBusArgument &) const override;
//! \copydoc CValueObject::unmarshallFromDbus
virtual void unmarshallFromDbus(const QDBusArgument &) override;
//! \copydoc CValueObject::getMetaTypeId()
int getMetaTypeId() const;
//! \copydoc CValueObject::compareImpl
int compareImpl(const CValueObject &otherBase) const override;
public:
//! Columns
enum ColumnIndex
{
@@ -74,16 +61,6 @@ namespace BlackSim
*/
CAircraftMapping(qint32 mappingId, qint32 proposalId, const QString &fsAircraftKey, const QString &icaoAircraftDesignator, const QString &icaoAirline, const QString &icaoAircraftType, const QString &icaoWakeTurbulenceCategory, const QString &painting, const QString &lastChanged, CSimulatorInfo simulator);
//! Virtual destructor
virtual ~CAircraftMapping()
{}
//! operator ==
bool operator ==(const CAircraftMapping &otherMapping) const;
//! operator !=
bool operator !=(const CAircraftMapping &otherMapping) const;
//! Mapping id
qint32 getMappingId() const { return this->m_mappingId; }
@@ -172,12 +149,6 @@ namespace BlackSim
//! \copydoc CValueObject::getValueHash()
virtual uint getValueHash() const override;
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::convertFromQVariant
virtual void convertFromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! Current UTC timestamp
static QString currentUtcTimestamp()
{
@@ -189,8 +160,6 @@ namespace BlackSim
protected:
//! \copydoc CValueObject::convertToQString
virtual QString convertToQString(bool i18n = false) const;
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
@@ -205,14 +174,6 @@ namespace BlackSim
QString m_lastChanged; //!< Simple timestamp as YYYYMMDDhhmmss
BlackSim::CSimulatorInfo m_simulatorInfo; //!< Mapping is for simulator
bool m_changed; //! Changed flag
//! \copydoc CValueObject::convertFromJson
virtual void convertFromJson(const QJsonObject &json) override;
//! Register metadata
static void registerMetadata();
//! JSON member names
static const QStringList &jsonMembers();
};
} // namespace
} // namespace