refs #314, fromQVariant / location of toQVariant

* 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

View File

@@ -13,6 +13,7 @@
#define BLACKMISC_PROPERTYINDEX_H
#include "valueobject.h"
#include "blackmiscfreefunctions.h"
#include <initializer_list>
namespace BlackMisc
@@ -95,18 +96,11 @@ namespace BlackMisc
//! \copydoc CValueObject::CPropertyIndexlueHash()
virtual uint getValueHash() const override;
//! CValueObject::toQVariant()
//! \copydoc CValueObject::toQVariant
virtual QVariant toQVariant() const override { return QVariant::fromValue(*this); }
//! \copydoc CValueObject::fromQVariant
virtual void fromQVariant(const QVariant &variant) override
{
Q_ASSERT(variant.canConvert<CPropertyIndex>());
if (variant.canConvert<CPropertyIndex>())
{
(*this) = variant.value<CPropertyIndex>();
}
}
virtual void fromQVariant(const QVariant &variant) override { BlackMisc::setFromQVariant(this, variant); }
//! \copydoc CValueObject::toJson
virtual QJsonObject toJson() const override;