mirror of
https://github.com/swift-project/pilotclient.git
synced 2026-04-02 23:25:53 +08:00
refs #345 First wave of value classes using the CValueObjectStdTuple CRTP class template.
This commit is contained in:
@@ -18,7 +18,7 @@
|
||||
namespace BlackMisc
|
||||
{
|
||||
//! Value object representing a hotkey function.
|
||||
class CHotkeyFunction : public CValueObject
|
||||
class CHotkeyFunction : public CValueObjectStdTuple<CHotkeyFunction>
|
||||
{
|
||||
public:
|
||||
//! Function type
|
||||
@@ -48,27 +48,6 @@ namespace BlackMisc
|
||||
//! Set function
|
||||
void setFunction(const Function &function) { m_function = function; }
|
||||
|
||||
//! \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::getValueHash
|
||||
virtual uint getValueHash() const override;
|
||||
|
||||
//! \copydoc CValueObject::toJson
|
||||
virtual QJsonObject toJson() const override;
|
||||
|
||||
//! \copydoc CValueObject::convertFromJson
|
||||
virtual void convertFromJson(const QJsonObject &json) override;
|
||||
|
||||
//! Register metadata
|
||||
static void registerMetadata();
|
||||
|
||||
//! Equal?
|
||||
bool operator ==(const CHotkeyFunction &other) const;
|
||||
|
||||
//! Hotkey function is Ptt
|
||||
static const CHotkeyFunction &Ptt()
|
||||
{
|
||||
@@ -112,25 +91,9 @@ namespace BlackMisc
|
||||
}
|
||||
|
||||
protected:
|
||||
|
||||
//! \copydoc CValueObject::convertToQString
|
||||
virtual QString convertToQString(bool i18n = false) const override;
|
||||
|
||||
//! \copydoc CValueObject::getMetaTypeId
|
||||
virtual int getMetaTypeId() const override;
|
||||
|
||||
//! \copydoc CValueObject::isA
|
||||
virtual bool isA(int metaTypeId) const override;
|
||||
|
||||
//! \copydoc CValueObject::compareImpl(otherBase)
|
||||
virtual int compareImpl(const CValueObject &otherBase) const override;
|
||||
|
||||
//! \copydoc CValueObject::marshallToDbus
|
||||
virtual void marshallToDbus(QDBusArgument &argument) const override;
|
||||
|
||||
//! \copydoc CValueObject::unmarshallFromDbus
|
||||
virtual void unmarshallFromDbus(const QDBusArgument &argument) override;
|
||||
|
||||
private:
|
||||
BLACK_ENABLE_TUPLE_CONVERSION(CHotkeyFunction)
|
||||
Function m_function;
|
||||
|
||||
Reference in New Issue
Block a user