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

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

View File

@@ -47,73 +47,6 @@ namespace BlackMisc
return s;
}
/*
* Marshall to DBus
*/
void CNameVariantPair::marshallToDbus(QDBusArgument &argument) const
{
argument << TupleConverter<CNameVariantPair>::toTuple(*this);
}
/*
* Unmarshall from DBus
*/
void CNameVariantPair::unmarshallFromDbus(const QDBusArgument &argument)
{
argument >> TupleConverter<CNameVariantPair>::toTuple(*this);
}
/*
* Equal?
*/
bool CNameVariantPair::operator ==(const CNameVariantPair &other) const
{
if (this == &other) return true;
return TupleConverter<CNameVariantPair>::toTuple(*this) == TupleConverter<CNameVariantPair>::toTuple(other);
}
/*
* Unequal?
*/
bool CNameVariantPair::operator !=(const CNameVariantPair &other) const
{
return !((*this) == other);
}
/*
* Hash
*/
uint CNameVariantPair::getValueHash() const
{
return qHash(TupleConverter<CNameVariantPair>::toTuple(*this));
}
/*
* metaTypeId
*/
int CNameVariantPair::getMetaTypeId() const
{
return qMetaTypeId<CNameVariantPair>();
}
/*
* is a
*/
bool CNameVariantPair::isA(int metaTypeId) const
{
if (metaTypeId == qMetaTypeId<CNameVariantPair>()) { return true; }
return this->CValueObject::isA(metaTypeId);
}
/*
* Compare
*/
int CNameVariantPair::compareImpl(const CValueObject &otherBase) const
{
const auto &other = static_cast<const CNameVariantPair &>(otherBase);
return compare(TupleConverter<CNameVariantPair>::toTuple(*this), TupleConverter<CNameVariantPair>::toTuple(other));
}
/*
* Property by index
*/
@@ -172,37 +105,4 @@ namespace BlackMisc
}
}
/*
* Register metadata
*/
void CNameVariantPair::registerMetadata()
{
qRegisterMetaType<CNameVariantPair>();
qDBusRegisterMetaType<CNameVariantPair>();
}
/*
* To JSON
*/
QJsonObject CNameVariantPair::toJson() const
{
return BlackMisc::serializeJson(TupleConverter<CNameVariantPair>::toMetaTuple(*this));
}
/*
* From JSON
*/
void CNameVariantPair::convertFromJson(const QJsonObject &json)
{
BlackMisc::deserializeJson(json, TupleConverter<CNameVariantPair>::toMetaTuple(*this));
}
/*
* Members
*/
const QStringList &CNameVariantPair::jsonMembers()
{
return TupleConverter<CNameVariantPair>::jsonMembers();
}
} // namespace