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

@@ -192,6 +192,9 @@ namespace BlackMisc
//! Virtual method to return CVariant
virtual CVariant toCVariant() const { return CVariant(this->toQVariant()); }
//! Set from QVariant
virtual void fromQVariant(const QVariant &variant) = 0;
//! Contribute to JSON object
virtual QJsonObject toJson() const { QJsonObject json; return json;}
@@ -217,7 +220,7 @@ namespace BlackMisc
virtual QString propertyByIndexAsString(const CPropertyIndex &index, bool i18n = false) const;
//! The stored object as CValueObject
static const CValueObject *fromQVariant(const QVariant &qv);
static const CValueObject *convertFromQVariant(const QVariant &variant);
protected:
//! Default constructor