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

44
src/blackmisc/nwaircraftmapping.h
View File

@@ -23,7 +23,7 @@ namespace BlackMisc
/*!
* Mapping
*/
class CAircraftMapping: public BlackMisc::CValueObject
class CAircraftMapping : public CValueObjectStdTuple<CAircraftMapping>
{
private:
BLACK_ENABLE_TUPLE_CONVERSION(CAircraftMapping)
@@ -34,21 +34,6 @@ namespace BlackMisc
//! \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(const CValueObject &)
int compareImpl(const CValueObject &otherBase) const override;
//! \copydoc CValueObject::getMetaTypeId()
int getMetaTypeId() const override;
//! \copydoc CValueObject::isA
virtual bool isA(int metaTypeId) const override;
public:
//! Properties
enum ColumnIndex
@@ -63,12 +48,6 @@ namespace BlackMisc
//! Constructor
CAircraftMapping(const QString &aircraftDesignator, const QString &airlineDesignator, const QString &model);
//! operator ==
bool operator ==(const CAircraftMapping &other) const;
//! operator !=
bool operator !=(const CAircraftMapping &other) const;
//! \copydoc CValueObject::propertyByIndex
QVariant propertyByIndex(const BlackMisc::CPropertyIndex &index) const override;
@@ -87,32 +66,11 @@ namespace BlackMisc
//! Model
const BlackMisc::Network::CAircraftModel &getModel() const { return this->m_model; }
//! \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;
//! Matches model string?
bool matchesModelString(const QString &modelString, Qt::CaseSensitivity sensitivity) const;
//! Matches wildcard icao object
bool matchesWildcardIcao(const BlackMisc::Aviation::CAircraftIcao &otherIcao) const { return m_icao.matchesWildcardIcao(otherIcao); }
//! Register the metatypes
static void registerMetadata();
//! Members
static const QStringList &jsonMembers();
};
}
}